Merge remote-tracking branch 'origin/master'

zengh

2021-03-19 b9db46787e3e106207f1625958e3ca7adbc41032

Merge remote-tracking branch 'origin/master'

 src/router/views/index.js

@@ -101,8 +101,7 @@
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/Video/video')
  }
    , {
        }, {
    path: 'history/:historyId',
    name: '设备历史',
    meta: {
@@ -210,6 +209,32 @@
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
    }]
    }, {
        path: '/healthcode',
        component: Layout,
        redirect: '/healthcode/healthcodePage',
        children: [{
            path: 'healthcodePage',
            name: '健康码',
            meta: {
                i18n: 'healthcode'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/healthcode/healthcode')
        }]
    }, {
        path: '/animalHeat',
        component: Layout,
        redirect: '/animalHeat/animalHeatPage',
        children: [{
            path: 'animalHeatPage',
            name: '体温检测',
            meta: {
                i18n: 'animalHeat'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/animalHeat/animalHeat')
        }]
  }



 src/views/healthcode/healthcode.vue

@@ -75,26 +75,11 @@
            },
            {
              label: "检测时间",
              prop: "createTime"
              prop: "dtime"
            },
            {
              label: "体温",
              prop: "tempRed"
            },
            {
              label: '图片',
              prop: 'picture',
              type: 'upload',
              width: 300,
              listType: 'picture-img',
              span: 24,
              propsHttp: {
                res: 'data'
              },
              canvasOption: {
                text: 'avue',
                ratio: 0.1
              }
              label: '性别',
              prop: 'sex'
            },
            {
              label: "检测时间",
@@ -118,21 +103,37 @@
              ]
            },
            {
              label: "体温状态",
              label: "行政区",
              searchSpan: 4,
              prop: "addvcd",
              search: true,
              type: "tree",
              dicUrl: "/api/blade-jfpts/district/district/selectd",
              props: {
                label: "addvnm",
                value: "addvcds"
              }
            },
            {
              label: "健康码颜色",
              search: true,
              searchLabelWidth: 120,
              prop: "status",
              prop: "type",
              searchSpan: 5,
              width:110,
              type: "select",
              dicData: [
                {
                  label: "正常",
                  value: 0
                  label: "绿色",
                  value: 1
                },
                {
                  label: "异常",
                  value: 1
                  label: "黄色",
                  value: 2
                },
                {
                  label: "红色",
                  value: 3
                }
              ],
            }
@@ -198,9 +199,6 @@
          this.loading = false;
          this.selectionClear();
        });
      },
      handleHealthcode(row) {
        this.$router.push({ path: `/healthcode/healthcode/${row.deviceNumber}` });
      }
    }
  };

 src/views/home/home.vue

@@ -24,17 +24,20 @@
      }
    },
    mounted() {
      window.handleStart = this.handleStart;
      window.handleStartAnimalHeat = this.handleStartAnimalHeat;
      window.handleStartHealthcode = this.handleStartHealthcode;
    },
    methods: {
      handleStart() {
      handleStartAnimalHeat(data) {
        this.$router.push({
          path: `/real/history/000000000003`
          path: `/animalHeat/animalHeatPage`,
          query: data
        });
      },
      handleStartHealthcode(){
      handleStartHealthcode(data){
        this.$router.push({
          path: `/healthcode/healthcode/1`
          path: `/healthcode/healthcodePage`,
          query: data
        });
      }