浏览代码

详情调试(未完成)

zhangyu 5 年之前
父节点
当前提交
f56b2adeb9

+ 6 - 14
src/components/data_admin/buildTask/detail/assetsDetail.vue

@@ -3,34 +3,26 @@
     <el-scrollbar style="height:100%;">
       <div class="attribute-detail detail-item">
         <el-form :model="detail" label-width="150px">
-          <el-form-item label="资产基本信息"></el-form-item>
+          <el-form-item label="资产基本信息"></el-form-item>
           <el-form-item label="任务创建时间:">{{ detail.CreateTime || '--' }}</el-form-item>
           <el-form-item label="任务当前状态:">{{ detail.TaskState || '--' }}</el-form-item>
           <el-form-item label="任务执行方案:">{{ detail.TaskId || '--' }}</el-form-item>
-          <el-form-item label="设备族:">{{ detail.EquipCategory.EquipName || '--' }}</el-form-item>
+          <el-form-item label="设备族:">{{ detail.EquipFamily.FamilyName || '--' }}</el-form-item>
           <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
-          <el-form-item label="设备本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
-          <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
+          <el-form-item label="资产本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
+          <el-form-item label="资产本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
           <el-form-item label="设计图纸中编码:">{{ detail.CadId || '--' }}</el-form-item>
           <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
           <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
           <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
           <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
-          <el-form-item label="包含设备:">
-            <div v-if="detail.Equipment.Component && detail.Equipment.Component.length">
-              <p v-for="(item, index) in detail.Equipment.Component" :key="index" show-overflow-tooltip>
-               {{ item.EquipName }}
-              </p>
-            </div>
-            <div v-else>--</div>
-          </el-form-item>
         </el-form>
       </div>
-      <div class="implement-detail detail-item">
+      <div class="implement-detail detail-item" v-if="detail.TaskState == '未找到'">
         <el-form :model="detail" label-width="150px">
           <el-form-item label="执行任务人:">{{ detail.WorkerName || '--' }}</el-form-item>
           <el-form-item label="执行时间:">{{ detail.ProcessTime || '--' }}</el-form-item>
-          <el-form-item label="未找到对象信息"></el-form-item>
+          <el-form-item label="未找到对象信息"></el-form-item>
           <el-form-item label="设备信息:">
             <div v-if="detail.Equipment.Component && detail.Equipment.Component.length">
               <p v-for="(item, index) in detail.Equipment.Component" :key="index" show-overflow-tooltip>

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

@@ -3,7 +3,7 @@
     <el-scrollbar style="height:100%;">
       <div class="attribute-detail detail-item">
         <el-form :model="detail" label-width="150px">
-          <el-form-item label="设备基本信息"></el-form-item>
+          <el-form-item label="设备基本信息"></el-form-item>
           <el-form-item label="任务创建时间:">{{ detail.CreateTime || '--' }}</el-form-item>
           <el-form-item label="任务当前状态:">{{ detail.TaskState || '--' }}</el-form-item>
           <el-form-item label="任务执行方案:">{{ detail.TaskId || '--' }}</el-form-item>
@@ -26,15 +26,15 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="implement-detail detail-item">
+      <div class="implement-detail detail-item" v-if="detail.TaskState == '未找到'">
         <el-form :model="detail" label-width="150px">
           <el-form-item label="执行任务人:">{{ detail.WorkerName || '--' }}</el-form-item>
           <el-form-item label="执行时间:">{{ detail.ProcessTime || '--' }}</el-form-item>
-          <el-form-item label="未找到对象信息"></el-form-item>
+          <el-form-item label="未找到对象信息"></el-form-item>
           <el-form-item label="部件信息:">
-            <div v-if="detail.Component && detail.Component.length">
-              <p v-for="(item, index) in detail.Component?detail.Component:[]" :key="index" show-overflow-tooltip>
-               {{ item.EquipName }}
+            <div v-if="detail.ComponentCount && detail.ComponentCount.length">
+              <p v-for="item in detail.ComponentCount?detail.ComponentCount:[]" :key="item.code" show-overflow-tooltip>
+               {{ `${item.name}:${item.count}`}}
               </p>
             </div>
             <div v-else>--</div>

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

@@ -15,11 +15,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="FolderName" label="所属模型文件夹" width="110" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="FileName" label="模型文件名" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="FileName" label="模型文件名" width="80" show-overflow-tooltip></el-table-column>
         <el-table-column prop="EquipLocalName" label="设备本地名称" show-overflow-tooltip width="100"></el-table-column>
         <el-table-column prop="EquipLocalID" label="设备本地编码" show-overflow-tooltip width="100"></el-table-column>
-        <el-table-column prop="EquipCategory.EquipName" label="设备类"></el-table-column>
-        <el-table-column prop="BimId" label="BIM Id" show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column prop="EquipCategory.EquipName" label="设备类" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column prop="BimId" label="BIM Id" show-overflow-tooltip width="80"></el-table-column>
         <el-table-column prop="type" label="现场验证操作规定" width="150">
           <template slot-scope="scope">
             <el-select style="width:100px;" v-model="scope.row.SchemeId" placeholder="请选择">
@@ -118,6 +118,10 @@ export default {
         params.Filters += `;ModelId='${this.params.CurrentModelId}'`
       }
 
+      if(this.params.isVerification){
+        params.Filters += `;TaskState isNull`
+      }
+
       if(this.params.device){
         params.Filters += `;Category='${this.params.category}'`
       }
@@ -159,7 +163,7 @@ export default {
       if(this.selections.length){
         let list = this.selections.map((item) => {
           return {
-            EquipID: item.EquipID,
+            EquipId: item.EquipID,
             FileId: item.FileId,
             FileName: item.FileName,
             FolderId: item.FolderId,

+ 1 - 1
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -157,7 +157,7 @@ export default {
     handleConfirm(index, row){
       let params = {
         Content: [{
-          EquipId: row.EquipId,
+          TaskId: row.TaskId,
           TaskState: 0
         }]
       }

+ 1 - 1
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -185,7 +185,7 @@ export default {
     handleConfirm(index, row){
       let params = {
         Content: [{
-          EquipId: row.EquipId,
+          TaskId: row.TaskId,
           TaskState: 0
         }]
       }

+ 1 - 1
src/components/data_admin/buildTask/table/modelTable.vue

@@ -172,7 +172,7 @@ export default {
     handleConfirm(index, row){
       let params = {
         Content: [{
-          EquipId: row.EquipId,
+          TaskId: row.TaskId,
           TaskState: 0
         }]
       }

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

@@ -140,7 +140,7 @@ export default {
     },
     //格式化条件
     formatFilter() {
-      let param = {
+      let params = {
         Cascade: [
           {
             Name: "familyName"
@@ -161,30 +161,30 @@ export default {
       }
 
       if(this.params.isVerification){
-        param.Filters += `;TaskState isNull'`
+        params.Filters += `;TaskState isNull`
       }
 
       if(this.keycode){
-        param.Filters += `;LedgerParam.Siteinstall.InstallLocation contain '${this.keycode}'`
+        params.Filters += `;LedgerParam.Siteinstall.InstallLocation contain '${this.keycode}'`
       }
 
       if(this.params.category){
-        param.Filters += `;Family='${this.params.category}'`
+        params.Filters += `;Family='${this.params.category}'`
       }
 
       if (this.params.buildId == "noKnow") {
-        param.Filters += `;BuildingId isNull`
+        params.Filters += `;BuildingId isNull`
       } else if (this.params.buildId && this.params.buildId != "all") {
-        param.Filters += `;BuildingId='${this.params.buildId}'`
+        params.Filters += `;BuildingId='${this.params.buildId}'`
       }
 
       if (this.params.floorId == "noKnow") {
-        param.Filters += `;FloorId isNull`
+        params.Filters += `;FloorId isNull`
       } else if (this.params.floorId && this.params.floorId != "all") {
-        param.Filters += `;FloorId='${this.params.floorId}'`
+        params.Filters += `;FloorId='${this.params.floorId}'`
       }
 
-      return param
+      return params
     },
     //选择的设备或部件
     handleSelectionChange(val) {
@@ -204,7 +204,7 @@ export default {
     //创建已选
     handleClickCreate() {
       let list = this.multipleSelection.map((item) => {
-        return {EquipID: item.EquipID}
+        return {EquipId: item.EquipID}
       })
       let param = {
         Content: list

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

@@ -180,7 +180,7 @@ export default {
     },
     //格式化条件
     formatFilter() {
-      let param = {
+      let params = {
         Cascade: [
           {
             Name: "equipCategory",
@@ -206,30 +206,30 @@ export default {
       }
       
       if(this.params.isVerification){
-        param.Filters += `;TaskState isNull'`
+        params.Filters += `;TaskState isNull`
       }
 
       if(this.keycode){
-        param.Filters += `;LedgerParam.Siteinstall.InstallLocation contain '${this.keycode}'`
+        params.Filters += `;LedgerParam.Siteinstall.InstallLocation contain '${this.keycode}'`
       }
 
       if(this.params.category){
-        param.Filters += `;Category='${this.params.category}'`
+        params.Filters += `;Category='${this.params.category}'`
       }
 
       if (this.params.buildId == "noKnow") {
-        param.Filters += `;BuildingId isNull`
+        params.Filters += `;BuildingId isNull`
       } else if (this.params.buildId && this.params.buildId != "all") {
-        param.Filters += `;BuildingId='${this.params.buildId}'`
+        params.Filters += `;BuildingId='${this.params.buildId}'`
       }
 
       if (this.params.floorId == "noKnow") {
-        param.Filters += `;FloorId isNull`
+        params.Filters += `;FloorId isNull`
       } else if (this.params.floorId && this.params.floorId != "all") {
-        param.Filters += `;FloorId='${this.params.floorId}'`
+        params.Filters += `;FloorId='${this.params.floorId}'`
       }
 
-      return param
+      return params
     },
     //选择的设备或部件
     handleSelectionChange(val) {
@@ -249,7 +249,7 @@ export default {
     //创建已选
     handleClickCreate() {
       let list = this.multipleSelection.map((item) => {
-        return {EquipID: item.EquipID}
+        return {EquipId: item.EquipID}
       })
       let param = {
         Content: list

+ 6 - 2
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -42,6 +42,7 @@ export default {
   },
   data() {
     return {
+      query: {},//query信息
       dialogVisible: false,//是否显示弹窗
       modelFolderName: '',//模型文件夹名字
       modelFolderId: '',//模型文件夹的id
@@ -60,11 +61,14 @@ export default {
         CurrentModelId: this.CurrentModelId,
         modelFolderName: this.modelFolderName,
         modelFileName: this.modelFileName,
-        spaceList: this.spaceList
+        spaceList: this.spaceList,
+        isVerification: this.query.isVerification
       }
     }
   },
-  mounted() { },
+  created() { 
+    this.query = this.$route.query
+  },
   methods: {
     goBack(){//返回
       this.$router.push({name:'buildTask'})