Преглед изворни кода

下拉菜单采用 el-popover

庄逸洲 пре 5 година
родитељ
комит
7c452c1fb8
6 измењених фајлова са 208 додато и 144 уклоњено
  1. 3 3
      build/webpack.base.conf.js
  2. 109 81
      package-lock.json
  3. 1 0
      package.json
  4. 81 49
      src/pages/main/DialysisArea.vue
  5. 14 6
      src/pages/main/WaitingArea.vue
  6. 0 5
      src/styles/vux.less

+ 3 - 3
build/webpack.base.conf.js Прегледај датотеку

97
 // var vueLoaderConfig = require('./vue-loader.conf')
97
 // var vueLoaderConfig = require('./vue-loader.conf')
98
 const vuxLoader = require('vux-loader')
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
 module.exports = vuxLoader.merge(webpackConfig, {
104
 module.exports = vuxLoader.merge(webpackConfig, {
105
   plugins: [
105
   plugins: [

+ 109 - 81
package-lock.json Прегледај датотеку

265
       }
265
       }
266
     },
266
     },
267
     "@types/node": {
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
       "dev": true
271
       "dev": true
272
     },
272
     },
273
     "@types/semver": {
273
     "@types/semver": {
399
         "json-schema-traverse": "^0.3.0"
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
     "ajv-keywords": {
408
     "ajv-keywords": {
403
       "version": "2.1.1",
409
       "version": "2.1.1",
404
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
410
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
2244
     },
2250
     },
2245
     "boom": {
2251
     "boom": {
2246
       "version": "2.10.1",
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
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2254
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
2249
       "dev": true,
2255
       "dev": true,
2250
       "requires": {
2256
       "requires": {
3440
     },
3446
     },
3441
     "cryptiles": {
3447
     "cryptiles": {
3442
       "version": "2.0.5",
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
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
3450
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
3445
       "dev": true,
3451
       "dev": true,
3446
       "optional": true,
3452
       "optional": true,
4227
     },
4233
     },
4228
     "draftlog": {
4234
     "draftlog": {
4229
       "version": "1.0.12",
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
       "integrity": "sha1-fbajxbYhBrsy3Uo11nvMy2x9naA=",
4237
       "integrity": "sha1-fbajxbYhBrsy3Uo11nvMy2x9naA=",
4232
       "dev": true
4238
       "dev": true
4233
     },
4239
     },
4888
     },
4894
     },
4889
     "esprima-extract-comments": {
4895
     "esprima-extract-comments": {
4890
       "version": "0.2.1",
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
       "integrity": "sha1-kBjY3zf/2V3WFQFajF8Ede10NCM=",
4898
       "integrity": "sha1-kBjY3zf/2V3WFQFajF8Ede10NCM=",
4893
       "dev": true,
4899
       "dev": true,
4894
       "requires": {
4900
       "requires": {
5141
     },
5147
     },
5142
     "extract-comments": {
5148
     "extract-comments": {
5143
       "version": "0.10.1",
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
       "integrity": "sha1-i2AxgIovX94c1nv4MXuRggQwRAg=",
5151
       "integrity": "sha1-i2AxgIovX94c1nv4MXuRggQwRAg=",
5146
       "dev": true,
5152
       "dev": true,
5147
       "requires": {
5153
       "requires": {
5153
       "dependencies": {
5159
       "dependencies": {
5154
         "define-property": {
5160
         "define-property": {
5155
           "version": "0.2.5",
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
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
5163
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
5158
           "dev": true,
5164
           "dev": true,
5159
           "requires": {
5165
           "requires": {
5162
         },
5168
         },
5163
         "extend-shallow": {
5169
         "extend-shallow": {
5164
           "version": "2.0.1",
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
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
5172
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
5167
           "dev": true,
5173
           "dev": true,
5168
           "requires": {
5174
           "requires": {
6476
     },
6482
     },
6477
     "has-symbols": {
6483
     "has-symbols": {
6478
       "version": "1.0.0",
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
       "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
6486
       "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
6481
       "dev": true
6487
       "dev": true
6482
     },
6488
     },
6574
     },
6580
     },
6575
     "hawk": {
6581
     "hawk": {
6576
       "version": "3.1.3",
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
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
6584
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
6579
       "dev": true,
6585
       "dev": true,
6580
       "optional": true,
6586
       "optional": true,
6604
     },
6610
     },
6605
     "hoek": {
6611
     "hoek": {
6606
       "version": "2.16.3",
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
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6614
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
6609
       "dev": true
6615
       "dev": true
6610
     },
6616
     },
6998
     },
7004
     },
6999
     "inline-manifest-webpack-plugin": {
7005
     "inline-manifest-webpack-plugin": {
7000
       "version": "3.0.1",
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
       "integrity": "sha1-yiFRBjEVKY4v2UtmmrdsfdY+RK0=",
7008
       "integrity": "sha1-yiFRBjEVKY4v2UtmmrdsfdY+RK0=",
7003
       "dev": true,
7009
       "dev": true,
7004
       "requires": {
7010
       "requires": {
7333
     },
7339
     },
7334
     "is-regexp": {
7340
     "is-regexp": {
7335
       "version": "1.0.0",
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
       "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
7343
       "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
7338
       "dev": true
7344
       "dev": true
7339
     },
7345
     },
8490
     },
8496
     },
8491
     "lodash.differencewith": {
8497
     "lodash.differencewith": {
8492
       "version": "4.5.0",
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
       "integrity": "sha1-uvr7yRi1UVTheRdqALsK76rIVLc=",
8500
       "integrity": "sha1-uvr7yRi1UVTheRdqALsK76rIVLc=",
8495
       "dev": true
8501
       "dev": true
8496
     },
8502
     },
8508
     },
8514
     },
8509
     "lodash.isequal": {
8515
     "lodash.isequal": {
8510
       "version": "4.5.0",
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
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
8518
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
8513
       "dev": true
8519
       "dev": true
8514
     },
8520
     },
8578
     },
8584
     },
8579
     "lodash.unionwith": {
8585
     "lodash.unionwith": {
8580
       "version": "4.6.0",
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
       "integrity": "sha1-dNFAtcqBRubGQ8NyT1FSU42awfA=",
8588
       "integrity": "sha1-dNFAtcqBRubGQ8NyT1FSU42awfA=",
8583
       "dev": true
8589
       "dev": true
8584
     },
8590
     },
9082
     "nan": {
9088
     "nan": {
9083
       "version": "2.11.0",
9089
       "version": "2.11.0",
9084
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
9090
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
9085
-<<<<<<< .mine
9086
       "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
9091
       "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
9092
+      "dev": true,
9087
       "optional": true
9093
       "optional": true
9088
-=======
9089
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
9090
-      "dev": true
9091
->>>>>>> .theirs
9092
     },
9094
     },
9093
     "nanomatch": {
9095
     "nanomatch": {
9094
       "version": "1.2.13",
9096
       "version": "1.2.13",
9229
     },
9231
     },
9230
     "node-cli-config": {
9232
     "node-cli-config": {
9231
       "version": "0.0.1",
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
       "integrity": "sha1-r3d02FQCprfLlsH5G7JP3VjXwLA=",
9235
       "integrity": "sha1-r3d02FQCprfLlsH5G7JP3VjXwLA=",
9234
       "dev": true
9236
       "dev": true
9235
     },
9237
     },
9326
       }
9328
       }
9327
     },
9329
     },
9328
     "node-sass": {
9330
     "node-sass": {
9329
-<<<<<<< .mine
9330
       "version": "4.12.0",
9331
       "version": "4.12.0",
9331
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
9332
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
9332
       "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
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
       "dev": true,
9334
       "dev": true,
9339
       "requires": {
9335
       "requires": {
9340
         "async-foreach": "^0.1.3",
9336
         "async-foreach": "^0.1.3",
9385
             "which": "^1.2.9"
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
         "nan": {
9384
         "nan": {
9396
           "version": "2.14.0",
9385
           "version": "2.14.0",
9397
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
9386
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
9398
           "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
9387
           "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
9399
           "dev": true
9388
           "dev": true
9400
         },
9389
         },
9401
-=======
9402
-
9403
-
9404
-
9405
-
9406
-
9407
-
9408
-
9409
-
9410
-
9411
-
9412
-
9413
-
9414
->>>>>>> .theirs
9415
         "supports-color": {
9390
         "supports-color": {
9416
           "version": "2.0.0",
9391
           "version": "2.0.0",
9417
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
9392
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
9904
     },
9879
     },
9905
     "parse-code-context": {
9880
     "parse-code-context": {
9906
       "version": "0.2.2",
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
       "integrity": "sha1-FEuK+3IZSC1+iMHranZVlvOmrA0=",
9883
       "integrity": "sha1-FEuK+3IZSC1+iMHranZVlvOmrA0=",
9909
       "dev": true
9884
       "dev": true
9910
     },
9885
     },
12262
       "dev": true
12237
       "dev": true
12263
     },
12238
     },
12264
     "progress-bar-webpack-plugin": {
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
       "dev": true,
12243
       "dev": true,
12269
       "requires": {
12244
       "requires": {
12270
         "chalk": "^1.1.1",
12245
         "chalk": "^1.1.1",
12274
       "dependencies": {
12249
       "dependencies": {
12275
         "ansi-styles": {
12250
         "ansi-styles": {
12276
           "version": "2.2.1",
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
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
12253
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
12279
           "dev": true
12254
           "dev": true
12280
         },
12255
         },
12281
         "chalk": {
12256
         "chalk": {
12282
           "version": "1.1.3",
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
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
12259
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
12285
           "dev": true,
12260
           "dev": true,
12286
           "requires": {
12261
           "requires": {
12293
         },
12268
         },
12294
         "progress": {
12269
         "progress": {
12295
           "version": "1.1.8",
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
           "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
12272
           "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
12298
           "dev": true
12273
           "dev": true
12299
         },
12274
         },
12300
         "supports-color": {
12275
         "supports-color": {
12301
           "version": "2.0.0",
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
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
12278
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
12304
           "dev": true
12279
           "dev": true
12305
         }
12280
         }
13903
     },
13878
     },
13904
     "sntp": {
13879
     "sntp": {
13905
       "version": "1.0.9",
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
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
13882
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
13908
       "dev": true,
13883
       "dev": true,
13909
       "optional": true,
13884
       "optional": true,
14323
     },
14298
     },
14324
     "strip-comments": {
14299
     "strip-comments": {
14325
       "version": "0.4.4",
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
       "integrity": "sha1-ucqvxP6QX5bAkd+J+achXyqmKcY=",
14302
       "integrity": "sha1-ucqvxP6QX5bAkd+J+achXyqmKcY=",
14328
       "dev": true,
14303
       "dev": true,
14329
       "requires": {
14304
       "requires": {
14333
       "dependencies": {
14308
       "dependencies": {
14334
         "extend-shallow": {
14309
         "extend-shallow": {
14335
           "version": "2.0.1",
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
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
14312
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
14338
           "dev": true,
14313
           "dev": true,
14339
           "requires": {
14314
           "requires": {
14344
     },
14319
     },
14345
     "strip-css-comments": {
14320
     "strip-css-comments": {
14346
       "version": "3.0.0",
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
       "integrity": "sha1-elYl7/iisibPiUehElTaluE9rok=",
14323
       "integrity": "sha1-elYl7/iisibPiUehElTaluE9rok=",
14349
       "dev": true,
14324
       "dev": true,
14350
       "requires": {
14325
       "requires": {
14372
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
14347
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
14373
       "dev": true
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
     "supports-color": {
14403
     "supports-color": {
14376
       "version": "5.5.0",
14404
       "version": "5.5.0",
14377
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
14405
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
14628
     },
14656
     },
14629
     "touch": {
14657
     "touch": {
14630
       "version": "1.0.0",
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
       "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
14660
       "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
14633
       "dev": true,
14661
       "dev": true,
14634
       "requires": {
14662
       "requires": {
14637
       "dependencies": {
14665
       "dependencies": {
14638
         "nopt": {
14666
         "nopt": {
14639
           "version": "1.0.10",
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
           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
14669
           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
14642
           "dev": true,
14670
           "dev": true,
14643
           "requires": {
14671
           "requires": {
15463
       "dependencies": {
15491
       "dependencies": {
15464
         "ajv": {
15492
         "ajv": {
15465
           "version": "4.11.8",
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
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
15495
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
15468
           "dev": true,
15496
           "dev": true,
15469
           "optional": true,
15497
           "optional": true,
15474
         },
15502
         },
15475
         "assert-plus": {
15503
         "assert-plus": {
15476
           "version": "0.2.0",
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
           "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
15506
           "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
15479
           "dev": true,
15507
           "dev": true,
15480
           "optional": true
15508
           "optional": true
15481
         },
15509
         },
15482
         "aws-sign2": {
15510
         "aws-sign2": {
15483
           "version": "0.6.0",
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
           "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
15513
           "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
15486
           "dev": true,
15514
           "dev": true,
15487
           "optional": true
15515
           "optional": true
15488
         },
15516
         },
15489
         "form-data": {
15517
         "form-data": {
15490
           "version": "2.1.4",
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
           "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
15520
           "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
15493
           "dev": true,
15521
           "dev": true,
15494
           "optional": true,
15522
           "optional": true,
15500
         },
15528
         },
15501
         "har-schema": {
15529
         "har-schema": {
15502
           "version": "1.0.5",
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
           "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
15532
           "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
15505
           "dev": true,
15533
           "dev": true,
15506
           "optional": true
15534
           "optional": true
15507
         },
15535
         },
15508
         "har-validator": {
15536
         "har-validator": {
15509
           "version": "4.2.1",
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
           "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
15539
           "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
15512
           "dev": true,
15540
           "dev": true,
15513
           "optional": true,
15541
           "optional": true,
15518
         },
15546
         },
15519
         "http-signature": {
15547
         "http-signature": {
15520
           "version": "1.1.1",
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
           "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
15550
           "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
15523
           "dev": true,
15551
           "dev": true,
15524
           "optional": true,
15552
           "optional": true,
15546
         },
15574
         },
15547
         "loader-utils": {
15575
         "loader-utils": {
15548
           "version": "0.2.17",
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
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
15578
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
15551
           "dev": true,
15579
           "dev": true,
15552
           "requires": {
15580
           "requires": {
15558
         },
15586
         },
15559
         "oauth-sign": {
15587
         "oauth-sign": {
15560
           "version": "0.8.2",
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
           "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
15590
           "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
15563
           "dev": true,
15591
           "dev": true,
15564
           "optional": true
15592
           "optional": true
15574
         },
15602
         },
15575
         "performance-now": {
15603
         "performance-now": {
15576
           "version": "0.2.0",
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
           "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
15606
           "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
15579
           "dev": true,
15607
           "dev": true,
15580
           "optional": true
15608
           "optional": true
15581
         },
15609
         },
15582
         "qs": {
15610
         "qs": {
15583
           "version": "6.4.0",
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
           "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
15613
           "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
15586
           "dev": true,
15614
           "dev": true,
15587
           "optional": true
15615
           "optional": true
15588
         },
15616
         },
15589
         "request": {
15617
         "request": {
15590
           "version": "2.81.0",
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
           "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
15620
           "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
15593
           "dev": true,
15621
           "dev": true,
15594
           "optional": true,
15622
           "optional": true,
15619
         },
15647
         },
15620
         "source-list-map": {
15648
         "source-list-map": {
15621
           "version": "0.1.8",
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
           "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
15651
           "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
15624
           "dev": true
15652
           "dev": true
15625
         },
15653
         },
15626
         "source-map": {
15654
         "source-map": {
15627
           "version": "0.5.7",
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
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
15657
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
15630
           "dev": true
15658
           "dev": true
15631
         },
15659
         },
15641
         },
15669
         },
15642
         "webpack-merge": {
15670
         "webpack-merge": {
15643
           "version": "1.1.2",
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
           "integrity": "sha1-SfKmi6X9NLsTwzjBhMcCjZOENDI=",
15673
           "integrity": "sha1-SfKmi6X9NLsTwzjBhMcCjZOENDI=",
15646
           "dev": true,
15674
           "dev": true,
15647
           "requires": {
15675
           "requires": {
15656
         },
15684
         },
15657
         "webpack-sources": {
15685
         "webpack-sources": {
15658
           "version": "0.1.5",
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
           "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
15688
           "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
15661
           "dev": true,
15689
           "dev": true,
15662
           "requires": {
15690
           "requires": {

+ 1 - 0
package.json Прегледај датотеку

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

+ 81 - 49
src/pages/main/DialysisArea.vue Прегледај датотеку

1
 <template>
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
       </div>
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
 </template>
70
 </template>
46
 
71
 
47
 <script>
72
 <script>
72
 
97
 
73
       zone_selected: this.$store.getters.app.dialysis_area.zone_select_index,
98
       zone_selected: this.$store.getters.app.dialysis_area.zone_select_index,
74
       zones: [{ value: 0, text: "全部分区", select: true }],
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
   props: {
106
   props: {
140
           const schedule = originSchedules[s_i];
168
           const schedule = originSchedules[s_i];
141
           if (
169
           if (
142
             zone_name.length == 0 ||
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
             if (
174
             if (
146
               timetype_selected == 0 ||
175
               timetype_selected == 0 ||
165
   },
194
   },
166
   methods: {
195
   methods: {
167
     handletimeType: function(index) {
196
     handletimeType: function(index) {
197
+      this.sch_type_options_visible = false;
168
       this.schedual_type_selected = index;
198
       this.schedual_type_selected = index;
169
       this.$emit("clear_search_keyword");
199
       this.$emit("clear_search_keyword");
170
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
200
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
174
       });
204
       });
175
     },
205
     },
176
     handleZoneChange: function(index) {
206
     handleZoneChange: function(index) {
207
+      this.zone_options_visible = false;
177
       this.zone_selected = index;
208
       this.zone_selected = index;
178
       this.$emit("clear_search_keyword");
209
       this.$emit("clear_search_keyword");
179
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
210
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
214
               }
245
               }
215
               schedualMap[schedual.device_number.zone.name].push(schedual);
246
               schedualMap[schedual.device_number.zone.name].push(schedual);
216
               if (zoneMap[schedual.device_number.zone.name] == null) {
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
 .screening {
293
 .screening {
262
   border-bottom: 1px #e5e5e5 solid;
294
   border-bottom: 1px #e5e5e5 solid;
263
   position: fixed;
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
   ul {
301
   ul {
270
     @include display-flex;
302
     @include display-flex;
271
     @include align-items-center;
303
     @include align-items-center;
292
     font-size: 0.34rem;
324
     font-size: 0.34rem;
293
     font-weight: 600;
325
     font-weight: 600;
294
     color: $title-color;
326
     color: $title-color;
295
-    height:1rem;
327
+    height: 1rem;
296
     line-height: 0.8rem;
328
     line-height: 0.8rem;
297
     display: inline-block;
329
     display: inline-block;
298
   }
330
   }

+ 14 - 6
src/pages/main/WaitingArea.vue Прегледај датотеку

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

+ 0 - 5
src/styles/vux.less Прегледај датотеку

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