Merge remote-tracking branch 'origin/master'

zengh

2021-03-19 b9db46787e3e106207f1625958e3ca7adbc41032

Merge remote-tracking branch 'origin/master'

 src/router/views/index.js

@@ -1,216 +1,241 @@
import Layout from '@/page/index/'

export default [{
  path: '/wel',
  component: Layout,
  redirect: '/wel/index',
  children: [{
    path: 'index',
    name: '首页',
    meta: {
      i18n: 'dashboard'
        path: '/wel',
        component: Layout,
        redirect: '/wel/index',
        children: [{
            path: 'index',
            name: '首页',
            meta: {
                i18n: 'dashboard'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/home/home')
        }, {
            path: 'dashboard',
            name: '控制台',
            meta: {
                i18n: 'dashboard',
                menu: false,
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
        }]
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/home/home')
  }, {
    path: 'dashboard',
    name: '控制台',
    meta: {
      i18n: 'dashboard',
      menu: false,
    {
        path: '/distribution',
        component: Layout,
        redirect: '/distribution/index',
        children: [{
            path: 'index',
            name: '警情分发处置',
            meta: {
                i18n: 'distribution'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/distribution/index')
        }]
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
  }]
},
{
  path: '/distribution',
  component: Layout,
  redirect: '/distribution/index',
  children: [{
    path: 'index',
    name: '警情分发处置',
    meta: {
      i18n: 'distribution'
    {
        path: '/test',
        component: Layout,
        redirect: '/test/index',
        children: [{
            path: 'index',
            name: '测试页',
            meta: {
                i18n: 'test'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/util/test')
        }]
    }, {
        path: '/dict-horizontal',
        component: Layout,
        redirect: '/dict-horizontal/index',
        children: [{
            path: 'index',
            name: '字典管理',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
        }]
    }, {
        path: '/dict-vertical',
        component: Layout,
        redirect: '/dict-vertical/index',
        children: [{
            path: 'index',
            name: '字典管理',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
        }]
    }, {
        path: '/info',
        component: Layout,
        redirect: '/info/index',
        children: [{
            path: 'index',
            name: '个人信息',
            meta: {
                i18n: 'info'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
        }]
    }, {
        path: '/real',
        component: Layout,
        redirect: '/real/video',
        children: [{
            path: 'video',
            name: '视频',
            meta: {
                i18n: 'real'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/Video/video')
        }, {
            path: 'history/:historyId',
            name: '设备历史',
            meta: {
                i18n: 'real'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
        }]
    }, {
        path: '/work/process/leave',
        component: Layout,
        redirect: '/work/process/leave/form',
        children: [{
            path: 'form/:processDefinitionId',
            name: '请假流程',
            meta: {
                i18n: 'work'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
        }, {
            path: 'handle/:taskId/:processInstanceId/:businessId',
            name: '处理请假流程',
            meta: {
                i18n: 'work'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
        }, {
            path: 'detail/:processInstanceId/:businessId',
            name: '请假流程详情',
            meta: {
                i18n: 'work'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
        }]
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/distribution/index')
  }]
},
{
  path: '/test',
  component: Layout,
  redirect: '/test/index',
  children: [{
    path: 'index',
    name: '测试页',
    meta: {
      i18n: 'test'
    {
        path: '/realTimePolice',
        component: Layout,
        redirect: '/realTimePolice/real',
        children: [{
            path: 'index',
            name: '实时报警',
            meta: {
                i18n: 'real'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
        }]
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/util/test')
  }]
}, {
  path: '/dict-horizontal',
  component: Layout,
  redirect: '/dict-horizontal/index',
  children: [{
    path: 'index',
    name: '字典管理',
    meta: {
      i18n: 'dict'
    {
        path: '/attendance',
        component: Layout,
        redirect: '/attendance/attendance',
        children: [{
            path: 'index',
            name: '考勤管理',
            meta: {
                i18n: 'attendance'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
        }]
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
  }]
}, {
  path: '/dict-vertical',
  component: Layout,
  redirect: '/dict-vertical/index',
  children: [{
    path: 'index',
    name: '字典管理',
    meta: {
      i18n: 'dict'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
  }]
}, {
  path: '/info',
  component: Layout,
  redirect: '/info/index',
  children: [{
    path: 'index',
    name: '个人信息',
    meta: {
      i18n: 'info'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
  }]
}, {
  path: '/real',
  component: Layout,
  redirect: '/real/video',
  children: [{
    path: 'video',
    name: '视频',
    meta: {
      i18n: 'real'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/Video/video')
  }
    , {
    path: 'history/:historyId',
    name: '设备历史',
    meta: {
      i18n: 'real'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
  }]
}, {
  path: '/work/process/leave',
  component: Layout,
  redirect: '/work/process/leave/form',
  children: [{
    path: 'form/:processDefinitionId',
    name: '请假流程',
    meta: {
      i18n: 'work'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
  }, {
    path: 'handle/:taskId/:processInstanceId/:businessId',
    name: '处理请假流程',
    meta: {
      i18n: 'work'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
  }, {
    path: 'detail/:processInstanceId/:businessId',
    name: '请假流程详情',
    meta: {
      i18n: 'work'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
  }]
},
{
  path: '/realTimePolice',
  component: Layout,
  redirect: '/realTimePolice/real',
  children: [{
    path: 'index',
    name: '实时报警',
    meta: {
      i18n: 'real'
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
  }]
},
  {
    path: '/attendance',
    component: Layout,
    redirect: '/attendance/attendance',
    children: [{
      path: 'index',
      name: '考勤管理',
      meta: {
        i18n: 'attendance'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
    }]
  },
{
  path: '/clientManagement',
  component: Layout,
  redirect: '/clientManagement/clientManagement',
  children: [{
    {
        path: '/clientManagement',
        component: Layout,
        redirect: '/clientManagement/clientManagement',
        children: [{

    path: 'index',
    name: '设备管理',
    meta: {
      i18n: 'clientManagement'
            path: 'index',
            name: '设备管理',
            meta: {
                i18n: 'clientManagement'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
        }]
    },
    component: () =>
      import( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
  }]
},
  {
    path: '/suser',
    component: Layout,
    redirect: '/suser/suser',
    children: [{
      path: 'index',
      name: '客户管理',
      meta: {
        i18n: 'suser'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/suser/suser')
    }]
  },{
    path: '/policeTracking',
    component: Layout,
    redirect: '/policeTracking/track',
    children: [{
      path: 'track',
      name: '警情追踪',
      meta: {
        i18n: 'track'
      },
      component: () =>
        import( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
    }]
  }
    {
        path: '/suser',
        component: Layout,
        redirect: '/suser/suser',
        children: [{
            path: 'index',
            name: '客户管理',
            meta: {
                i18n: 'suser'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/suser/suser')
        }]
    }, {
        path: '/policeTracking',
        component: Layout,
        redirect: '/policeTracking/track',
        children: [{
            path: 'track',
            name: '警情追踪',
            meta: {
                i18n: 'track'
            },
            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
        });
      }