Browse Source

添加字段

csx 5 years ago
parent
commit
58a6d7b294

+ 2 - 2
build/cdn.json View File

1
 {
1
 {
2
-  "version": "1.0.20"
3
-}
2
+  "version": "1.0.28"
3
+}

+ 2 - 2
config/prod.env.js View File

1
 'use strict'
1
 'use strict'
2
 module.exports = {
2
 module.exports = {
3
   NODE_ENV: '"production"',
3
   NODE_ENV: '"production"',
4
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
4
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
5
 
5
 
6
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
6
+  BASE_API: '"https://api.xt.kuyicloud.com"'
7
 
7
 
8
   // http://api.xt.test.sgjyun.com
8
   // http://api.xt.test.sgjyun.com
9
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
9
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'

+ 12 - 33
package-lock.json View File

2305
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
2305
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
2306
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2306
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2307
       "dev": true,
2307
       "dev": true,
2308
-      "optional": true,
2309
       "requires": {
2308
       "requires": {
2310
         "hoek": "2.x.x"
2309
         "hoek": "2.x.x"
2311
       }
2310
       }
5735
         "ansi-regex": {
5734
         "ansi-regex": {
5736
           "version": "2.1.1",
5735
           "version": "2.1.1",
5737
           "bundled": true,
5736
           "bundled": true,
5738
-          "dev": true,
5739
-          "optional": true
5737
+          "dev": true
5740
         },
5738
         },
5741
         "aproba": {
5739
         "aproba": {
5742
           "version": "1.2.0",
5740
           "version": "1.2.0",
5757
         "balanced-match": {
5755
         "balanced-match": {
5758
           "version": "1.0.0",
5756
           "version": "1.0.0",
5759
           "bundled": true,
5757
           "bundled": true,
5760
-          "dev": true,
5761
-          "optional": true
5758
+          "dev": true
5762
         },
5759
         },
5763
         "brace-expansion": {
5760
         "brace-expansion": {
5764
           "version": "1.1.11",
5761
           "version": "1.1.11",
5765
           "bundled": true,
5762
           "bundled": true,
5766
           "dev": true,
5763
           "dev": true,
5767
-          "optional": true,
5768
           "requires": {
5764
           "requires": {
5769
             "balanced-match": "^1.0.0",
5765
             "balanced-match": "^1.0.0",
5770
             "concat-map": "0.0.1"
5766
             "concat-map": "0.0.1"
5779
         "code-point-at": {
5775
         "code-point-at": {
5780
           "version": "1.1.0",
5776
           "version": "1.1.0",
5781
           "bundled": true,
5777
           "bundled": true,
5782
-          "dev": true,
5783
-          "optional": true
5778
+          "dev": true
5784
         },
5779
         },
5785
         "concat-map": {
5780
         "concat-map": {
5786
           "version": "0.0.1",
5781
           "version": "0.0.1",
5787
           "bundled": true,
5782
           "bundled": true,
5788
-          "dev": true,
5789
-          "optional": true
5783
+          "dev": true
5790
         },
5784
         },
5791
         "console-control-strings": {
5785
         "console-control-strings": {
5792
           "version": "1.1.0",
5786
           "version": "1.1.0",
5793
           "bundled": true,
5787
           "bundled": true,
5794
-          "dev": true,
5795
-          "optional": true
5788
+          "dev": true
5796
         },
5789
         },
5797
         "core-util-is": {
5790
         "core-util-is": {
5798
           "version": "1.0.2",
5791
           "version": "1.0.2",
5909
         "inherits": {
5902
         "inherits": {
5910
           "version": "2.0.3",
5903
           "version": "2.0.3",
5911
           "bundled": true,
5904
           "bundled": true,
5912
-          "dev": true,
5913
-          "optional": true
5905
+          "dev": true
5914
         },
5906
         },
5915
         "ini": {
5907
         "ini": {
5916
           "version": "1.3.5",
5908
           "version": "1.3.5",
5922
           "version": "1.0.0",
5914
           "version": "1.0.0",
5923
           "bundled": true,
5915
           "bundled": true,
5924
           "dev": true,
5916
           "dev": true,
5925
-          "optional": true,
5926
           "requires": {
5917
           "requires": {
5927
             "number-is-nan": "^1.0.0"
5918
             "number-is-nan": "^1.0.0"
5928
           }
5919
           }
5937
           "version": "3.0.4",
5928
           "version": "3.0.4",
5938
           "bundled": true,
5929
           "bundled": true,
5939
           "dev": true,
5930
           "dev": true,
5940
-          "optional": true,
5941
           "requires": {
5931
           "requires": {
5942
             "brace-expansion": "^1.1.7"
5932
             "brace-expansion": "^1.1.7"
5943
           }
5933
           }
5945
         "minimist": {
5935
         "minimist": {
5946
           "version": "0.0.8",
5936
           "version": "0.0.8",
5947
           "bundled": true,
5937
           "bundled": true,
5948
-          "dev": true,
5949
-          "optional": true
5938
+          "dev": true
5950
         },
5939
         },
5951
         "minipass": {
5940
         "minipass": {
5952
           "version": "2.2.4",
5941
           "version": "2.2.4",
5953
           "bundled": true,
5942
           "bundled": true,
5954
           "dev": true,
5943
           "dev": true,
5955
-          "optional": true,
5956
           "requires": {
5944
           "requires": {
5957
             "safe-buffer": "^5.1.1",
5945
             "safe-buffer": "^5.1.1",
5958
             "yallist": "^3.0.0"
5946
             "yallist": "^3.0.0"
5971
           "version": "0.5.1",
5959
           "version": "0.5.1",
5972
           "bundled": true,
5960
           "bundled": true,
5973
           "dev": true,
5961
           "dev": true,
5974
-          "optional": true,
5975
           "requires": {
5962
           "requires": {
5976
             "minimist": "0.0.8"
5963
             "minimist": "0.0.8"
5977
           }
5964
           }
6052
         "number-is-nan": {
6039
         "number-is-nan": {
6053
           "version": "1.0.1",
6040
           "version": "1.0.1",
6054
           "bundled": true,
6041
           "bundled": true,
6055
-          "dev": true,
6056
-          "optional": true
6042
+          "dev": true
6057
         },
6043
         },
6058
         "object-assign": {
6044
         "object-assign": {
6059
           "version": "4.1.1",
6045
           "version": "4.1.1",
6065
           "version": "1.4.0",
6051
           "version": "1.4.0",
6066
           "bundled": true,
6052
           "bundled": true,
6067
           "dev": true,
6053
           "dev": true,
6068
-          "optional": true,
6069
           "requires": {
6054
           "requires": {
6070
             "wrappy": "1"
6055
             "wrappy": "1"
6071
           }
6056
           }
6151
         "safe-buffer": {
6136
         "safe-buffer": {
6152
           "version": "5.1.1",
6137
           "version": "5.1.1",
6153
           "bundled": true,
6138
           "bundled": true,
6154
-          "dev": true,
6155
-          "optional": true
6139
+          "dev": true
6156
         },
6140
         },
6157
         "safer-buffer": {
6141
         "safer-buffer": {
6158
           "version": "2.1.2",
6142
           "version": "2.1.2",
6188
           "version": "1.0.2",
6172
           "version": "1.0.2",
6189
           "bundled": true,
6173
           "bundled": true,
6190
           "dev": true,
6174
           "dev": true,
6191
-          "optional": true,
6192
           "requires": {
6175
           "requires": {
6193
             "code-point-at": "^1.0.0",
6176
             "code-point-at": "^1.0.0",
6194
             "is-fullwidth-code-point": "^1.0.0",
6177
             "is-fullwidth-code-point": "^1.0.0",
6208
           "version": "3.0.1",
6191
           "version": "3.0.1",
6209
           "bundled": true,
6192
           "bundled": true,
6210
           "dev": true,
6193
           "dev": true,
6211
-          "optional": true,
6212
           "requires": {
6194
           "requires": {
6213
             "ansi-regex": "^2.0.0"
6195
             "ansi-regex": "^2.0.0"
6214
           }
6196
           }
6252
         "wrappy": {
6234
         "wrappy": {
6253
           "version": "1.0.2",
6235
           "version": "1.0.2",
6254
           "bundled": true,
6236
           "bundled": true,
6255
-          "dev": true,
6256
-          "optional": true
6237
+          "dev": true
6257
         },
6238
         },
6258
         "yallist": {
6239
         "yallist": {
6259
           "version": "3.0.2",
6240
           "version": "3.0.2",
6260
           "bundled": true,
6241
           "bundled": true,
6261
-          "dev": true,
6262
-          "optional": true
6242
+          "dev": true
6263
         }
6243
         }
6264
       }
6244
       }
6265
     },
6245
     },
6717
       "version": "2.16.3",
6697
       "version": "2.16.3",
6718
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6698
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6719
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6699
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6720
-      "dev": true,
6721
-      "optional": true
6700
+      "dev": true
6722
     },
6701
     },
6723
     "home-or-tmp": {
6702
     "home-or-tmp": {
6724
       "version": "2.0.0",
6703
       "version": "2.0.0",

+ 4 - 4
src/pages/main/dialog/AcceptsDialog.vue View File

62
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="2">低风险</el-radio>
62
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="2">低风险</el-radio>
63
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="3">中度风险</el-radio>
63
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="3">中度风险</el-radio>
64
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="4">高风险</el-radio>
64
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="4">高风险</el-radio>
65
-
66
           </el-form-item>
65
           </el-form-item>
67
 
66
 
67
+
68
           <el-form-item label-width="155px" label="跌倒风险预防措施: " v-if="isShow('跌倒风险预防措施')">
68
           <el-form-item label-width="155px" label="跌倒风险预防措施: " v-if="isShow('跌倒风险预防措施')">
69
           <el-radio v-model="receiveTreatmentAsses.precaution" label="1">镇定剂</el-radio>
69
           <el-radio v-model="receiveTreatmentAsses.precaution" label="1">镇定剂</el-radio>
70
           <el-radio v-model="receiveTreatmentAsses.precaution" label="2">约束带</el-radio>
70
           <el-radio v-model="receiveTreatmentAsses.precaution" label="2">约束带</el-radio>
177
               this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
177
               this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
178
               this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
178
               this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
179
 
179
 
180
-              this.receiveTreatmentAsses.precaution = this.accepts.precaution
180
+              this.receiveTreatmentAsses.precaution = this.accepts.precaution +''
181
               this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
181
               this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
182
 
182
 
183
 
183
 
227
                 this.receiveTreatmentAsses.score = this.accepts.score
227
                 this.receiveTreatmentAsses.score = this.accepts.score
228
                 this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
228
                 this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
229
 
229
 
230
-                this.receiveTreatmentAsses.precaution = this.accepts.precaution
230
+                this.receiveTreatmentAsses.precaution = this.accepts.precaution + ''
231
                 this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
231
                 this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
232
                 this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
232
                 this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
233
 
233
 
251
           this.receiveTreatmentAsses.score = this.accepts.score
251
           this.receiveTreatmentAsses.score = this.accepts.score
252
           this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
252
           this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
253
 
253
 
254
-          this.receiveTreatmentAsses.precaution = this.accepts.precaution
254
+          this.receiveTreatmentAsses.precaution = this.accepts.precaution +''
255
           this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
255
           this.receiveTreatmentAsses.precaution_other = this.accepts.precaution_other
256
           this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
256
           this.receiveTreatmentAsses.psychological_other = this.accepts.psychological_other
257
 
257
 

+ 3 - 3
src/pages/main/dialog/AssessmentDialog.vue View File

1018
           case 20:
1018
           case 20:
1019
             if( val.selectId == 1){
1019
             if( val.selectId == 1){
1020
               this.infect_state = true
1020
               this.infect_state = true
1021
-              this.formValue.is_infect = val.selectId
1021
+              this.formValue.is_infect = val.selectId.toString()
1022
             }else if(val.selectId == 2){
1022
             }else if(val.selectId == 2){
1023
               this.infect_state = false
1023
               this.infect_state = false
1024
-              this.formValue.is_infect = val.selectId
1024
+              this.formValue.is_infect = val.selectId.toString()
1025
             }else if(this.formValue.is_infect == -2){
1025
             }else if(this.formValue.is_infect == -2){
1026
             }
1026
             }
1027
             break
1027
             break
1028
           case 21:
1028
           case 21:
1029
-            this.formValue.skin = val.selectId
1029
+            this.formValue.skin = val.selectId.toString()
1030
             break
1030
             break
1031
         }
1031
         }
1032
 
1032
 

+ 0 - 2
src/pages/main/dialog/MonitDialog.vue View File

22
                 <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
22
                 <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
23
                 <th v-if="isShow('脉搏')" width="80px">脉搏(次/分)</th>
23
                 <th v-if="isShow('脉搏')" width="80px">脉搏(次/分)</th>
24
                 <th v-if="isShow('体温')" width="80px">体温(℃)</th>
24
                 <th v-if="isShow('体温')" width="80px">体温(℃)</th>
25
-                <td v-if="isShow('心率')" width="80px">心率(次/分)</td>
26
                 <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
25
                 <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
27
                 <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
26
                 <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
28
                 <th width="76px">静脉压/动脉压(mmHg)</th>
27
                 <th width="76px">静脉压/动脉压(mmHg)</th>
47
                 </td>
46
                 </td>
48
                 <td v-if="isShow('脉搏')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
47
                 <td v-if="isShow('脉搏')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
49
                 <td v-if="isShow('体温')">{{item.temperature?item.temperature:''}}</td>
48
                 <td v-if="isShow('体温')">{{item.temperature?item.temperature:''}}</td>
50
-                <td v-if="isShow('心率')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
51
                 <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:''}}</td>
49
                 <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:''}}</td>
52
                 <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
50
                 <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
53
                 <td>
51
                 <td>

+ 2 - 2
src/pages/main/today/acceptsAssessment.vue View File

145
       },psychological_assessment: {
145
       },psychological_assessment: {
146
         "1": "正常",
146
         "1": "正常",
147
         "2": "异常",
147
         "2": "异常",
148
-      },precaution: {
148
+      },precautionss: {
149
         "1": "镇定剂",
149
         "1": "镇定剂",
150
         "2": "约束带",
150
         "2": "约束带",
151
         "3": "床栏",
151
         "3": "床栏",
210
       if (this.record == null || this.record.id == "") {
210
       if (this.record == null || this.record.id == "") {
211
         return ""
211
         return ""
212
       } else {
212
       } else {
213
-        return this.precaution[this.record.precaution] == undefined ? "" : this.precaution[this.record.precaution] + ""
213
+        return this.precautionss[this.record.precaution] == undefined ? "" : this.precautionss[this.record.precaution] + ""
214
       }
214
       }
215
     },intakes: function() {
215
     },intakes: function() {
216
       if (this.record == null || this.record.id == "") {
216
       if (this.record == null || this.record.id == "") {

+ 6 - 6
src/pages/main/today/assessmentBefore.vue View File

51
           <span class="unit">{{ temperature?'℃':''}}</span>
51
           <span class="unit">{{ temperature?'℃':''}}</span>
52
         </li>
52
         </li>
53
         <li v-if="isShow('脉搏')">
53
         <li v-if="isShow('脉搏')">
54
-          <label>脉 : </label>
54
+          <label>脉 : </label>
55
           <span class="content">{{ pulse_frequency?pulse_frequency:''}}</span>
55
           <span class="content">{{ pulse_frequency?pulse_frequency:''}}</span>
56
           <span class="unit">{{ pulse_frequency?'次/分':''}}</span>
56
           <span class="unit">{{ pulse_frequency?'次/分':''}}</span>
57
         </li>
57
         </li>
123
       <ul > -->
123
       <ul > -->
124
         <li style="height: 0.6rem;" v-if="isShow('位置')">
124
         <li style="height: 0.6rem;" v-if="isShow('位置')">
125
           <label>位置:</label>
125
           <label>位置:</label>
126
-          <span class="content" v-if="this.record.venous_catheterization_part != -1">{{getVenousCatheterizationPart(this.record.venous_catheterization_part)}}</span>
127
-          <span class="content" v-if="this.record.venous_catheterization_part == -1">{{venous_catheterization_part_other}}</span>
126
+          <span class="content">{{getVenousCatheterizationPart(this.record.venous_catheterization_part)}}</span>
127
+          <span class="content" >{{venous_catheterization_part_other}}</span>
128
         </li>
128
         </li>
129
 
129
 
130
         <li v-if="isShow('中心静脉导管')">
130
         <li v-if="isShow('中心静脉导管')">
142
 
142
 
143
         <li v-if="isShow('急诊')">
143
         <li v-if="isShow('急诊')">
144
           <label>急诊: </label>
144
           <label>急诊: </label>
145
-          <span class="content" v-if="this.record.emergency_treatment != -1">{{getEmergencyTreatment(this.record.emergency_treatment)}}</span>
146
-          <span class="content" v-if="this.record.emergency_treatment == -1">{{emergency_treatment_other}}</span>
145
+          <span class="content">{{getEmergencyTreatment(this.record.emergency_treatment)}}</span>
146
+          <span class="content" >{{emergency_treatment_other}}</span>
147
         </li>
147
         </li>
148
 
148
 
149
 
149
 
164
 
164
 
165
         <li style="height: 0.6rem;" v-if="isShow('外露')">
165
         <li style="height: 0.6rem;" v-if="isShow('外露')">
166
           <label>外露:</label>
166
           <label>外露:</label>
167
-          <span class="content">{{this.record.exposed?exposed:''}}</span>
167
+          <span class="content">{{this.record.exposed?this.record.exposed:''}}</span>
168
           <span class="unit">cm</span>
168
           <span class="unit">cm</span>
169
         </li>
169
         </li>
170
 
170
 

+ 1 - 1
src/pages/main/today/dialysisMonitoring.vue View File

7
           <th v-if="isShow('监测时间')" width="124px">时间</th>
7
           <th v-if="isShow('监测时间')" width="124px">时间</th>
8
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
8
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
9
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
9
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
10
-          <th v-if="isShow('脉搏')" width="80px">脉(次/分)</th>
10
+          <th v-if="isShow('脉搏')" width="80px">脉(次/分)</th>
11
           <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
11
           <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
12
           <th width="76px">静脉压/动脉压(mmHg)</th>
12
           <th width="76px">静脉压/动脉压(mmHg)</th>
13
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
13
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>