5月31日17点提交

config/dev.env.js

@@ -6,5 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://localhost:9529"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://112.74.16.180:9527"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/router/index.js

@@ -532,9 +532,7 @@ export const xt_constantRouterMap = [
       { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
       { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
     ]
-  },
-
-  {
+  }, {
     path: '/fullscreenboard',
     component: () => import('@/xt_pages/fullscreenboard/index'),
     hidden: true
@@ -766,7 +764,7 @@ export const xt_asyncRouterMap = [
   //     },
   //     { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
   //   ]
-  // }, 
+  // },
   // {
   //   path: '/stock/',
   //   component: Layout,
@@ -775,12 +773,6 @@ export const xt_asyncRouterMap = [
   //   meta: { title: 'stockManage', icon: 'stock' },
   //   children: [
   //     {
-  //       path: '/stock/config',
-  //       component: () => import('@/xt_pages/stock/index'),
-  //       name: 'config',
-  //       meta: { title: 'config' }
-  //     },
-  //     {
   //       path: '/stock/in',
   //       component: () => import('@/xt_pages/stock/stockInOrder'),
   //       name: 'stockInOrder',
@@ -790,7 +782,7 @@ export const xt_asyncRouterMap = [
   //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
   //       name: 'salesReturnOrder',
   //       meta: { title: 'salesReturnOrder', noCache: true }
-  //     }, 
+  //     },
   //     {
   //       path: '/stock/out',
   //       component: () => import('@/xt_pages/stock/stockOutOrder'),
@@ -887,6 +879,12 @@ export const xt_asyncRouterMap = [
   //       hidden: true,
   //       is_menu: false,
   //       meta: { title: 'cancelStockDetail', noCache: true }
+  //     },
+  //     {
+  //       path: '/stock/config',
+  //       component: () => import('@/xt_pages/stock/index'),
+  //       name: 'config',
+  //       meta: { title: 'config' }
   //     }
 
   //   ]

src/xt_pages/sign/index.vue

@@ -10,7 +10,7 @@
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
-                    <el-button type="primary" @change="changeSearch">搜索</el-button>
+                    <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</el-button>
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
@@ -52,43 +52,7 @@
                   <el-button  @click="change()" style="float:right;">修改</el-button>
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
                    </div>
-                    <div class="border"></div>
-                    <!-- <el-row :gutter="20">
-                    <el-col :span="8">
-                       <el-form-item label="透前称重(kg):" label-width="100px">
-                       <el-input :disabled="disa" v-model="weigh_list.weight_before"></el-input>
-                    </el-form-item>
-                    </el-col> 
-                    <el-col :span="8">
-                      <el-form-item label="干体重(kg):" label-width="100px">
-                       <el-input :disabled="disa" v-model="weigh_list.dry_weight"></el-input>
-                      </el-form-item>
-                      </el-col>
-                    </el-row>
-                      <el-row :gutter="20">
-                        <el-col :span="4">
-                            <el-form-item label="体温(℃):" label-width="80px">
-                               <el-input :disabled="disa" v-model="weigh_list.temperature" style="width: 70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input :disabled="disa" v-model="weigh_list.breathing_rate"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="9">
-                            <el-form-item label="血压(mmHg):" label-width="100px">
-                                <el-input :disabled="disa" v-model="weigh_list.systolic_blood_pressure" style="width: 70px"></el-input>
-                                <span> / </span>
-                                <el-input :disabled="disa" v-model="weigh_list.diastolic_blood_pressure" style="width: 70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                         <el-col :span="5">
-                            <el-form-item label="脉搏(次/分):" label-width="100px">
-                                <el-input :disabled="disa" v-model="weigh_list.pulse_frequency"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row> -->
+                    <div class="border"></div>       
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>

src/xt_permission.js

@@ -23,8 +23,8 @@ router.beforeEach((to, from, next) => {
     next()
   }
   return
-//线上注释
-
+ //线上注释
+ 
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)