Merge remote-tracking branch 'origin/test'

# Conflicts:
#	src/api/cdss.js

src/api/cdss.js

@@ -28,8 +28,8 @@ export default {
     //医学数据-化验大小项与公表项维护-单个删除
     return axios.post(urls.delLisMappingByIdCDSS, param);
   },
-  getConceptInfoAssay(param) {
-    return axios.post(urls.getConceptInfoAssayCDSS, param); //化验子项-搜索术语
+  getConceptInfoAssay(param) { //化验子项-搜索术语
+    return axios.post(urls.getConceptInfoAssayCDSS, param); 
   },
   getAllLisConcept(param) {
     //医学数据-化验大小项与公表项维护-获取所有化验公表项

src/components/cdssManage/hospital/Hospital.vue

@@ -40,7 +40,7 @@
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
             <el-button @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
-            <!-- <span style="margin:0 3px;">|</span>
+            <span style="margin:0 3px;">|</span>
             <el-button
               @click="resetFildF(scope.row)"
               v-if="scope.row.id !== -1"
@@ -49,7 +49,7 @@
               size="small"
             >方案重置</el-button>
             <el-button type="text" size="small" v-else disabled>方案重置</el-button>
-            <span style="margin:0 3px;">|</span>
+            <!-- <span style="margin:0 3px;">|</span>
             <el-button
               @click="startOrEndHos(scope.row,'start')"
               type="text"

vue.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
-//const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://192.168.2.236:5050';
+const proxy_path = 'http://192.168.2.241:88';
+// const proxy_path = 'http://192.168.2.236:5050';
 // 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.113:5050'; //王峰