Merge branch 'master' of http://git.keliuyun.com:55676/luoxinlin/vion-tools

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "private": true,
     "scripts": {
     "scripts": {
         "serve": "vue-cli-service serve",
         "serve": "vue-cli-service serve",
-        "build": "vue-cli-service build",
+        "build": "set NODE_OPTIONS=--openssl-legacy-provider &&  vue-cli-service build",
         "lint": "vue-cli-service lint",
         "lint": "vue-cli-service lint",
         "dev": "vue-cli-service serve"
         "dev": "vue-cli-service serve"
     },
     },

src/views/FeatureMatchingAccuracy/FeatureMatchingAccuracy.vue

@@ -129,29 +129,29 @@
       <div @click="returns" style="cursor: pointer;margin-bottom: 10px;color: blue;">返回</div>
       <div @click="returns" style="cursor: pointer;margin-bottom: 10px;color: blue;">返回</div>
       <div v-for="item in tableDataList" :key="item.id" style="margin-bottom: 10px;border-top: 1px solid #ccc;padding-top: 10px;">
       <div v-for="item in tableDataList" :key="item.id" style="margin-bottom: 10px;border-top: 1px solid #ccc;padding-top: 10px;">
         <div>
         <div>
-            <div style="margin-left: 55px;"><span style="font-weight: bolder;">姓名：</span>{{ item.name }}</div>
-            <div style="display: flex;align-items: center;">
-                <span><span style="font-weight: bolder;">注册图片数量：</span>{{ item.picList&& item.picList.length}}</span>
-                <el-image v-for="(item1,index) in item.picList" :key="index" :src='formatUrl(item1)' alt="" style="width: 100px;height:100px;margin-left: 10px;"  :preview-src-list="[formatUrl(item1)]"></el-image>
-                <!-- <el-image v-for="(item1,index) in item.picList" :key="index" :src='formatUrl(item1)' alt="" style="width: 100px;height:100px;margin-left: 20px;"  :preview-src-list="formatUrlList"></el-image> -->
-            </div>
-            <div style="margin-top: 10px;margin-bottom: 10px;">
-                <span><span style="font-weight: bolder;">命中目标数量：</span>{{ item.hitRecords&& item.hitRecords.length}}</span>
-            </div>
+          <div style="margin-left: 55px;"><span style="font-weight: bolder;">姓名：</span>{{ item.name }}</div>
+          <div style="display: flex;align-items: center;">
+            <span><span style="font-weight: bolder;">注册图片数量：</span>{{ item.picList&& item.picList.length}}</span>
+            <el-image v-for="(item1,index) in item.picList" :key="index" :src='formatUrl(item1)' alt="" style="width: 100px;height:100px;margin-left: 10px;" :preview-src-list="[formatUrl(item1)]"></el-image>
+            <!-- <el-image v-for="(item1,index) in item.picList" :key="index" :src='formatUrl(item1)' alt="" style="width: 100px;height:100px;margin-left: 20px;"  :preview-src-list="formatUrlList"></el-image> -->
+          </div>
+          <div style="margin-top: 10px;margin-bottom: 10px;">
+            <span><span style="font-weight: bolder;">命中目标数量：</span>{{ item.hitRecords&& item.hitRecords.length}}</span>
+          </div>
         </div>
         </div>
         <el-table :data="item.hitRecords" style="width: 100%" border>
         <el-table :data="item.hitRecords" style="width: 100%" border>
           <el-table-column type="index" label="序号" width="80">
           <el-table-column type="index" label="序号" width="80">
           </el-table-column>
           </el-table-column>
-          <el-table-column prop="counttime" label="时间" >
+          <el-table-column prop="counttime" label="时间">
           </el-table-column>
           </el-table-column>
-          <el-table-column prop="gateName" label="监控点名称" >
+          <el-table-column prop="gateName" label="监控点名称">
           </el-table-column>
           </el-table-column>
           <el-table-column prop="direction" label="方向">
           <el-table-column prop="direction" label="方向">
           </el-table-column>
           </el-table-column>
-          <el-table-column  label="图片">
+          <el-table-column label="图片">
             <template #default="scope">
             <template #default="scope">
-                <!-- <img :src='formatUrl1(scope.row.picture_path)' alt="" style="width: 100px;height:100px;margin-left: 10px;margin-top: 5px;"> -->
-                <el-image :src='formatUrl1(scope.row.picture_path)' alt="" style="width: 100px;height:100px;margin-left: 10px;"  :preview-src-list="[formatUrl1(scope.row.picture_path)]"></el-image>
+              <!-- <img :src='formatUrl1(scope.row.picture_path)' alt="" style="width: 100px;height:100px;margin-left: 10px;margin-top: 5px;"> -->
+              <el-image :src='formatUrl1(scope.row.picture_path)' alt="" style="width: 100px;height:100px;margin-left: 10px;" :preview-src-list="[formatUrl1(scope.row.picture_path)]"></el-image>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
@@ -187,9 +187,7 @@ export default {
   setup() {
   setup() {
     const accountList = ref([]);
     const accountList = ref([]);
     const plazaList = ref([]);
     const plazaList = ref([]);
-    const tableDataList = ref([
-     
-    ]);
+    const tableDataList = ref([]);
     const selectList = ref([]);
     const selectList = ref([]);
     const router = useRouter();
     const router = useRouter();
     const isShow = ref(true);
     const isShow = ref(true);
@@ -509,6 +507,13 @@ export default {
           });
           });
           identifyResultList.value = r.data;
           identifyResultList.value = r.data;
           total_identify.value = r.data.total;
           total_identify.value = r.data.total;
+        } else {
+        //     identifyResultList.value = [];
+        //   total_identify.value =0;
+          ElMessage({
+            message: r.msg_info,
+            type: "warning",
+          });
         }
         }
       });
       });
     };
     };
@@ -617,39 +622,39 @@ export default {
       selectList.value = val;
       selectList.value = val;
       console.log(val);
       console.log(val);
     };
     };
-    const formatUrlList=ref([])
+    const formatUrlList = ref([]);
     const selectReport = () => {
     const selectReport = () => {
-        if (selectList.value.length <= 0) {
-          return ElMessage({
-            message: `请选择`,
-            type: "warning",
-          });
-        }
+      if (selectList.value.length <= 0) {
+        return ElMessage({
+          message: `请选择`,
+          type: "warning",
+        });
+      }
 
 
       isShow.value = false;
       isShow.value = false;
-      let datas=selectList.value.map(item=>item.id).join(',')
+      let datas = selectList.value.map((item) => item.id).join(",");
       FeatureMatchingAccuracyApi.getfeatureReport({
       FeatureMatchingAccuracyApi.getfeatureReport({
-        idList:datas
-      }).then(res=>{
-        tableDataList.value=res
-// console.log(tableDataList.value)
-//         formatUrlList.value=tableDataList.value.picList.map(item=>{
-//            return window._baseImgUrl + "tool/picture/" + item
-//         })
-//         console.log(formatUrlList.value)
-      })
+        idList: datas,
+      }).then((res) => {
+        tableDataList.value = res;
+        // console.log(tableDataList.value)
+        //         formatUrlList.value=tableDataList.value.picList.map(item=>{
+        //            return window._baseImgUrl + "tool/picture/" + item
+        //         })
+        //         console.log(formatUrlList.value)
+      });
     };
     };
     const returns = () => {
     const returns = () => {
       console.log(isShow.value);
       console.log(isShow.value);
 
 
       isShow.value = true;
       isShow.value = true;
     };
     };
-    const formatUrl=(url)=>{
-       return  window._baseImgUrl + "tool/picture/" + url;
-    }
-    const formatUrl1=(url)=>{
-       return  window._baseImgUrl + "picture/" + url;
-    }
+    const formatUrl = (url) => {
+      return window._baseImgUrl + "tool/picture/" + url;
+    };
+    const formatUrl1 = (url) => {
+      return window._baseImgUrl + "picture/" + url;
+    };
     return {
     return {
       // sequence
       // sequence
       tableDataList,
       tableDataList,