浏览代码

Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

柳香萍 6 年前
父节点
当前提交
01375c9d27

+ 1 - 1
config/dev.env.js 查看文件

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://112.74.16.180:9527"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
9
+  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
10
 }
10
 }

文件差异内容过多而无法显示
+ 490 - 501
src/router/index.js


+ 1 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue 查看文件

241
           </el-row>
241
           </el-row>
242
         </el-form>
242
         </el-form>
243
 
243
 
244
-        <div slot="footer" class="dialog-footer">
244
+        <div slot="footer" class="dialog-footer" v-show="edit" >
245
               <el-button @click="cancelEditAction">取 消</el-button>
245
               <el-button @click="cancelEditAction">取 消</el-button>
246
               <el-button type="primary" @click="submitAction">保 存</el-button>
246
               <el-button type="primary" @click="submitAction">保 存</el-button>
247
         </div>
247
         </div>

+ 1 - 1
src/xt_pages/qcd/components/BarChart.vue 查看文件

21
     },
21
     },
22
     height: {
22
     height: {
23
       type: String,
23
       type: String,
24
-      default: '350px'
24
+      default: '380px'
25
     },
25
     },
26
     title:{
26
     title:{
27
       type: String,
27
       type: String,

+ 1 - 1
src/xt_pages/qcd/components/LineChart.vue 查看文件

19
     },
19
     },
20
     height: {
20
     height: {
21
       type: String,
21
       type: String,
22
-      default: '350px'
22
+      default: '380px'
23
     },
23
     },
24
     autoResize: {
24
     autoResize: {
25
       type: Boolean,
25
       type: Boolean,

+ 1 - 1
src/xt_pages/qcd/components/PieChart.vue 查看文件

19
     },
19
     },
20
     height: {
20
     height: {
21
       type: String,
21
       type: String,
22
-      default: '350px'
22
+      default: '380px'
23
     },
23
     },
24
     title:{
24
     title:{
25
       type: String,
25
       type: String,

+ 1 - 1
src/xt_pages/qcd/outcomeIndicators/control.vue 查看文件

4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
5
     </div>
5
     </div>
6
     <div class="app-container">
6
     <div class="app-container">
7
-      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
7
+      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
8
           <el-tab-pane label="指标控制" name="control"></el-tab-pane>
8
           <el-tab-pane label="指标控制" name="control"></el-tab-pane>
9
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
9
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
10
       </el-tabs>
10
       </el-tabs>

+ 1 - 1
src/xt_pages/qcd/outcomeIndicators/query.vue 查看文件

4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
5
     </div>
5
     </div>
6
     <div class="app-container" id="outcome-indicators-query">
6
     <div class="app-container" id="outcome-indicators-query">
7
-      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
7
+      <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
8
           <el-tab-pane label="指标控制" name="control"></el-tab-pane>
8
           <el-tab-pane label="指标控制" name="control"></el-tab-pane>
9
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
9
           <el-tab-pane label="指标查询" name="query"></el-tab-pane>
10
       </el-tabs>
10
       </el-tabs>

+ 1 - 1
src/xt_pages/qcd/patientAnalysis/components/analysisNav.vue 查看文件

1
 <template>
1
 <template>
2
-    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick">
2
+    <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
3
         <el-tab-pane label="总量分析" name="total"></el-tab-pane>
3
         <el-tab-pane label="总量分析" name="total"></el-tab-pane>
4
         <el-tab-pane label="体重分析" name="weight"></el-tab-pane>
4
         <el-tab-pane label="体重分析" name="weight"></el-tab-pane>
5
         <el-tab-pane label="血压分析" name="bloodpressure"></el-tab-pane>
5
         <el-tab-pane label="血压分析" name="bloodpressure"></el-tab-pane>

+ 1 - 1
src/xt_pages/qcd/patientAnalysis/person/indicators.vue 查看文件

213
   },
213
   },
214
   computed:{
214
   computed:{
215
     activeReferences:function(){
215
     activeReferences:function(){
216
-      var routineBloodShowItem = {17:17,35:35,36:36,37:37,51:51,46:46};
216
+      var routineBloodShowItem = {17:1,35:1,36:1,37:1,49:1,46:1,48:1};
217
       var references = [];
217
       var references = [];
218
       for (const index in this.references) {
218
       for (const index in this.references) {
219
         if (this.references[index].id in routineBloodShowItem) {
219
         if (this.references[index].id in routineBloodShowItem) {

+ 1 - 3
src/xt_pages/qcd/patientAnalysis/total.vue 查看文件

9
       <div class="cell clearfix">
9
       <div class="cell clearfix">
10
         <el-form :inline="true" :model="listQuery" >
10
         <el-form :inline="true" :model="listQuery" >
11
           <el-form-item label="">
11
           <el-form-item label="">
12
-            <el-input v-model="listQuery.search" placeholder="姓名/透析号"></el-input>
13
-          </el-form-item>
14
-          <el-form-item>
12
+            <el-input v-model="listQuery.search" placeholder="姓名/透析号" style="width: 377px;"></el-input>
15
             <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
13
             <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
16
           </el-form-item>
14
           </el-form-item>
17
         </el-form>
15
         </el-form>

+ 1 - 1
src/xt_pages/workforce/components/tableData.vue 查看文件

141
             </div>
141
             </div>
142
           </div>
142
           </div>
143
         </div>
143
         </div>
144
-        <el-table ref="singleTable" :data="patients" border height="250" highlight-current-row @current-change="handleCurrentChange" :header-cell-style="{ backgroundColor: 'rgb(236, 245, 255)'}" >
144
+        <el-table ref="singleTable" :data="patients" border  highlight-current-row @current-change="handleCurrentChange" :header-cell-style="{ backgroundColor: 'rgb(236, 245, 255)'}" >
145
           <el-table-column type="index" label="序号" width="89" align="center"> </el-table-column>
145
           <el-table-column type="index" label="序号" width="89" align="center"> </el-table-column>
146
           <el-table-column property="dialysis_no" label="透析号" min-width="110" align="center" ></el-table-column>
146
           <el-table-column property="dialysis_no" label="透析号" min-width="110" align="center" ></el-table-column>
147
           <el-table-column property="name" label="姓名" min-width="110" align="center" ></el-table-column>
147
           <el-table-column property="name" label="姓名" min-width="110" align="center" ></el-table-column>

+ 5 - 1
src/xt_pages/workforce/schedule_print.vue 查看文件

1
 <template>
1
 <template>
2
 <div class="main-contain">
2
 <div class="main-contain">
3
     <div class="position">
3
     <div class="position">
4
-       <bread-crumb></bread-crumb>
4
+       <bread-crumb :crumbs="crumbs"></bread-crumb>
5
         <el-row style="float:right;">
5
         <el-row style="float:right;">
6
             <el-col :span="24">
6
             <el-col :span="24">
7
                 <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
7
                 <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
88
     name: "SchedulePrint",
88
     name: "SchedulePrint",
89
     data() {
89
     data() {
90
         return {
90
         return {
91
+            crumbs: [
92
+                { path: false, name: '排班管理' },
93
+                { path: false, name: '排班打印' },
94
+            ],
91
             td_1_width: "8%",
95
             td_1_width: "8%",
92
             td_2_width: "8%",
96
             td_2_width: "8%",
93
             td_3_width: "64%",
97
             td_3_width: "64%",