Sfoglia il codice sorgente

'现场验证资产任务详情优化'

zhangyu 4 anni fa
parent
commit
2baa9e051d

+ 75 - 19
src/components/data_admin/buildTask/detail/assetsDetail.vue

@@ -6,7 +6,9 @@
           <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.ScanScheme?detail.ScanScheme.SchemeName?detail.ScanScheme.SchemeName:'--':'--' }}</el-form-item>
+          <el-form-item label="任务执行方案:">
+            {{detail.SchemeId?detail.SchemeId == 1 ? '极简' : '标准':'--' }}
+          </el-form-item>
           <el-form-item label="设备族:">{{ detail.EquipFamily?detail.EquipFamily.FamilyName?detail.EquipFamily.FamilyName:'--':'--' }}</el-form-item>
           <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
           <el-form-item label="资产本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
@@ -43,34 +45,39 @@
           </el-form-item>
           <el-form-item label="现场视频:" v-show="videoList && videoList.length">
             <video controls style="width:100%;" v-for="item in videoList" :key="item.Key" :title="item.Name">
-              <source :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`" type="video/mp4">
+              <source :src="`/image-service/common/file_get?systemId=dataPlatform&key=${item.Key}`" type="video/mp4">
               您的浏览器不支持 HTML5 video ,暂无法播放。
             </video>
           </el-form-item>
           <el-form-item label="备注信息:">{{ detail.Note || '--' }}</el-form-item>
         </el-form>
       </div>
-      <div class="operation-detail detail-item">
+      <div class="operation-detail detail-item" v-if="detail.TaskState === '未找到'">
         <el-form>
           <el-form-item label="操作信息:"></el-form-item>
           <div class="block">
             <el-timeline>
-              <el-timeline-item timestamp="2018/4/12" placement="top">
-                <el-card>
-                  <h4>更新 Github 模板</h4>
-                  <p>王小虎 提交于 2018/4/12 20:46</p>
-                </el-card>
-              </el-timeline-item>
-              <el-timeline-item timestamp="2018/4/3" placement="top">
-                <el-card>
-                  <h4>更新 Github 模板</h4>
-                  <p>王小虎 提交于 2018/4/3 20:46</p>
-                </el-card>
-              </el-timeline-item>
-              <el-timeline-item timestamp="2018/4/2" placement="top">
+              <el-timeline-item
+                  placement="top"
+                  v-for="(item,index) in arr"
+                  :key="index"
+                  :timestamp="item.timestamp"
+              >
                 <el-card>
-                  <h4>更新 Github 模板</h4>
-                  <p>王小虎 提交于 2018/4/2 20:46</p>
+                  <small>{{item.content}}</small>
+                  <p>{{item.title}}</p>
+                  <img
+                      v-for="isImg in item.imgs"
+                      :key="isImg.Key"
+                      :src="`/image-service/common/image_get?systemId=dataPlatform&key=${isImg.Key}`">
+
+                  <video controls style="width:100%;" v-for="v in videoList" :key="index"
+                         :title="v.Name">
+                    <source
+                        :src="`/image-service/common/file_get?systemId=dataPlatform&key=${v.Key}`"
+                        type="video/mp4">
+                    您的浏览器不支持 HTML5 video ,暂无法播放。
+                  </video>
                 </el-card>
               </el-timeline-item>
             </el-timeline>
@@ -91,6 +98,53 @@ export default {
   components: {
 
   },
+  created() {
+    let {ConfirmTime, PositivePhotoTime, QrCodeTime, NameplateTime, SidePhotoTime, VideoTime, EquipProblemTime, EquipProblem, TaskPicList} = this.detail;
+    let arr = []
+    QrCodeTime && arr.push({
+      timestamp: QrCodeTime,
+      time: new Date(QrCodeTime).getTime(),
+      content: '黏贴二维码',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('带二维码的设备近景照片'))
+    })
+    PositivePhotoTime && arr.push({
+      timestamp: PositivePhotoTime,
+      time: new Date(PositivePhotoTime).getTime(),
+      content: '拍摄正面照片',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备正面照片'))
+    })
+    NameplateTime && arr.push({
+      timestamp: NameplateTime,
+      time: new Date(NameplateTime).getTime(),
+      content: '拍摄铭牌照片',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('铭牌照片'))
+    })
+    SidePhotoTime && arr.push({
+      timestamp: SidePhotoTime,
+      time: new Date(SidePhotoTime).getTime(),
+      content: '拍摄侧面照片',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备左侧照片' || '设备右侧照片'))
+    })
+    VideoTime && arr.push({
+      timestamp: VideoTime,
+      time: new Date(VideoTime).getTime(),
+      content: '拍摄30s视频',
+      videoList: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('视频资料'))
+    })
+    EquipProblemTime && arr.push({
+      timestamp: EquipProblemTime,
+      time: new Date(EquipProblemTime).getTime(),
+      content: '记录设备问题',
+      title: EquipProblem
+    })
+    ConfirmTime && arr.push({
+      timestamp: ConfirmTime,
+      time: new Date(ConfirmTime).getTime(),
+      content: '确认信息',
+      title: '已确认的设备信息'
+    })
+    this.arr = arr.map(i => ({...i})).sort((a, b) => b.time - a.time)
+  },
   computed: {
     ...mapGetters("layout", ["projectId"]),
     panoramaList(){
@@ -138,10 +192,12 @@ export default {
   data() {
     return {
       dialogVisible: false,//全景图弹出框
-      nowUrl: ''//当前正在显示的图
+      nowUrl: '',//当前正在显示的图
+      arr: [],
     };
   },
   methods: {
+
   },
   watch: {
     'detail.TaskId'() {

+ 2 - 3
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -7,8 +7,7 @@
           <el-form-item label="任务创建时间:">{{ detail.CreateTime || '--' }}</el-form-item>
           <el-form-item label="任务当前状态:">{{ detail.TaskState || '--' }}</el-form-item>
           <el-form-item label="任务执行方案:">
-<!--            {{detail.ScanScheme?detail.ScanScheme.SchemeName?detail.ScanScheme.SchemeName:'&#45;&#45;':'&#45;&#45;' }}-->
-            {{detail.SchemeId == 1 ? '极简' : '标准' }}
+            {{detail.SchemeId?detail.SchemeId == 1 ? '极简' : '标准':'--' }}
           </el-form-item>
           <el-form-item label="设备类:">{{
             detail.EquipCategory?detail.EquipCategory.EquipName?detail.EquipCategory.EquipName:'--':'--' }}
@@ -101,7 +100,7 @@
                   <video controls style="width:100%;" v-for="v in videoList" :key="index"
                          :title="v.Name">
                     <source
-                        :src="`/image-service/common/image_get?systemId=dataPlatform&key=${v.Key}`"
+                        :src="`/image-service/common/file_get?systemId=dataPlatform&key=${v.Key}`"
                         type="video/mp4">
                     您的浏览器不支持 HTML5 video ,暂无法播放。
                   </video>

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

@@ -183,10 +183,6 @@ export default {
     handleCurrentChange(pageNo) {
       this.page.pageNumber = pageNo;
       this.getTableData()
-    },
-    projectId() {
-      this.page.pageNumber = 1
-      this.getTableData()
     }
   },
   watch: {
@@ -199,6 +195,10 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    projectId() {
+      this.page.pageNumber = 1
+      this.getTableData()
     }
   }
 };

+ 36 - 9
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -26,6 +26,13 @@
           <el-table-column prop="EquipLocalID" label="资产本地编码" show-overflow-tooltip width="200"></el-table-column>
           <el-table-column prop="FamilyName.Name" label="设备族"></el-table-column>
           <el-table-column prop="LedgerParam.Siteinstall.InstallLocation" label="安装位置"></el-table-column>
+          <el-table-column prop="type" label="现场验证操作规定" width="200">
+            <template slot-scope="scope">
+              <el-select style="width:100px;" v-model="scope.row.SchemeId" placeholder="请选择">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
@@ -72,6 +79,13 @@
         pageNumber: 1,
         total: 0
       },
+      options: [{//方案
+        value: '1',
+        label: '极简'
+      }, {
+        value: '2',
+        label: '标准'
+      }],
       tableData: [],
       multipleSelection:[],
       headerStyle: {
@@ -204,16 +218,29 @@
     },
     //创建已选
     handleClickCreate() {
-      let list = this.multipleSelection.map((item) => {
-        return {EquipId: item.EquipID}
-      })
-      let param = {
-        Content: list
+      if (this.multipleSelection.length) {
+        let list = this.multipleSelection.map((item) => {
+          if (item.SchemeId) {
+            return {
+              EquipId: item.EquipID,
+              SchemeId: item.SchemeId
+            }
+          } else {
+            return {
+              EquipId: item.EquipID
+            }
+          }
+        })
+        let param = {
+          Content: list
+        }
+        createAssetsTask(param, res => {
+          this.$message.success("创建成功!")
+          this.$router.push({ name: "buildTask",query:{ newTaskTypes:this.$route.query.newTaskTypes } })
+        })
+      } else {
+        this.$message('请选择要创建的任务!')
       }
-      createAssetsTask(param, res => {
-        this.$message.success("创建成功!")
-        this.$router.push({ name: "buildTask",query:{ newTaskTypes:this.$route.query.newTaskTypes } })
-      })
     }
   }
 };

+ 2 - 2
src/views/ready/collectsetting/index.vue

@@ -26,7 +26,7 @@
               <ul class="family_list">
                 <li class="family_item" @click="familyActive(family.name,family.code)"
                     :class="active == family.name ? 'active' : ''" v-for="(family,index) in allFamily" :key="index"
-                    v-if="family.capitalize === letter">{{family.name}}-{{family.code}}
+                    v-show="family.capitalize === letter">{{family.name}}-{{family.code}}
                 </li>
               </ul>
             </div>
@@ -34,7 +34,7 @@
               <ul class="family_list">
                 <li class="family_item" @click="familyActive(family.name,family.code)"
                     :class="active == family.name ? 'active' : ''" v-for="(family,index) in searchArr" :key="index"
-                    v-if="family.capitalize === letter">{{family.name}}-{{family.code}}
+                    v-show="family.capitalize === letter">{{family.name}}-{{family.code}}
                 </li>
               </ul>
             </div>