Browse Source

5月31日17点提交

xiaoming_global 6 years ago
parent
commit
602dc6e309
4 changed files with 14 additions and 52 deletions
  1. 1 1
      config/dev.env.js
  2. 9 11
      src/router/index.js
  3. 2 38
      src/xt_pages/sign/index.vue
  4. 2 2
      src/xt_permission.js

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

6
 module.exports = {
6
 module.exports = {
7
   NODE_ENV: '"development"',
7
   NODE_ENV: '"development"',
8
   ENV_CONFIG: '"dev"',
8
   ENV_CONFIG: '"dev"',
9
-  BASE_API: '"http://localhost:9529"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
9
+  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
10
 }
10
 }

+ 9 - 11
src/router/index.js View File

532
       { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
532
       { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
533
       { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
533
       { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
534
     ]
534
     ]
535
-  },
536
-
537
-  {
535
+  }, {
538
     path: '/fullscreenboard',
536
     path: '/fullscreenboard',
539
     component: () => import('@/xt_pages/fullscreenboard/index'),
537
     component: () => import('@/xt_pages/fullscreenboard/index'),
540
     hidden: true
538
     hidden: true
766
   //     },
764
   //     },
767
   //     { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
765
   //     { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
768
   //   ]
766
   //   ]
769
-  // }, 
767
+  // },
770
   // {
768
   // {
771
   //   path: '/stock/',
769
   //   path: '/stock/',
772
   //   component: Layout,
770
   //   component: Layout,
775
   //   meta: { title: 'stockManage', icon: 'stock' },
773
   //   meta: { title: 'stockManage', icon: 'stock' },
776
   //   children: [
774
   //   children: [
777
   //     {
775
   //     {
778
-  //       path: '/stock/config',
779
-  //       component: () => import('@/xt_pages/stock/index'),
780
-  //       name: 'config',
781
-  //       meta: { title: 'config' }
782
-  //     },
783
-  //     {
784
   //       path: '/stock/in',
776
   //       path: '/stock/in',
785
   //       component: () => import('@/xt_pages/stock/stockInOrder'),
777
   //       component: () => import('@/xt_pages/stock/stockInOrder'),
786
   //       name: 'stockInOrder',
778
   //       name: 'stockInOrder',
790
   //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
782
   //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
791
   //       name: 'salesReturnOrder',
783
   //       name: 'salesReturnOrder',
792
   //       meta: { title: 'salesReturnOrder', noCache: true }
784
   //       meta: { title: 'salesReturnOrder', noCache: true }
793
-  //     }, 
785
+  //     },
794
   //     {
786
   //     {
795
   //       path: '/stock/out',
787
   //       path: '/stock/out',
796
   //       component: () => import('@/xt_pages/stock/stockOutOrder'),
788
   //       component: () => import('@/xt_pages/stock/stockOutOrder'),
887
   //       hidden: true,
879
   //       hidden: true,
888
   //       is_menu: false,
880
   //       is_menu: false,
889
   //       meta: { title: 'cancelStockDetail', noCache: true }
881
   //       meta: { title: 'cancelStockDetail', noCache: true }
882
+  //     },
883
+  //     {
884
+  //       path: '/stock/config',
885
+  //       component: () => import('@/xt_pages/stock/index'),
886
+  //       name: 'config',
887
+  //       meta: { title: 'config' }
890
   //     }
888
   //     }
891
 
889
 
892
   //   ]
890
   //   ]

+ 2 - 38
src/xt_pages/sign/index.vue View File

10
                 <div class="dataTitle">患者列表</div>
10
                 <div class="dataTitle">患者列表</div>
11
                 <div style="margin-bottom: 10px;">
11
                 <div style="margin-bottom: 10px;">
12
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
12
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
13
-                    <el-button type="primary" @change="changeSearch">搜索</el-button>
13
+                    <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</el-button>
14
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
14
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
15
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
15
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
16
                     </el-select>
16
                     </el-select>
52
                   <el-button  @click="change()" style="float:right;">修改</el-button>
52
                   <el-button  @click="change()" style="float:right;">修改</el-button>
53
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
53
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
54
                    </div>
54
                    </div>
55
-                    <div class="border"></div>
56
-                    <!-- <el-row :gutter="20">
57
-                    <el-col :span="8">
58
-                       <el-form-item label="透前称重(kg):" label-width="100px">
59
-                       <el-input :disabled="disa" v-model="weigh_list.weight_before"></el-input>
60
-                    </el-form-item>
61
-                    </el-col> 
62
-                    <el-col :span="8">
63
-                      <el-form-item label="干体重(kg):" label-width="100px">
64
-                       <el-input :disabled="disa" v-model="weigh_list.dry_weight"></el-input>
65
-                      </el-form-item>
66
-                      </el-col>
67
-                    </el-row>
68
-                      <el-row :gutter="20">
69
-                        <el-col :span="4">
70
-                            <el-form-item label="体温(℃):" label-width="80px">
71
-                               <el-input :disabled="disa" v-model="weigh_list.temperature" style="width: 70px"></el-input>
72
-                            </el-form-item>
73
-                        </el-col>
74
-                        <el-col :span="5">
75
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
76
-                                <el-input :disabled="disa" v-model="weigh_list.breathing_rate"></el-input>
77
-                            </el-form-item>
78
-                        </el-col>
79
-                        <el-col :span="9">
80
-                            <el-form-item label="血压(mmHg):" label-width="100px">
81
-                                <el-input :disabled="disa" v-model="weigh_list.systolic_blood_pressure" style="width: 70px"></el-input>
82
-                                <span> / </span>
83
-                                <el-input :disabled="disa" v-model="weigh_list.diastolic_blood_pressure" style="width: 70px"></el-input>
84
-                            </el-form-item>
85
-                        </el-col>
86
-                         <el-col :span="5">
87
-                            <el-form-item label="脉搏(次/分):" label-width="100px">
88
-                                <el-input :disabled="disa" v-model="weigh_list.pulse_frequency"></el-input>
89
-                            </el-form-item>
90
-                        </el-col>
91
-                    </el-row> -->
55
+                    <div class="border"></div>       
92
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
56
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
93
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
57
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
94
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
58
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>

+ 2 - 2
src/xt_permission.js View File

23
     next()
23
     next()
24
   }
24
   }
25
   return
25
   return
26
-//线上注释
27
-
26
+ //线上注释
27
+ 
28
   NProgress.start()
28
   NProgress.start()
29
   // console.log(store.getters.current_role_urls.indexOf(to.path))
29
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // alert('path:' + to.path)
30
   // alert('path:' + to.path)