代码冲突

src/views/bus/components/subMage.vue

@@ -115,6 +115,8 @@
         <v-warn ref="emailed" :exportData="exportData"></v-warn>
         <!-- 选择区域、采购单位行业、信息类型弹框 -->
         <v-edit ref="editModel" :digs="digs" :boxData="boxData"></v-edit>
+         <!-- 区域选择 -->
+        <area-select ref="editArea"></area-select>
     </div>
 </template>
 
@@ -124,6 +126,7 @@ import vKey from './antistop.vue';
 import vDistri from './distribute.vue';
 import vWarn from './warnBox.vue';
 import vEdit from './editBox.vue';
+import areaSelect from "@/components/areaSelect.vue"
 export default {
     props: {
         entData: {}
@@ -132,7 +135,7 @@ export default {
         vKey, 
         vDistri,
         vWarn,
-        vEdit
+        vEdit,areaSelect
     },
     data() {
         return {
@@ -177,6 +180,19 @@ export default {
             this.bookForm.tuiCheck1 = res.data.apppush == '1' ? true : false;
             this.bookForm.tuiCheck2 = res.data.mailpush == '1' ? true : false;
         })
+        //获取区域设置
+       areaGetdata().then(res =>{
+          let newArr = "";
+          for(let key in res.data.area){
+            if(res.data.area[key].length == 0){
+                newArr += `${key}、`
+            }else{
+              newArr += `${key} (${res.data.area[key].join('、')})、`
+            }
+          }
+          newArr = newArr.replace(/(.*)、/,'$1');
+          this.bookForm.areas = newArr;
+        })
     },
     methods: {
         booked(num) {
@@ -212,8 +228,12 @@ export default {
             })
         },
         decMsg(nums) {// 弹框
+        if(nums == 1){
+             this.$refs.editArea.boxVisible = true;
+        }else{
             this.$refs.editModel.boxVisible = true;
             this.digs = nums;
+        }   
         },
         tuiChecked(val) {// 推送时间
             this.ratemodes = val;

vue.config.js

@@ -18,9 +18,8 @@ module.exports = {
       "/entbase": {
         // target: "https://app2-jytest.jianyu360.cn",
         // target: "http://127.0.0.1:812",
-        // target: "http://127.0.0.1:812",
-        target:'http://192.168.20.214:815',//任
-        // target:'http://192.168.20.241:815',
+        // target:'http://192.168.20.214:815',//任
+        target:'http://192.168.20.241:815',
         changeOrigin: true,
         ws: true,
         pathRewrite: {
@@ -29,9 +28,9 @@ module.exports = {
       },
       "/entniche": {
         // target: "https://app2-jytest.jianyu360.cn",
-        // target: "http://192.168.20.241:812",
+        target: "http://192.168.20.241:812",
         // target: "http://127.0.0.1:812",
-        target:'http://192.168.20.214:812',//任
+        // target:'http://192.168.20.214:812',//任
         changeOrigin: true,
         ws: true,
         pathRewrite: {