From 9027351c68d5dabf70120f5c1304abebddc3afca Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 22 十一月 2022 18:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
public/inquest_record.docx | 0
vue.config.js | 3 +
package-lock.json | 44 +++++++++++----------
src/views/operate/writManager/components/inquest_record/edit.vue | 14 +++++-
src/views/layout/components/Header/index.vue | 47 +++++++++++++----------
5 files changed, 62 insertions(+), 46 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 4da1edc..59dc656 100644
--- a/package-lock.json
+++ b/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
}
}
diff --git a/public/inquest_record.docx b/public/inquest_record.docx
index a5b6f8e..98a27f7 100644
--- a/public/inquest_record.docx
+++ b/public/inquest_record.docx
Binary files differ
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index de1b36d..015a5b4 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -18,7 +18,7 @@
<el-avatar :size="20" :src="user.user.icon" v-if="user.user.icon"></el-avatar>
<el-avatar :size="20" src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png" v-else>
</el-avatar>
- <span style="padding: 0 5px;">{{ user.user.username}}</span>
+ <span style="padding: 0 5px;">{{ user.user.username }}</span>
<i class="el-icon-arrow-down"></i>
<!-- 鐢ㄦ埛鎿嶄綔 -->
<div class="user-card" v-if="flag.user" @mouseleave="flag.user = false">
@@ -70,10 +70,10 @@
<el-form-item prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="10">
<el-input v-model="info.nickName"></el-input>
</el-form-item>
- <el-form-item prop="nickName" label="鎵�灞炲鍚�" min-width="8">
+ <el-form-item prop="nickName" label="鎵�灞炲鍚�" min-width="8">
<el-input v-model="info.username"></el-input>
</el-form-item>
- <el-form-item prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
+ <el-form-item prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
<el-input v-model="info.mobile"></el-input>
</el-form-item>
<el-form-item prop="jobTitle" label="鎵�灞炶亴鍔�" min-width="8">
@@ -187,40 +187,43 @@
} else {
this.user = await this.getLoginInfo();
}
- this.show = true;
this.getMessage();
+ this.show = true
},
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- async getLoginInfo(){
- const name = sessionStorage.getItem('name');
- let res = await this.$axios({
- method: 'get',
- url: 'sccg/admin/info?name=' + name,
- })
- sessionStorage.setItem('user', JSON.stringify(res.data));
- return res.data;
+ async getLoginInfo() {
+ const name = sessionStorage.getItem('name');
+ let res = await this.$axios({
+ method: 'get',
+ url: 'sccg/admin/info?name=' + name,
+ })
+ sessionStorage.setItem('user', JSON.stringify(res.data));
+ return res.data;
},
getMessage() {
- users.getMessageAuditList({ userId: this.user.user.id })
- .then(res => {
- this.menuMessageList = res;
- this.menuMessageList.forEach(item => {
- this.messageCounts += item.messageNumber;
- })
+ const userInfo = JSON.parse(sessionStorage.getItem('user'));
+ users.getMessageAuditList({ userId: userInfo.user.id })
+ .then(res => {
+ this.menuMessageList = res;
+ this.menuMessageList.forEach(item => {
+ this.messageCounts += item.messageNumber;
})
- .catch(err => this.$message.error(`${err}`))
+ })
+ .catch(err => this.$message.error(`${err}`))
}
}
};
</script>
<style lang="scss" scoped>
- ::v-deep .el-form{
+::v-deep .el-form {
padding: 3vh 5vw;
- .el-form-item__label{
+
+ .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;
diff --git a/src/views/operate/writManager/components/inquest_record/edit.vue b/src/views/operate/writManager/components/inquest_record/edit.vue
index d00b0c4..92e164f 100644
--- a/src/views/operate/writManager/components/inquest_record/edit.vue
+++ b/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(
@@ -267,7 +273,7 @@
"/inquest_record.docx", //"https://docxtemplater.com/tag-example.docx"
function (error, content) {
// eslint-disable-next-line no-debugger
-
+
if (error) {
throw error;
}
@@ -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();
diff --git a/vue.config.js b/vue.config.js
index 957682a..156bf9d 100644
--- a/vue.config.js
+++ b/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
}
},
--
Gitblit v1.8.0