Sfoglia il codice sorgente

Merge branch 'termLink0615' into test

wyq 4 anni fa
parent
commit
b3ee5eac0b

+ 1 - 1
src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 500000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-// axios.defaults.baseURL = 'http://192.168.2.236:6060';
+axios.defaults.baseURL = 'http://192.168.2.236:6060';
 // axios.defaults.baseURL = 'http://192.168.2.241';
 // axios.defaults.baseURL = 'http://192.168.3.113:6060';
 

+ 1 - 0
src/components/common/HomePage.vue

@@ -294,6 +294,7 @@ export default {
     logout() {
       //退出
       localStorage.removeItem('token');
+      localStorage.removeItem('menuPath')
       this.$router.push({ path: '/' });
     }
   }

+ 1 - 1
src/components/icss/dept/DeptManage.vue

@@ -448,7 +448,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/disease/ChemicalAndCommonMapping.vue

@@ -443,7 +443,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/drug/DrugManage.vue

@@ -439,7 +439,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/fusion/Fusion.vue

@@ -438,7 +438,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/lis/Lis.vue

@@ -446,7 +446,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/nursing/nursing.vue

@@ -448,7 +448,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/operation/Operation.vue

@@ -445,7 +445,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/pacs/Pacs.vue

@@ -445,7 +445,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});

+ 1 - 1
src/components/icss/scale/ScaleManage.vue

@@ -441,7 +441,7 @@ export default {
             cancelButtonClass: 'cancelSure',
             confirmButtonClass: 'sure',
             customClass: 'exportConfirm',
-            type: 'warning'
+            type: 'success'
           })
             .then(() => {})
             .catch(() => {});