Browse Source

添加字段

csx 5 years ago
parent
commit
58a6d7b294

+ 2 - 2
build/cdn.json View File

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

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

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

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

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

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

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

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

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

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

@@ -145,7 +145,7 @@ export default {
145 145
       },psychological_assessment: {
146 146
         "1": "正常",
147 147
         "2": "异常",
148
-      },precaution: {
148
+      },precautionss: {
149 149
         "1": "镇定剂",
150 150
         "2": "约束带",
151 151
         "3": "床栏",
@@ -210,7 +210,7 @@ export default {
210 210
       if (this.record == null || this.record.id == "") {
211 211
         return ""
212 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 215
     },intakes: function() {
216 216
       if (this.record == null || this.record.id == "") {

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

@@ -51,7 +51,7 @@
51 51
           <span class="unit">{{ temperature?'℃':''}}</span>
52 52
         </li>
53 53
         <li v-if="isShow('脉搏')">
54
-          <label>脉 : </label>
54
+          <label>脉 : </label>
55 55
           <span class="content">{{ pulse_frequency?pulse_frequency:''}}</span>
56 56
           <span class="unit">{{ pulse_frequency?'次/分':''}}</span>
57 57
         </li>
@@ -123,8 +123,8 @@
123 123
       <ul > -->
124 124
         <li style="height: 0.6rem;" v-if="isShow('位置')">
125 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 128
         </li>
129 129
 
130 130
         <li v-if="isShow('中心静脉导管')">
@@ -142,8 +142,8 @@
142 142
 
143 143
         <li v-if="isShow('急诊')">
144 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 147
         </li>
148 148
 
149 149
 
@@ -164,7 +164,7 @@
164 164
 
165 165
         <li style="height: 0.6rem;" v-if="isShow('外露')">
166 166
           <label>外露:</label>
167
-          <span class="content">{{this.record.exposed?exposed:''}}</span>
167
+          <span class="content">{{this.record.exposed?this.record.exposed:''}}</span>
168 168
           <span class="unit">cm</span>
169 169
         </li>
170 170
 

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

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