Bladeren bron

修改详情显示规则,通过模型验证添加分页,修改总览手动编辑主从对象显示文案

shaun-sheep 4 jaren geleden
bovenliggende
commit
7558464562

+ 6 - 12
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -243,10 +243,10 @@
     },
     methods: {
       //  查询设备部件数量
-      handleContent() {
+      handleContent(row) {
         let param = {
-          TaskId: this.detail.TaskId,
-          EquipId: this.detail.EquipId
+          TaskId: row.TaskId,
+          EquipId: row.EquipId
         }
         this.Name = ''
         this.Count = ''
@@ -259,11 +259,10 @@
         })
       },
       //  查询模型部件数量
-      handleModelContent() {
-
+      handleModelContent(row) {
         let param = {
-          TaskId: this.detail.TaskId,
-          EquipId: this.detail.EquipId
+          TaskId: row.TaskId,
+          EquipId: row.EquipId
         }
         this.Name = ''
         this.Count = ''
@@ -279,11 +278,6 @@
     watch: {
       'detail.TaskId'() {
         console.log(this.detail)
-        if (this.type == 'model') {
-          this.handleModelContent()
-        } else {
-          this.handleContent()
-        }
       }
     }
   };

+ 3 - 1
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -138,7 +138,9 @@
         })
         let param = {
           ModelId: this.params.CurrentModelId,
-          IdList: arr
+          IdList: arr,
+          PageNumber: this.page.pageNumber,
+          PageSize: this.page.pageSize
         }
         // console.log(param,'param')
         queryModelDiglog(param, res => {

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

@@ -45,7 +45,7 @@
      :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
     </el-pagination>
     <el-drawer title="任务详情" :visible.sync="drawer" direction="rtl" size="600px">
-      <device-detail :detail="detailDevice" type="device"></device-detail>
+      <device-detail :detail="detailDevice" ref="deviceDetail"></device-detail>
     </el-drawer>
   </div>
 </template>
@@ -206,7 +206,12 @@
     //查看任务详情
     handleDetail(index, row) {
       this.drawer = true
-      this.detailDevice = row
+      this.$nextTick(() => {
+        this.detailDevice = row
+        this.$refs.deviceDetail.handleContent(row)
+      })
+
+
     },
     // 改变pagesize
     handleSizeChange(pageSize) {

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

@@ -39,7 +39,7 @@
      :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
     </el-pagination>
     <el-drawer title="任务详情" :visible.sync="drawer" direction="rtl" size="600px">
-      <device-detail :detail="detailModel" type="model"></device-detail>
+      <device-detail :detail="detailModel" ref="detailModel"></device-detail>
     </el-drawer>
   </div>
 </template>
@@ -193,7 +193,10 @@
     //查看任务详情
     handleDetail(index, row) {
       this.drawer = true
-      this.detailModel = row
+      this.$nextTick(() => {
+        this.detailModel = row
+        this.$refs.detailModel.handleModelContent(row)
+      })
     },
     // 改变pagesize
     handleSizeChange(pageSize) {

+ 1 - 1
src/components/data_admin/buildTask/taskStatistics.vue

@@ -3,7 +3,7 @@
 		<div class="statistics-all flex-row">
       <div class="statistics-progress">
         <div class="statistics-progress-num">
-          <p>{{taskProgress?taskProgress:0 + '%'}}</p>
+          <p>{{taskProgress?taskProgress + '%':0 + '%'}}</p>
           <p>完成情况</p>
         </div>
         <el-progress :width="90" type="circle" :percentage="taskProgress?taskProgress:0" :show-text="false"></el-progress>

+ 2 - 2
src/components/relation/relationShip/Modal/addRelationShip.vue

@@ -152,8 +152,8 @@
           label: '本地名称'
         }],
         codeValue: '',
-        MainObject: `(包括:${localStorage.getItem('MainObject')} )限制条件`,
-        FromObject: `(包括:${localStorage.getItem('FromObject')} )限制条件`,
+        MainObject: `(限制条件:${localStorage.getItem('MainObject') || '无'} )类型`,
+        FromObject: `(限制条件:${localStorage.getItem('FromObject') || '无'} )类型`,
         ruleForm: {
           main: '',
           codeList: [{

+ 1 - 1
src/views/relation/overview/index.vue

@@ -169,7 +169,7 @@ export default {
         }
       this.init();
       });
-     
+      this.init();
     },
     calcSpecial(relation) {
       this.currentRelationTypeName = relation.RelationTypeName;

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

@@ -265,8 +265,8 @@
     data() {
       return {
         visible: false,
-        MainObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('MainObject')}类型)`,
-        FromObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('FromObject')}类型)`,
+        MainObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('MainObject') || '无'}类型)`,
+        FromObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('FromObject') || '无'}类型)`,
         pageSizes: [10, 20, 50, 100],
         pageSize: 50,
         currentPage: 1,
@@ -564,6 +564,7 @@
 
     /deep/ .el-input__inner {
       width: 220px;
+      padding-right: 25px;
     }
 
     /deep/ .el-input {