Administrator
2021-08-18 ed6d69666ea57947cd3c42a5ce41c11186806488
准考证,保安证,通知公告修改
10 files modified
127 ■■■■■ changed files
public/papers.html 23 ●●●● patch | view | raw | blame | history
public/papersApply.html 2 ●●● patch | view | raw | blame | history
public/securityPrint.html 14 ●●●● patch | view | raw | blame | history
src/styles/element-ui.scss 50 ●●●●● patch | view | raw | blame | history
src/views/applydetailed/index.vue 2 ●●● patch | view | raw | blame | history
src/views/companyApply/index.vue 10 ●●●● patch | view | raw | blame | history
src/views/desk/notice.vue 16 ●●●● patch | view | raw | blame | history
src/views/exam/papers.vue 5 ●●●● patch | view | raw | blame | history
src/views/workreport/data.js 3 ●●●● patch | view | raw | blame | history
src/views/workreport/workreport.vue 2 ●●●●● patch | view | raw | blame | history
public/papers.html
@@ -12,10 +12,27 @@
            justify-content: center;
            flex-direction: column;
        }
        /* .print-header {
            width: 100%;
            text-align: center;
        } */
        .print {
            position: absolute;
            left: 47%;
            top: 58%;
            width: 7%;
            height: 30px;
            border: 0px;
            border-radius: 6px;
            color: #fff;
            background-color: #1D5CE4;
            letter-spacing: 4px;
        }
        
        .user-info-table {
            margin-top: 30px;
            width: 60%;
            width: 90%;
            height: 60%;
            border: 1px solid #000;
            background-color: #fff;
@@ -51,8 +68,8 @@
<body>
    <div>
        <div>
            <button onclick="preview(1)">打印</button>
        <div class="print-header">
            <button onclick="preview(1)" class="print">打印</button>
        </div>
        <!--startprint-->
        <div id="table">
public/papersApply.html
@@ -55,7 +55,7 @@
<body>
    <div>
        <div>
            <button onclick="preview(1)">打印</button>
            <button onclick="preview(1)" class="print">打印</button>
        </div>
        <!--startprint-->
        <div id="table">
public/securityPrint.html
@@ -12,13 +12,19 @@
            /* display: flex; */
            align-items: center;
            justify-content: center;
            background-color: #666666;
        }
        
        .print {
            position: absolute;
            left: 20px;
            top: 10px;
            left: 43%;
            top: 60%;
            width: 7%;
            height: 36px;
            border-radius: 9px;
            background-color: #1D5CE4;
            border: 0px;
            color: #fff;
            letter-spacing: 4px;
        }
        
        #table {
@@ -185,6 +191,8 @@
        </div>
    </div>
    <script>
        var getData = function(name) {
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;
}
@@ -89,7 +89,6 @@
//     box-shadow: none !important;
//     height: 40px;
// }
// //取消顶部搜索栏
// .user .el-card.is-never-shadow.avue-crud__search {
//     position: relative !important;
@@ -99,116 +98,93 @@
//     box-shadow: none !important;
//     height: auto;
// }
// .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;
// }
// .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;
// }
// .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;
// }
// .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;
// }
// .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;
// }
// .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;
// }
// .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-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-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;
// }
// .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;
// }
// .avue-form {
//     position: relative;
//     top: -10px;
// }
// //顶部按钮栏
// .avue-crud__menu {
//     height: 60px;
// }
// //顶部按钮
// .avue-crud .avue-crud__left .el-button,
// .avue-crud .avue-crud__right .el-button,
@@ -225,6 +201,7 @@
.avue-form__menu--center .el-button {
    float: left;
}
.avue-form__menu--center .el-button:nth-child(1) {
    margin-left: 30px;
}
@@ -262,8 +239,17 @@
}
//top 导航 按钮
.el-menu--horizontal > .el-menu-item.is-active,
.el-menu--horizontal>.el-menu-item.is-active,
.avue-top,
.el-dropdown {
    color: #fff !important;
}
.securityPapers {
    width: 100%;
    height: 100%;
    background-color: #f4f6f8;
    position: absolute;
    top: 40px;
    left: 0;
}
src/views/applydetailed/index.vue
@@ -54,7 +54,7 @@
                :type="type"
                size="small"
                icon="el-icon-receiving"
                :disabled="row.applyStatus == 4"
                :disabled="row.candidateNo==''"
                @click="handlePrint(row)"
                >准考证打印
              </el-button>
src/views/companyApply/index.vue
@@ -53,7 +53,7 @@
                :type="type"
                size="small"
                icon="el-icon-folder-checked"
                v-if="row.isApply == 2 || row.isApply == -1"
                v-if="row.isApply == 2 || row.isApply == -1 || row.isApply == 3"
                @click="questionBankRowSave(row)"
                >报名
              </el-button>
@@ -120,6 +120,10 @@
    {
      label: "已取消",
      value: 2,
    },
    {
      label: "考试结束",
      value: 3,
    },
  ],
};
@@ -375,8 +379,8 @@
                value: 2,
              },
              {
                label: "",
                value: -1,
                label: "考试结束",
                value: 3,
              },
            ],
            dataType: "number",
src/views/desk/notice.vue
@@ -55,6 +55,7 @@
import { getListPage, remove, update, add, getNotice } from "@/api/desk/notice";
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
import { mapState } from 'vuex';
export default {
  data() {
@@ -223,8 +224,13 @@
      });
      return ids.join(",");
    },
    ...mapState({
        userInfo: state => state.user.userInfo
    })
  },
  mounted() {},
  mounted() {
    this.getDeptInfo(this.userInfo.dept_id);
  },
  methods: {
    //获取当前用户部门信息
    getDeptInfo(deptId) {
@@ -254,7 +260,11 @@
      });
    },
    rowSave(row, done, loading) {
      row.category = 1;
      if (this.deptCategory) {
        row.category = 1;
      }else{
        row.category = 2;
      }
      row.deptId = this.deptId;
      add(row).then(
        () => {
@@ -384,7 +394,7 @@
        const { releaseTimeRange } = this.query;
        // if (that.deptCategory) {
        params["deptId"] = this.deptId;
        // params["deptId"] = this.deptId;
        params["jurisdiction"] = this.jurisdiction;
        // }
        let values = {
src/views/exam/papers.vue
@@ -1,6 +1,9 @@
<template>
  <!-- <iframe src="http://124.71.113.22/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe> -->
<div class="securityPapers">
  <iframe :src="url" style="width: 100%; height: 100%" frameborder="0"></iframe>
</div>
  <!-- <iframe src="http://124.71.113.22/map/index.html?openid=PatrolManagement" style="width: 100%;height: 100%" frameborder="0"></iframe> -->
</template>
<script>
src/views/workreport/data.js
@@ -76,7 +76,8 @@
        prop: "receivedIds",
        span: 24,
        type: "tree",
        // dicUrl: "/api/blade-system/dept/lazy-tree-user",
        // lazy: true,
        // dicUrl: "/api/blade-system/dept/lazy-tree-user?parentId=0",
        hide: true,
        props: {
            label: "title",
src/views/workreport/workreport.vue
@@ -80,6 +80,8 @@
        searchMenuSpan: 6,
        border: false,
        addBtnText: "发起",
        saveBtnText: "发起",
        addTitle: "发起",
        index: true,
        stripe: true,
        viewBtn: true,