diff --git a/src/components/ration/soilMoisture/index.vue b/src/components/ration/soilMoisture/index.vue index 35478ca..9abcf9d 100644 --- a/src/components/ration/soilMoisture/index.vue +++ b/src/components/ration/soilMoisture/index.vue @@ -443,6 +443,7 @@ export default { } }, changeSampleFun(sfVal) { + this.$store.commit("setSampleFunArr",sfVal); //保存样本抽样方法 if (Array.isArray(sfVal)) { const ssf = Number(sfVal[0]); diff --git a/src/store/index.js b/src/store/index.js index e88392f..2c57e8a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,6 +6,7 @@ const state = { breadListState: [], // 面包屑列表数据 pixelFun:null, sampleFun:null, + sampleFunArr:[], altRange:null }; @@ -23,6 +24,9 @@ export default new Vuex.Store({ }, setAltRange(getters, val){ getters.altRange=val + }, + setSampleFunArr(getters, val){ + getters.sampleFunArr=val } } }); diff --git a/src/views/Daichuli/Feedback/Inspection/index.vue b/src/views/Daichuli/Feedback/Inspection/index.vue index a2d76b7..5da0883 100644 --- a/src/views/Daichuli/Feedback/Inspection/index.vue +++ b/src/views/Daichuli/Feedback/Inspection/index.vue @@ -659,6 +659,13 @@ export default { this.$store.commit("setPixelFun", null); this.$store.commit("setAltRange", null); }, + watch:{ + "$store.state.sampleFunArr":{ + handler:function(newVal,oldVal){ + this.pixelFun = ""; + } + } + }, computed: { hasPixelFun: function () { return ( diff --git a/vue.config.js b/vue.config.js index 04e9991..9ab79d7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,7 +35,7 @@ module.exports = { } }, [process.env.VUE_APP_REALITY_API]: { - target: "http://192.168.88.199:18092/microwave", + target: "http://192.168.88.3:18092/microwave", // target: "https://124.16.188.131:28092/microwave", // target: "http://192.168.1.227:18092/microwave", changeOrigin: true, @@ -44,7 +44,7 @@ module.exports = { } }, [process.env.VUE_APP_FILE_API]: { - target: "http://192.168.88.199:18093/file", + target: "http://192.168.88.3:18093/file", // target: "https://124.16.188.131:28093/file", // target: "http://192.168.1.227:18093/file", changeOrigin: true,