From 28239ff3df23e1c5818aaae30aabd66824ebaabf Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 01 十二月 2020 15:49:48 +0800
Subject: [PATCH] 相机标定新增标注添加id,确定方法更新

---
 src/pages/cameraAccess/components/DataStackInfo.vue |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/pages/cameraAccess/components/DataStackInfo.vue b/src/pages/cameraAccess/components/DataStackInfo.vue
index aebdd67..fcd94b7 100644
--- a/src/pages/cameraAccess/components/DataStackInfo.vue
+++ b/src/pages/cameraAccess/components/DataStackInfo.vue
@@ -13,7 +13,22 @@
             <el-radio v-model="form.type" :label="3" :disabled="!isAdd">闊抽</el-radio>
             <el-radio v-model="form.type" :label="4" :disabled="!isAdd">鍏朵粬鏁版嵁</el-radio>
           </el-form-item>
-
+          <el-form-item label="澶勭悊鍒嗚鲸鐜�" style="width:440px">
+            <el-select
+              v-model="form.resolution"
+              placeholder="鏈満鍒嗚鲸鐜�"
+              style="position: absolute;left: 0;"
+              size="small"
+              @change="checkResolution"
+            >
+              <el-option
+                v-for="item in form.resolutions"
+                :key="`${item.width}*${item.height}`"
+                :label="`${item.width}*${item.height}`=='0*0'?'鏈満鍒嗚鲸鐜�':`${item.width}*${item.height}`"
+                :value="`${item.width}*${item.height}`"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item
             label="澶勭悊瀹屾垚鍚庤嚜鍔ㄥ垹闄ゆ枃浠�"
             prop="isAutoDelFile"
@@ -222,7 +237,7 @@
                 :disabled="scope.row.status == 2"
                 class="iconfont iconzhongxinkaishi btn"
                 @click="handleFileStatus(scope.row, 1)"
-                v-show="scope.row.status === 9"
+                v-show="scope.row.status === 9 || scope.row.status === -2"
               ></el-button>
             </el-tooltip>
 
@@ -341,6 +356,7 @@
   filters: {
     statusFormat(value) {
       let statusCode = {
+        "-2": "澶勭悊寮傚父",
         "-1": "宸插垹闄�",
         "0": "鏆傚仠澶勭悊",
         "1": "绛夊緟澶勭悊",
@@ -400,7 +416,8 @@
       multipleSelection: [],
       searchInput: "",
       form: {
-        id: ""
+        id: "",
+        resolution: ""
       },
       fileList: [],
       // 璁板綍娣诲姞鐘舵��
@@ -420,7 +437,6 @@
       timer: 0,
       targetDir: "",
       targetFile: "",
-
     };
   },
   mounted() {
@@ -441,6 +457,10 @@
     },
   },
   methods: {
+    checkResolution(val){
+      this.form.resolution_width = Number(val.split('*')[0]);
+      this.form.resolution_height = Number(val.split('*')[1]);
+    },
     preview(row) {
       this.previewDialog = true;
       if (row.type === 1) {
@@ -475,6 +495,7 @@
       if (node.id === "") {
         return
       }
+      console.log('閫夋嫨鏁版嵁鏍�',node)
       this.isDisabled = false;
       this.isAdd = false;
       this.videoItem = null;
@@ -482,6 +503,7 @@
       // this.initFormData();
       // this.$refs.addForm.clearValidate();
       this.form = { ...node };
+      this.form.resolution = `${node.resolution_width}*${node.resolution_height}`;
       delete this.form.createTime;
       delete this.form.updateTime;
       delete this.form.status;
@@ -515,9 +537,7 @@
       findAllFileByStackId({ name: this.searchInput, stackId: this.form.id, page: this.page, size: this.size, type: 0 }).then(rsp => {
         if (rsp && rsp.success && rsp.data.total >= 0) {
           this.fileList = rsp.data.dataList;
-
           this.total = rsp.data.total;
-
           // 瀹氭椂鍒锋柊浼氭竻绌洪�変腑鐘舵�侊紝鍦ㄨ繖閲屾仮澶�
           this.fileList.forEach(row => {
             //this.polygonDatas.push({snapshot_url:row.snapshot_url})

--
Gitblit v1.8.0