Merge branch 'master' of http://git.shengws.com/csx/Vue_New

config/dev.env.js

@@ -12,5 +12,5 @@ module.exports = {
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
-  CDM_HOST: '"http://cdm.test.sgjyun.com"',
-}
+  CDM_HOST: '"http://cdm.test.sgjyun.com"'
+};

config/index.js

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

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -207,13 +207,16 @@ export default {
     }
   }
 }
-.el-menu-item{
+.menu-wrapper{
+  .el-menu-item{
    background-color:#1F2D3D !important;
+  }
+  .el-menu{
+    background-color:#1F2D3D !important;
+  }
+  .el-submenu__title{
+    background-color:#1F2D3D !important;
+  }
 }
-.el-menu{
-  background-color:#1F2D3D !important;
-}
-.el-submenu__title{
-  background-color:#1F2D3D !important;
-}
+
 </style>

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -67,20 +67,20 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">
-            <el-form-item label="压迫后内瘘震颤: ">
-              <el-select v-model="form.internal_fistula_tremor_ac">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="item in internalFistulaTremorAcOptions"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">-->
+<!--            <el-form-item label="压迫后内瘘震颤: ">-->
+<!--              <el-select v-model="form.internal_fistula_tremor_ac">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+<!--                <el-option-->
+<!--                  v-for="item in internalFistulaTremorAcOptions"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.id"-->
+<!--                  :key="item.id"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <el-col :span="8" v-if="isShow('并发症')">
             <el-form-item label="并发症: ">

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -276,18 +276,18 @@
           </el-col>
 
 
-          <el-col :span="8">
+<!--          <el-col :span="8">-->
 
-            <el-form-item label="位置： " v-if="isShow('位置')">
-              <el-select v-model="assessmentBeforeDislysis.venous_catheterization_part">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+<!--            <el-form-item label="位置： " v-if="isShow('位置')">-->
+<!--              <el-select v-model="assessmentBeforeDislysis.venous_catheterization_part">-->
+<!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option v-for="item in this.$store.getters.venous_catheterization_part" :label="item.name"
-                           :value="item.id"
-                           :key="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--                <el-option v-for="item in this.$store.getters.venous_catheterization_part" :label="item.name"-->
+<!--                           :value="item.id"-->
+<!--                           :key="item.id"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <el-col :span="8">
             <el-form-item label="其他位置:" v-if="isShow('其他位置')">
@@ -296,13 +296,13 @@
           </el-col>
 
 
-          <el-col :span="8" v-if="isShow('导管')">
-            <el-form-item label="导管:">
-              <div>
-                <el-input v-model="assessmentBeforeDislysis.ductus_arantii" @focus="showInnerDialog('10')"></el-input>
-              </div>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8" v-if="isShow('导管')">-->
+<!--            <el-form-item label="导管:">-->
+<!--              <div>-->
+<!--                <el-input v-model="assessmentBeforeDislysis.ductus_arantii" @focus="showInnerDialog('10')"></el-input>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
 
           <el-col :span="8" v-if="isShow('其他中心静脉导管')">

src/xt_permission.js

@@ -1,12 +1,14 @@
-import router from "./router";
-import store from "./store";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
+import router from './router'
+import store from './store'
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
 
-NProgress.configure({ showSpinner: false }); // NProgress Configuration
+NProgress.configure({
+  showSpinner: false
+}) // NProgress Configuration
 
-const loginWhiteList = ["/token/verify", "/401", "/404"]; // 登录验证白名单
-const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名单
+const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名单
+const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
@@ -25,28 +27,33 @@ router.beforeEach((to, from, next) => {
   // return
   // 线上注释
 
-  NProgress.start();
+  NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)
   // 如果 url 带有 lt (login_token)参数，则跳转到验证 token 时等待的页面
   if (to.query.lt != null && to.query.lt.length > 0) {
     // alert('will go to verify token: ' + to.query.lt)
-    next({ path: "/token/verify", query: { token: to.query.lt } });
+    next({
+      path: '/token/verify',
+      query: {
+        token: to.query.lt
+      }
+    })
 
     // 否则 如果没有 user 信息，则前往 sso 登录
   } else if (store.getters.xt_user.user.id === 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
       // alert('登录白名单内，跳过登录')
-      next();
+      next()
     } else {
       // alert('前往登录')
-      window.location.href = process.env.BASE_API + "/login"; // sso 地址
+      window.location.href = process.env.BASE_API + '/login' // sso 地址
     }
 
     // 否则 如果当前 url 不需要验证访问权限，则通过
   } else if (permissionWhiteList.indexOf(to.path) !== -1) {
     // alert('权限验证白名单内，直接进入')
-    next();
+    next()
 
     // 否则 如果拥有当前 url 的权限，则通过
     // } else if (store.getters.current_role_urls.indexOf(to.path) !== -1) {
@@ -58,11 +65,11 @@ router.beforeEach((to, from, next) => {
     // console.log(store.getters.current_role_urls)
     // console.log(store.getters.current_role_urls.indexOf(to.path))
     // alert('401')
-    next();
+    next()
     // next({ path: '/404' })
   }
-});
+})
 
 router.afterEach(() => {
-  NProgress.done();
-});
+  NProgress.done()
+})