Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-22 9027351c68d5dabf70120f5c1304abebddc3afca

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/layout/components/Header/index.vue

 package-lock.json

@@ -1951,6 +1951,29 @@
        "webpack-merge": "^5.7.3",
        "webpack-virtual-modules": "^0.4.2",
        "whatwg-fetch": "^3.6.2"
      },
      "dependencies": {
        "@vue/vue-loader-v15": {
          "version": "npm:vue-loader@15.10.1",
          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
          "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
          "dev": true,
          "requires": {
            "@vue/component-compiler-utils": "^3.1.0",
            "hash-sum": "^1.0.2",
            "loader-utils": "^1.1.0",
            "vue-hot-reload-api": "^2.3.0",
            "vue-style-loader": "^4.1.0"
          },
          "dependencies": {
            "hash-sum": {
              "version": "1.0.2",
              "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
              "dev": true
            }
          }
        }
      }
    },
    "@vue/cli-shared-utils": {
@@ -2057,27 +2080,6 @@
          "version": "2.1.2",
          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
          "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
          "dev": true
        }
      }
    },
    "@vue/vue-loader-v15": {
      "version": "npm:vue-loader@15.10.1",
      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
      "dev": true,
      "requires": {
        "@vue/component-compiler-utils": "^3.1.0",
        "hash-sum": "^1.0.2",
        "loader-utils": "^1.1.0",
        "vue-hot-reload-api": "^2.3.0",
        "vue-style-loader": "^4.1.0"
      },
      "dependencies": {
        "hash-sum": {
          "version": "1.0.2",
          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
          "dev": true
        }
      }

 public/inquest_record.docx

Binary files differ

 src/views/layout/components/Header/index.vue

@@ -187,8 +187,8 @@
      } else {
        this.user = await this.getLoginInfo();
      }
      this.show = true;
      this.getMessage();
      this.show = true
    },
    // 获取登录用户信息
    async getLoginInfo(){
@@ -201,7 +201,8 @@
        return res.data;
    },
    getMessage() {
      users.getMessageAuditList({ userId: this.user.user.id })
      const userInfo = JSON.parse(sessionStorage.getItem('user'));
      users.getMessageAuditList({ userId: userInfo.user.id })
          .then(res => {
            this.menuMessageList = res;
            this.menuMessageList.forEach(item => {
@@ -217,10 +218,12 @@
<style lang="scss" scoped>
 ::v-deep .el-form{
  padding: 3vh 5vw;

   .el-form-item__label{
    color: #4b9bb7;
  }
}

.el-header {
  background-color: #071a38;
  color: #333;
@@ -236,6 +239,7 @@
  .header-left {
    display: flex;
    flex: 1;

    .menu-left__item {
      width: 120px;

@@ -262,6 +266,7 @@
    display: flex;
    padding-left: 10vw;
    flex: 1;

    .item {
      width: 100%;
      position: relative;

 src/views/operate/writManager/components/inquest_record/edit.vue

@@ -260,6 +260,12 @@
      });
    },
    handlePrint(e) {},
    judgeLength(word, length) {
      for (let index = 0; word.length < length; index++) {
        word += " ";
      }
      return word;
    },
    handleExport(e) {
      let that = this;
      loadFile(
@@ -276,8 +282,10 @@
            paragraphLoop: true,
            linebreaks: true,
          });
          
          doc.setData(that.form);
          var data = that.form;
          data.jc_address = that.judgeLength(data.jc_address, 33);
          debugger;
          doc.setData(data);
          /*向文档中写入数据*/
          doc.render();


 vue.config.js

@@ -39,7 +39,8 @@
    proxy: {
      // 跨域配置
      "/sccg": {
        target: `http://42.193.1.25:8082/`,
        target: `http://42.193.1.25/`,
        // target: `http://127.0.0.1:8082/`,
        changeOrigin: true
      }
    },