瀏覽代碼

Merge remote-tracking branch 'origin/dragTerm1025-zsw' into test

zhouna 3 年之前
父節點
當前提交
195f711aeb
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 1 1
      src/components/callRecord/CallRecordManager.vue
  2. 3 2
      vue.config.js

+ 1 - 1
src/components/callRecord/CallRecordManager.vue

@@ -203,7 +203,7 @@
           prop="subHospitalName"
           label="子院区"
           align="center"
-          width="120"
+          width="180"
           show-overflow-tooltip
         >
         <template slot-scope="scope">

+ 3 - 2
vue.config.js

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