Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-01 4da370f500cbabfbeb75f8006b8a3403656c4c5f

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

 public/img/glba.jpg

 public/img/gldw.jpg

 public/img/glgj.jpg

 public/img/glgz.jpg

 public/img/gltz.jpg

 public/securityPrint.html

@@ -76,6 +76,11 @@
            font-weight: 200;
        }
        
        .img-title {
            width: 100%;
            font-size: 14px;
        }
        
        .table-center-right {
            width: 152px;
            height: 205px;
@@ -92,7 +97,7 @@
            height: 100%;
            display: inline-block;
            vertical-align: middle;
            border-radius: 50px;
            border-radius: 10px;
        }
        
        .security-info {
@@ -139,6 +144,15 @@
        .my-picture {
            width: 150px;
            /* height: 200px; */
        }
        
        .avatar {
            width: 100%;
        }
        
        .qrCode {
            margin-top: 0px;
            margin-left: 25px;
        }
    </style>
    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
@@ -211,7 +225,11 @@
        axios.get('http://223.82.109.183:2080/api/apply/userDetail?id=' + id).then(function(res) {

            var data = res.data.data;
            var str = `<div id="table1"></div>
            var img = data.avatar ? `<div class="avatar"><img src="${data.avatar}"></div>` : `<div class="img-title">暂无照片</div>`
            axios.get('http://223.82.109.183:2080/api/qrCode/getQrCodeBase64?securityNumber=' + data.securitynumber).then(function(res1) {
                console.log(res1.data, 333);
                var qrCode = res1.data ? `<div class="qrCode"><img src="${res1.data}"></div>` : `<div"></div>`
                var str = `<div id="table1"></div>
            <div id="table">
                <div class="table-top">
                    <span>保安员证</span>
@@ -240,15 +258,18 @@
                        </div>
                    </div>
                    <div class="table-center-right">
                            <img src="${data.avatar}">
                        ${img}
                        ${qrCode}
                    </div>
                </div>
            </div>
        </div>`
                    // <img src="${data.avatar}">
                var dom = $('#print');
                dom.empty();
                dom.append(str);
            })

            var dom = $('#print');
            dom.empty();
            dom.append(str);
        })

        function preview(oper) {

 src/config/website.js

@@ -1,6 +1,19 @@
/**
 * 全局配置文件
 */

var fistPage = {
    label: "首页",
    value: "/wel/index",
    params: {},
    query: {},
    meta: {
        i18n: 'dashboard'
    },
    group: [],
    close: false
}

export default {
    title: "saber",
    logo: "S",
@@ -18,17 +31,61 @@
    statusWhiteList: [],
    //配置首页不可关闭
    isFirstPage: false,
    fistPage: {
        label: "首页",
        value: "/wel/index",
        params: {},
        query: {},
        meta: {
            i18n: 'dashboard'
        },
        group: [],
        close: false
    },
    fistPage: fistPage,
    //首页跳转数据
    homePage: [
        {
            userName: 'administrator',
            list: [
                {
                    label: '保安员管理',
                    value: '/securityGuard/index',
                    imgs: 'url(/img/glba.jpg)'
                }, {
                    label: '通知公告',
                    value: '/desk/index',
                    imgs: 'url(/img/gltz.jpg)'
                }, {
                    label: '公司动态',
                    value: '/desk/notification',
                    imgs: 'url(/img/glgj.jpg)'
                }, {
                    label: '单位信息',
                    value: '/securityUnit/localCompany',
                    imgs: 'url(/img/gldw.jpg)'
                }, {
                    label: '统计分析',
                    value: '/securityAnalysis/index',
                    imgs: 'url(/img/glgz.jpg)'
                },]
        }, {
            userName: '保安',
            list: [
                {
                    label: '保安员信息',
                    value: '/securityMan/index',
                    imgs: 'url(/img/yijianbaoj.jpg)'
                }, {
                    label: '派遣记录',
                    value: '/dispatchChildoperableSee/index',
                    imgs: 'url(/img/fangyi.jpg)'
                }, {
                    label: '从业记录',
                    value: '/job/index',
                    imgs: 'url(/img/anjian.jpg)'
                }, {
                    label: '工作汇报',
                    value: '/workreport/workreport',
                    imgs: 'url(/img/tiwen.jpg)'
                }, {
                    label: '表现记录',
                    value: '/expression/index',
                    imgs: 'url(/img/tongji.jpg)'
                },]
        }
    ],


    //配置菜单的属性
    menu: {
        iconDefault: 'iconfont icon-caidan',

 src/views/dispatch/dispatchChildoperable.vue

@@ -29,9 +29,9 @@
  update1,
  remove1,
  getDispatcherUnitByDeptId,
  overDispatcher
  overDispatcher,
} from "@/api/dispatch/dispatch";
import { update,getListByDeptId } from "@/api/system/user";
import { update, getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";

export default {
@@ -279,10 +279,14 @@
  },
  created() {
    if (this.userInfo.role_name == "保安公司管理员") {
      console.log("保安公司管理员登入");
      const deptColumn = this.findObject(this.option1.column, "deptId");
      deptColumn.search = false;
    }else{
      const deptColumn = this.findObject(this.option1.column, "dispatcherUnitId");
    } else {
      const deptColumn = this.findObject(
        this.option1.column,
        "dispatcherUnitId"
      );
      deptColumn.search = false;
    }
  },
@@ -469,7 +473,7 @@
      this.loading1 = true;
      var values;
      //默认查询已派遣的，派遣结束，未派遣的不显示
      params['dispatch'] = 0;
      params["dispatch"] = 0;
      const { releaseTimeRange } = this.query1;
      if (releaseTimeRange) {
        values = {
@@ -518,7 +522,7 @@
            this.option1.column,
            "dispatcherUnitId"
          );
          console.log(res.data.data,111);
          console.log(res.data.data, 111);
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
      }

 src/views/securityMan/index.vue

@@ -2,7 +2,8 @@
  <div class="dispatch">
    <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
    <span v-if="typeTABS.prop === 'tab1'">
      <avue-form ref="form" v-model="obj0" :option="option0" @submit="submit"> </avue-form>
      <avue-form ref="form" v-model="obj0" :option="option0" @submit="submit">
      </avue-form>
    </span>
    <span v-else-if="typeTABS.prop === 'tab2'">
      <avue-crud
@@ -95,7 +96,7 @@
  updateExperience,
  getUserDetails,
  experienceRemove,
  getExperienceList
  getExperienceList,
} from "@/api/experience/experience";

import {
@@ -107,7 +108,7 @@
  getER,
} from "@/api/performance/performance";

import {update as updateUserInfo} from "@/api/system/user";
import { update as updateUserInfo } from "@/api/system/user";

import { mapState } from "vuex";

@@ -116,7 +117,7 @@
    return {
      typeTABS: {}, //标签页
      row: {}, //数据
      isSecurity:false,
      isSecurity: false,
      optionTABS: {
        column: [
          {
@@ -192,7 +193,7 @@
      option2: {
        card: true,
        menu: false,
        addBtn:false,
        addBtn: false,
        height: "auto",
        widtd: "auto",
        calcHeight: 54,
@@ -222,7 +223,6 @@
    ...mapState({
      userInfo: (state) => state.user.userInfo,
    }),
    
  },
  methods: {
    Print() {
@@ -262,7 +262,7 @@
        securityid: this.id,
      };
      //获取用户从业信息
      getExperienceList(this.current, this.size,param).then((res1) => {
      getExperienceList(this.current, this.size, param).then((res1) => {
        const data = res1.data.data;
        this.page1.total = data.total;
        this.data1 = data.records;
@@ -283,7 +283,6 @@
        this.loading2 = false;
      });
    },
    

    rowSave2(form, done, loading) {
      form.securityid = this.id;
@@ -391,56 +390,54 @@
        });
    },
    //信息修改
    submit(){

      updateUserInfo(this.obj0).then(()=>{
          this.$message({
    submit() {
      updateUserInfo(this.obj0).then(() => {
        this.$message({
          type: "success",
          message: "操作成功!",
        });
      })
    }
      });
    },
  },
  mounted() {
    this.typeTABS = this.optionTABS.column[0];
    // var data = JSON.parse(this.$route.query.row);
    //查询保安员信息
    console.log(this.userInfo,456);
    console.log(this.userInfo, 456);
    this.id = this.userInfo.Id;
    var roleName  = this.userInfo.role_name;
    debugger;
    var roleName = this.userInfo.role_name;
    // debugger;
    //如果保安，才能看保安证
    if(roleName=="保安"){
      this.isSecurity= true;
    if (roleName == "保安") {
      this.isSecurity = true;
      this.optionTABS.column = [
          {
            // icon: "el-icon-info",
            label: "保安员基本信息",
            prop: "tab1",
          },
          {
            // icon: "el-icon-info",
            label: "从业记录",
            prop: "tab2",
          },
          {
            // icon: "el-icon-info",
            label: "现实表现记录",
            prop: "tab3",
          },
          {
            // icon: "el-icon-info",
            label: "保安员证",
            prop: "tab4",
          },
        ]
        {
          // icon: "el-icon-info",
          label: "保安员基本信息",
          prop: "tab1",
        },
        {
          // icon: "el-icon-info",
          label: "从业记录",
          prop: "tab2",
        },
        {
          // icon: "el-icon-info",
          label: "现实表现记录",
          prop: "tab3",
        },
        {
          // icon: "el-icon-info",
          label: "保安员证",
          prop: "tab4",
        },
      ];
    }
    getUserDetails(this.id).then((res)=>{
      console.log(res.data.data,123);
    getUserDetails(this.id).then((res) => {
      console.log(res.data.data, 123);
      var data = res.data.data;
      this.obj0 = data;
    })

    });

    var flag = false,
      i = 0,

 src/views/securityUnitChild/index.vue

@@ -878,9 +878,9 @@
          if (roleAlias == "保安公司管理员") {
            that.option0.submitBtn = true;
            for (var k in d) {
              if (d[k].label != "企业类型") {
                d[k].disabled = false;
              }
              // if (d[k].label != "企业类型") {
              d[k].disabled = false;
              // }
            }
          } else {
            that.option0.submitBtn = false;

 src/views/securityUnitChild/social.vue

@@ -76,6 +76,7 @@
  props: ["deptid"],
  data() {
    var deptid = this.deptid;

    return {
      do: 0,
      form: { cardid: "" },
@@ -325,7 +326,7 @@
              res: "data",
            },
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/social/import-user",
            action: "/api/social/import-user?deptid=" + deptid,
          },
          // {
          //   label: "数据覆盖",

 src/views/wel/index.vue

@@ -5,7 +5,20 @@
      <span class="h2">Security service enterprise management platform</span>
    </div>
    <div class="homeL-bar">
      <div class="outS" @click="down1">
      <div
        class="outS"
        v-for="(item, index) in usedata.list"
        :key="index"
        @click="down(item.value)"
      >
        <div
          class="down1"
          :style="{ backgroundImage: item.imgs, color: 'red' }"
        >
          <span>{{ item.label }}</span>
        </div>
      </div>
      <!-- <div class="outS" @click="down1">
        <div class="down1"><span>保安员管理</span></div>
      </div>
      <div class="outS" @click="down2">
@@ -19,33 +32,37 @@
      </div>
      <div class="outS" @click="down5">
        <div class="down5"><span>通知公告</span></div>
      </div>
      </div> -->
    </div>
  </div>
</template>

<script>
import website from "@/config/website";
import { mapGetters } from "vuex";
export default {
  data() {
    return {
      a: 1,
      usedata: {},
    };
  },
  mounted() {
    var data = website.homePage;
    console.log(data);
    console.log(this.userInfo);
    data.forEach((item) => {
      if (item.userName == this.userInfo.role_name) {
        this.usedata = item;
        console.log(this.usedata);
      }
    });
  },
  computed: {
    ...mapGetters(["userInfo"]),
  },
  methods: {
    down1() {
      this.$router.push({ path: "/securityGuard/index" });
    },
    down2() {
      this.$router.push({ path: "/securityUnit/index" });
    },
    down3() {
      this.$router.push({ path: "/dispatch/dispatch" });
    },
    down4() {
      this.$router.push({ path: "/traincompany/index" });
    },
    down5() {
      this.$router.push({ path: "/desk/index" });
    down(path) {
      this.$router.push({ path: path });
    },
  },
  mouted() {},
@@ -130,21 +147,21 @@
        // 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");
    }
    // .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>

 src/views/workreport/data.js

@@ -1,232 +1,232 @@
//已发送列表信息
export var workreportColumn = [{
        label: "汇报时间",
        prop: "reportTime",
        type: "datetime",
        format: "yyyy-MM-dd HH:mm:ss",
        valueFormat: "yyyy-MM-dd HH:mm:ss",
        searchRange: true,
        searchSpan: 6,
        hide: false,
        addDisplay: false,
        editDisplay: false,
        // viewDisplay: false,
        search: false,
        rules: [{
            required: true,
            message: "请输入时间",
            trigger: "blur"
        }]
    }, {
        label: "汇报类别",
        prop: "category",
        type: "select",
        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
        cascaderItem: ["receivedIds"],
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        searchSpan: 5,
        search: true,
        rules: [{
            required: true,
            message: "请选择汇报类别",
            trigger: "blur"
        }]
    }, {
        label: "汇报类型",
        prop: "type",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        searchSpan: 5,
        search: true,
        rules: [{
            required: true,
            message: "请选择汇报类型",
            trigger: "blur"
        }]
    label: "汇报时间",
    prop: "reportTime",
    type: "datetime",
    format: "yyyy-MM-dd HH:mm:ss",
    valueFormat: "yyyy-MM-dd HH:mm:ss",
    searchRange: true,
    searchSpan: 6,
    hide: false,
    addDisplay: false,
    editDisplay: false,
    // viewDisplay: false,
    search: false,
    rules: [{
        required: true,
        message: "请输入时间",
        trigger: "blur"
    }]
}, {
    label: "汇报类别",
    prop: "category",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
    cascaderItem: ["receivedIds"],
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    {
        label: "汇报人身份证号",
        prop: "idCardNo",
        hide: true,
        addDisplay: false,
        editDisplay: false,
        viewDisplay: false,
    dataType: "number",
    searchSpan: 5,
    search: true,
    rules: [{
        required: true,
        message: "请选择汇报类别",
        trigger: "blur"
    }]
}, {
    label: "汇报类型",
    prop: "type",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    {
        label: "汇报内容",
        prop: "content",
        type: "textarea",
        span: 24,
        rules: [{
            required: true,
            message: "请输入汇报内容",
            trigger: "blur"
        }]
    dataType: "number",
    searchSpan: 5,
    search: true,
    rules: [{
        required: true,
        message: "请选择汇报类型",
        trigger: "blur"
    }]
},
{
    label: "汇报人身份证号",
    prop: "idCardNo",
    hide: true,
    addDisplay: false,
    editDisplay: false,
    viewDisplay: false,
},
{
    label: "汇报内容",
    prop: "content",
    type: "textarea",
    span: 24,
    rules: [{
        required: true,
        message: "请输入汇报内容",
        trigger: "blur"
    }]
},
{
    label: "接收人",
    prop: "receivedIds",
    span: 24,
    type: "tree",
    // lazy: true,
    // dicUrl: "/api/blade-system/dept/lazy-tree-user-app?type={{key}}",
    hide: true,
    props: {
        label: "title",
        value: "id",
    },
    {
        label: "接收人",
        prop: "receivedIds",
        span: 24,
        type: "tree",
        // lazy: true,
        // dicUrl: "/api/blade-system/dept/lazy-tree-user-app?type={{key}}",
        hide: true,
        props: {
            label: "title",
            value: "id",
        },
        multiple: true,
        // dataType: "number",
        rules: [{
            required: true,
            message: "请选择接收人",
            trigger: "blur"
        }]
    },
    {
        label: "接收人",
        prop: "replyRealName",
        addDisplay: false,
        editDisplay: false,
        viewDisplay: false,
    },
    {
        label: "接收人单位",
        prop: "replyDeptName",
        addDisplay: false,
        editDisplay: false,
        // viewDisplay: false,
    },
    {
        label: "回复内容",
        prop: "replyContent",
        type: "textarea",
        span: 24,
        addDisplay: false,
        editDisplay: false,
        rules: [{
            required: true,
            message: "请输入回复内容",
            trigger: "blur"
        }]
    }
    multiple: true,
    // dataType: "number",
    rules: [{
        required: true,
        message: "请选择接收人",
        trigger: "blur"
    }]
},
{
    label: "接收人",
    prop: "replyRealName",
    addDisplay: false,
    editDisplay: false,
    viewDisplay: false,
},
{
    label: "接收人单位",
    prop: "replyDeptName",
    addDisplay: false,
    editDisplay: false,
    // viewDisplay: false,
},
{
    label: "回复内容",
    prop: "replyContent",
    type: "textarea",
    span: 24,
    addDisplay: false,
    editDisplay: false,
    rules: [{
        required: true,
        message: "请输入回复内容",
        trigger: "blur"
    }]
}
]


//接收人列信息
export var workreplyColumn = [{
        label: "汇报人",
        prop: "realName",
        disabled: true,
        span: 24,
        rules: [{
            required: true,
            message: "请选择接收人",
            trigger: "blur"
        }]
    label: "汇报人",
    prop: "realName",
    disabled: true,
    span: 24,
    rules: [{
        required: true,
        message: "请选择接收人",
        trigger: "blur"
    }]
},
{
    label: "汇报人单位",
    prop: "deptName",
    addDisplay: false,
    editDisplay: false,
    // viewDisplay: false,
}, {
    label: "汇报时间",
    prop: "reportTime",
    type: "datetime",
    format: "yyyy-MM-dd HH:mm:ss",
    valueFormat: "yyyy-MM-dd HH:mm:ss",
    searchRange: true,
    searchSpan: 6,
    hide: false,
    addDisplay: false,
    editDisplay: false,
    // viewDisplay: false,
    search: false,
    rules: [{
        required: true,
        message: "请输入时间",
        trigger: "blur"
    }]
}, {
    label: "汇报类别",
    prop: "category",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    {
        label: "汇报人单位",
        prop: "deptName",
        addDisplay: false,
        editDisplay: false,
        // viewDisplay: false,
    }, {
        label: "汇报时间",
        prop: "reportTime",
        type: "datetime",
        format: "yyyy-MM-dd HH:mm:ss",
        valueFormat: "yyyy-MM-dd HH:mm:ss",
        searchRange: true,
        searchSpan: 6,
        hide: false,
        addDisplay: false,
        editDisplay: false,
        // viewDisplay: false,
        search: false,
        rules: [{
            required: true,
            message: "请输入时间",
            trigger: "blur"
        }]
    }, {
        label: "汇报类别",
        prop: "category",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        searchSpan: 4,
        search: true,
        hide: true,
        editDisplay: false,
        rules: [{
            required: true,
            message: "请选择汇报类别",
            trigger: "blur"
        }]
    }, {
        label: "汇报类型",
        prop: "type",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        searchSpan: 4,
        search: true,
        disabled: true,
        rules: [{
            required: true,
            message: "请选择汇报类型",
            trigger: "blur"
        }]
    dataType: "number",
    searchSpan: 4,
    search: true,
    hide: true,
    editDisplay: false,
    rules: [{
        required: true,
        message: "请选择汇报类别",
        trigger: "blur"
    }]
}, {
    label: "汇报类型",
    prop: "type",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    // {
    //     label: "汇报人身份证号",
    //     prop: "idCardNo",
    //     hide: true,
    //     addDisplay: false,
    //     editDisplay: false,
    //     viewDisplay: false,
    // },
    {
        label: "汇报内容",
        prop: "content",
        type: "textarea",
        // editDisplay: false,
        disabled: true,
        span: 24,
        rules: [{
            required: true,
            message: "请输入汇报内容",
            trigger: "blur"
        }]
    },
    {
        label: "回复内容",
        prop: "replyContent",
        type: "textarea",
        span: 24,
        rules: [{
            required: true,
            message: "请输入回复内容",
            trigger: "blur"
        }]
    }
    dataType: "number",
    searchSpan: 4,
    search: true,
    disabled: true,
    rules: [{
        required: true,
        message: "请选择汇报类型",
        trigger: "blur"
    }]
},
// {
//     label: "汇报人身份证号",
//     prop: "idCardNo",
//     hide: true,
//     addDisplay: false,
//     editDisplay: false,
//     viewDisplay: false,
// },
{
    label: "汇报内容",
    prop: "content",
    type: "textarea",
    // editDisplay: false,
    disabled: true,
    span: 24,
    rules: [{
        required: true,
        message: "请输入汇报内容",
        trigger: "blur"
    }]
},
{
    label: "回复内容",
    prop: "replyContent",
    type: "textarea",
    span: 24,
    rules: [{
        required: true,
        message: "请输入回复内容",
        trigger: "blur"
    }]
}

]

 src/views/workreport/workreport.vue

@@ -282,8 +282,7 @@
            this.selectionClear();
          });
        });
      }
      if (this.userInfo.role_name == "公安管理员") {
      } else if (this.userInfo.role_name == "公安管理员") {
        const column = that.findObject(that.option.column, "category");
        var code1 = { code: "workReportCategory" };
        getDictionaryBiz(code1).then((res) => {
@@ -313,8 +312,15 @@
            this.selectionClear();
          });
        });
      } else if (this.userInfo.role_name == "administrator") {
        getListPage(page.currentPage, page.pageSize, params).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }

    },
  },
};