XMLWAN 4 years ago
parent
commit
35f18021c0

+ 4 - 4
config/dev.env.js View File

@@ -6,11 +6,11 @@
6 6
 module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9
-  // BASE_API:  '"http://new_mobile.xt.api.sgjyun.com"',// //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
-  BASE_API:'"http://localhost:9531"',
9
+  BASE_API: '"http://api.xt.test.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
+  //BASE_API:'"http://localhost:9529"',
11 11
   SSO_HOST: '"http://testsso.sgjyun.com"',
12 12
   SRCM_HOST: '"http://test1.sgjyun.com"',
13 13
   XT_HOST: '"http://xt.test.sgjyun.com"',
14 14
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
15
-  CDM_HOST: '"http://cdm.test.sgjyun.com"',
16
-}
15
+  CDM_HOST: '"http://cdm.test.sgjyun.com"'
16
+};

+ 2 - 2
config/index.js View File

@@ -19,8 +19,8 @@ module.exports = {
19 19
 
20 20
     // host: 'xt.test.sgjyun.com',
21 21
     // host: 'xt.kuyicloud.com',
22
-    // host: 'xt.test.sgjyun.com',
23
-    host:'localhost',
22
+    host: 'xt.test.sgjyun.com',
23
+    //host:'localhost',
24 24
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
25 25
     autoOpenBrowser: true,
26 26
     errorOverlay: true,

+ 14 - 14
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue View File

@@ -67,20 +67,20 @@
67 67
             </el-form-item>
68 68
           </el-col>
69 69
 
70
-          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">
71
-            <el-form-item label="压迫后内瘘震颤: ">
72
-              <el-select v-model="form.internal_fistula_tremor_ac">
73
-                <el-option :key="0" label="请选择" :value="0"></el-option>
74
-
75
-                <el-option
76
-                  v-for="item in internalFistulaTremorAcOptions"
77
-                  :label="item.name"
78
-                  :value="item.id"
79
-                  :key="item.id"
80
-                ></el-option>
81
-              </el-select>
82
-            </el-form-item>
83
-          </el-col>
70
+<!--          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">-->
71
+<!--            <el-form-item label="压迫后内瘘震颤: ">-->
72
+<!--              <el-select v-model="form.internal_fistula_tremor_ac">-->
73
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
74
+
75
+<!--                <el-option-->
76
+<!--                  v-for="item in internalFistulaTremorAcOptions"-->
77
+<!--                  :label="item.name"-->
78
+<!--                  :value="item.id"-->
79
+<!--                  :key="item.id"-->
80
+<!--                ></el-option>-->
81
+<!--              </el-select>-->
82
+<!--            </el-form-item>-->
83
+<!--          </el-col>-->
84 84
 
85 85
           <el-col :span="8" v-if="isShow('并发症')">
86 86
             <el-form-item label="并发症: ">

+ 17 - 17
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue View File

@@ -276,18 +276,18 @@
276 276
           </el-col>
277 277
 
278 278
 
279
-          <el-col :span="8">
279
+<!--          <el-col :span="8">-->
280 280
 
281
-            <el-form-item label="位置: " v-if="isShow('位置')">
282
-              <el-select v-model="assessmentBeforeDislysis.venous_catheterization_part">
283
-                <el-option :key="0" label="请选择" :value="0"></el-option>
281
+<!--            <el-form-item label="位置: " v-if="isShow('位置')">-->
282
+<!--              <el-select v-model="assessmentBeforeDislysis.venous_catheterization_part">-->
283
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
284 284
 
285
-                <el-option v-for="item in this.$store.getters.venous_catheterization_part" :label="item.name"
286
-                           :value="item.id"
287
-                           :key="item.id"></el-option>
288
-              </el-select>
289
-            </el-form-item>
290
-          </el-col>
285
+<!--                <el-option v-for="item in this.$store.getters.venous_catheterization_part" :label="item.name"-->
286
+<!--                           :value="item.id"-->
287
+<!--                           :key="item.id"></el-option>-->
288
+<!--              </el-select>-->
289
+<!--            </el-form-item>-->
290
+<!--          </el-col>-->
291 291
 
292 292
           <el-col :span="8">
293 293
             <el-form-item label="其他位置:" v-if="isShow('其他位置')">
@@ -296,13 +296,13 @@
296 296
           </el-col>
297 297
 
298 298
 
299
-          <el-col :span="8" v-if="isShow('导管')">
300
-            <el-form-item label="导管:">
301
-              <div>
302
-                <el-input v-model="assessmentBeforeDislysis.ductus_arantii" @focus="showInnerDialog('10')"></el-input>
303
-              </div>
304
-            </el-form-item>
305
-          </el-col>
299
+<!--          <el-col :span="8" v-if="isShow('导管')">-->
300
+<!--            <el-form-item label="导管:">-->
301
+<!--              <div>-->
302
+<!--                <el-input v-model="assessmentBeforeDislysis.ductus_arantii" @focus="showInnerDialog('10')"></el-input>-->
303
+<!--              </div>-->
304
+<!--            </el-form-item>-->
305
+<!--          </el-col>-->
306 306
 
307 307
 
308 308
           <el-col :span="8" v-if="isShow('其他中心静脉导管')">

+ 36 - 29
src/xt_permission.js View File

@@ -1,52 +1,59 @@
1
-import router from "./router";
2
-import store from "./store";
3
-import NProgress from "nprogress"; // progress bar
4
-import "nprogress/nprogress.css"; // progress bar style
1
+import router from './router'
2
+import store from './store'
3
+import NProgress from 'nprogress' // progress bar
4
+import 'nprogress/nprogress.css' // progress bar style
5 5
 
6
-NProgress.configure({ showSpinner: false }); // NProgress Configuration
6
+NProgress.configure({
7
+  showSpinner: false
8
+}) // NProgress Configuration
7 9
 
8
-const loginWhiteList = ["/token/verify", "/401", "/404"]; // 登录验证白名单
9
-const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名单
10
+const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名单
11
+const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
10 12
 
11 13
 router.beforeEach((to, from, next) => {
12 14
   // 线上注释
13
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
14
-    store.dispatch('VerifyConfigList', []).then(() => {
15
-      next()
16
-    })
17
-  }
18
-  if (store.getters.permission_routers === undefined) {
19
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
20
-      next()
21
-    })
22
-  } else {
23
-    next()
24
-  }
25
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
26 28
   // 线上注释
27 29
 
28
-  NProgress.start();
30
+  NProgress.start()
29 31
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30 32
   // alert('path:' + to.path)
31 33
   // 如果 url 带有 lt (login_token)参数,则跳转到验证 token 时等待的页面
32 34
   if (to.query.lt != null && to.query.lt.length > 0) {
33 35
     // alert('will go to verify token: ' + to.query.lt)
34
-    next({ path: "/token/verify", query: { token: to.query.lt } });
36
+    next({
37
+      path: '/token/verify',
38
+      query: {
39
+        token: to.query.lt
40
+      }
41
+    })
35 42
 
36 43
     // 否则 如果没有 user 信息,则前往 sso 登录
37 44
   } else if (store.getters.xt_user.user.id === 0) {
38 45
     if (loginWhiteList.indexOf(to.path) !== -1) {
39 46
       // alert('登录白名单内,跳过登录')
40
-      next();
47
+      next()
41 48
     } else {
42 49
       // alert('前往登录')
43
-      window.location.href = process.env.BASE_API + "/login"; // sso 地址
50
+      window.location.href = process.env.BASE_API + '/login' // sso 地址
44 51
     }
45 52
 
46 53
     // 否则 如果当前 url 不需要验证访问权限,则通过
47 54
   } else if (permissionWhiteList.indexOf(to.path) !== -1) {
48 55
     // alert('权限验证白名单内,直接进入')
49
-    next();
56
+    next()
50 57
 
51 58
     // 否则 如果拥有当前 url 的权限,则通过
52 59
     // } else if (store.getters.current_role_urls.indexOf(to.path) !== -1) {
@@ -58,11 +65,11 @@ router.beforeEach((to, from, next) => {
58 65
     // console.log(store.getters.current_role_urls)
59 66
     // console.log(store.getters.current_role_urls.indexOf(to.path))
60 67
     // alert('401')
61
-    next();
68
+    next()
62 69
     // next({ path: '/404' })
63 70
   }
64
-});
71
+})
65 72
 
66 73
 router.afterEach(() => {
67
-  NProgress.done();
68
-});
74
+  NProgress.done()
75
+})