Browse Source

Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

csx 5 years ago
parent
commit
68c0d88a6a

+ 3 - 3
build/webpack.base.conf.js View File

@@ -97,9 +97,9 @@ module.exports = webpackConfig
97 97
 // var vueLoaderConfig = require('./vue-loader.conf')
98 98
 const vuxLoader = require('vux-loader')
99 99
 
100
-module.exports = vuxLoader.merge(webpackConfig, {
101
-  plugins: ['vux-ui']
102
-})
100
+// module.exports = vuxLoader.merge(webpackConfig, {
101
+//   plugins: ['vux-ui']
102
+// })
103 103
 
104 104
 module.exports = vuxLoader.merge(webpackConfig, {
105 105
   plugins: [

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

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

+ 109 - 81
package-lock.json View File

@@ -265,9 +265,9 @@
265 265
       }
266 266
     },
267 267
     "@types/node": {
268
-      "version": "10.12.2",
269
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.2.tgz",
270
-      "integrity": "sha512-53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ==",
268
+      "version": "12.0.4",
269
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz",
270
+      "integrity": "sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==",
271 271
       "dev": true
272 272
     },
273 273
     "@types/semver": {
@@ -399,6 +399,12 @@
399 399
         "json-schema-traverse": "^0.3.0"
400 400
       }
401 401
     },
402
+    "ajv-errors": {
403
+      "version": "1.0.1",
404
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
405
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
406
+      "dev": true
407
+    },
402 408
     "ajv-keywords": {
403 409
       "version": "2.1.1",
404 410
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
@@ -2244,7 +2250,7 @@
2244 2250
     },
2245 2251
     "boom": {
2246 2252
       "version": "2.10.1",
2247
-      "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
2253
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
2248 2254
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2249 2255
       "dev": true,
2250 2256
       "requires": {
@@ -3440,7 +3446,7 @@
3440 3446
     },
3441 3447
     "cryptiles": {
3442 3448
       "version": "2.0.5",
3443
-      "resolved": "http://registry.npm.taobao.org/cryptiles/download/cryptiles-2.0.5.tgz",
3449
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
3444 3450
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
3445 3451
       "dev": true,
3446 3452
       "optional": true,
@@ -4227,7 +4233,7 @@
4227 4233
     },
4228 4234
     "draftlog": {
4229 4235
       "version": "1.0.12",
4230
-      "resolved": "http://registry.npm.taobao.org/draftlog/download/draftlog-1.0.12.tgz",
4236
+      "resolved": "https://registry.npmjs.org/draftlog/-/draftlog-1.0.12.tgz",
4231 4237
       "integrity": "sha1-fbajxbYhBrsy3Uo11nvMy2x9naA=",
4232 4238
       "dev": true
4233 4239
     },
@@ -4888,7 +4894,7 @@
4888 4894
     },
4889 4895
     "esprima-extract-comments": {
4890 4896
       "version": "0.2.1",
4891
-      "resolved": "http://registry.npm.taobao.org/esprima-extract-comments/download/esprima-extract-comments-0.2.1.tgz",
4897
+      "resolved": "https://registry.npmjs.org/esprima-extract-comments/-/esprima-extract-comments-0.2.1.tgz",
4892 4898
       "integrity": "sha1-kBjY3zf/2V3WFQFajF8Ede10NCM=",
4893 4899
       "dev": true,
4894 4900
       "requires": {
@@ -5141,7 +5147,7 @@
5141 5147
     },
5142 5148
     "extract-comments": {
5143 5149
       "version": "0.10.1",
5144
-      "resolved": "http://registry.npm.taobao.org/extract-comments/download/extract-comments-0.10.1.tgz",
5150
+      "resolved": "https://registry.npmjs.org/extract-comments/-/extract-comments-0.10.1.tgz",
5145 5151
       "integrity": "sha1-i2AxgIovX94c1nv4MXuRggQwRAg=",
5146 5152
       "dev": true,
5147 5153
       "requires": {
@@ -5153,7 +5159,7 @@
5153 5159
       "dependencies": {
5154 5160
         "define-property": {
5155 5161
           "version": "0.2.5",
5156
-          "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
5162
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
5157 5163
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
5158 5164
           "dev": true,
5159 5165
           "requires": {
@@ -5162,7 +5168,7 @@
5162 5168
         },
5163 5169
         "extend-shallow": {
5164 5170
           "version": "2.0.1",
5165
-          "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
5171
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
5166 5172
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
5167 5173
           "dev": true,
5168 5174
           "requires": {
@@ -6476,7 +6482,7 @@
6476 6482
     },
6477 6483
     "has-symbols": {
6478 6484
       "version": "1.0.0",
6479
-      "resolved": "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz",
6485
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
6480 6486
       "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
6481 6487
       "dev": true
6482 6488
     },
@@ -6574,7 +6580,7 @@
6574 6580
     },
6575 6581
     "hawk": {
6576 6582
       "version": "3.1.3",
6577
-      "resolved": "http://registry.npm.taobao.org/hawk/download/hawk-3.1.3.tgz",
6583
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
6578 6584
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
6579 6585
       "dev": true,
6580 6586
       "optional": true,
@@ -6604,7 +6610,7 @@
6604 6610
     },
6605 6611
     "hoek": {
6606 6612
       "version": "2.16.3",
6607
-      "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6613
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
6608 6614
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6609 6615
       "dev": true
6610 6616
     },
@@ -6998,7 +7004,7 @@
6998 7004
     },
6999 7005
     "inline-manifest-webpack-plugin": {
7000 7006
       "version": "3.0.1",
7001
-      "resolved": "http://registry.npm.taobao.org/inline-manifest-webpack-plugin/download/inline-manifest-webpack-plugin-3.0.1.tgz",
7007
+      "resolved": "https://registry.npmjs.org/inline-manifest-webpack-plugin/-/inline-manifest-webpack-plugin-3.0.1.tgz",
7002 7008
       "integrity": "sha1-yiFRBjEVKY4v2UtmmrdsfdY+RK0=",
7003 7009
       "dev": true,
7004 7010
       "requires": {
@@ -7333,7 +7339,7 @@
7333 7339
     },
7334 7340
     "is-regexp": {
7335 7341
       "version": "1.0.0",
7336
-      "resolved": "http://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz",
7342
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
7337 7343
       "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
7338 7344
       "dev": true
7339 7345
     },
@@ -8490,7 +8496,7 @@
8490 8496
     },
8491 8497
     "lodash.differencewith": {
8492 8498
       "version": "4.5.0",
8493
-      "resolved": "http://registry.npm.taobao.org/lodash.differencewith/download/lodash.differencewith-4.5.0.tgz",
8499
+      "resolved": "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz",
8494 8500
       "integrity": "sha1-uvr7yRi1UVTheRdqALsK76rIVLc=",
8495 8501
       "dev": true
8496 8502
     },
@@ -8508,7 +8514,7 @@
8508 8514
     },
8509 8515
     "lodash.isequal": {
8510 8516
       "version": "4.5.0",
8511
-      "resolved": "http://registry.npm.taobao.org/lodash.isequal/download/lodash.isequal-4.5.0.tgz",
8517
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
8512 8518
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
8513 8519
       "dev": true
8514 8520
     },
@@ -8578,7 +8584,7 @@
8578 8584
     },
8579 8585
     "lodash.unionwith": {
8580 8586
       "version": "4.6.0",
8581
-      "resolved": "http://registry.npm.taobao.org/lodash.unionwith/download/lodash.unionwith-4.6.0.tgz",
8587
+      "resolved": "https://registry.npmjs.org/lodash.unionwith/-/lodash.unionwith-4.6.0.tgz",
8582 8588
       "integrity": "sha1-dNFAtcqBRubGQ8NyT1FSU42awfA=",
8583 8589
       "dev": true
8584 8590
     },
@@ -9082,13 +9088,9 @@
9082 9088
     "nan": {
9083 9089
       "version": "2.11.0",
9084 9090
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
9085
-<<<<<<< .mine
9086 9091
       "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
9092
+      "dev": true,
9087 9093
       "optional": true
9088
-=======
9089
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
9090
-      "dev": true
9091
->>>>>>> .theirs
9092 9094
     },
9093 9095
     "nanomatch": {
9094 9096
       "version": "1.2.13",
@@ -9229,7 +9231,7 @@
9229 9231
     },
9230 9232
     "node-cli-config": {
9231 9233
       "version": "0.0.1",
9232
-      "resolved": "http://registry.npm.taobao.org/node-cli-config/download/node-cli-config-0.0.1.tgz",
9234
+      "resolved": "https://registry.npmjs.org/node-cli-config/-/node-cli-config-0.0.1.tgz",
9233 9235
       "integrity": "sha1-r3d02FQCprfLlsH5G7JP3VjXwLA=",
9234 9236
       "dev": true
9235 9237
     },
@@ -9326,15 +9328,9 @@
9326 9328
       }
9327 9329
     },
9328 9330
     "node-sass": {
9329
-<<<<<<< .mine
9330 9331
       "version": "4.12.0",
9331 9332
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
9332 9333
       "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
9333
-=======
9334
-      "version": "4.11.0",
9335
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
9336
-      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
9337
->>>>>>> .theirs
9338 9334
       "dev": true,
9339 9335
       "requires": {
9340 9336
         "async-foreach": "^0.1.3",
@@ -9385,33 +9381,12 @@
9385 9381
             "which": "^1.2.9"
9386 9382
           }
9387 9383
         },
9388
-<<<<<<< .mine
9389
-        "lodash": {
9390
-          "version": "4.17.11",
9391
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
9392
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
9393
-          "dev": true
9394
-        },
9395 9384
         "nan": {
9396 9385
           "version": "2.14.0",
9397 9386
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
9398 9387
           "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
9399 9388
           "dev": true
9400 9389
         },
9401
-=======
9402
-
9403
-
9404
-
9405
-
9406
-
9407
-
9408
-
9409
-
9410
-
9411
-
9412
-
9413
-
9414
->>>>>>> .theirs
9415 9390
         "supports-color": {
9416 9391
           "version": "2.0.0",
9417 9392
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -9904,7 +9879,7 @@
9904 9879
     },
9905 9880
     "parse-code-context": {
9906 9881
       "version": "0.2.2",
9907
-      "resolved": "http://registry.npm.taobao.org/parse-code-context/download/parse-code-context-0.2.2.tgz",
9882
+      "resolved": "https://registry.npmjs.org/parse-code-context/-/parse-code-context-0.2.2.tgz",
9908 9883
       "integrity": "sha1-FEuK+3IZSC1+iMHranZVlvOmrA0=",
9909 9884
       "dev": true
9910 9885
     },
@@ -12262,9 +12237,9 @@
12262 12237
       "dev": true
12263 12238
     },
12264 12239
     "progress-bar-webpack-plugin": {
12265
-      "version": "1.11.0",
12266
-      "resolved": "https://registry.npmjs.org/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.11.0.tgz",
12267
-      "integrity": "sha512-XT6r8strD6toU0ZVip25baJINo7uE4BD4H8d4vhOV4GIK5PvNNky8GYJ2wMmVoYP8eo/sSmtNWn0Vw7zWDDE3A==",
12240
+      "version": "1.12.1",
12241
+      "resolved": "https://registry.npmjs.org/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.12.1.tgz",
12242
+      "integrity": "sha512-tVbPB5xBbqNwdH3mwcxzjL1r1Vrm/xGu93OsqVSAbCaXGoKFvfWIh0gpMDpn2kYsPVRSAIK0pBkP9Vfs+JJibQ==",
12268 12243
       "dev": true,
12269 12244
       "requires": {
12270 12245
         "chalk": "^1.1.1",
@@ -12274,13 +12249,13 @@
12274 12249
       "dependencies": {
12275 12250
         "ansi-styles": {
12276 12251
           "version": "2.2.1",
12277
-          "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
12252
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
12278 12253
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
12279 12254
           "dev": true
12280 12255
         },
12281 12256
         "chalk": {
12282 12257
           "version": "1.1.3",
12283
-          "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
12258
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
12284 12259
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
12285 12260
           "dev": true,
12286 12261
           "requires": {
@@ -12293,13 +12268,13 @@
12293 12268
         },
12294 12269
         "progress": {
12295 12270
           "version": "1.1.8",
12296
-          "resolved": "http://registry.npm.taobao.org/progress/download/progress-1.1.8.tgz",
12271
+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
12297 12272
           "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
12298 12273
           "dev": true
12299 12274
         },
12300 12275
         "supports-color": {
12301 12276
           "version": "2.0.0",
12302
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz",
12277
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
12303 12278
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
12304 12279
           "dev": true
12305 12280
         }
@@ -13903,7 +13878,7 @@
13903 13878
     },
13904 13879
     "sntp": {
13905 13880
       "version": "1.0.9",
13906
-      "resolved": "http://registry.npm.taobao.org/sntp/download/sntp-1.0.9.tgz",
13881
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
13907 13882
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
13908 13883
       "dev": true,
13909 13884
       "optional": true,
@@ -14323,7 +14298,7 @@
14323 14298
     },
14324 14299
     "strip-comments": {
14325 14300
       "version": "0.4.4",
14326
-      "resolved": "http://registry.npm.taobao.org/strip-comments/download/strip-comments-0.4.4.tgz",
14301
+      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-0.4.4.tgz",
14327 14302
       "integrity": "sha1-ucqvxP6QX5bAkd+J+achXyqmKcY=",
14328 14303
       "dev": true,
14329 14304
       "requires": {
@@ -14333,7 +14308,7 @@
14333 14308
       "dependencies": {
14334 14309
         "extend-shallow": {
14335 14310
           "version": "2.0.1",
14336
-          "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
14311
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
14337 14312
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
14338 14313
           "dev": true,
14339 14314
           "requires": {
@@ -14344,7 +14319,7 @@
14344 14319
     },
14345 14320
     "strip-css-comments": {
14346 14321
       "version": "3.0.0",
14347
-      "resolved": "http://registry.npm.taobao.org/strip-css-comments/download/strip-css-comments-3.0.0.tgz",
14322
+      "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz",
14348 14323
       "integrity": "sha1-elYl7/iisibPiUehElTaluE9rok=",
14349 14324
       "dev": true,
14350 14325
       "requires": {
@@ -14372,6 +14347,59 @@
14372 14347
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
14373 14348
       "dev": true
14374 14349
     },
14350
+    "style-loader": {
14351
+      "version": "0.23.1",
14352
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
14353
+      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
14354
+      "dev": true,
14355
+      "requires": {
14356
+        "loader-utils": "^1.1.0",
14357
+        "schema-utils": "^1.0.0"
14358
+      },
14359
+      "dependencies": {
14360
+        "ajv": {
14361
+          "version": "6.10.0",
14362
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
14363
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
14364
+          "dev": true,
14365
+          "requires": {
14366
+            "fast-deep-equal": "^2.0.1",
14367
+            "fast-json-stable-stringify": "^2.0.0",
14368
+            "json-schema-traverse": "^0.4.1",
14369
+            "uri-js": "^4.2.2"
14370
+          }
14371
+        },
14372
+        "ajv-keywords": {
14373
+          "version": "3.4.0",
14374
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
14375
+          "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
14376
+          "dev": true
14377
+        },
14378
+        "fast-deep-equal": {
14379
+          "version": "2.0.1",
14380
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
14381
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
14382
+          "dev": true
14383
+        },
14384
+        "json-schema-traverse": {
14385
+          "version": "0.4.1",
14386
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
14387
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
14388
+          "dev": true
14389
+        },
14390
+        "schema-utils": {
14391
+          "version": "1.0.0",
14392
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
14393
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
14394
+          "dev": true,
14395
+          "requires": {
14396
+            "ajv": "^6.1.0",
14397
+            "ajv-errors": "^1.0.0",
14398
+            "ajv-keywords": "^3.1.0"
14399
+          }
14400
+        }
14401
+      }
14402
+    },
14375 14403
     "supports-color": {
14376 14404
       "version": "5.5.0",
14377 14405
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -14628,7 +14656,7 @@
14628 14656
     },
14629 14657
     "touch": {
14630 14658
       "version": "1.0.0",
14631
-      "resolved": "http://registry.npm.taobao.org/touch/download/touch-1.0.0.tgz",
14659
+      "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
14632 14660
       "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
14633 14661
       "dev": true,
14634 14662
       "requires": {
@@ -14637,7 +14665,7 @@
14637 14665
       "dependencies": {
14638 14666
         "nopt": {
14639 14667
           "version": "1.0.10",
14640
-          "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-1.0.10.tgz",
14668
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
14641 14669
           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
14642 14670
           "dev": true,
14643 14671
           "requires": {
@@ -15463,7 +15491,7 @@
15463 15491
       "dependencies": {
15464 15492
         "ajv": {
15465 15493
           "version": "4.11.8",
15466
-          "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-4.11.8.tgz",
15494
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
15467 15495
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
15468 15496
           "dev": true,
15469 15497
           "optional": true,
@@ -15474,21 +15502,21 @@
15474 15502
         },
15475 15503
         "assert-plus": {
15476 15504
           "version": "0.2.0",
15477
-          "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-0.2.0.tgz",
15505
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
15478 15506
           "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
15479 15507
           "dev": true,
15480 15508
           "optional": true
15481 15509
         },
15482 15510
         "aws-sign2": {
15483 15511
           "version": "0.6.0",
15484
-          "resolved": "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.6.0.tgz",
15512
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
15485 15513
           "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
15486 15514
           "dev": true,
15487 15515
           "optional": true
15488 15516
         },
15489 15517
         "form-data": {
15490 15518
           "version": "2.1.4",
15491
-          "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.1.4.tgz",
15519
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
15492 15520
           "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
15493 15521
           "dev": true,
15494 15522
           "optional": true,
@@ -15500,14 +15528,14 @@
15500 15528
         },
15501 15529
         "har-schema": {
15502 15530
           "version": "1.0.5",
15503
-          "resolved": "http://registry.npm.taobao.org/har-schema/download/har-schema-1.0.5.tgz",
15531
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
15504 15532
           "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
15505 15533
           "dev": true,
15506 15534
           "optional": true
15507 15535
         },
15508 15536
         "har-validator": {
15509 15537
           "version": "4.2.1",
15510
-          "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-4.2.1.tgz",
15538
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
15511 15539
           "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
15512 15540
           "dev": true,
15513 15541
           "optional": true,
@@ -15518,7 +15546,7 @@
15518 15546
         },
15519 15547
         "http-signature": {
15520 15548
           "version": "1.1.1",
15521
-          "resolved": "http://registry.npm.taobao.org/http-signature/download/http-signature-1.1.1.tgz",
15549
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
15522 15550
           "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
15523 15551
           "dev": true,
15524 15552
           "optional": true,
@@ -15546,7 +15574,7 @@
15546 15574
         },
15547 15575
         "loader-utils": {
15548 15576
           "version": "0.2.17",
15549
-          "resolved": "http://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz",
15577
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
15550 15578
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
15551 15579
           "dev": true,
15552 15580
           "requires": {
@@ -15558,7 +15586,7 @@
15558 15586
         },
15559 15587
         "oauth-sign": {
15560 15588
           "version": "0.8.2",
15561
-          "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.8.2.tgz",
15589
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
15562 15590
           "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
15563 15591
           "dev": true,
15564 15592
           "optional": true
@@ -15574,21 +15602,21 @@
15574 15602
         },
15575 15603
         "performance-now": {
15576 15604
           "version": "0.2.0",
15577
-          "resolved": "http://registry.npm.taobao.org/performance-now/download/performance-now-0.2.0.tgz",
15605
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
15578 15606
           "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
15579 15607
           "dev": true,
15580 15608
           "optional": true
15581 15609
         },
15582 15610
         "qs": {
15583 15611
           "version": "6.4.0",
15584
-          "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.4.0.tgz",
15612
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
15585 15613
           "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
15586 15614
           "dev": true,
15587 15615
           "optional": true
15588 15616
         },
15589 15617
         "request": {
15590 15618
           "version": "2.81.0",
15591
-          "resolved": "http://registry.npm.taobao.org/request/download/request-2.81.0.tgz",
15619
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
15592 15620
           "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
15593 15621
           "dev": true,
15594 15622
           "optional": true,
@@ -15619,13 +15647,13 @@
15619 15647
         },
15620 15648
         "source-list-map": {
15621 15649
           "version": "0.1.8",
15622
-          "resolved": "http://registry.npm.taobao.org/source-list-map/download/source-list-map-0.1.8.tgz",
15650
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
15623 15651
           "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
15624 15652
           "dev": true
15625 15653
         },
15626 15654
         "source-map": {
15627 15655
           "version": "0.5.7",
15628
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
15656
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
15629 15657
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
15630 15658
           "dev": true
15631 15659
         },
@@ -15641,7 +15669,7 @@
15641 15669
         },
15642 15670
         "webpack-merge": {
15643 15671
           "version": "1.1.2",
15644
-          "resolved": "http://registry.npm.taobao.org/webpack-merge/download/webpack-merge-1.1.2.tgz",
15672
+          "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-1.1.2.tgz",
15645 15673
           "integrity": "sha1-SfKmi6X9NLsTwzjBhMcCjZOENDI=",
15646 15674
           "dev": true,
15647 15675
           "requires": {
@@ -15656,7 +15684,7 @@
15656 15684
         },
15657 15685
         "webpack-sources": {
15658 15686
           "version": "0.1.5",
15659
-          "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-0.1.5.tgz",
15687
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz",
15660 15688
           "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
15661 15689
           "dev": true,
15662 15690
           "requires": {

+ 1 - 0
package.json View File

@@ -87,6 +87,7 @@
87 87
     "selenium-server": "^3.0.1",
88 88
     "semver": "^5.3.0",
89 89
     "shelljs": "^0.7.6",
90
+    "style-loader": "^0.23.1",
90 91
     "uglifyjs-webpack-plugin": "^1.1.1",
91 92
     "url-loader": "^0.5.8",
92 93
     "vue-jest": "^1.0.2",

+ 81 - 49
src/pages/main/DialysisArea.vue View File

@@ -1,47 +1,72 @@
1 1
 <template>
2
-    <div>
3
-       <div class="screening">
4
-           <ul>
5
-              <popover placement="bottom" >
6
-                <div slot="content" class="popover-demo-content">
7
-                  <ul>
8
-                    <li v-for="(zone, index) in zones" :key="zone.value" @click="handleZoneChange(index)"  :class="zone_selected == index ? 'tick' : ''">{{zone.text}}</li>
9
-                  </ul>
10
-                </div>
11
-               <li>{{ zones.length <= 1 && zone_selected > 0 ? "全部分区" : zones[zone_selected].text }}<span class="iconfont">&#xe74a;</span></li>
12
-               </popover>
13
-               
14
-               <popover placement="bottom" >  
15
-                <div slot="content" class="popover-demo-content">
16
-                  <ul>
17
-                    <li v-for="schedualType in schedual_types" :key="schedualType.value" @click="handletimeType(schedualType.value)" :class="schedual_type_selected == schedualType.value ? 'tick' : ''" >{{schedualType.text}}</li>
18
-                  </ul> 
19
-                </div>
20
-                <li>{{ schedual_types[schedual_type_selected].text}}<span class="iconfont">&#xe74a;</span></li>
21
-               </popover>
2
+  <div>
3
+    <div class="screening">
4
+      <ul>
5
+        <el-popover
6
+          v-model="zone_options_visible"
7
+          placement="bottom"
8
+          trigger="click">
9
+          <li slot="reference">
10
+            {{ zones.length <= 1 && zone_selected > 0 ? "全部分区" : zones[zone_selected].text }}
11
+            <span class="iconfont">&#xe74a;</span>
12
+          </li>
13
+          <div class="popover-demo-content">
14
+            <ul>
15
+              <li
16
+                v-for="(zone, index) in zones"
17
+                :key="zone.value"
18
+                @click="handleZoneChange(index)"
19
+                :class="zone_selected == index ? 'tick' : ''"
20
+              >{{zone.text}}</li>
21
+            </ul>
22
+          </div>
23
+        </el-popover>
22 24
 
23
-              
24
-               <li @click="openPicker()">{{selected_date_str}}<span class="iconfont">&#xe74a;</span></li>
25
-           </ul>
26
-       </div>
27
-      <div class="stateBox ">
28
-        <div v-for="(item, index) in filtedScheduals" :key="index" >
29
-          <h2 class="title" >{{item.zone_name}}</h2>
30
-          <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
31
-        </div>
32
-        <div class="NoData" v-show="filtedScheduals.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
25
+        <el-popover
26
+          v-model="sch_type_options_visible"
27
+          placement="bottom"
28
+          trigger="click">
29
+          <li slot="reference">
30
+            {{ schedual_types[schedual_type_selected].text}}
31
+            <span class="iconfont">&#xe74a;</span>
32
+          </li>
33
+          <div class="popover-demo-content">
34
+            <ul>
35
+              <li
36
+                v-for="schedualType in schedual_types"
37
+                :key="schedualType.value"
38
+                @click="handletimeType(schedualType.value)"
39
+                :class="schedual_type_selected == schedualType.value ? 'tick' : ''"
40
+              >{{schedualType.text}}</li>
41
+            </ul>
42
+          </div>
43
+        </el-popover>
33 44
 
45
+        <li @click="openPicker()">
46
+          {{selected_date_str}}
47
+          <span class="iconfont">&#xe74a;</span>
48
+        </li>
49
+      </ul>
50
+    </div>
51
+    <div class="stateBox">
52
+      <div v-for="(item, index) in filtedScheduals" :key="index">
53
+        <h2 class="title">{{item.zone_name}}</h2>
54
+        <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
34 55
       </div>
35
-      <mt-datetime-picker
36
-        v-model="selected_date"
37
-        ref="picker"
38
-        type="date"
39
-        year-format="{value} "
40
-        month-format="{value} "
41
-        date-format="{value} "
42
-        @confirm="handleScheduleDateChange">
43
-      </mt-datetime-picker>
44
-    </div>  
56
+      <div class="NoData" v-show="filtedScheduals.length == 0">
57
+        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt>
58
+      </div>
59
+    </div>
60
+    <mt-datetime-picker
61
+      v-model="selected_date"
62
+      ref="picker"
63
+      type="date"
64
+      year-format="{value} "
65
+      month-format="{value} "
66
+      date-format="{value} "
67
+      @confirm="handleScheduleDateChange"
68
+    ></mt-datetime-picker>
69
+  </div>
45 70
 </template>
46 71
 
47 72
 <script>
@@ -72,7 +97,10 @@ export default {
72 97
 
73 98
       zone_selected: this.$store.getters.app.dialysis_area.zone_select_index,
74 99
       zones: [{ value: 0, text: "全部分区", select: true }],
75
-      dialysis_scheduals: []
100
+      dialysis_scheduals: [],
101
+
102
+      zone_options_visible: false,
103
+      sch_type_options_visible: false,
76 104
     };
77 105
   },
78 106
   props: {
@@ -140,7 +168,8 @@ export default {
140 168
           const schedule = originSchedules[s_i];
141 169
           if (
142 170
             zone_name.length == 0 ||
143
-            (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)
171
+            (zone_name.length > 0 &&
172
+              zone_name == schedule.device_number.zone.name)
144 173
           ) {
145 174
             if (
146 175
               timetype_selected == 0 ||
@@ -165,6 +194,7 @@ export default {
165 194
   },
166 195
   methods: {
167 196
     handletimeType: function(index) {
197
+      this.sch_type_options_visible = false;
168 198
       this.schedual_type_selected = index;
169 199
       this.$emit("clear_search_keyword");
170 200
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
@@ -174,6 +204,7 @@ export default {
174 204
       });
175 205
     },
176 206
     handleZoneChange: function(index) {
207
+      this.zone_options_visible = false;
177 208
       this.zone_selected = index;
178 209
       this.$emit("clear_search_keyword");
179 210
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
@@ -214,7 +245,8 @@ export default {
214 245
               }
215 246
               schedualMap[schedual.device_number.zone.name].push(schedual);
216 247
               if (zoneMap[schedual.device_number.zone.name] == null) {
217
-                zoneMap[schedual.device_number.zone.name] = schedual.device_number.zone;
248
+                zoneMap[schedual.device_number.zone.name] =
249
+                  schedual.device_number.zone;
218 250
               }
219 251
             }
220 252
 
@@ -261,11 +293,11 @@ export default {
261 293
 .screening {
262 294
   border-bottom: 1px #e5e5e5 solid;
263 295
   position: fixed;
264
-    top: 63px;
265
-    right: 0;
266
-    z-index: 66;
267
-    left: 1.58rem;
268
-    background: #fff;
296
+  top: 63px;
297
+  right: 0;
298
+  z-index: 66;
299
+  left: 1.58rem;
300
+  background: #fff;
269 301
   ul {
270 302
     @include display-flex;
271 303
     @include align-items-center;
@@ -292,7 +324,7 @@ export default {
292 324
     font-size: 0.34rem;
293 325
     font-weight: 600;
294 326
     color: $title-color;
295
-    height:1rem;
327
+    height: 1rem;
296 328
     line-height: 0.8rem;
297 329
     display: inline-block;
298 330
   }

+ 14 - 6
src/pages/main/WaitingArea.vue View File

@@ -2,15 +2,20 @@
2 2
   <div>
3 3
     <div class="screening">
4 4
       <ul>
5
-       
6
-        <popover placement="bottom" >
7
-          <div slot="content" class="popover-demo-content">
5
+        <el-popover
6
+          v-model="zone_options_visible"
7
+          placement="bottom"
8
+          trigger="click">
9
+          <li slot="reference">
10
+            {{ zone_options[zone_selected].text }}<span class="iconfont">&#xe74a;</span>
11
+          </li>
12
+          <div class="popover-demo-content">
8 13
             <ul>
9 14
               <li v-for="(option, index) in zone_options" :key="index" @click="handleZoneChange(index)" :class="zone_selected == index ? 'tick' : ''">{{ option.text }}</li>
10 15
             </ul>
11 16
           </div>
12
-          <li>{{ zone_options[zone_selected].text }}<span class="iconfont">&#xe74a;</span></li>
13
-        </popover>
17
+        </el-popover>
18
+
14 19
          <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)" 
15 20
         :key="i">{{ item.label + (item.count > 0 ? '(' + item.count + ')' : '') }}</li>
16 21
       </ul>
@@ -52,7 +57,9 @@ export default {
52 57
       scheduals: [],
53 58
 
54 59
       zone_options: [{ value: 0, text: "全部分区" }],
55
-      zone_scheduals: []
60
+      zone_scheduals: [],
61
+
62
+      zone_options_visible: false,
56 63
     };
57 64
   },
58 65
   props: {
@@ -126,6 +133,7 @@ export default {
126 133
       this.zone_selected = 0;
127 134
     },
128 135
     handleZoneChange: function(index) {
136
+      this.zone_options_visible = false;
129 137
       this.zone_selected = index;
130 138
       this.select_index = -1;
131 139
     },

+ 3 - 2
src/pages/main/add_urgent_schedule.vue View File

@@ -22,7 +22,7 @@
22 22
                     <van-col :span="9">
23 23
                         <span class="title">日期:</span>
24 24
                         <div class="field_panel">
25
-                            <van-field v-model="date" disabled class="field"></van-field>
25
+                            <van-field v-model="date"  class="field"></van-field>
26 26
                         </div>
27 27
                     </van-col>
28 28
                 </van-row>
@@ -58,7 +58,7 @@
58 58
                     <van-col :span="24">
59 59
                         <span class="title">&nbsp;</span>
60 60
                         <div class="field_panel">
61
-                            <van-button type="info" @click="submitAction">立即排班</van-button>
61
+                            <van-button type="info" size="normal" @click="submitAction">立即排班</van-button>
62 62
                         </div>
63 63
                     </van-col>
64 64
                 </van-row>
@@ -365,6 +365,7 @@ export default {
365 365
         background: #fff;
366 366
         min-height: calc(100vh - 2px);
367 367
         padding-top:55px; 
368
+        padding-left: 20px;
368 369
         .row {
369 370
             padding: 5px 0;
370 371
             .title {

+ 1 - 1
src/pages/main/dialysis/AdviceTable.vue View File

@@ -1533,7 +1533,7 @@ export default {
1533 1533
 .AdviceTable{
1534 1534
   padding-top:0; 
1535 1535
   background: #fff;
1536
-  min-height: calc(100vh - 180px);
1536
+  min-height: calc(100vh - 230px);
1537 1537
 }
1538 1538
 }
1539 1539
 

+ 2 - 2
src/pages/main/dialysis/CheckTab.vue View File

@@ -59,9 +59,9 @@ export default {
59 59
     border-bottom: 1px #e5e5e5 solid;
60 60
     background: #fff;
61 61
      position: fixed;
62
-    top: 115px;
62
+    top: 116px;
63 63
     right: 0;
64
-    z-index: 66;
64
+    z-index: 55;
65 65
     left: 1.58rem;
66 66
     background: #fff;
67 67
     ul {

+ 0 - 4
src/pages/main/dialysis/InspectionItemTable.vue View File

@@ -190,14 +190,10 @@ export default {
190 190
 <style style="stylesheet/scss" lang="scss" scoped>
191 191
 .top {
192 192
   padding: 0.28rem 0.3rem;
193
-  // @include display-flex;
194
-  // @include align-items-center;
195 193
   @include text-align;
196
-  // @include justify-content-between;
197 194
   font-size: 0.3rem;
198 195
   border-bottom: 1px #e5e5e5 solid;
199 196
   position: relative;
200
-
201 197
   .title {
202 198
     font-size: 0.3rem;
203 199
     font-weight: bold;

+ 4 - 0
src/pages/main/dialysis/RecordTable.vue View File

@@ -441,5 +441,9 @@ export default {
441 441
   background: #fff;
442 442
   min-height: calc(100vh - 180px);
443 443
 }
444
+.popover-demo-content{
445
+  max-height: 400px;
446
+  overflow-y: scroll;
447
+}
444 448
 </style>
445 449
 

+ 161 - 145
src/pages/main/today/TodayTab.vue View File

@@ -1,5 +1,5 @@
1 1
 <template>
2
-  <div v-loading="loading">
2
+  <div v-loading="loading" id="today_panel">
3 3
 
4 4
     <div class="grid">
5 5
       <div class="list">
@@ -63,9 +63,6 @@
63 63
     <dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" title="透析处方"
64 64
                            :device_number_map="device_map"></dialysis-prescription>
65 65
 
66
-    <!-- <div class="blueBorder"></div>
67
-    <past-data class="往期数据"></past-data> -->
68
-
69 66
     <div class="blueBorder"></div>
70 67
     <accepts-assessment id="accepts_assessment" :record="receiver_treatment_access" title="接诊评估"></accepts-assessment>
71 68
 
@@ -160,7 +157,7 @@
160 157
                         @close="closeTreatmentOf" ref="treatment_dialog"></treatment-dialog>
161 158
     </van-popup>
162 159
 
163
-    <div class="fixedNav" ref="fixed_nav" v-show="show_fixed_nav">
160
+    <!-- <div class="fixedNav" ref="fixed_nav" v-show="show_fixed_nav">
164 161
       <ul>
165 162
         <li @click="menuClick(1)">透析处方</li>
166 163
         <li @click="menuClick(2)">接诊评估</li>
@@ -173,9 +170,11 @@
173 170
         <li @click="menuClick(8)">透后评估</li>
174 171
         <li @click="menuClick(9)">治疗小结</li>
175 172
       </ul>
176
-    </div>
173
+    </div> -->
174
+ 
175
+   <el-button class="goTop" v-show="goTopShow" @click="goTop"  type="primary" icon="el-icon-arrow-up" circle style="position:fixed;right:20px;bottom:20px;"></el-button>
177 176
 
178
-  </div>
177
+   </div>
179 178
 </template>
180 179
 
181 180
 <script>
@@ -207,7 +206,6 @@ import ComputerDialog from "../dialog/ComputerDialog";
207 206
 
208 207
 import { dialysisGlobalConfig, getDialysisRecord } from "@/api/dialysis";
209 208
 import { parseTime } from "@/utils";
210
-import Vue from 'vue'
211 209
 
212 210
 export default {
213 211
   name: "TodayTab",
@@ -240,7 +238,7 @@ export default {
240 238
   data() {
241 239
     return {
242 240
       loading: true,
243
-      show_fixed_nav: false,
241
+      // show_fixed_nav: false,
244 242
       patient_id: 0,
245 243
       date: 0,
246 244
       menuList: [
@@ -272,7 +270,7 @@ export default {
272 270
       monitor_records: [], // 透析监测
273 271
       last_monitor_record: {
274 272
         id: 0,
275
-        operate_time: (new Date()).getTime(),
273
+        operate_time: new Date().getTime(),
276 274
         sodium_concentration: "",
277 275
         dialysate_temperature: ""
278 276
       }, // 上一次透析的监测记录
@@ -280,10 +278,11 @@ export default {
280 278
       admin_users: [], //系统用户列表
281 279
       devices: [], //设备
282 280
       device_numbers: [], // 床位号
283
-
284 281
       admin_user_map: {}, // {user_id: admin_user object}
285 282
       device_map: {}, // {device_id: device}
286
-      device_number_map: {} // {device_number_id: device_number}
283
+      device_number_map: {}, // {device_number_id: device_number}
284
+      scrollTop: "",
285
+      goTopShow: false
287 286
     };
288 287
   },
289 288
   computed: {
@@ -370,21 +369,20 @@ export default {
370 369
     },
371 370
 
372 371
     $route: "requestDialysisRecord"
373
-
374 372
   },
375 373
   methods: {
376
-    handleScroll: function() {
377
-      var scrollTop =
378
-        window.pageYOffset ||
379
-        document.documentElement.scrollTop ||
380
-        document.body.scrollTop;
381
-      this.show_fixed_nav = scrollTop > 160;
382
-    },
374
+    // handleScroll: function() {
375
+    //   var scrollTop =
376
+    //     window.pageYOffset ||
377
+    //     document.documentElement.scrollTop ||
378
+    //     document.body.scrollTop;
379
+    //   this.show_fixed_nav = scrollTop > 160;
380
+    // },
383 381
 
384 382
     didAddMonitor(monitor) {
385
-      this.monitor_records.push(monitor)
383
+      this.monitor_records.push(monitor);
386 384
 
387
-      this.monitor_records.sort((a,b)=>b.operate_time-a.operate_time)
385
+      this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
388 386
 
389 387
       // for (let index = 0; index < this.monitor_records.length; index++) {
390 388
       //   const record = this.monitor_records[index];
@@ -394,8 +392,7 @@ export default {
394 392
       //   }
395 393
       // }
396 394
       this.monitor_records.reverse();
397
-      this.last_monitor_record = monitor
398
-
395
+      this.last_monitor_record = monitor;
399 396
     },
400 397
 
401 398
     didEditMonitor(monitor) {
@@ -408,35 +405,49 @@ export default {
408 405
         }
409 406
       }
410 407
 
411
-      console.log(monitor)
412
-      console.log(this.monitor_records[monitor_index])
413
-
414
-
415
-      this.monitor_records[monitor_index].arterial_pressure = monitor.arterial_pressure
416
-      this.monitor_records[monitor_index].blood_flow_volume = monitor.blood_flow_volume
417
-      this.monitor_records[monitor_index].breathing_rate = monitor.breathing_rate
418
-      this.monitor_records[monitor_index].dialysate_temperature = monitor.dialysate_temperature
419
-      this.monitor_records[monitor_index].diastolic_bp = monitor.diastolic_bp
420
-      this.monitor_records[monitor_index].displacement_quantity = monitor.displacement_quantity
421
-      this.monitor_records[monitor_index].dispose = monitor.dispose
422
-      this.monitor_records[monitor_index].ktv = monitor.ktv
423
-      this.monitor_records[monitor_index].monitor_date = monitor.monitor_date
424
-      this.monitor_records[monitor_index].monitoring_nurse = monitor.monitoring_nurse
425
-      this.monitor_records[monitor_index].operate_time = monitor.operate_time
426
-      this.monitor_records[monitor_index].pulse_frequency = monitor.pulse_frequency
427
-      this.monitor_records[monitor_index].replacement_rate = monitor.replacement_rate
428
-      this.monitor_records[monitor_index].result = monitor.result
429
-      this.monitor_records[monitor_index].sodium_concentration = monitor.sodium_concentration
430
-      this.monitor_records[monitor_index].symptom = monitor.symptom
431
-      this.monitor_records[monitor_index].systolic_bp = monitor.systolic_bp
432
-      this.monitor_records[monitor_index].transmembrane_pressure = monitor.transmembrane_pressure
433
-      this.monitor_records[monitor_index].ultrafiltration_rate = monitor.ultrafiltration_rate
434
-      this.monitor_records[monitor_index].ultrafiltration_volume = monitor.ultrafiltration_volume
435
-      this.monitor_records[monitor_index].venous_pressure = monitor.venous_pressure
436
-      this.monitor_records[monitor_index].diastolic_blood_pressure = monitor.diastolic_blood_pressure
437
-      this.monitor_records[monitor_index].systolic_blood_pressure = monitor.systolic_blood_pressure
438
-
439
-      this.monitor_records.sort((a,b)=>b.operate_time-a.operate_time)
408
+      console.log(monitor);
409
+      console.log(this.monitor_records[monitor_index]);
410
+
411
+      this.monitor_records[monitor_index].arterial_pressure =
412
+        monitor.arterial_pressure;
413
+      this.monitor_records[monitor_index].blood_flow_volume =
414
+        monitor.blood_flow_volume;
415
+      this.monitor_records[monitor_index].breathing_rate =
416
+        monitor.breathing_rate;
417
+      this.monitor_records[monitor_index].dialysate_temperature =
418
+        monitor.dialysate_temperature;
419
+      this.monitor_records[monitor_index].diastolic_bp = monitor.diastolic_bp;
420
+      this.monitor_records[monitor_index].displacement_quantity =
421
+        monitor.displacement_quantity;
422
+      this.monitor_records[monitor_index].dispose = monitor.dispose;
423
+      this.monitor_records[monitor_index].ktv = monitor.ktv;
424
+      this.monitor_records[monitor_index].monitor_date = monitor.monitor_date;
425
+      this.monitor_records[monitor_index].monitoring_nurse =
426
+        monitor.monitoring_nurse;
427
+      this.monitor_records[monitor_index].operate_time = monitor.operate_time;
428
+      this.monitor_records[monitor_index].pulse_frequency =
429
+        monitor.pulse_frequency;
430
+      this.monitor_records[monitor_index].replacement_rate =
431
+        monitor.replacement_rate;
432
+      this.monitor_records[monitor_index].result = monitor.result;
433
+      this.monitor_records[monitor_index].sodium_concentration =
434
+        monitor.sodium_concentration;
435
+      this.monitor_records[monitor_index].symptom = monitor.symptom;
436
+      this.monitor_records[monitor_index].systolic_bp = monitor.systolic_bp;
437
+      this.monitor_records[monitor_index].transmembrane_pressure =
438
+        monitor.transmembrane_pressure;
439
+      this.monitor_records[monitor_index].ultrafiltration_rate =
440
+        monitor.ultrafiltration_rate;
441
+      this.monitor_records[monitor_index].ultrafiltration_volume =
442
+        monitor.ultrafiltration_volume;
443
+      this.monitor_records[monitor_index].venous_pressure =
444
+        monitor.venous_pressure;
445
+      this.monitor_records[monitor_index].diastolic_blood_pressure =
446
+        monitor.diastolic_blood_pressure;
447
+      this.monitor_records[monitor_index].systolic_blood_pressure =
448
+        monitor.systolic_blood_pressure;
449
+
450
+      this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
440 451
 
441 452
       // if (monitor_index >= 0) {
442 453
       //   var record = this.monitor_records[monitor_index]
@@ -519,10 +530,8 @@ export default {
519 530
     closeDialog(index) {
520 531
       this.index = -1;
521 532
       this.menuList[index].showPopup = false;
522
-    },refresh(){
523
-
524
-
525
-
533
+    },
534
+    refresh() {
526 535
       var dateStr = parseTime(this.$route.query.date, "{y}-{m}-{d}");
527 536
       var params = {
528 537
         patient_id: this.$route.query.patient_id,
@@ -569,56 +578,59 @@ export default {
569 578
 
570 579
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
571 580
           if (this.doctor_advices.length > 0) {
572
-            var group = this.newAdviceGroupObject()
581
+            var group = this.newAdviceGroupObject();
573 582
             var initGroupBlock = function(group, advice) {
574
-              group.group_no = advice.groupno
583
+              group.group_no = advice.groupno;
575 584
               // group.start_time = advice.start_time
576 585
               // group.advice_doctor = advice.advice_doctor
577 586
               // group.exec_staff = advice.execution_staff
578 587
               // group.exec_time = advice.execution_time
579 588
               // group.checker = advice.checker
580
-            }
589
+            };
581 590
             for (let index = 0; index < this.doctor_advices.length; index++) {
582 591
               const advice = this.doctor_advices[index];
583
-              if (advice.groupno == 0) { // 老版本的医嘱没有分组的概念,所以这一个 if 是解决这个问题的,将每个无分组的医嘱各自归为一组
592
+              if (advice.groupno == 0) {
593
+                // 老版本的医嘱没有分组的概念,所以这一个 if 是解决这个问题的,将每个无分组的医嘱各自归为一组
584 594
                 if (advice.parent_id > 0) {
585 595
                   if (this.advice_groups.length > 0) {
586
-                    var parent_group = this.advice_groups[this.advice_groups.length - 1]
596
+                    var parent_group = this.advice_groups[
597
+                      this.advice_groups.length - 1
598
+                    ];
587 599
                     if (parent_group.advices.length > 0) {
588 600
                       if (parent_group.advices[0].id == advice.parent_id) {
589
-                        parent_group.advices.push(advice)
601
+                        parent_group.advices.push(advice);
590 602
                       }
591 603
                     }
592 604
                   }
593
-                  continue
594
-
605
+                  continue;
595 606
                 } else {
596 607
                   if (group.group_no > 0) {
597
-                    this.advice_groups.push(group)
598
-                    group = this.newAdviceGroupObject()
608
+                    this.advice_groups.push(group);
609
+                    group = this.newAdviceGroupObject();
599 610
                   }
600 611
 
601
-                  initGroupBlock(group, advice)
602
-                  group.advices.push(advice)
603
-                  this.advice_groups.push(group)
604
-                  group = this.newAdviceGroupObject()
605
-                  continue
612
+                  initGroupBlock(group, advice);
613
+                  group.advices.push(advice);
614
+                  this.advice_groups.push(group);
615
+                  group = this.newAdviceGroupObject();
616
+                  continue;
606 617
                 }
607 618
               }
608 619
 
609 620
               if (group.group_no > 0 && group.group_no != advice.groupno) {
610
-                this.advice_groups.push(group)
611
-                group = this.newAdviceGroupObject()
621
+                this.advice_groups.push(group);
622
+                group = this.newAdviceGroupObject();
612 623
               }
613 624
               if (group.group_no == 0) {
614
-                initGroupBlock(group, advice)
625
+                initGroupBlock(group, advice);
615 626
               }
616 627
               if (group.group_no == advice.groupno) {
617
-                group.advices.push(advice)
628
+                group.advices.push(advice);
618 629
               }
619 630
             }
620
-            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加上
621
-              this.advice_groups.push(group)
631
+            if (group.group_no > 0) {
632
+              // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加上
633
+              this.advice_groups.push(group);
622 634
             }
623 635
 
624 636
             // console.log(this.advice_groups)
@@ -687,7 +699,6 @@ export default {
687 699
           this.loading = false;
688 700
         }
689 701
       });
690
-
691 702
     },
692 703
 
693 704
     requestDialysisRecord() {
@@ -737,58 +748,61 @@ export default {
737 748
 
738 749
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
739 750
           if (this.doctor_advices.length > 0) {
740
-            var group = this.newAdviceGroupObject()
751
+            var group = this.newAdviceGroupObject();
741 752
             var initGroupBlock = function(group, advice) {
742
-              group.group_no = advice.groupno
753
+              group.group_no = advice.groupno;
743 754
               // group.start_time = advice.start_time
744 755
               // group.advice_doctor = advice.advice_doctor
745 756
               // group.exec_staff = advice.execution_staff
746 757
               // group.exec_time = advice.execution_time
747 758
               // group.checker = advice.checker
748
-            }
759
+            };
749 760
             for (let index = 0; index < this.doctor_advices.length; index++) {
750 761
               const advice = this.doctor_advices[index];
751
-              if (advice.groupno == 0) { // 老版本的医嘱没有分组的概念,所以这一个 if 是解决这个问题的,将每个无分组的医嘱各自归为一组
762
+              if (advice.groupno == 0) {
763
+                // 老版本的医嘱没有分组的概念,所以这一个 if 是解决这个问题的,将每个无分组的医嘱各自归为一组
752 764
                 if (advice.parent_id > 0) {
753 765
                   if (this.advice_groups.length > 0) {
754
-                    var parent_group = this.advice_groups[this.advice_groups.length - 1]
766
+                    var parent_group = this.advice_groups[
767
+                      this.advice_groups.length - 1
768
+                    ];
755 769
                     if (parent_group.advices.length > 0) {
756 770
                       if (parent_group.advices[0].id == advice.parent_id) {
757
-                        parent_group.advices.push(advice)
771
+                        parent_group.advices.push(advice);
758 772
                       }
759 773
                     }
760 774
                   }
761
-                  continue
762
-
775
+                  continue;
763 776
                 } else {
764 777
                   if (group.group_no > 0) {
765
-                    this.advice_groups.push(group)
766
-                    group = this.newAdviceGroupObject()
778
+                    this.advice_groups.push(group);
779
+                    group = this.newAdviceGroupObject();
767 780
                   }
768
-                    
769
-                  initGroupBlock(group, advice)
770
-                  group.advices.push(advice)
771
-                  this.advice_groups.push(group)
772
-                  group = this.newAdviceGroupObject()
773
-                  continue
781
+
782
+                  initGroupBlock(group, advice);
783
+                  group.advices.push(advice);
784
+                  this.advice_groups.push(group);
785
+                  group = this.newAdviceGroupObject();
786
+                  continue;
774 787
                 }
775 788
               }
776 789
 
777 790
               if (group.group_no > 0 && group.group_no != advice.groupno) {
778
-                this.advice_groups.push(group)
779
-                group = this.newAdviceGroupObject()
791
+                this.advice_groups.push(group);
792
+                group = this.newAdviceGroupObject();
780 793
               }
781 794
               if (group.group_no == 0) {
782
-                initGroupBlock(group, advice)
795
+                initGroupBlock(group, advice);
783 796
               }
784 797
               if (group.group_no == advice.groupno) {
785
-                group.advices.push(advice)
798
+                group.advices.push(advice);
786 799
               }
787 800
             }
788
-            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加上
789
-              this.advice_groups.push(group)
801
+            if (group.group_no > 0) {
802
+              // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加上
803
+              this.advice_groups.push(group);
790 804
             }
791
-            
805
+
792 806
             // console.log(this.advice_groups)
793 807
           }
794 808
 
@@ -857,15 +871,18 @@ export default {
857 871
       });
858 872
     },
859 873
     newAdviceGroupObject: function() {
860
-      return Object.assign({}, {
861
-        group_no: 0,
862
-        // advice_doctor: 0,
863
-        // start_time: 0,
864
-        advices: [],
865
-        // exec_staff: 0,
866
-        // exec_time: 0,
867
-        // checker: 0,
868
-      })
874
+      return Object.assign(
875
+        {},
876
+        {
877
+          group_no: 0,
878
+          // advice_doctor: 0,
879
+          // start_time: 0,
880
+          advices: []
881
+          // exec_staff: 0,
882
+          // exec_time: 0,
883
+          // checker: 0,
884
+        }
885
+      );
869 886
     },
870 887
 
871 888
     closePrescriptionDialog: function() {
@@ -917,17 +934,48 @@ export default {
917 934
         document.querySelector("#" + id).offsetTop - 100;
918 935
       document.documentElement.scrollTop =
919 936
         document.querySelector("#" + id).offsetTop - 100;
937
+    },
938
+    handleScroll() {
939
+      this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
940
+      if (this.scrollTop > 50) {
941
+        this.goTopShow = true;
942
+      }else{
943
+        this.goTopShow = false;
944
+      }
945
+    },
946
+    goTop() {
947
+      let timer = null,
948
+        _that = this;
949
+    cancelAnimationFrame(timer);
950
+      timer = requestAnimationFrame(function fn() {
951
+        if (_that.scrollTop > 0) {
952
+          _that.scrollTop -= 50;
953
+          document.body.scrollTop = document.documentElement.scrollTop =
954
+            _that.scrollTop;
955
+          timer = requestAnimationFrame(fn);
956
+        } else {
957
+          cancelAnimationFrame(timer);
958
+          _that.goTopShow = false;
959
+        }
960
+      });
961
+    },
962
+    destroyed() {
963
+      window.removeEventListener("scroll", this.handleScroll);
920 964
     }
921 965
   }
922 966
 };
923 967
 </script>
924 968
 
925 969
 <style style="stylesheet/scss" lang="scss" scoped>
970
+.today_panel {
971
+  height: calc(100% - 63px);
972
+}
973
+
926 974
 .mainContent {
927 975
   position: relative;
928 976
   .grid {
929 977
     padding: 0.1rem 0 0.25rem 0;
930
-    margin: 0.2rem 0.2rem 0 0.2rem;
978
+    margin: 0.2rem 0 0 0;
931 979
     background: #fff;
932 980
     .list {
933 981
       ul {
@@ -938,7 +986,7 @@ export default {
938 986
         li {
939 987
           font-size: 0.24rem;
940 988
           color: #5d6b7a;
941
-          margin-top:0.35rem;
989
+          margin-top: 0.35rem;
942 990
           p {
943 991
             line-height: 0.6rem;
944 992
             color: #34495e;
@@ -952,38 +1000,6 @@ export default {
952 1000
       }
953 1001
     }
954 1002
   }
955
-  .fixedNav {
956
-    position: fixed;
957
-    right: 0;
958
-    top: 0;
959
-    left: 1.58rem;
960
-    background: #f18f68;
961
-    color: #fff;
962
-    font-size: 0.24rem;
963
-    z-index: 99;
964
-    padding: 0 0.1rem;
965
-    margin-top: 1.17rem;
966
-    ul {
967
-      @include display-flex;
968
-      @include align-items-center;
969
-      @include text-align;
970
-      @include box-sizing;
971
-      @include justify-content-between;
972
-      margin: 0.3rem 0;
973
-      li {
974
-        height: 0.6rem;
975
-        line-height: 0.6rem;
976
-        padding: 0 0.2rem;
977
-        border-radius: 30px;
978
-        font-size: 0.32rem;
979
-        cursor: pointer;
980
-        background: #f4aa8c;
981
-        &.active {
982
-          background: #f4aa8c;
983
-        }
984
-      }
985
-    }
986
-  }
987 1003
 }
988 1004
 </style>
989 1005
 

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

@@ -143,7 +143,6 @@ export default {
143 143
 <style rel="stylesheet/scss" lang="scss" scoped>
144 144
 .info {
145 145
   background: $text-color;
146
-  margin: 0 0.2rem;
147 146
   ul {
148 147
     padding: 0.4rem 0.8rem;
149 148
     li {

+ 3 - 2
src/styles/style.scss View File

@@ -47,7 +47,6 @@
47 47
 .plate-box {
48 48
   background: $text-color;
49 49
   padding: 0 0 0.3rem 0;
50
-  margin:  0 0.2rem;
51 50
   .title {
52 51
     border-bottom: 1px $border-color solid;
53 52
     line-height: 1rem;
@@ -293,7 +292,7 @@
293 292
   box-shadow: 0 0 15px #eee;
294 293
   .popover-demo-content {
295 294
     ul {
296
-      width: 6.4rem;
295
+      // width: 6.4rem;
297 296
       padding: 0.28rem;
298 297
       li {
299 298
         font-size: 0.32rem;
@@ -740,3 +739,5 @@
740 739
   min-height: calc(100vh - 2px);
741 740
   padding-left: 0.45rem;
742 741
 }
742
+
743
+

+ 0 - 5
src/styles/vux.less View File

@@ -297,8 +297,3 @@
297 297
 * loadmore
298 298
 */
299 299
 @load-more-line-color: #E5E5E5;
300
-
301
-作者:yundGo
302
-链接:https://www.jianshu.com/p/936c2a2481f8
303
-來源:简书
304
-简书著作权归作者所有,任何形式的转载都请联系作者获得授权并注明出处。