Browse Source

改bug

wangqin
hui 9 months ago
parent
commit
36c37308b3
  1. 3
      ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
  2. 2
      ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
  3. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
  4. 4
      ruoyi-ui/vue.config.js

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

@ -329,7 +329,6 @@ export default {
}, },
methods: { methods: {
initData() { initData() {
console.log("调用initData+++++++");
if(this.isLocked){ if(this.isLocked){
return return
} }
@ -356,7 +355,7 @@ export default {
} }
} }
else { else {
tempTpl = _.merge(this.deviceCttDefault, this.tpl.origin); // tempTpl = _.merge({}, this.deviceCttDefault, this.tpl.origin); //
} }
this.dataForm = infoBoardUtils.dialogSourceFormat(tempTpl, this.type, this.mode); this.dataForm = infoBoardUtils.dialogSourceFormat(tempTpl, this.type, this.mode);
} else { } else {

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

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

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

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

4
ruoyi-ui/vue.config.js

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

Loading…
Cancel
Save