Browse Source

no message

张保健 5 years ago
parent
commit
d37cdb280f
5 changed files with 4 additions and 167 deletions
  1. 0 3
      build/cdn.json
  2. 0 76
      config/index.js
  3. 0 9
      config/prod.env.js
  4. 4 4
      src/pages/main/WaitingArea.vue
  5. 0 75
      src/router/index.js

+ 0 - 3
build/cdn.json View File

@@ -1,3 +0,0 @@
1
-{
2
-  "version": "1.0.55"
3
-}

+ 0 - 76
config/index.js View File

@@ -1,76 +0,0 @@
1
-'use strict'
2
-// Template version: 1.3.1
3
-// see http://vuejs-templates.github.io/webpack for documentation.
4
-
5
-const path = require('path')
6
-
7
-module.exports = {
8
-  dev: {
9
-
10
-    // Paths
11
-    assetsSubDirectory: 'static',
12
-    assetsPublicPath: '/',
13
-    proxyTable: {},
14
-
15
-    // Various Dev Server settings
16
-    // host: 'localhost', // can be overwritten by process.env.HOST
17
-    port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
18
-    autoOpenBrowser: false,
19
-    errorOverlay: true,
20
-    notifyOnErrors: true,
21
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
22
-
23
-    // Use Eslint Loader?
24
-    // If true, your code will be linted during bundling and
25
-    // linting errors and warnings will be shown in the console.
26
-    useEslint: true,
27
-    // If true, eslint errors and warnings will also be shown in the error overlay
28
-    // in the browser.
29
-    showEslintErrorsInOverlay: false,
30
-
31
-    /**
32
-     * Source Maps
33
-     */
34
-
35
-    // https://webpack.js.org/configuration/devtool/#development
36
-    devtool: 'cheap-module-eval-source-map',
37
-
38
-    // If you have problems debugging vue-files in devtools,
39
-    // set this to false - it *may* help
40
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
41
-    cacheBusting: true,
42
-
43
-    cssSourceMap: true
44
-  },
45
-
46
-  build: {
47
-    // Template for index.html
48
-    index: path.resolve(__dirname, '../dist/index.html'),
49
-
50
-    // Paths
51
-    assetsRoot: path.resolve(__dirname, '../dist'),
52
-    assetsSubDirectory: 'static',
53
-    assetsPublicPath: './',
54
-
55
-    /**
56
-     * Source Maps
57
-     */
58
-
59
-    productionSourceMap: false,
60
-    // https://webpack.js.org/configuration/devtool/#production
61
-    devtool: '#source-map',
62
-
63
-    // Gzip off by default as many popular static hosts such as
64
-    // Surge or Netlify already gzip all static assets for you.
65
-    // Before setting to `true`, make sure to:
66
-    // npm install --save-dev compression-webpack-plugin
67
-    productionGzip: false,
68
-    productionGzipExtensions: ['js', 'css'],
69
-
70
-    // Run the build command with an extra argument to
71
-    // View the bundle analyzer report after build finishes:
72
-    // `npm run build --report`
73
-    // Set to `true` or `false` to always turn it on or off
74
-    bundleAnalyzerReport: process.env.npm_config_report
75
-  }
76
-}

+ 0 - 9
config/prod.env.js View File

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

+ 4 - 4
src/pages/main/WaitingArea.vue View File

@@ -254,7 +254,7 @@ export default {
254 254
           var scheduals = [];
255 255
           for (let index = 0; index < this.scheduals.length; index++) {
256 256
             const schedual = this.scheduals[index];
257
-            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
257
+            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
258 258
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
259 259
                 continue
260 260
               }
@@ -270,7 +270,7 @@ export default {
270 270
           var scheduals = [];
271 271
           for (let index = 0; index < this.scheduals.length; index++) {
272 272
             const schedual = this.scheduals[index];
273
-            if (schedual.prescription == null || schedual.prescription.creater == 0) {
273
+            if (schedual.prescription == null || schedual.prescription.prescription_doctor == 0) {
274 274
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
275 275
                 continue
276 276
               }
@@ -381,12 +381,12 @@ export default {
381 381
           schedualMap[schedual.device_number.zone.id] = [];
382 382
         }
383 383
         if (this.select_index == 1) {
384
-            if(schedual.prescription == null || schedual.prescription.creater == 0){
384
+            if(schedual.prescription == null || schedual.prescription.prescription_doctor == 0){
385 385
             schedualMap[schedual.device_number.zone.id].push(schedual);
386 386
             prescription_count++
387 387
           }
388 388
         } else if (this.select_index == 2){
389
-            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0){
389
+            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0){
390 390
             schedualMap[schedual.device_number.zone.id].push(schedual);
391 391
             assessment_before_dislysis_count++
392 392
           }

+ 0 - 75
src/router/index.js View File

@@ -1,75 +0,0 @@
1
-import Vue from 'vue'
2
-import Router from 'vue-router'
3
-
4
-Vue.use(Router)
5
-
6
-export default new Router({
7
-  routes: [
8
-    {
9
-      path: '/',
10
-      name: 'Home',
11
-      component: () => import('@/pages/home/login')
12
-    },
13
-    {
14
-      path: '/product',
15
-      name: 'Product',
16
-      component: () => import('@/pages/product/index')
17
-    },
18
-    {
19
-      path: '/main',
20
-      name: 'main',
21
-      component: () => import('@/pages/main/index')
22
-    },
23
-    {
24
-      path: '/details',
25
-      name: 'details',
26
-      component: () => import('@/pages/main/DetailsPage')
27
-    },
28
-    {
29
-      path: '/monitoring',
30
-      name: 'monitorPage',
31
-      component: () => import('@/pages/monitoring/index')
32
-
33
-    },
34
-    {
35
-      path: '/my',
36
-      name: 'my',
37
-      component: () => import('@/pages/personal/index')
38
-    },
39
-    {
40
-      path: '/advice',
41
-      name: 'doctorAdvice',
42
-      component: () => import('@/pages/advice/index')
43
-    },
44
-    {
45
-      path: '/EditPersonal',
46
-      name: 'EditPersonal',
47
-      component: () => import('@/pages/personal/EditPersonal')
48
-    },
49
-    {
50
-      path: '/ElectronicSignature',
51
-      name: 'ElectronicSignature',
52
-      component: () => import('@/pages/personal/ElectronicSignature')
53
-    },
54
-    {
55
-      path: '/Print',
56
-      name: 'Print',
57
-      component: () => import('@/pages/main/PrintIndex')
58
-    },
59
-    {
60
-      path: '/add_urgent_schedule',
61
-      name: 'AddUrgentSchedule',
62
-      component: () => import('@/pages/main/add_urgent_schedule')
63
-    },
64
-    {
65
-      path: '/Prints',
66
-      name: 'Prints',
67
-      component: () => import('@/pages/main/Print')
68
-    },
69
-    {
70
-      path: '/mypatients',
71
-      name: '/mypatients',
72
-      component: () => import('@/pages/my/mypatient')
73
-    }
74
-  ]
75
-})