Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-07-15 957ef82a3cf13bf29076e3e892de0328dc993fed

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

 enterprises.zip

Binary files differ

 enterprises/cdn/animate/3.5.2/animate.css

File was deleted

 enterprises/cdn/avue/2.8.12/avue.min.js

File was deleted

 enterprises/cdn/avue/2.8.12/index.css

File was deleted

 enterprises/cdn/axios/1.0.0/axios.min.js

File was deleted

 enterprises/cdn/echarts/echarts.min.js

File was deleted

 enterprises/cdn/element-ui/2.15.1/index.js

File was deleted

 enterprises/cdn/element-ui/2.15.1/theme-chalk/fonts/element-icons.ttf

Binary files differ

 enterprises/cdn/element-ui/2.15.1/theme-chalk/fonts/element-icons.woff

Binary files differ

 enterprises/cdn/element-ui/2.15.1/theme-chalk/index.css

File was deleted

 enterprises/cdn/iconfont/avue/iconfont.css

File was deleted

 enterprises/cdn/iconfont/avue/iconfont.eot

Binary files differ

 enterprises/cdn/iconfont/avue/iconfont.js

File was deleted

 enterprises/cdn/iconfont/avue/iconfont.json

File was deleted

 enterprises/cdn/iconfont/avue/iconfont.svg

File was deleted

 enterprises/cdn/iconfont/avue/iconfont.ttf

Binary files differ

 enterprises/cdn/iconfont/avue/iconfont.woff

Binary files differ

 enterprises/cdn/iconfont/avue/iconfont.woff2

Binary files differ

 enterprises/cdn/iconfont/index.css

File was deleted

 enterprises/cdn/iconfont/saber/iconfont.css

File was deleted

 enterprises/cdn/iconfont/saber/iconfont.eot

Binary files differ

 enterprises/cdn/iconfont/saber/iconfont.js

File was deleted

 enterprises/cdn/iconfont/saber/iconfont.json

File was deleted

 enterprises/cdn/iconfont/saber/iconfont.svg

File was deleted

 enterprises/cdn/iconfont/saber/iconfont.ttf

Binary files differ

 enterprises/cdn/iconfont/saber/iconfont.woff

Binary files differ

 enterprises/cdn/iconfont/saber/iconfont.woff2

Binary files differ

 enterprises/cdn/vue-router/3.0.1/vue-router.min.js

File was deleted

 enterprises/cdn/vue/2.6.10/vue.min.js

File was deleted

 enterprises/cdn/vuex/3.1.1/vuex.min.js

File was deleted

 enterprises/cdn/xlsx/FileSaver.min.js

File was deleted

 enterprises/cdn/xlsx/xlsx.full.min.js

File was deleted

 enterprises/css/app.14f86087.css

File was deleted

 enterprises/css/chunk-0d5e8253.af197752.css

File was deleted

 enterprises/css/chunk-vendors.19c090c1.css

File was deleted

 enterprises/css/page.63184886.css

File was deleted

 enterprises/css/views.4eb57a44.css

File was deleted

 enterprises/favicon.png

Binary files differ

 enterprises/img/bg/403.svg

File was deleted

 enterprises/img/bg/404.svg

File was deleted

 enterprises/img/bg/500.svg

File was deleted

 enterprises/img/bg/bg.jpg

Binary files differ

 enterprises/img/bg/bg1.jpg

Binary files differ

 enterprises/img/bg/bg2.jpg

Binary files differ

 enterprises/img/bg/bg3.jpg

Binary files differ

 enterprises/img/bg/bg4.jpg

Binary files differ

 enterprises/img/bg/cloud.jpg

Binary files differ

 enterprises/img/bg/img-logo.png

Binary files differ

 enterprises/img/bg/login.png

Binary files differ

 enterprises/img/bg/logo.png

Binary files differ

 enterprises/img/bg/star-squashed.jpg

Binary files differ

 enterprises/img/bg/vip1.png

Binary files differ

 enterprises/img/bg/vip2.png

Binary files differ

 enterprises/img/bg/vip3.png

Binary files differ

 enterprises/img/bg/vip4.png

Binary files differ

 enterprises/img/logo copy.png

Binary files differ

 enterprises/img/logo.png

Binary files differ

 enterprises/img/mock/card/card-1.jpg

Binary files differ

 enterprises/img/mock/card/card-2.jpg

Binary files differ

 enterprises/img/mock/card/card-3.jpg

Binary files differ

 enterprises/img/mock/card/card-4.jpg

Binary files differ

 enterprises/img/mock/cli/1.png

Binary files differ

 enterprises/img/mock/cli/2.png

Binary files differ

 enterprises/img/mock/cli/3.png

Binary files differ

 enterprises/img/mock/iconfont.png

Binary files differ

 enterprises/index.html

File was deleted

 enterprises/js/app.609e4c4a.js

File was deleted

 enterprises/js/chunk-0d5e8253.bb403c90.js

File was deleted

 enterprises/js/chunk-2d0e4caf.d3f2a3e0.js

File was deleted

 enterprises/js/chunk-vendors.93c88c6d.js

File was deleted

 enterprises/js/page.55acbf68.js

File was deleted

 enterprises/js/views.073d40f3.js

File was deleted

 enterprises/svg/loading-spin.svg

File was deleted

 enterprises/util/aes.js

File was deleted

 enterprises/util/screen/guge.png

Binary files differ

 enterprises/util/screen/huohu.png

Binary files differ

 enterprises/util/screen/screen.css

File was deleted

 enterprises/util/screen/screen.js

File was deleted

 src/router/views/index.js

@@ -384,4 +384,263 @@
                import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
        }]
    }
]
]
path: 'detail/:processInstanceId/:businessId',
    name: '请假流程详情',
    meta: {
        i18n: 'work'
    },
    component: () =>
    import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
}, {
    path: '/securityAnalysis',
    component: Layout,
    redirect: '/securityAnalysis/index',
    children: [{
        path: 'index',
        name: '保安单位情况智能分析',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/securityAnalysis/index')
    }]
}, {
    path: '/recruitmentManagement',
    component: Layout,
    redirect: '/recruitmentManagement/index',
    children: [{
        path: 'index',
        name: '招聘管理',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/recruitmentManagement/index')
    }]
}, {
    path: '/securityUnit',
    component: Layout,
    redirect: '/securityUnit/index',
    children: [{
        path: 'index',
        name: '保安单位信息',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/securityUnit/index')
    }]
}, {
    path: '/securityGuard',
    component: Layout,
    redirect: '/securityGuard/securityGuard',
    children: [{
        path: 'index',
        name: '保安员查询',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
    }]
}, {
    path: '/securityGuardDetail',
    component: Layout,
    redirect: '/securityGuardDetail/index',
    children: [{
        path: 'index',
        name: '保安员详情',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
    }]
}, {
    path: '/resource',
    component: Layout,
    redirect: '/resource/attach',
    children: [{
        path: 'attach',
        name: '附件上传',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/resource/attach')
    }]
}, {
    path: '/securityUnitChild',
    component: Layout,
    redirect: '/securityUnitChild/index',
    children: [{
        path: 'index',
        name: '保安单位详情',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/securityUnitChild/index')
    }]
}, {
    path: '/securityGuard',
    component: Layout,
    redirect: '/securityGuard/securityGuard',
    children: [{
        path: 'index',
        name: '保安员管理',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
    }]
},
// {
//     path: '/dispatch/dispatch',
//     component: Layout,
//     redirect: '/dispatch/dispatch',
//     children: [{
//         path: 'index',
//         name: '派遣服务管理',
//         meta: {
//             i18n: 'dict'
//         },
//         component: () =>
//             import( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
//     }]
// },
{
    path: '/desk',
    component: Layout,
    redirect: '/desk/notice',
    children: [{
        path: 'index',
        name: '通知公告',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/desk/notice')
    }]
}, {
    path: '/dispatch',
    component: Layout,
    redirect: '/dispatch/dispatch',
    children: [{
        path: 'dispatch',
        name: '派遣单位管理',
        meta: {
            i18n: 'dispatch'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatch')
    }, {
        path: 'dispatchChildoperable',
        name: '派遣记录管理',
        meta: {
            i18n: 'dispatch'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperable')
    }]
}, {
    path: '/dispatchChild',
    component: Layout,
    redirect: '/dispatchChild/index',
    children: [{
        path: 'index',
        name: '派遣服务记录',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/dispatchChild/index')
    }]
},
// {
//     path: '/equipments',
//     component: Layout,
//     redirect: '/equipments/index',
//     children: [{
//         path: 'index',
//         name: '保安公司装备管理',
//         meta: {
//             i18n: 'dict'
//         },
//         component: () =>
//             import( /* webpackChunkName: "views" */ '@/views/equipments/index')
//     }]
// }, {
//     path: '/car',
//     component: Layout,
//     redirect: '/car/index',
//     children: [{
//         path: 'index',
//         name: '保安公司车辆管理',
//         meta: {
//             i18n: 'dict'
//         },
//         component: () =>
//             import( /* webpackChunkName: "views" */ '@/views/car/index')
//     }]
// }, {
//     path: '/gun',
//     component: Layout,
//     redirect: '/gun/index',
//     children: [{
//         path: 'index',
//         name: '保安公司枪支管理',
//         meta: {
//             i18n: 'dict'
//         },
//         component: () =>
//             import( /* webpackChunkName: "views" */ '@/views/gun/index')
//     }]
// },
// {
//     path: '/securityEquipment',
//     component: Layout,
//     redirect: '/securityEquipment',
//     children: [{
//         path: 'equipments',
//         name: '装备管理',
//         meta: {
//             i18n: 'securityEquipment'
//         },
//         component: () =>
//             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/equipments')
//     }, {
//         path: 'car',
//         name: '车辆管理',
//         meta: {
//             i18n: 'car'
//         },
//         component: () =>
//             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/car')
//     }, {
//         path: 'gun',
//         name: '车辆管理',
//         meta: {
//             i18n: 'gun'
//         },
//         component: () =>
//             import( /* webpackChunkName: "views" */ '@/views/securityEquipment/gun')
//     }]
// },
{
    path: '/trainingRegistration',
    component: Layout,
    redirect: '/trainingRegistration/index',
    children: [{
        path: 'index',
        name: '保安培训报名管理',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import ( /* webpackChunkName: "views" */ '@/views/trainingRegistration/index')
    }]
}]

 src/views/dispatch/data.js

@@ -77,7 +77,7 @@
    //     // overHidden: true
    // },
    {
        label: "所属行政区",
        label: "所属辖区",
        prop: "jurisdiction",
        // multiple: true,
        labelWidth: 110,

 src/views/dispatch/dispatchChildoperable.vue

@@ -77,6 +77,7 @@
  update1,
  remove1,
} from "@/api/dispatch/dispatch";
import { getDept } from "@/api/system/dept";

export default {
  data() {
@@ -133,6 +134,8 @@
      //   selection: true,
      //   column: column,
      // },
      deptCategory: "",
      deptId: "",

      loading1: true, //派遣记录
      selectionList1: [],
@@ -150,7 +153,7 @@
        // menu: false,
        searchSize: "mini",
        searchMenuSpan: 8,
        height: 563,
        height: 623,
        cellBtn: false,
        // addBtn: false,
        // menuWidth: 160,
@@ -193,18 +196,25 @@
          },
          {
            label: "派遣单位",
            prop: "id",
            prop: "dispatcherCompany",
            addDisplay: false,
            editDisplay: false,
          },
          {
            label: "派遣单位",
            prop: "dispatcherUnitId",
            labelWidth: 120,
            searchLabelWidth: 120,
            dicUrl: "/api/page-tree",
            dicUrl: "/api/dispatcherUnit/page-tree",
            props: {
              label: "name",
              value: "id",
            },
            hide: true,
            searchSpan: 4,
            search: true,
            overHidden: true,
            type: "select",
            type: "tree",
            rules: [
              {
                required: true,
@@ -233,6 +243,7 @@
            label: "身份证",
            prop: "cardid",
            labelWidth: 120,
            overHidden: true,
            rules: [
              {
                required: true,
@@ -261,6 +272,7 @@
            labelWidth: 120,
            searchSpan: 4,
            search: true,
            overHidden: true,
            rules: [
              {
                required: true,
@@ -277,6 +289,7 @@
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            labelWidth: 120,
            overHidden: true,
            rules: [
              {
                required: true,
@@ -668,6 +681,27 @@
    //   this.obj0.name = " 未选择派遣单位";
    // }
  },
  // onLoad(page, params = {}) {
  //   this.deptId = JSON.parse(
  //       window.localStorage.getItem("saber-userInfo")
  //     ).content.dept_id;

  //     //获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
  //     var that = this;
  //     getDept(this.deptId).then((res) => {
  //       var deptCategory = res.data.data.deptCategory;
  //       deptCategory == 1
  //         ? (that.deptCategory = true)
  //         : (that.deptCategory = false);

  //       if (that.deptCategory) {
  //         params["deptId"] = this.deptId;
  //       }
  //       let values = {
  //         ...params,
  //       };
  //    })
  // }
};
</script>


 src/views/dispatchChild/data.js

@@ -98,10 +98,62 @@
    //     // addDisplay: false
    // },
    {
        label: "保安公司",
        prop: "deptId",
        labelWidth: 120,
        searchLabelWidth: 120,
        searchSpan: 4,
        dicUrl:
            "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
        props: {
            label: "title",
            value: "id",
        },
        search: true,
        overHidden: true,
        type: "select",
        rules: [
            {
                required: true,
                message: "请输入保安公司",
                trigger: "blur",
            },
        ],
    },
    {
        label: "派遣单位",
        prop: "dispatcherCompany",
        addDisplay: false,
        editDisplay: false,
    },
    {
        label: "派遣单位",
        prop: "dispatcherUnitId",
        labelWidth: 120,
        searchLabelWidth: 120,
        dicUrl: "/api/dispatcherUnit/page-tree",
        props: {
            label: "name",
            value: "id",
        },
        hide: true,
        searchSpan: 4,
        search: true,
        overHidden: true,
        type: "tree",
        rules: [
            {
                required: true,
                message: "请输入保安公司",
                trigger: "blur",
            },
        ],
    },
    {
        label: "保安人名称",
        prop: "name",
        search: true,
        searchSpan: 5,
        searchSpan: 4,
        searchLabelWidth: 120
        // overHidden: true
    }, {
@@ -125,7 +177,7 @@
        format: "yyyy-MM-dd hh:mm:ss",
        valueFormat: "timestamp",
        search: true,
        searchSpan: 5,
        searchSpan: 4,
        // overHidden: true
    }, {
        label: "结束时间",

 src/views/trainingRegistration/data.js

@@ -9,10 +9,10 @@
]
var DIC1 = [
    {
        label: '已撤销',
        label: '未撤销',
        value: 1,
    }, {
        label: '未撤销',
        label: '已撤销',
        value: 2,
    }
]