[FE]修改提交

ebc-middle-platform/src/components/loginer.vue

@@ -7,7 +7,7 @@
      <h3 class="welcome">{{ $t('aidp.account.welcome') }} <span class="system-name">{{ $t('aidp.account.demo') }}</span> {{ $t('aidp.account.system') }}</h3>
    </template>
    <h2 v-else class="d-flex align-items-center justify-content-center mb-36 text-nowrap">
      <img v-if="theme === 'dark'" src="/static/images/aid-logo.png" alt="" style="height: 25px;"/>
      <img v-if="theme === 'dark'" src="/static/images/aid-logo.png" alt="" style="height: 30px;width: 95px;"/>
      <img v-else src="/static/images/aid-logo-dark.png" alt="" style="height: 25px;"/>
      <strong class="text-dark ml-12">人员定位与搜救系统</strong>
    </h2>

ebc-middle-platform/src/routes.js

@@ -114,9 +114,9 @@ export default [
    name: 'index',
    path: '/',
    component: () =>
      import(
        /* webpackChunkName: "welcome" */ './modules/layouts/BasicLayout.vue'
      ),
        import(
            /* webpackChunkName: "welcome" */ './modules/layouts/BasicLayout.vue'
            ),
    redirect: '/orientation',
    meta: { title: '首页' },
    children: [
@@ -124,30 +124,30 @@ export default [
      {
        path: '/orientation',
        component: () =>
          import(
            /* webpackChunkName: "welcome" */ '@/modules/orientation/orientation.vue'
          ),
            import(
                /* webpackChunkName: "welcome" */ '@/modules/orientation/orientation.vue'
                ),
        name: 'orientation',
        meta: { title: '人员定位', keepAlive: true, icon: 'heart-outline', hiddenHeaderContent: true }
        meta: { title: '人员定位', keepAlive: true, icon: 'map-marker', hiddenHeaderContent: true }
      },
      // 报警救援
      {
        path: '/call-help',
        component: () =>
          import(
            /* webpackChunkName: "call-help" */ '@/modules/layouts/RouteView.vue'
          ),
            import(
                /* webpackChunkName: "call-help" */ '@/modules/layouts/RouteView.vue'
                ),
        name: 'callHelp',
        meta: { title: '报警救援', icon: 'heart-outline' },
        meta: { title: '报警救援', icon: 'alert-circle-outline' },
        redirect: '/call-help/current',
        children: [
          {
            path: '/call-help/current',
            name: 'CallHelpOne',
            component: () =>
              import(
                /* webpackChunkName: "call-help" */ '@/modules/call-help/current.vue'
              ),
                import(
                    /* webpackChunkName: "call-help" */ '@/modules/call-help/current.vue'
                    ),
            meta: {
              title: '实时报警',
              hiddenHeaderContent: true,
@@ -158,9 +158,9 @@ export default [
            path: '/call-help/history',
            name: 'CallHelpTwo',
            component: () =>
              import(
                /* webpackChunkName: "call-help" */ '@/modules/call-help/history.vue'
              ),
                import(
                    /* webpackChunkName: "call-help" */ '@/modules/call-help/history.vue'
                    ),
            meta: {
              title: '历史报警',
              hiddenHeaderContent: true,
@@ -173,20 +173,20 @@ export default [
      {
        path: '/attendance',
        component: () =>
          import(
            /* webpackChunkName: "attendance" */ '@/modules/layouts/RouteView.vue'
          ),
            import(
                /* webpackChunkName: "attendance" */ '@/modules/layouts/RouteView.vue'
                ),
        name: 'attendance',
        meta: { title: '考勤管理', icon: 'heart-outline' },
        meta: { title: '考勤管理', icon: 'calendar-outline' },
        redirect: '/attendance/attendance',
        children: [
          {
            path: '/attendance/attendance',
            name: 'attendanceWork',
            component: () =>
              import(
                /* webpackChunkName: "attendance" */ '@/modules/attendance/attendance.vue'
              ),
                import(
                    /* webpackChunkName: "attendance" */ '@/modules/attendance/attendance.vue'
                    ),
            meta: {
              title: '作业考勤',
              hiddenHeaderContent: true,
@@ -197,9 +197,9 @@ export default [
            path: '/attendance/track',
            name: 'track',
            component: () =>
              import(
                /* webpackChunkName: "attendance" */ '@/modules/attendance/track.vue'
              ),
                import(
                    /* webpackChunkName: "attendance" */ '@/modules/attendance/track.vue'
                    ),
            meta: {
              title: '轨迹分析',
              hiddenHeaderContent: true,
@@ -212,20 +212,20 @@ export default [
      {
        path: '/system-management',
        component: () =>
          import(
            /* webpackChunkName: "system-management" */ '@/modules/layouts/RouteView.vue'
          ),
            import(
                /* webpackChunkName: "system-management" */ '@/modules/layouts/RouteView.vue'
                ),
        name: 'systemManagement',
        meta: { title: '系统管理', icon: 'heart-outline' },
        meta: { title: '系统管理', icon: 'setting-outline' },
        redirect: '/system-management/terminal-management',
        children: [
          {
            path: '/system-management/terminal-management',
            name: 'terminalManagement',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/terminal-management.vue'
              ),
                import(
                    /* webpackChunkName: "system-management" */ '@/modules/system-management/terminal-management.vue'
                    ),
            meta: {
              title: '终端管理',
              hiddenHeaderContent: true,
@@ -236,9 +236,9 @@ export default [
            path: '/system-management/map-mark',
            name: 'mapMark',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/map-mark.vue'
              ),
                import(
                    /* webpackChunkName: "system-management" */ '@/modules/system-management/map-mark.vue'
                    ),
            meta: {
              title: '地图标记',
              hiddenHeaderContent: true,
@@ -249,9 +249,9 @@ export default [
            path: '/system-management/default-map',
            name: 'defaultMap',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/default-map.vue'
              ),
                import(
                    /* webpackChunkName: "system-management" */ '@/modules/system-management/default-map.vue'
                    ),
            meta: {
              title: '默认地图',
              hiddenHeaderContent: true,
@@ -262,9 +262,9 @@ export default [
            path: '/system-management/equipment-management',
            name: 'equipmentManagement',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/equipment-management.vue'
              ),
                import(
                    /* webpackChunkName: "system-management" */ '@/modules/system-management/equipment-management.vue'
                    ),
            meta: {
              title: '设备管理',
              hiddenHeaderContent: true,
@@ -275,9 +275,9 @@ export default [
            path: '/system-management/user-management',
            name: 'userManagement',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/user-management.vue'
              ),
                import(
                    /* webpackChunkName: "system-management" */ '@/modules/system-management/user-management.vue'
                    ),
            meta: {
              title: '用户管理',
              hiddenHeaderContent: true,
@@ -288,9 +288,9 @@ export default [
            path: '/system-management/role-management',
            name: 'roleManagement',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/role-management.vue'
              ),
                import(
                    /* webpackChunkName: "system-management" */ '@/modules/system-management/role-management.vue'
                    ),
            meta: {
              title: '角色管理',
              hiddenHeaderContent: true,
@@ -301,9 +301,9 @@ export default [
            path: '/system-management/menu-management',
            name: 'menuManagement',
            component: () =>
              import(
                /* webpackChunkName: "system-management" */ '@/modules/system-management/menu-management.vue'
              ),
                import(
                    /* webpackChunkName: "system-management" */ '@/modules/system-management/menu-management.vue'
                    ),
            meta: {
              title: '菜单管理',
              hiddenHeaderContent: true,
@@ -316,20 +316,20 @@ export default [
      {
        path: '/authorization',
        component: () =>
          import(
            /* webpackChunkName: "authorization" */ '@/modules/layouts/RouteView.vue'
          ),
            import(
                /* webpackChunkName: "authorization" */ '@/modules/layouts/RouteView.vue'
                ),
        name: 'authorization',
        meta: { title: '授权管理', icon: 'heart-outline' },
        meta: { title: '授权管理', icon: 'user-outline' },
        redirect: '/authorization/menu-authorization',
        children: [
          {
            path: '/authorization/menu-authorization',
            name: 'menuAuthorization',
            component: () =>
              import(
                /* webpackChunkName: "call-help-One" */ '@/modules/authorization/menu-authorization.vue'
              ),
                import(
                    /* webpackChunkName: "call-help-One" */ '@/modules/authorization/menu-authorization.vue'
                    ),
            meta: {
              title: '菜单授权',
              hiddenHeaderContent: true,
@@ -340,9 +340,9 @@ export default [
            path: '/authorization/role-authorization',
            name: 'roleAuthorization',
            component: () =>
              import(
                /* webpackChunkName: "call-help-Two" */ '@/modules/authorization/role-authorization.vue'
              ),
                import(
                    /* webpackChunkName: "call-help-Two" */ '@/modules/authorization/role-authorization.vue'
                    ),
            meta: {
              title: '角色授权',
              hiddenHeaderContent: true,
@@ -357,6 +357,6 @@ export default [
    path: '*',
    hidden: true,
    component: () =>
      import(/* webpackChunkName: "fail" */ './modules/ootb/exception/404.vue')
        import(/* webpackChunkName: "fail" */ './modules/ootb/exception/404.vue')
  }
]

security-protection-platform/src/modules/dashboard/index.vue

@@ -324,6 +324,9 @@ export default {
          data = data.slice(0, 4)
        }
        data.forEach(e => {
          if (e.employeeName == null || e.employeeName == ''){
            e.employeeCode = '未识别成功'
          }
          e.simi = e.simi.split('.')[0] + '%'
          e.newImg = e.idenPictureUrl
          var loadTimer

security-protection-platform/src/modules/workorder/components/table/index.vue

@@ -3,7 +3,6 @@
    <div class="table-box">
      <t-table :data="data" :loading="tableLoading" line>
        <t-table-column type="selection" width="70"></t-table-column>
        <t-table-column prop="orderId" label="工单编号" width="220"></t-table-column>
        <t-table-column prop="orderTypeName" label="工单类型" width="100">
          <template v-slot="{row}">
            <div :class="getTypecellClass(row.orderTypeName)" class="tag-cell">
@@ -12,21 +11,19 @@
          </template>
        </t-table-column>
        <t-table-column prop="name" label="姓名" width="100"></t-table-column>
        <t-table-column prop="userno" label="员工编号" width="100"></t-table-column>
        <t-table-column prop="startAndEndDate" label="起止时间" width="210">
          <template v-slot="{row}">
            <span else>{{ row.reclockingTime||formatDate(row) }}</span>
          </template>
        </t-table-column>
        <t-table-column prop="duration" label="时长（天）" width="120" align="center">
        <t-table-column prop="duration" label="时长（天）" width="80" align="center">
          <template v-slot="{row}">
            <span else>{{ row.reclockingTime?'--':row.duration }}</span>
          </template>
        </t-table-column>
        <t-table-column prop="reason" label="事由" width="200"></t-table-column>
        <t-table-column prop="submitTime" label="申请时间" width="200"></t-table-column>
        <t-table-column prop="submitTime" label="申请时间" width="180"></t-table-column>
        <t-table-column prop="approver" label="审批人" width="100"></t-table-column>
        <t-table-column v-if="status===1" prop="approveTime" label="审批时间" width="200"></t-table-column>
        <t-table-column v-if="status===1" prop="approveTime" label="审批时间" width="180"></t-table-column>
        <t-table-column v-if="status===1" prop="result" label="审批结果" width="100">
          <template v-slot="{row}">
            <div style="display: flex; align-items: center;justify-content: center;">