Bläddra i källkod

Merge branch 'dev'

zhangyu 4 år sedan
förälder
incheckning
7712158788

+ 4 - 2
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -93,6 +93,7 @@ export default {
   },
   methods: {
     getTableData() {
+      this.loading = true
       let params = {
         Cascade: [
           {
@@ -119,11 +120,11 @@ export default {
       }
 
       if (this.params.isVerification) {
-        params.Filters += `;TaskState isNull`
+        params.Filters += `;(TaskState isNull || TaskState=0)`
       }
 
       if (this.params.device) {
-        params.Filters += `;Category='${this.params.category}'`
+        params.Filters += `;Category='${this.params.device}'`
       }
 
       if (this.params.spaceList && this.params.spaceList.length) {
@@ -135,6 +136,7 @@ export default {
       } else {
         params.Filters += `;ModelId='${this.params.CurrentModelId}'`
         queryEquip(params, res => {
+          this.loading = false
           this.dataFormatter(res)
         })
       }

+ 2 - 0
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -83,6 +83,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}'`,
         Cascade: [
@@ -117,6 +118,7 @@ export default {
         params.Filters += `;Category='${this.paramsData.family}'`
       }
       queryAssetsTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           item.TaskState = this.taskStateMap[item.TaskState]

+ 2 - 0
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -92,6 +92,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}'`,
         Cascade: [
@@ -128,6 +129,7 @@ export default {
         params.Filters += `;Category='${this.paramsData.deviceCategory}'`
       }
       queryDeviceTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           if(item.Component && item.Component.length){

+ 2 - 0
src/components/data_admin/buildTask/table/modelTable.vue

@@ -89,6 +89,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}'`,
         Cascade: [
@@ -114,6 +115,7 @@ export default {
         params.Filters += `;Category='${this.paramsData.modelCategory}'`
       }
       queryModelTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           if(item.Component && item.Component.length){

+ 2 - 0
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -92,6 +92,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}';TaskType in ['2']`,
         Cascade: [
@@ -124,6 +125,7 @@ export default {
       //   params.Filters += `;Family='${this.paramsData.family}'`
       // }
       queryAssetsTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           item.TaskState = this.taskStateMap[item.TaskState]

+ 2 - 0
src/components/data_admin/buildTask/table/tearTable.vue

@@ -92,6 +92,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}';TaskType in ['3','-5']`,
         Cascade: [
@@ -124,6 +125,7 @@ export default {
       //   params.Filters += `;Family='${this.paramsData.family}'`
       // }
       queryAssetsTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           item.TaskState = this.taskStateMap[item.TaskState]

+ 1 - 0
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -162,6 +162,7 @@
       finish() {
         this.dialogProcess = false
         this.dialogExport = false
+        this.$emit('upDataTable')
       },
 
     }

+ 1 - 1
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -176,7 +176,7 @@
       }
 
       if(this.params.isVerification){
-        params.Filters += `;TaskState isNull`
+        params.Filters += `;(TaskState isNull || TaskState=0)`
       }
 
       if(this.keycode){

+ 1 - 1
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -220,7 +220,7 @@ export default {
       }
 
       if(this.params.isVerification){
-        params.Filters += `;TaskState isNull`
+        params.Filters += `;(TaskState isNull || TaskState=0)`
       }
 
       if(this.keycode){

+ 6 - 2
src/views/relation/relationShip/index.vue

@@ -136,7 +136,7 @@
         <el-table-column
           label="对象详情"
           prop="btn"
-          align="left"
+          align="center"
           min-width="90"
         >
           <template slot-scope="scope">
@@ -175,7 +175,7 @@
         </el-table-column>
         <el-table-column
           label="对象详情"
-          align="left"
+          align="center"
         >
           <template slot-scope="scope">
             <el-button
@@ -239,6 +239,7 @@
       ref="export"
       :values="values"
       :length="length"
+      @upDataTable="upDataTable"
     />
     <addRelationShip
       ref="addShipComponent"
@@ -382,6 +383,9 @@
       deepCopy(obj) {
         return JSON.parse(JSON.stringify(obj))
       },
+      upDataTable() {
+        this.init()
+      },
       init() {
         this.loading = true
         let data = {