Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue

@@ -329,7 +329,6 @@ export default {
   },
   methods: {
     initData() {
-      console.log("调用initData+++++++");
       if(this.isLocked){
         return
       }
@@ -356,7 +355,7 @@ export default {
           }
         }
         else {
-          tempTpl = _.merge(this.deviceCttDefault, this.tpl.origin);    //首页弹窗，新增设备项时，需要传设备尺寸过来
+          tempTpl = _.merge({}, this.deviceCttDefault, this.tpl.origin);    //首页弹窗，新增设备项时，需要传设备尺寸过来
         }
         this.dataForm = infoBoardUtils.dialogSourceFormat(tempTpl, this.type, this.mode);
       } else {

ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue

@@ -27,7 +27,7 @@ export default {
         },
         tpl: {
             type: Object,
-            default: {}
+            default: ()=>{}
         },
     },
     watch:{

ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@@ -498,10 +498,10 @@ export default {
         if (para.mode == "edit") {
           this.selectedBdMsg[this.boardItemEdtingIndex] = para.data;
         } else {
-          this.selectedBdMsg.push(para.data);
+          this.selectedBdMsg.push(_.cloneDeep(para.data));
         }
       }else if(para.mode == "toDevice"){
-        this.selectedBdMsg.push(para.data);
+        this.selectedBdMsg.push(_.cloneDeep(para.data));
       }else{
         this.____refreshPageData(para);
       }

ruoyi-ui/vue.config.js

@@ -50,8 +50,8 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        target: `http://10.168.68.42:8087`, //王思祥
+        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        // target: `http://10.168.68.42:8087`, //王思祥
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",