Merge branch 'fly' into xy-ly

src/utils/api/index.js

@@ -505,7 +505,17 @@ export function delUserApi(data) {
     },
   });
 }
+//获取设备接口
+
+export function getCoordinate(data) {
+  return request({
+    url: "/api/getCoordinate",
+    method: "post",
+    data,
+  });
+}
 //绘制坐标保存
+
 export function updateCoordinate(data) {
   return request({
     url: "/api/updateCoordinate",

src/views/devicePhotoSchedule/components/setdevice.vue

@@ -196,39 +196,32 @@ export default {
     // 保存确定操作
     submitForm() {
       console.log(this.termidArr);
-      this.timer = window.setInterval(() => {
-        this.termidArrNum++;
-        console.log(this.termidArrNum);
-        if (this.termidArrNum < this.termidArr.length) {
       this.sureSum();
-        } else {
-          this.$message({
-            showClose: true,
-            message: "添加成功",
-            type: "success",
-          });
-          this.isShow = false;
-          this.$parent.deviceList();
-          clearTimeout(this.timer);
-        }
-      }, 1000);
     },
     //时间表
     sureSum() {
-      setScheduleRulel({
+      console.log(this.termidArr);
-        list: [
+      console.log(this.checkedAisle);
-          {
+      var ruleBox = [];
-            termid: this.termidArr[this.termidArrNum],
+      for (var i = 0; i < this.termidArr.length; i++) {
+        var parmsobj = {
+          termid: this.termidArr[i],
           channelidlist: [this.checkedAisle],
-          },
+        };
-        ],
+        console.log(parmsobj);
+        ruleBox.push(parmsobj);
+      }
+      console.log(ruleBox);
+      setScheduleRulel({
+        list: ruleBox,
         scheduleid: this.selid,
       })
         .then((res) => {
+          console.log(res);
           //  this.$message({
           //   showClose: true,
           //   message: '添加成功',type: 'success'
-          // });;
+          // });
         })
         .catch((err) => {
           this.$message({

src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue

@@ -81,7 +81,7 @@
   </el-dialog>
 </template>
 <script>
-import { updateCoordinate } from "@/utils/api/index";
+import { updateCoordinate, getCoordinate } from "@/utils/api/index";
 export default {
   props: {
     title: String,
@@ -125,6 +125,7 @@ export default {
       this.picsrc = obj.path;
       this.channelId = obj.id;
       this.photoId = obj.photoId;
+      this.getcanvansPic(this.pictureData, this.channelId);
       // console.log(this.picsrc);
     },
     //获取线宽
@@ -139,16 +140,36 @@ export default {
     },
     display(val) {
       this.isShow = true;
-      console.log(val);
       this.pictureData = val; //获取当前列表数据
       this.picoptions = val.list; //获取所有通道
-      this.picvalue = val.list[0].name; //获取第一个通道
-      this.picsrc = val.list[0].path;
       this.channelId = val.list[0].id;
-      this.termId = val.id;
+      this.picvalue = val.list[0].name; //获取第一个通道
-      this.markId = val.markId;
+      this.termId = val.id; //装置id
-      this.cmdid = val.cmdid;
+      this.getcanvansPic(val, this.channelId);
-      this.photoId = val.list[0].photoId;
+    },
+    hide() {
+      this.isShow = false;
+      this.pictureData = "";
+      this.picoptions = [];
+      this.picvalue = "";
+    },
+    getcanvansPic(val, channelid) {
+      getCoordinate({
+        channelId: channelid,
+        needPic: "0",
+        termId: this.termId,
+      })
+        .then((res) => {
+          console.log(res);
+          this.picsrc = res.data.path;
+        })
+        .catch((err) => {});
+
+      // this.picsrc = val.list[0].path;
+
+      // this.markId = val.markId;
+      // this.cmdid = val.cmdid;
+      // this.photoId = val.list[0].photoId;
       console.log("this.canvas");
       this.$nextTick(function () {
         // codeing
@@ -166,13 +187,6 @@ export default {
         this.drawline();
       });
     },
-    hide() {
-      this.isShow = false;
-      this.pictureData = "";
-      this.picoptions = [];
-      this.picvalue = "";
-    },
-
     mousedown(e) {
       //console.log("鼠标落下");
       this.saveDrawingSurface();

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -133,7 +133,7 @@
               <el-button
                 type="text"
                 @click.native.stop="handleImageCapture(scope.row)"
-                >图像采集装置</el-button
+                >图像采集参数</el-button
               >
               <el-button
                 type="text"

vue.config.js

@@ -1,6 +1,13 @@
 const { defineConfig } = require("@vue/cli-service");
 const path = require("path");
 module.exports = defineConfig({
+  //打包清除console
+  chainWebpack(config) {
+    config.optimization.minimizer("terser").tap((args) => {
+      args[0].terserOptions.compress.drop_console = true;
+      return args;
+    });
+  },
   productionSourceMap: false, // 生产环境是否要生成 sourceMap
   publicPath: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : "./", //   部署应用包时的基本 URL
   //assetsPublicPath: process.env.NODE_ENV === "production" ? "" : "/",