Merge remote-tracking branch 'origin/bugfix' into test

src/api/config.js

@@ -1,4 +1,4 @@
-const testUrl = 'http://223.93.170.82:23650'
+const testUrl = ''
 export default {
   host:'http://192.168.2.241:5050',
   imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址

src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 5000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-//axios.defaults.baseURL = 'http://223.93.170.82:23650';
+//axios.defaults.baseURL = 'http://192.168.2.236:88';
 
 const urls = config.urls;
 export default {

src/components/preTreat/PubSelect.vue

@@ -2,13 +2,6 @@
   <div class="single-container">
     <el-form>
       <div class="operation-row">
-        <el-checkbox-group size="small" v-model="checkedCon">
-          <el-checkbox-button
-            :label="0"
-            v-if="type==1||type==2"
-            @change="handleExcluCon"
-          >添加关联</el-checkbox-button>
-        </el-checkbox-group>
         <el-checkbox-group size="small">
           <el-checkbox-button
             :label="0"
@@ -115,6 +108,14 @@
               </p>
             </li>
           </ul>
+
+          <el-checkbox-group size="small" v-model="checkedCon" class="connect">
+            <el-checkbox-button
+              :label="0"
+              v-if="type==1||type==2"
+              @change="handleExcluCon"
+            >{{checkedCon?'取消关联':'添加关联'}}</el-checkbox-button>
+          </el-checkbox-group>
         </div>
       </div>
     </el-form>
@@ -396,6 +397,7 @@ export default {
           type: "warning",
           showClose: true
         });
+        this.checkedCon = false
         return;
       }
       if(this.selectLeftTagsList.length==0&&this.rows[i].exclusionCon!=1){
@@ -404,6 +406,7 @@ export default {
           type: "warning",
           showClose: true
         });
+        this.checkedCon = false
         return;
       }
       if (this.rows[i].exclusionCon&&this.rows[i].exclusionCon === 1) {
@@ -591,4 +594,12 @@ export default {
 .main-area .inps,.main-area .el-button {
   width:calc(100% - 120px)
 }
+.el-checkbox-group.connect {
+  position: absolute;
+  right: -150px;
+  top: 0;
+}
+.pool {
+  position: relative;
+}
 </style>

vue.config.js

@@ -1,8 +1,8 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
 // const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://223.93.170.82:23650';
-// const proxy_path = 'http://192.168.2.236:88';
+//const proxy_path = 'http://223.93.170.82:23650';
+ const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.115:5050';