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

Administrator

2021-08-07 adf8980d8563fe03a2d4d626c0ab3235f8263fe9

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

 public/img/anjian.jpg

 public/img/big-img-close.png

 public/img/bjkeji.png

 public/img/bjkeji2.jpg

 public/img/fangyi.jpg

 public/img/tiwen.jpg

 public/img/tongji.jpg

 public/img/yijianbaoj.jpg

 src/config/website.js

@@ -8,7 +8,7 @@
    indexTitle: '保安服务企业管理',
    clientId: 'saber', // 客户端id
    clientSecret: 'saber_secret', // 客户端密钥
    tenantMode: true, // 是否开启保安单位模式
    tenantMode: false, // 是否开启保安单位模式 租户ID
    tenantId: "000000", // 管理组保安单位编号
    captchaMode: false, // 是否开启验证码模式
    lockPage: '/lock',
@@ -45,4 +45,4 @@
    flowDesignUrl: 'http://localhost:9999',
    // 报表设计器地址(cloud端口为8108,boot端口为80)
    reportUrl: 'http://localhost:8108/ureport',
}
}

 src/page/login/userlogin.vue

@@ -78,9 +78,9 @@
          //保安单位ID
          tenantId: "000000",
          //用户名
          username: "admin",
          username: "ncsadmin",
          //密码
          password: "admin",
          password: "123456",
          //账号类型
          type: "account",
          //验证码的值

 src/router/views/index.js

@@ -389,7 +389,7 @@
        redirect: '/trainingRegistration/index',
        children: [{
            path: 'index',
            name: '培训人员列表',
            name: '保安培训报名管理',
            meta: {
                i18n: 'dict'
            },
@@ -765,12 +765,52 @@
        redirect: '/traincompany/index',
        children: [{
            path: 'index',
            name: '保安培训报名',
            name: '培训公司查询',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/traincompany/index')
        }]
    }, {
        path: '/dispatchChildoperableSee',
        component: Layout,
        redirect: '/dispatchChildoperableSee/index',
        children: [{
            path: 'index',
            name: '派遣记录',
            meta: {
                i18n: 'index'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/dispatch/dispatchChildoperableSee')
        }]
    },
    // {
    //     path: '/people',
    //     component: Layout,
    //     redirect: '/people/expression',
    //     children: [{
    //         path: 'expression',
    //         name: '表现记录查看',
    //         meta: {
    //             i18n: 'expression'
    //         },
    //         component: () =>
    //             import( /* webpackChunkName: "views" */ '@/views/people/expression')
    //     }]
    // }, {
    //     path: '/people',
    //     component: Layout,
    //     redirect: '/people/job',
    //     children: [{
    //         path: 'job',
    //         name: '从业记录查看',
    //         meta: {
    //             i18n: 'job'
    //         },
    //         component: () =>
    //             import( /* webpackChunkName: "views" */ '@/views/people/job')
    //     }]
    // },
]

 src/styles/element-ui.scss

@@ -20,7 +20,7 @@
}

.el-menu--display,
.el-menu--display+.el-submenu__icon-arrow {
.el-menu--display + .el-submenu__icon-arrow {
    display: none;
}

@@ -49,17 +49,17 @@

.el-dropdown-menu__item--divided:before,
.el-menu,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
    background-color: transparent;
}

.el-dropdown-menu__item--divided:before,
.el-menu,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
    background-color: transparent !important;
}

@@ -80,143 +80,143 @@
    // background-color: rgba($color: #000000, $alpha: 0.1) !important;
}

//顶部搜索栏
.el-card.is-never-shadow.avue-crud__search {
    position: absolute !important;
    width: calc(100% - 220px) !important;
    z-index: 500 !important;
    border: none !important;
    box-shadow: none !important;
    height: 40px;
}
// //顶部搜索栏
// .el-card.is-never-shadow.avue-crud__search {
//     position: absolute !important;
//     width: calc(100% - 220px) !important;
//     z-index: 500 !important;
//     border: none !important;
//     box-shadow: none !important;
//     height: 40px;
// }

//取消顶部搜索栏
.user .el-card.is-never-shadow.avue-crud__search {
    position: relative !important;
    width: auto !important;
    z-index: 500 !important;
    border: none !important;
    box-shadow: none !important;
    height: auto;
}
// //取消顶部搜索栏
// .user .el-card.is-never-shadow.avue-crud__search {
//     position: relative !important;
//     width: auto !important;
//     z-index: 500 !important;
//     border: none !important;
//     box-shadow: none !important;
//     height: auto;
// }

.desk .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 360px) !important;
}
// .desk .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 360px) !important;
// }

.securityGuard .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 300px) !important;
    left: 120px;
}
// .securityGuard .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 300px) !important;
//     left: 120px;
// }

.securityUnit .el-card.is-never-shadow.avue-crud__search {
    left: 200px;
    width: calc(100% - 380px) !important;
}
// .securityUnit .el-card.is-never-shadow.avue-crud__search {
//     left: 200px;
//     width: calc(100% - 380px) !important;
// }

.equipments .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 380px) !important;
    left: 200px;
}
// .equipments .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 380px) !important;
//     left: 200px;
// }

.dispatch .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 380px) !important;
    left: 200px;
}
// .dispatch .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 380px) !important;
//     left: 200px;
// }

.dispatchChildoperable .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 280px) !important;
    left: 90px;
}
// .dispatchChildoperable .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 280px) !important;
//     left: 90px;
// }

.workreply .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 380px) !important;
    left: 200px !important;
}
// .workreply .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 380px) !important;
//     left: 200px !important;
// }

.recruitmentManagement .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 380px) !important;
    left: 120px !important;
}
// .recruitmentManagement .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 380px) !important;
//     left: 120px !important;
// }

.hasButOne .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 300px) !important;
    left: 120px !important;
}
// .hasButOne .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 300px) !important;
//     left: 120px !important;
// }

.hasButTwo .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 380px) !important;
    left: 200px !important;
}
// .hasButTwo .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 380px) !important;
//     left: 200px !important;
// }

.desk1 .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 410px) !important;
    left: 200px !important;
}
// .desk1 .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 410px) !important;
//     left: 200px !important;
// }

.topmenu .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 390px) !important;
    left: 220px !important;
}
// .topmenu .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 390px) !important;
//     left: 220px !important;
// }

.hasButThree .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 510px) !important;
    left: 310px !important;
}
// .hasButThree .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 510px) !important;
//     left: 310px !important;
// }

.morpheus-box .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 590px) !important;
    left: 420px !important;
}
// .morpheus-box .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 590px) !important;
//     left: 420px !important;
// }

.morpheus-box-exam .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 390px) !important;
    left: 20px !important;
}
// .morpheus-box-exam .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 390px) !important;
//     left: 20px !important;
// }

.morpheus-box-paper .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 390px) !important;
    left: 220px !important;
}
// .morpheus-box-paper .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 390px) !important;
//     left: 220px !important;
// }

.morpheus-box-score .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 390px) !important;
    left: 150px !important;
}
// .morpheus-box-score .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 390px) !important;
//     left: 150px !important;
// }

.morpheus-box-apply-exam .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 390px) !important;
    left: 120px !important;
}
// .morpheus-box-apply-exam .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 390px) !important;
//     left: 120px !important;
// }

.desk .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 390px) !important;
    left: 280px !important;
}
// .desk .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 390px) !important;
//     left: 280px !important;
// }

.morpheus-box-apply-exam-1 .el-card.is-never-shadow.avue-crud__search {
    width: calc(100% - 390px) !important;
    left: 220px !important;
}
// .morpheus-box-apply-exam-1 .el-card.is-never-shadow.avue-crud__search {
//     width: calc(100% - 390px) !important;
//     left: 220px !important;
// }

.avue-form {
    position: relative;
    top: -10px;
}
// .avue-form {
//     position: relative;
//     top: -10px;
// }

//顶部按钮栏
.avue-crud__menu {
    height: 60px;
}
// //顶部按钮栏
// .avue-crud__menu {
//     height: 60px;
// }

//顶部按钮
.avue-crud .avue-crud__left .el-button,
.avue-crud .avue-crud__right .el-button,
.avue-form .avue-crud__left .el-button,
.avue-form .avue-crud__right .el-button {
    position: relative;
    top: 5px;
}
// //顶部按钮
// .avue-crud .avue-crud__left .el-button,
// .avue-crud .avue-crud__right .el-button,
// .avue-form .avue-crud__left .el-button,
// .avue-form .avue-crud__right .el-button {
//     position: relative;
//     top: 5px;
// }

//左侧导航栏
.avue-logo {
@@ -251,8 +251,8 @@
}

//top 导航 按钮
.el-menu--horizontal>.el-menu-item.is-active,
.el-menu--horizontal > .el-menu-item.is-active,
.avue-top,
.el-dropdown {
    color: #fff !important;
}
}

 src/views/dispatch/dispatchChildoperableSee.vue

New file
@@ -0,0 +1,10 @@
<template>
  <div>543435</div>
</template>

<script>
export default {};
</script>

<style>
</style>

 src/views/wel/index.vue

@@ -1,40 +1,150 @@
<template>
  <div>
    <el-row>
      <el-col :span="24">
        <third-register></third-register>
      </el-col>
    </el-row>


  <div id="homeL">
    <div class="homeL-up">
      <span class="h1">保安服务企业管理平台</span>
      <span class="h2">Security service enterprise management platform</span>
    </div>
    <div class="homeL-bar">
      <div class="outS" @click="down1">
        <div class="down1"><span>保安员管理</span></div>
      </div>
      <div class="outS" @click="down2">
        <div class="down2"><span>保安单位</span></div>
      </div>
      <div class="outS" @click="down3">
        <div class="down3"><span>派遣管理</span></div>
      </div>
      <div class="outS" @click="down4">
        <div class="down4"><span>培训公司</span></div>
      </div>
      <div class="outS" @click="down5">
        <div class="down5"><span>通知公告</span></div>
      </div>
    </div>
  </div>
</template>

<script>
  import {mapGetters} from "vuex";

  export default {
    name: "wel",
    data() {
      return {
        activeNames: ['1', '2', '3', '5'],
        logActiveNames: ['23']
      };
export default {
  data() {
    return {
      a: 1,
    };
  },
  methods: {
    down1() {
      this.$router.push({ path: "/securityGuard/index" });
    },
    computed: {
      ...mapGetters(["userInfo"]),
    down2() {
      this.$router.push({ path: "/securityUnit/index" });
    },
    methods: {
      handleChange(val) {
        window.console.log(val);
      }
    down3() {
      this.$router.push({ path: "/dispatch/dispatch" });
    },
  };
    down4() {
      this.$router.push({ path: "/traincompany/index" });
    },
    down5() {
      this.$router.push({ path: "/desk/index" });
    },
  },
  mouted() {},
};
</script>

<style>
  .el-font-size {
    font-size: 14px;
<style lang="scss">
#homeL {
  width: 100%;
  height: 96%;
  //   border: 1px solid #000;
  .homeL-up {
    width: 100%;
    height: 70%;
    // border: 1px solid rgb(39, 164, 185);
    display: flex;
    align-items: center;
    justify-content: center;
    flex-direction: column;
    background-image: url("../../../public/img/bjkeji.png");
    background-color: #fff;
    background-repeat: no-repeat;
    background-size: 100% 100%;
    -moz-background-size: 100% 100%;
    color: #4ba3fe;
    .h1,
    .h2 {
      position: relative;
      left: 18%;
    }
    .h1 {
      font-size: 54px;
    }
    .h2 {
      font-size: 28px;
    }
  }
</style>

  .homeL-bar {
    width: 100%;
    height: 30%;
    position: relative;
    top: 2.5px;
    // border: 1px solid rgb(51, 22, 180);
    display: flex;
    align-items: center;
    justify-content: center;
    .outS {
      width: 20%;
      height: 100%;
      //   border: 1px solid rgb(180, 22, 75);
      display: flex;
      align-items: center;
      justify-content: center;
    }
    .down1,
    .down2,
    .down3,
    .down4,
    .down5 {
      width: 96%;
      height: 96%;
      background-repeat: no-repeat;
      background-size: 100% 100%;
      cursor: pointer;
      display: flex;
      align-items: center;
      justify-content: center;
      border-radius: 5px;
      &:hover {
        width: 99%;
        height: 99%;
        transition: all 0.3s ease;
      }
      span {
        position: relative;
        top: -30px;
        left: -50px;
        font-weight: 600;
        font-size: 30px;
        color: #fff;
        display: inline-block;
        // border: 1px solid rgb(180, 22, 75);
      }
    }
    .down1 {
      background-image: url("../../../public/img/yijianbaoj.jpg");
    }
    .down2 {
      background-image: url("../../../public/img/fangyi.jpg");
    }
    .down3 {
      background-image: url("../../../public/img/anjian.jpg");
    }
    .down4 {
      background-image: url("../../../public/img/tiwen.jpg");
    }
    .down5 {
      background-image: url("../../../public/img/tongji.jpg");
    }
  }
}
</style>

 vue.config.js

@@ -29,7 +29,8 @@
        //本地服务接口地址
        // target: 'http://localhost',
        // target: 'http://192.168.0.114:81',//钟W
        target: 'http://localhost:81',//原W
        // target: 'http://localhost:81',//原W
        target: 'http://192.168.0.108:81',//原W
        // target: 'http://192.168.0.104:80',//唐N
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',