Przeglądaj źródła

修改华侨问题

csx 6 lat temu
rodzic
commit
cb995f064c

+ 1 - 1
config/index.js Wyświetl plik

9
 
9
 
10
     // Paths
10
     // Paths
11
     assetsSubDirectory: 'static',
11
     assetsSubDirectory: 'static',
12
-    assetsPublicPath: './',
12
+    assetsPublicPath: '/',
13
     proxyTable: {},
13
     proxyTable: {},
14
 
14
 
15
     // Various Dev Server settings
15
     // Various Dev Server settings

+ 1 - 1
config/prod.env.js Wyświetl plik

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.kuyicloud.com"'
5
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
5
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
6
 }
6
 }

+ 28 - 28
package-lock.json Wyświetl plik

54
     },
54
     },
55
     "@antv/gl-matrix": {
55
     "@antv/gl-matrix": {
56
       "version": "2.7.1",
56
       "version": "2.7.1",
57
-      "resolved": "https://registry.npm.taobao.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz",
57
+      "resolved": "http://registry.npm.taobao.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz",
58
       "integrity": "sha1-rLjjf3qz3wE0WrpDcteUK+QuuhQ="
58
       "integrity": "sha1-rLjjf3qz3wE0WrpDcteUK+QuuhQ="
59
     },
59
     },
60
     "@antv/scale": {
60
     "@antv/scale": {
78
     },
78
     },
79
     "@antv/util": {
79
     "@antv/util": {
80
       "version": "1.2.5",
80
       "version": "1.2.5",
81
-      "resolved": "https://registry.npm.taobao.org/@antv/util/download/@antv/util-1.2.5.tgz",
81
+      "resolved": "http://registry.npm.taobao.org/@antv/util/download/@antv/util-1.2.5.tgz",
82
       "integrity": "sha1-iJbFBV7Cnko0S12ql7+CkF99QM0=",
82
       "integrity": "sha1-iJbFBV7Cnko0S12ql7+CkF99QM0=",
83
       "requires": {
83
       "requires": {
84
         "@antv/gl-matrix": "^2.7.1"
84
         "@antv/gl-matrix": "^2.7.1"
840
     },
840
     },
841
     "array-filter": {
841
     "array-filter": {
842
       "version": "1.0.0",
842
       "version": "1.0.0",
843
-      "resolved": "https://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
843
+      "resolved": "http://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
844
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
844
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
845
     },
845
     },
846
     "array-find": {
846
     "array-find": {
847
       "version": "1.0.0",
847
       "version": "1.0.0",
848
-      "resolved": "https://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
848
+      "resolved": "http://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
849
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
849
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
850
     },
850
     },
851
     "array-find-index": {
851
     "array-find-index": {
871
     },
871
     },
872
     "array-map": {
872
     "array-map": {
873
       "version": "0.0.0",
873
       "version": "0.0.0",
874
-      "resolved": "https://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
874
+      "resolved": "http://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
875
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
875
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
876
     },
876
     },
877
     "array-shuffle": {
877
     "array-shuffle": {
878
       "version": "1.0.1",
878
       "version": "1.0.1",
879
-      "resolved": "https://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
879
+      "resolved": "http://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
880
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
880
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
881
     },
881
     },
882
     "array-union": {
882
     "array-union": {
1052
     },
1052
     },
1053
     "autosize": {
1053
     "autosize": {
1054
       "version": "3.0.21",
1054
       "version": "3.0.21",
1055
-      "resolved": "https://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
1055
+      "resolved": "http://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
1056
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
1056
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
1057
     },
1057
     },
1058
     "aws-sign2": {
1058
     "aws-sign2": {
2194
     },
2194
     },
2195
     "blueimp-md5": {
2195
     "blueimp-md5": {
2196
       "version": "2.10.0",
2196
       "version": "2.10.0",
2197
-      "resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.10.0.tgz",
2197
+      "resolved": "http://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.10.0.tgz",
2198
       "integrity": "sha1-AvCEOSH5DcoU9biSCjhZMgHWlk0="
2198
       "integrity": "sha1-AvCEOSH5DcoU9biSCjhZMgHWlk0="
2199
     },
2199
     },
2200
     "bn.js": {
2200
     "bn.js": {
3407
     },
3407
     },
3408
     "countup.js": {
3408
     "countup.js": {
3409
       "version": "1.9.3",
3409
       "version": "1.9.3",
3410
-      "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
3410
+      "resolved": "http://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
3411
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
3411
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
3412
     },
3412
     },
3413
     "create-ecdh": {
3413
     "create-ecdh": {
5280
     },
5280
     },
5281
     "fastclick": {
5281
     "fastclick": {
5282
       "version": "1.0.6",
5282
       "version": "1.0.6",
5283
-      "resolved": "https://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
5283
+      "resolved": "http://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
5284
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
5284
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
5285
     },
5285
     },
5286
     "fastparse": {
5286
     "fastparse": {
5318
     },
5318
     },
5319
     "fecha": {
5319
     "fecha": {
5320
       "version": "2.3.3",
5320
       "version": "2.3.3",
5321
-      "resolved": "https://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
5321
+      "resolved": "http://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
5322
       "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
5322
       "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
5323
     },
5323
     },
5324
     "figures": {
5324
     "figures": {
6474
     },
6474
     },
6475
     "hammerjs": {
6475
     "hammerjs": {
6476
       "version": "2.0.8",
6476
       "version": "2.0.8",
6477
-      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
6477
+      "resolved": "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
6478
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
6478
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
6479
     },
6479
     },
6480
     "handle-thing": {
6480
     "handle-thing": {
8635
     },
8635
     },
8636
     "lodash.throttle": {
8636
     "lodash.throttle": {
8637
       "version": "4.1.1",
8637
       "version": "4.1.1",
8638
-      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
8638
+      "resolved": "http://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
8639
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
8639
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
8640
     },
8640
     },
8641
     "lodash.unionwith": {
8641
     "lodash.unionwith": {
9416
         },
9416
         },
9417
         "chalk": {
9417
         "chalk": {
9418
           "version": "1.1.3",
9418
           "version": "1.1.3",
9419
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
9419
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
9420
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
9420
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
9421
           "dev": true,
9421
           "dev": true,
9422
           "requires": {
9422
           "requires": {
9502
     },
9502
     },
9503
     "normalize-wheel": {
9503
     "normalize-wheel": {
9504
       "version": "1.0.1",
9504
       "version": "1.0.1",
9505
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
9505
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
9506
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
9506
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
9507
     },
9507
     },
9508
     "npm-run-path": {
9508
     "npm-run-path": {
12305
       "dependencies": {
12305
       "dependencies": {
12306
         "ansi-styles": {
12306
         "ansi-styles": {
12307
           "version": "2.2.1",
12307
           "version": "2.2.1",
12308
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
12308
+          "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
12309
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
12309
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
12310
           "dev": true
12310
           "dev": true
12311
         },
12311
         },
12312
         "chalk": {
12312
         "chalk": {
12313
           "version": "1.1.3",
12313
           "version": "1.1.3",
12314
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
12314
+          "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
12315
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
12315
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
12316
           "dev": true,
12316
           "dev": true,
12317
           "requires": {
12317
           "requires": {
12324
         },
12324
         },
12325
         "progress": {
12325
         "progress": {
12326
           "version": "1.1.8",
12326
           "version": "1.1.8",
12327
-          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
12327
+          "resolved": "http://registry.npm.taobao.org/progress/download/progress-1.1.8.tgz",
12328
           "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
12328
           "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
12329
           "dev": true
12329
           "dev": true
12330
         },
12330
         },
12331
         "supports-color": {
12331
         "supports-color": {
12332
           "version": "2.0.0",
12332
           "version": "2.0.0",
12333
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
12333
+          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz",
12334
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
12334
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
12335
           "dev": true
12335
           "dev": true
12336
         }
12336
         }
12458
     },
12458
     },
12459
     "qr.js": {
12459
     "qr.js": {
12460
       "version": "0.0.0",
12460
       "version": "0.0.0",
12461
-      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
12461
+      "resolved": "http://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
12462
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
12462
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
12463
     },
12463
     },
12464
     "qs": {
12464
     "qs": {
13731
     },
13731
     },
13732
     "shake.js": {
13732
     "shake.js": {
13733
       "version": "1.2.2",
13733
       "version": "1.2.2",
13734
-      "resolved": "https://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
13734
+      "resolved": "http://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
13735
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
13735
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
13736
     },
13736
     },
13737
     "shallow-clone": {
13737
     "shallow-clone": {
15213
     },
15213
     },
15214
     "validator": {
15214
     "validator": {
15215
       "version": "9.4.1",
15215
       "version": "9.4.1",
15216
-      "resolved": "https://registry.npm.taobao.org/validator/download/validator-9.4.1.tgz",
15216
+      "resolved": "http://registry.npm.taobao.org/validator/download/validator-9.4.1.tgz",
15217
       "integrity": "sha1-q/Rm05i1Yc0kMFARLG/x3mzBJmM="
15217
       "integrity": "sha1-q/Rm05i1Yc0kMFARLG/x3mzBJmM="
15218
     },
15218
     },
15219
     "vanilla-masker": {
15219
     "vanilla-masker": {
15220
       "version": "1.2.0",
15220
       "version": "1.2.0",
15221
-      "resolved": "https://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
15221
+      "resolved": "http://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
15222
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
15222
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
15223
     },
15223
     },
15224
     "vant": {
15224
     "vant": {
15497
       "dependencies": {
15497
       "dependencies": {
15498
         "axios": {
15498
         "axios": {
15499
           "version": "0.15.3",
15499
           "version": "0.15.3",
15500
-          "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.15.3.tgz",
15500
+          "resolved": "http://registry.npm.taobao.org/axios/download/axios-0.15.3.tgz",
15501
           "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
15501
           "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
15502
           "requires": {
15502
           "requires": {
15503
             "follow-redirects": "1.0.0"
15503
             "follow-redirects": "1.0.0"
15505
         },
15505
         },
15506
         "follow-redirects": {
15506
         "follow-redirects": {
15507
           "version": "1.0.0",
15507
           "version": "1.0.0",
15508
-          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.0.0.tgz",
15508
+          "resolved": "http://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.0.0.tgz",
15509
           "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
15509
           "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
15510
           "requires": {
15510
           "requires": {
15511
             "debug": "^2.2.0"
15511
             "debug": "^2.2.0"
15515
     },
15515
     },
15516
     "vux-blazy": {
15516
     "vux-blazy": {
15517
       "version": "1.6.4",
15517
       "version": "1.6.4",
15518
-      "resolved": "https://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
15518
+      "resolved": "http://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
15519
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
15519
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
15520
     },
15520
     },
15521
     "vux-loader": {
15521
     "vux-loader": {
15752
     },
15752
     },
15753
     "vux-xscroll": {
15753
     "vux-xscroll": {
15754
       "version": "3.1.12",
15754
       "version": "3.1.12",
15755
-      "resolved": "https://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
15755
+      "resolved": "http://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
15756
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
15756
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
15757
     },
15757
     },
15758
     "w3c-hr-time": {
15758
     "w3c-hr-time": {
16469
     },
16469
     },
16470
     "x-photoswipe": {
16470
     "x-photoswipe": {
16471
       "version": "4.1.3-rc.1",
16471
       "version": "4.1.3-rc.1",
16472
-      "resolved": "https://registry.npm.taobao.org/x-photoswipe/download/x-photoswipe-4.1.3-rc.1.tgz",
16472
+      "resolved": "http://registry.npm.taobao.org/x-photoswipe/download/x-photoswipe-4.1.3-rc.1.tgz",
16473
       "integrity": "sha1-52GQF1LdPdH3GOU4UUtgm13199s="
16473
       "integrity": "sha1-52GQF1LdPdH3GOU4UUtgm13199s="
16474
     },
16474
     },
16475
     "xml-name-validator": {
16475
     "xml-name-validator": {

+ 2 - 2
src/pages/layout/SideBar.vue Wyświetl plik

44
   width:20px;
44
   width:20px;
45
   line-height:20px;
45
   line-height:20px;
46
   text-align:center;
46
   text-align:center;
47
-  font-size:0.2em;
47
+  font-size:0.74em;
48
   border-radius:20px;
48
   border-radius:20px;
49
   color:#fff;
49
   color:#fff;
50
-  background:red;
50
+  background:#F56C6C;
51
   position: absolute;
51
   position: absolute;
52
   top: -5px;
52
   top: -5px;
53
   right: -15px;
53
   right: -15px;

+ 1 - 1
src/pages/main/PatientBox.vue Wyświetl plik

343
   font-size:0.8em;
343
   font-size:0.8em;
344
   border-radius:20px;
344
   border-radius:20px;
345
   color:#fff;
345
   color:#fff;
346
-  background:red;
346
+  background:#F56C6C;
347
   position: absolute;
347
   position: absolute;
348
   top: -8px;
348
   top: -8px;
349
   left: 0.7rem;
349
   left: 0.7rem;

+ 1 - 1
src/pages/main/RecordPage.vue Wyświetl plik

163
   font-size:0.8em;
163
   font-size:0.8em;
164
   border-radius:20px;
164
   border-radius:20px;
165
   color:#fff;
165
   color:#fff;
166
-  background:red;
166
+  background:#F56C6C;
167
   position: absolute;
167
   position: absolute;
168
   top: -8px;
168
   top: -8px;
169
   right: -8px;
169
   right: -8px;

+ 16 - 3
src/pages/main/dialog/AcceptsDialog.vue Wyświetl plik

7
         <span class="success" @click="commitInfo">完成</span>
7
         <span class="success" @click="commitInfo">完成</span>
8
       </div>
8
       </div>
9
       <div class="DialogContent choose">
9
       <div class="DialogContent choose">
10
+
11
+
10
         <el-form :model="receiveTreatmentAsses" label-width="90px">
12
         <el-form :model="receiveTreatmentAsses" label-width="90px">
11
           <el-form-item label="入室方式: " v-if="isShow('入室方式')">
13
           <el-form-item label="入室方式: " v-if="isShow('入室方式')">
12
             <el-radio v-model="receiveTreatmentAsses.way" label="1">步行</el-radio>
14
             <el-radio v-model="receiveTreatmentAsses.way" label="1">步行</el-radio>
46
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="2">严重</el-radio>
48
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="2">严重</el-radio>
47
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>
49
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>
48
           </el-form-item>
50
           </el-form-item>
51
+          <el-form-item label-width="100dp" label="跌倒分险评估评分 : "
52
+                        v-if="isShow('跌倒分险评估评分')">
53
+            <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
54
+          </el-form-item>
49
 
55
 
50
           <el-form-item label="风险程度: " v-if="isShow('风险程度')">
56
           <el-form-item label="风险程度: " v-if="isShow('风险程度')">
51
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="1">无</el-radio>
57
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="1">无</el-radio>
54
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="4">高风险</el-radio>
60
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="4">高风险</el-radio>
55
 
61
 
56
           </el-form-item>
62
           </el-form-item>
63
+
64
+
57
           <el-form-item label="摄入量: "  v-if="isShow('摄入量')">
65
           <el-form-item label="摄入量: "  v-if="isShow('摄入量')">
58
             <el-radio v-model="receiveTreatmentAsses.intake" label="1">正常</el-radio>
66
             <el-radio v-model="receiveTreatmentAsses.intake" label="1">正常</el-radio>
59
             <el-radio v-model="receiveTreatmentAsses.intake" label="2">减少</el-radio>
67
             <el-radio v-model="receiveTreatmentAsses.intake" label="2">减少</el-radio>
102
           nutrition: '1',
110
           nutrition: '1',
103
           psychological_assessment: '1',
111
           psychological_assessment: '1',
104
           psychological_assessment_other: '',
112
           psychological_assessment_other: '',
113
+          score:'',
105
         },
114
         },
106
         patient: {
115
         patient: {
107
           id: 0
116
           id: 0
139
               this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
148
               this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
140
               this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
149
               this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
141
               this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other
150
               this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other
142
-
151
+              this.receiveTreatmentAsses.score = this.accepts.score
143
             }
152
             }
144
           }
153
           }
145
         })
154
         })
155
           this.accepts.intake == 0 &&
164
           this.accepts.intake == 0 &&
156
           this.accepts.nutrition == 0 &&
165
           this.accepts.nutrition == 0 &&
157
           this.accepts.psychological_assessment == 0 &&
166
           this.accepts.psychological_assessment == 0 &&
158
-          this.accepts.psychological_assessment_other == ''
159
-        ) {
167
+          this.accepts.psychological_assessment_other == ''&&
168
+          this.accepts.score == ''
169
+
170
+      ) {
160
           let ParamsQuery = {}
171
           let ParamsQuery = {}
161
           ParamsQuery['patient'] = this.$route.query.patient_id
172
           ParamsQuery['patient'] = this.$route.query.patient_id
162
           getLastAccepts(ParamsQuery).then(response => {
173
           getLastAccepts(ParamsQuery).then(response => {
178
                 this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
189
                 this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
179
                 this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
190
                 this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
180
                 this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
191
                 this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
192
+                this.receiveTreatmentAsses.score = this.accepts.score
181
 
193
 
182
               }
194
               }
183
             }
195
             }
195
           this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
207
           this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
196
           this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
208
           this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
197
           this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
209
           this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
210
+          this.receiveTreatmentAsses.score = this.accepts.score
198
 
211
 
199
 
212
 
200
         }
213
         }

+ 9 - 0
src/pages/main/dialog/AssessmentDialog.vue Wyświetl plik

26
             <input type="tel" @focus="inputFocus" v-model="formValue.temperature"/>
26
             <input type="tel" @focus="inputFocus" v-model="formValue.temperature"/>
27
           </div>
27
           </div>
28
         </div>
28
         </div>
29
+
30
+        <div class="item" v-if="isShow('呼吸频率')">
31
+          <h2 class="name">呼吸频率(次/分)</h2>
32
+          <div class="content">
33
+            <input type="tel" @focus="inputFocus" v-model="formValue.breathing_rate"/>
34
+          </div>
35
+        </div>
36
+
29
         <div class="item" v-if="isShow('出血')">
37
         <div class="item" v-if="isShow('出血')">
30
           <h2 class="name">出血</h2>
38
           <h2 class="name">出血</h2>
31
           <div class="content">
39
           <div class="content">
327
           internal_fistula_other: '',
335
           internal_fistula_other: '',
328
           blood_access_internal_fistula: '',
336
           blood_access_internal_fistula: '',
329
           machine_type:'',
337
           machine_type:'',
338
+          breathing_rate:'',
330
         },
339
         },
331
 
340
 
332
         record_date: ''
341
         record_date: ''

+ 4 - 4
src/pages/main/dialog/MonitDialog.vue Wyświetl plik

20
             <tr @click="selectRow(-1, null)">
20
             <tr @click="selectRow(-1, null)">
21
                 <th  v-if="isShow('监测时间')"  width="124px">时间</th>
21
                 <th  v-if="isShow('监测时间')"  width="124px">时间</th>
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="110px">呼吸(次/分)</th>
24
                 <th  v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
25
                 <th  v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
25
                 <th  v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
26
                 <th width="76px">静脉压/动脉压(mmHg)</th>
26
                 <th width="76px">静脉压/动脉压(mmHg)</th>
37
             <tr v-for="(item,index) in monitorRecords" :key="index" :value="item.value" @click="selectRow(index, item)" :class="index==currentIndex?rowClass:''">
37
             <tr v-for="(item,index) in monitorRecords" :key="index" :value="item.value" @click="selectRow(index, item)" :class="index==currentIndex?rowClass:''">
38
                 <td   v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
38
                 <td   v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
39
                 <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:""}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:""}}</td>
39
                 <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:""}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:""}}</td>
40
-                <td v-if="isShow('率')">{{item.pulse_frequency?item.pulse_frequency:""}}</td>
40
+                <td v-if="isShow('率')">{{item.pulse_frequency?item.pulse_frequency:""}}</td>
41
                 <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:""}}</td>
41
                 <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:""}}</td>
42
                 <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:""}}</td>
42
                 <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:""}}</td>
43
                 <td >{{item.venous_pressure?item.venous_pressure:""}}/{{item.arterial_pressure?item.arterial_pressure:""}}</td>
43
                 <td >{{item.venous_pressure?item.venous_pressure:""}}/{{item.arterial_pressure?item.arterial_pressure:""}}</td>
77
               <label>舒张压(mmHg)</label>
77
               <label>舒张压(mmHg)</label>
78
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.diastolic_bp">
78
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.diastolic_bp">
79
             </div>
79
             </div>
80
-            <div class="cell"  v-if="isShow('率')">
81
-              <label>率(次/分)</label>
80
+            <div class="cell"  v-if="isShow('率')">
81
+              <label>率(次/分)</label>
82
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.pulse_frequency">
82
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.pulse_frequency">
83
             </div>
83
             </div>
84
             <div class="cell"  v-if="isShow('呼吸频率')">
84
             <div class="cell"  v-if="isShow('呼吸频率')">

+ 1 - 1
src/pages/main/today/TodayTab.vue Wyświetl plik

1074
   font-size:0.8em;
1074
   font-size:0.8em;
1075
   border-radius:20px;
1075
   border-radius:20px;
1076
   color:#fff;
1076
   color:#fff;
1077
-  background:red;
1077
+  background:#F56C6C;
1078
   position: absolute;
1078
   position: absolute;
1079
   border: 1px solid #fff;
1079
   border: 1px solid #fff;
1080
   top: -8px;
1080
   top: -8px;

+ 5 - 0
src/pages/main/today/acceptsAssessment.vue Wyświetl plik

30
           <label>病情 </label>
30
           <label>病情 </label>
31
           <span class="content">{{sickCondition}} </span>
31
           <span class="content">{{sickCondition}} </span>
32
         </li>
32
         </li>
33
+        <li style="height: 0.6rem;" v-if="isShow('跌倒分险评估评分')">
34
+          <label>跌倒分险评估评分:</label>
35
+          <span class="content">{{this.record.score}}分</span>
36
+        </li>
33
         <li style="height: 0.6rem;" v-if="isShow('风险程度')">
37
         <li style="height: 0.6rem;" v-if="isShow('风险程度')">
34
           <label>风险程度:</label>
38
           <label>风险程度:</label>
35
           <span class="content">{{dangerLevel}}</span>
39
           <span class="content">{{dangerLevel}}</span>
127
     }
131
     }
128
   },
132
   },
129
   computed: {
133
   computed: {
134
+
130
     way: function() {
135
     way: function() {
131
       if (this.record == null || this.record.id == "") {
136
       if (this.record == null || this.record.id == "") {
132
         return ""
137
         return ""

+ 13 - 1
src/pages/main/today/assessmentBefore.vue Wyświetl plik

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>
58
+
59
+        <li v-if="isShow('呼吸频率')">
60
+          <label>呼吸频率 : </label>
61
+          <span class="content">{{ breathing_rate?breathing_rate:''}}</span>
62
+          <span class="unit">{{ breathing_rate?'次/分':''}}</span>
63
+        </li>
58
         <li v-if="isShow('透析前症状')">
64
         <li v-if="isShow('透析前症状')">
59
           <label>透析前症状 : </label>
65
           <label>透析前症状 : </label>
60
           <span class="content">{{ symptom_before_dialysis }}</span>
66
           <span class="content">{{ symptom_before_dialysis }}</span>
108
           <span class="content">{{getVenousCatheterization(this.record.venous_catheterization)}}</span>
114
           <span class="content">{{getVenousCatheterization(this.record.venous_catheterization)}}</span>
109
           <span class="unit"> </span>
115
           <span class="unit"> </span>
110
         </li>
116
         </li>
111
-<!-- 
117
+<!--
112
       </ul>
118
       </ul>
113
 
119
 
114
 
120
 
214
         }
220
         }
215
         return this.record.pulse_frequency
221
         return this.record.pulse_frequency
216
       },
222
       },
223
+      breathing_rate: function () {
224
+        if (this.record == null || this.record.id == '') {
225
+          return '-'
226
+        }
227
+        return this.record.breathing_rate
228
+      },
217
       symptom_before_dialysis: function () {
229
       symptom_before_dialysis: function () {
218
         if (this.record == null || this.record.id == '') {
230
         if (this.record == null || this.record.id == '') {
219
           return '-'
231
           return '-'

+ 64 - 61
src/pages/main/today/dialysisComputer.vue Wyświetl plik

1
 <template>
1
 <template>
2
-   <div class="plate-box">
3
-    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
4
-    <div class="plate " >
5
-        <ul>
6
-             <li>
7
-                <label>上机床位 : </label>
8
-                <span class="content">{{device_number}}</span>
9
-            </li>
10
-             <li>
11
-                <label>上机护士 : </label>
12
-                <span class="content">{{nurse}}</span>
13
-            </li>
14
-             <li>
15
-                <label>状态 : </label>
16
-                <span class="content">{{stage}}</span>
17
-            </li>
18
-          <li>
2
+  <div class="plate-box">
3
+    <h2 class="title"><span class="line"></span>
4
+      <p>{{title}}</p><span class="line"></span></h2>
5
+    <div class="plate ">
6
+      <ul>
7
+        <li>
8
+          <label>上机床位 : </label>
9
+          <span class="content">{{device_number}}</span>
10
+        </li>
11
+        <li>
12
+          <label>上机护士 : </label>
13
+          <span class="content">{{nurse}}</span>
14
+        </li>
15
+
16
+        <li>
19
           <label>上机时间 : </label>
17
           <label>上机时间 : </label>
20
-          <span class="content">{{start_time}}</span>
18
+          <span class="content" style="font-size: 15px">{{start_time}}</span>
21
         </li>
19
         </li>
22
-        </ul>
20
+
21
+        <li>
22
+          <label>状态 : </label>
23
+          <span class="content">{{stage}}</span>
24
+        </li>
25
+
26
+      </ul>
27
+
28
+
23
     </div>
29
     </div>
24
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
30
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
25
   </div>
31
   </div>
26
 </template>
32
 </template>
27
 
33
 
28
 <script>
34
 <script>
29
-  import { parseTime } from "@/utils";
35
+  import {parseTime} from '@/utils'
30
 
36
 
31
   export default {
37
   export default {
32
-  name: "DialysisComputer",
33
-  data() {
34
-    return {
35
-      title: "透析上机 ",
36
-    };
37
-  },
38
-  props: {
39
-    record: {
40
-      type: Object,
41
-    },
42
-    admin_map: {
43
-      type: Object,
44
-    },
45
-    device_number_map: {
46
-      type: Object,
47
-    }
48
-  },
49
-  computed: {
50
-    device_number: function() {
51
-      if (this.record == null || this.record.id == "") {
52
-        return "-"
38
+    name: 'DialysisComputer',
39
+    data () {
40
+      return {
41
+        title: '透析上机 ',
53
       }
42
       }
54
-      return this.device_number_map[this.record.bed_id] == null ? "" : this.device_number_map[this.record.bed_id].number
55
     },
43
     },
56
-    nurse: function() {
57
-      if (this.record == null || this.record.id == "") {
58
-        return "-"
44
+    props: {
45
+      record: {
46
+        type: Object,
47
+      },
48
+      admin_map: {
49
+        type: Object,
50
+      },
51
+      device_number_map: {
52
+        type: Object,
59
       }
53
       }
60
-      return this.admin_map[this.record.start_nurse] == null ? "" : this.admin_map[this.record.start_nurse].name
61
     },
54
     },
62
-    stage: function() {
63
-      if (this.record == null || this.record.id == "") {
64
-        return "未上机"
65
-      }
66
-      return this.record.stage == 1 ? "已上机" : "已下机"
67
-    },start_time:function () {
68
-      if (this.record == null || this.record.id == '') {
69
-        return "-"
70
-      }
71
-      return parseTime(this.record.start_time, "{y}年{m}月{d}日 {h}时");
72
-
55
+    computed: {
56
+      device_number: function () {
57
+        if (this.record == null || this.record.id == '') {
58
+          return '-'
59
+        }
60
+        return this.device_number_map[this.record.bed_id] == null ? '' : this.device_number_map[this.record.bed_id].number
61
+      },
62
+      nurse: function () {
63
+        if (this.record == null || this.record.id == '') {
64
+          return '-'
65
+        }
66
+        return this.admin_map[this.record.start_nurse] == null ? '' : this.admin_map[this.record.start_nurse].name
67
+      },
68
+      stage: function () {
69
+        if (this.record == null || this.record.id == '') {
70
+          return '未上机'
71
+        }
72
+        return this.record.stage == 1 ? '已上机' : '已下机'
73
+      }, start_time: function () {
74
+        if (this.record == null || this.record.id == '') {
75
+          return '-'
76
+        }
77
+        return parseTime(this.record.start_time, '{y}年{m}月{d}日 {h}时{i}分')
73
 
78
 
79
+      },
74
     },
80
     },
75
-  },
76
-  methods: {
77
-
81
+    methods: {}
78
   }
82
   }
79
-};
80
 </script>
83
 </script>
81
 
84
 
82
 <style rel="stylesheet/scss" lang="scss" scoped>
85
 <style rel="stylesheet/scss" lang="scss" scoped>

+ 2 - 2
src/pages/main/today/dialysisMonitoring.vue Wyświetl plik

6
         <tr>
6
         <tr>
7
           <th  v-if="isShow('监测时间')" width="124px">时间</th>
7
           <th  v-if="isShow('监测时间')" width="124px">时间</th>
8
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
8
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
9
-          <th v-if="isShow('心率')" width="80px">心率(次/分)</th>
9
+          <th v-if="isShow('脉率')" width="80px">脉率(次/分)</th>
10
           <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
10
           <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
11
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
11
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
12
           <th  width="76px">静脉压/动脉压(mmHg)</th>
12
           <th  width="76px">静脉压/动脉压(mmHg)</th>
23
         <tr v-for="(item,index) in tableDate" :key="index" :value="item.value">
23
         <tr v-for="(item,index) in tableDate" :key="index" :value="item.value">
24
           <td v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
24
           <td v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
25
           <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:''}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:''}}</td>
25
           <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_blood_pressure:''}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:''}}</td>
26
-          <td v-if="isShow('率')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
26
+          <td v-if="isShow('率')">{{item.pulse_frequency?item.pulse_frequency:''}}</td>
27
           <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:''}}</td>
27
           <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:''}}</td>
28
           <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
28
           <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
29
           <td>{{item.venous_pressure?item.venous_pressure:''}}/{{item.arterial_pressure?item.arterial_pressure:''}}</td>
29
           <td>{{item.venous_pressure?item.venous_pressure:''}}/{{item.arterial_pressure?item.arterial_pressure:''}}</td>

+ 2 - 2
src/pages/main/today/dialysisOff.vue Wyświetl plik

13
         </li>
13
         </li>
14
         <li>
14
         <li>
15
           <label>下机时间 : </label>
15
           <label>下机时间 : </label>
16
-          <span class="content">{{end_time}}</span>
16
+          <span class="content" style="font-size: 15px">{{end_time}}</span>
17
         </li>
17
         </li>
18
       </ul>
18
       </ul>
19
     </div>
19
     </div>
59
       } else if (this.record.stage == 1) {
59
       } else if (this.record.stage == 1) {
60
         return "-"
60
         return "-"
61
       } else {
61
       } else {
62
-        return parseTime(this.record.end_time, "{y}年{m}月{d}日 {h}时");
62
+        return parseTime(this.record.end_time, "{y}年{m}月{d}日 {h}时{i}分");
63
 
63
 
64
       }
64
       }
65
     },
65
     },

+ 6 - 6
src/styles/style.scss Wyświetl plik

82
         font-size: 0.34rem;
82
         font-size: 0.34rem;
83
         line-height: 0.62rem;
83
         line-height: 0.62rem;
84
         float: left;
84
         float: left;
85
-        width: 5.6rem;
85
+        width: 5.4rem;
86
         .content {
86
         .content {
87
           color: $main-color;
87
           color: $main-color;
88
         }
88
         }
366
 
366
 
367
 // 弹窗样式
367
 // 弹窗样式
368
 .van-popup {
368
 .van-popup {
369
-  //  max-height:8.6rem !important; 
369
+  //  max-height:8.6rem !important;
370
 }
370
 }
371
 
371
 
372
 .van-popup {
372
 .van-popup {
523
       background: #ecf5ff;
523
       background: #ecf5ff;
524
       border: none;
524
       border: none;
525
       padding: 0.18rem 0;
525
       padding: 0.18rem 0;
526
-      
526
+
527
       .xg {
527
       .xg {
528
         color: $main-color;
528
         color: $main-color;
529
         font-size: 0.28rem;
529
         font-size: 0.28rem;
570
   width: 100%;
570
   width: 100%;
571
   text-align: center;
571
   text-align: center;
572
   background: #fff;
572
   background: #fff;
573
-  padding:0.3rem 0; 
573
+  padding:0.3rem 0;
574
   display:flex;
574
   display:flex;
575
   align-items: center;
575
   align-items: center;
576
   justify-content: center;
576
   justify-content: center;
676
     align-items: center;
676
     align-items: center;
677
     height: 0.64rem!important;
677
     height: 0.64rem!important;
678
     line-height: 0.64rem!important;
678
     line-height: 0.64rem!important;
679
-   
679
+
680
   }
680
   }
681
 }
681
 }
682
 
682
 
736
 //   background: #fff;
736
 //   background: #fff;
737
 // }
737
 // }
738
 .stateBox{
738
 .stateBox{
739
-  padding-top:115px; 
739
+  padding-top:115px;
740
   background: #fff;
740
   background: #fff;
741
   min-height: calc(100vh - 2px);
741
   min-height: calc(100vh - 2px);
742
   padding-left: 0.45rem;
742
   padding-left: 0.45rem;