From 7afa7c7ad7d7f1250a086a406453a7cbc8b5cbd5 Mon Sep 17 00:00:00 2001
From: tian <3072314689@qq.com>
Date: 星期二, 23 九月 2025 19:35:55 +0800
Subject: [PATCH] 合并‘
---
src/views/archiveManager/archiveMaterial/index.vue | 31 +++---
src/views/archiveProjectName/index.vue | 55 +++++++++-
src/views/archiveExport/index.vue | 6
src/views/login.vue | 10 +
package-lock.json | 27 +++++
src/views/archivePlaceName/index.vue | 18 +++
src/views/archiveToUserStatistic/index.vue | 2
src/views/archiveCategory/index.vue | 10 +
src/views/archiveManager/index.vue | 97 ++++++++++++++++++-
src/views/archiveStatics/index.vue | 4
10 files changed, 219 insertions(+), 41 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index db53f18..022a088 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3626,6 +3626,17 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/bindings": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "file-uri-to-path": "1.0.0"
+ }
+ },
"node_modules/bluebird": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -7457,6 +7468,14 @@
"resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
},
+ "node_modules/file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/filesize": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -10503,6 +10522,14 @@
"thenify-all": "^1.0.0"
}
},
+ "node_modules/nan": {
+ "version": "2.23.0",
+ "resolved": "https://registry.npmmirror.com/nan/-/nan-2.23.0.tgz",
+ "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/nanoid": {
"version": "3.3.11",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
diff --git a/src/views/archiveCategory/index.vue b/src/views/archiveCategory/index.vue
index 6e46542..08e91ef 100644
--- a/src/views/archiveCategory/index.vue
+++ b/src/views/archiveCategory/index.vue
@@ -134,10 +134,10 @@
<!-- 娣诲姞鎴栦慨鏀广�愯濉啓鍔熻兘鍚嶇О銆戝璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="缂栧彿" prop="numb">
+ <el-form-item label="缂栧彿" prop="numb" required>
<el-input v-model="form.numb" placeholder="璇疯緭鍏ョ紪鍙�" />
</el-form-item>
- <el-form-item label="鍚嶇О" prop="nname">
+ <el-form-item label="鍚嶇О" prop="nname" required>
<el-input v-model="form.nname" placeholder="璇疯緭鍏ュ悕绉�" />
</el-form-item>
</el-form>
@@ -185,6 +185,12 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ numb: [
+ { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' }
+ ],
+ nname: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }
+ ]
}
}
},
diff --git a/src/views/archiveExport/index.vue b/src/views/archiveExport/index.vue
index f390598..3eb3e61 100644
--- a/src/views/archiveExport/index.vue
+++ b/src/views/archiveExport/index.vue
@@ -258,7 +258,7 @@
</el-row>
</el-form-item>
<el-form-item label="鍙戞枃鍙�" prop="inquiryNumber">
- <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂闂彿" disabled/>
+ <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂鏂囧彿" disabled/>
</el-form-item>
<el-form-item label="寤鸿椤圭洰鍚嶇О" prop="projectName">
<el-input v-model="form.projectName" placeholder="璇疯緭鍏ュ缓璁鹃」鐩悕绉�" disabled/>
@@ -380,7 +380,7 @@
</el-row>
</el-form-item>
<el-form-item label="鍙戞枃鍙�" prop="inquiryNumber">
- <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂闂彿" :disabled="userId!=1"
+ <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂鏂囧彿" :disabled="userId!=1"
/>
</el-form-item>
<el-form-item label="椤圭洰鍚嶇О" prop="everyProjectName">
@@ -595,7 +595,7 @@
{ required: true, message: "妗ｆ鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
inquiryNumber: [
- { required: true, message: "鍙戦棶鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ { required: true, message: "鍙戞枃鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
everyProjectName: [
{ required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: ['change', 'blur']}
diff --git a/src/views/archiveManager/archiveMaterial/index.vue b/src/views/archiveManager/archiveMaterial/index.vue
index e9f1ffb..d8a3c55 100644
--- a/src/views/archiveManager/archiveMaterial/index.vue
+++ b/src/views/archiveManager/archiveMaterial/index.vue
@@ -24,9 +24,8 @@
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鏃ユ湡">
</el-date-picker> -->
- <el-col :span="8">
- <el-input v-model="form.date" placeholder="璇疯緭鍏ユ棩鏈�" />
- </el-col>
+ <el-input v-model="form.date" placeholder="璇疯緭鍏ユ棩鏈� (鏍煎紡锛歽yyy-mm-dd)" style="width: 450px;" />
+ <!-- <div style="color: #999; font-size: 12px; margin-top: 4px;">璇疯緭鍏ユ纭殑鏃ユ湡鏍煎紡锛歽yyy-mm-dd</div> -->
</el-form-item>
@@ -52,10 +51,9 @@
</el-form-item>
<el-form-item
- label="椤靛彿"
- prop="pageNumber"
- v-if=" form.fileStyle !== '鍏朵粬鏉愭枡'"
->
+ label="椤靛彿"
+ prop="pageNumber"
+ v-if=" form.fileStyle !== '鍏朵粬鏉愭枡'">
<el-col :span="8">
<el-input
v-model="form.pageNumber"
@@ -315,7 +313,7 @@
<el-table-column label="瀹藉害" align="center" prop="width" />
<el-table-column label="楂樺害" align="center" prop="height" />
<el-table-column label="澶у皬" align="center" prop="fileSize" />
- <el-table-column label="闄勪欢鍙婂巻鍙插彂闂彿" align="center" prop="attachmentHistoryNumbers" />
+ <el-table-column label="闄勪欢鍙婂巻鍙插彂鏂囧彿" align="center" prop="attachmentHistoryNumbers" />
<el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding ">
<template slot-scope="scope">
@@ -356,7 +354,7 @@
<el-form ref="forms" :model="forms" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
- 8<el-form-item label="璐ｄ换鑰�" prop="creator">
+ <el-form-item label="璐ｄ换鑰�" prop="creator">
<el-input v-model="forms.creator" placeholder="璇疯緭鍏ヨ矗浠昏��" />
</el-form-item>
</el-col>
@@ -367,15 +365,13 @@
</el-col>
</el-row>
<el-form-item label="鏃ユ湡" prop="date">
+ <el-input v-model="forms.date" placeholder="璇疯緭鍏ユ棩鏈� (鏍煎紡锛歽yyy-mm-dd)" style="width: 200px;" />
<!-- <el-date-picker clearable
v-model="forms.date"
- type="date"
+ type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鏃ユ湡">
</el-date-picker> -->
-
- <el-input v-model="forms.date" placeholder="璇疯緭鍏ユ棩鏈�" prop="date"/>
-
</el-form-item>
<!-- <el-form-item label="椤垫" prop="pageOrder">
<el-input v-model="forms.pageOrder" placeholder="璇疯緭鍏ラ〉娆�" />
@@ -530,12 +526,14 @@
/>
</el-form-item>
<el-form-item label="鏃ユ湡" prop="date">
- <el-date-picker clearable
+ <el-input v-model="queryParams.date" placeholder="璇疯緭鍏ユ棩鏈� (鏍煎紡锛歽yyy-mm-dd)" />
+ <div style="color: #999; font-size: 12px; margin-top: 4px;">璇疯緭鍏ユ纭殑鏃ユ湡鏍煎紡锛歽yyy-mm-dd</div>
+ <!-- <el-date-picker clearable
v-model="queryParams.date"
type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鏃ユ湡">
- </el-date-picker>
+ </el-date-picker> -->
</el-form-item>
<el-form-item label="椤靛彿" prop="pageNumber">
<el-input
@@ -809,7 +807,8 @@
{ required: true, message: "妗堝嵎棰樺悕涓嶈兘涓虹┖", trigger: "blur" }
],
date: [
- { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
+ { pattern: /^\d{4}-\d{2}-\d{2}$/, message: "鏃ユ湡鏍煎紡蹇呴』涓簓yyy-mm-dd", trigger: "blur" }
],
}
}
diff --git a/src/views/archiveManager/index.vue b/src/views/archiveManager/index.vue
index 5087411..a3f7aa2 100644
--- a/src/views/archiveManager/index.vue
+++ b/src/views/archiveManager/index.vue
@@ -126,6 +126,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <!-- 娣诲姞椤圭洰鍚嶇О鎼滅储妗� -->
+ <el-form-item label="椤圭洰鍚嶇О" prop="everyProjectName">
+ <el-select
+ v-model="queryParams.everyProjectName"
+ placeholder="璇烽�夋嫨椤圭洰鍚嶇О"
+ clearable
+ >
+ <el-option
+ v-for="item in projectOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="椤圭洰缂栧彿" prop="projectNumber">
<el-input
v-model="queryParams.projectNumber"
@@ -360,7 +375,7 @@
</el-row>
</el-form-item>
<el-form-item label="鍙戞枃鍙�" prop="inquiryNumber">
- <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂闂彿" disabled/>
+ <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂鏂囧彿" disabled/>
</el-form-item>
<el-form-item label="寤鸿椤圭洰鍚嶇О" prop="projectName">
<el-input v-model="form.projectName" placeholder="璇疯緭鍏ュ缓璁鹃」鐩悕绉�" disabled/>
@@ -482,7 +497,7 @@
</el-row>
</el-form-item>
<el-form-item label="鍙戞枃鍙�" prop="inquiryNumber">
- <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂闂彿" :disabled="userId!=1"
+ <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂鏂囧彿" :disabled="userId!=1"
/>
</el-form-item>
<el-form-item label="椤圭洰鍚嶇О" prop="everyProjectName">
@@ -505,7 +520,7 @@
<div v-if="vis">
<el-form-item label="妗堝嵎棰樺悕" prop="caseTitle">
- <el-input v-model="form.caseTitle" placeholder="璇疯緭鍏ユ鍗烽鍚�" />
+ <el-input v-model="form.caseTitle" placeholder="鑷姩鐢熸垚" :readonly="true" />
</el-form-item>
<el-form-item label="鍏紑灞炴��" prop="publicAttribute">
@@ -576,7 +591,8 @@
<el-input v-model="form.constructionAddress" placeholder="璇疯緭鍏ュ缓璁惧湴鍧�" />
</el-form-item>
<el-form-item label="寤鸿椤圭洰鍚嶇О" prop="projectName">
- <el-input v-model="form.projectName" placeholder="璇疯緭鍏ュ缓璁鹃」鐩悕绉�" :disabled="userId!=1"/>
+ <el-input v-model="form.projectName" placeholder="璇疯緭鍏ュ缓璁鹃」鐩悕绉�" />
+ <!-- <el-input v-model="form.projectName" placeholder="璇疯緭鍏ュ缓璁鹃」鐩悕绉�" :disabled="userId!=1"/> -->
</el-form-item>
<el-form-item label="椤圭洰缂栧彿" prop="projectNumber">
<el-input v-model="form.projectNumber" placeholder="璇疯緭鍏ラ」鐩紪鍙�" />
@@ -695,11 +711,20 @@
{ required: true, message: "妗ｆ鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
inquiryNumber: [
- { required: true, message: "鍙戦棶鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ { required: true, message: "鍙戞枃鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
everyProjectName: [
{ required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: ['change', 'blur']}
],
+ caseTitle: [
+ { required: true, message: "妗堝嵎棰樺悕涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ constructionUnit: [
+ { required: true, message: "寤鸿鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ projectName: [
+ { required: true, message: "寤鸿椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ ]
}
}
},
@@ -714,6 +739,26 @@
this.fetchProjectOptions()
this.getList()
},
+ watch: {
+ 'form.constructionUnit': {
+ handler() {
+ this.generateCaseTitle();
+ },
+ immediate: true
+ },
+ 'form.constructionAddress': {
+ handler() {
+ this.generateCaseTitle();
+ },
+ immediate: true
+ },
+ 'form.projectName': {
+ handler() {
+ this.generateCaseTitle();
+ },
+ immediate: true
+ }
+ },
methods: {
getId()
{
@@ -727,6 +772,24 @@
// alert(this.maxId)
})
+ },
+ // 鐢熸垚妗堝嵎棰樺悕
+ generateCaseTitle() {
+ let titleParts = [];
+
+ if (this.form.constructionUnit) {
+ titleParts.push(this.form.constructionUnit);
+ }
+
+ if (this.form.constructionAddress) {
+ titleParts.push(this.form.constructionAddress);
+ }
+
+ if (this.form.projectName) {
+ titleParts.push(this.form.projectName);
+ }
+
+ this.form.caseTitle = titleParts.join('');
},
async getZoneOptions()
{
@@ -988,3 +1051,27 @@
}
}
</script>
+
+<style scoped>
+/* 鍔犲琛ㄦ牸搴曢儴婊氬姩鏉� */
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+ height: 20px; /* 妯悜婊氬姩鏉￠珮搴� */
+}
+
+/* 婊氬姩鏉¤建閬� */
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
+ background: #f1f1f1;
+ border-radius: 10px;
+}
+
+/* 婊氬姩鏉℃粦鍧� */
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
+ background: #c1c1c1;
+ border-radius: 10px;
+}
+
+/* 婊氬姩鏉℃粦鍧楁偓鍋滄晥鏋� */
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
+ background: #2f91ec;
+}
+</style>
diff --git a/src/views/archivePlaceName/index.vue b/src/views/archivePlaceName/index.vue
index c78fa6f..cd7e858 100644
--- a/src/views/archivePlaceName/index.vue
+++ b/src/views/archivePlaceName/index.vue
@@ -9,6 +9,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="瀵瑰簲鐨勫尯鍚嶇О" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ搴旂殑鍖哄悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -126,10 +134,10 @@
<!-- 娣诲姞鎴栦慨鏀广�愯濉啓鍔熻兘鍚嶇О銆戝璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="瀵瑰簲鐨勫尯鍙�" prop="nnumber">
+ <el-form-item label="瀵瑰簲鐨勫尯鍙�" prop="nnumber" required>
<el-input v-model="form.nnumber" placeholder="璇疯緭鍏ュ搴旂殑鍖哄彿" />
</el-form-item>
- <el-form-item label="瀵瑰簲鐨勫尯鍚嶇О" prop="name">
+ <el-form-item label="瀵瑰簲鐨勫尯鍚嶇О" prop="name" required>
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
</el-form>
@@ -177,6 +185,12 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ nnumber: [
+ { required: true, message: '璇疯緭鍏ュ搴旂殑鍖哄彿', trigger: 'blur' }
+ ],
+ name: [
+ { required: true, message: '璇疯緭鍏ュ搴旂殑鍖哄悕绉�', trigger: 'blur' }
+ ]
}
}
},
diff --git a/src/views/archiveProjectName/index.vue b/src/views/archiveProjectName/index.vue
index 8ed9064..f4647af 100644
--- a/src/views/archiveProjectName/index.vue
+++ b/src/views/archiveProjectName/index.vue
@@ -1,6 +1,30 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+ <el-form-item label="椤圭洰鍚嶇О" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ラ」鐩悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍏徃鍚嶇О" prop="companyName">
+ <el-input
+ v-model="queryParams.companyName"
+ placeholder="璇疯緭鍏ュ叕鍙稿悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="椤圭洰璐熻矗浜�" prop="createPerson">
+ <el-input
+ v-model="queryParams.createPerson"
+ placeholder="璇疯緭鍏ラ」鐩礋璐ｄ汉"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -120,8 +144,14 @@
<!-- 娣诲姞鎴栦慨鏀广�愯濉啓鍔熻兘鍚嶇О銆戝璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="椤圭洰鍚嶇О" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-form-item label="椤圭洰鍚嶇О" prop="name" required>
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
+ <el-form-item label="鍏徃鍚嶇О" prop="companyName" required>
+ <el-input v-model="form.companyName" placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" />
+ </el-form-item>
+ <el-form-item label="椤圭洰璐熻矗浜�" prop="createPerson" required>
+ <el-input v-model="form.createPerson" placeholder="璇疯緭鍏ラ」鐩礋璐ｄ汉" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -161,12 +191,23 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- name: null
+ name: null,
+ companyName: null,
+ createPerson: null
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ name: [
+ { required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur' }
+ ],
+ companyName: [
+ { required: true, message: '璇疯緭鍏ュ叕鍙稿悕绉�', trigger: 'blur' }
+ ],
+ createPerson: [
+ { required: true, message: '璇疯緭鍏ラ」鐩礋璐ｄ汉', trigger: 'blur' }
+ ]
}
}
},
@@ -193,7 +234,9 @@
reset() {
this.form = {
id: null,
- name: null
+ name: null,
+ companyName: null,
+ createPerson: null
}
this.resetForm("form")
},
@@ -228,7 +271,7 @@
this.form = response.data
console.log(response)
this.open = true
- this.title = "淇敼椤圭洰鍚嶇О"
+ this.title = "淇敼椤圭洰鍐呭"
})
},
/** 鎻愪氦鎸夐挳 */
diff --git a/src/views/archiveStatics/index.vue b/src/views/archiveStatics/index.vue
index 8801d9e..fb9319d 100644
--- a/src/views/archiveStatics/index.vue
+++ b/src/views/archiveStatics/index.vue
@@ -117,7 +117,7 @@
</el-row>
</el-form-item>
<el-form-item label="鍙戞枃鍙�" prop="inquiryNumber">
- <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂闂彿" />
+ <el-input v-model="form.inquiryNumber" placeholder="璇疯緭鍏ュ彂鏂囧彿" />
</el-form-item>
<el-form-item label="寤鸿椤圭洰鍚嶇О" prop="projectName">
<el-input v-model="form.projectName" placeholder="璇疯緭鍏ュ缓璁鹃」鐩悕绉�" />
@@ -275,7 +275,7 @@
{ required: true, message: "妗ｆ鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
inquiryNumber: [
- { required: true, message: "鍙戦棶鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ { required: true, message: "鍙戞枃鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
projectName: [
{ required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
diff --git a/src/views/archiveToUserStatistic/index.vue b/src/views/archiveToUserStatistic/index.vue
index 5a5acdd..fad4c33 100644
--- a/src/views/archiveToUserStatistic/index.vue
+++ b/src/views/archiveToUserStatistic/index.vue
@@ -124,7 +124,7 @@
{ required: true, message: "妗ｆ鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
inquiryNumber: [
- { required: true, message: "鍙戦棶鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ { required: true, message: "鍙戞枃鍙蜂笉鑳戒负绌�", trigger: "blur" }
],
projectName: [
{ required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
diff --git a/src/views/login.vue b/src/views/login.vue
index 5bdda11..2ca425e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -68,13 +68,14 @@
export default {
name: "Login",
+ // 淇敼 data 閮ㄥ垎锛屽皢榛樿鐨勭敤鎴峰悕鍜屽瘑鐮佹竻绌�
data() {
return {
title: process.env.VUE_APP_TITLE,
codeUrl: "",
loginForm: {
- username: "admin",
- password: "admin123",
+ username: "", // 鏀逛负绌哄瓧绗︿覆
+ password: "", // 鏀逛负绌哄瓧绗︿覆
rememberMe: false,
code: "",
uuid: ""
@@ -118,13 +119,14 @@
}
})
},
+ // 淇敼 getCookie 鏂规硶锛岀‘淇濅笉浣跨敤榛樿鍊�
getCookie() {
const username = Cookies.get("username")
const password = Cookies.get("password")
const rememberMe = Cookies.get('rememberMe')
this.loginForm = {
- username: username === undefined ? this.loginForm.username : username,
- password: password === undefined ? this.loginForm.password : decrypt(password),
+ username: username === undefined ? "" : username, // 鏀逛负绌哄瓧绗︿覆
+ password: password === undefined ? "" : decrypt(password), // 鏀逛负绌哄瓧绗︿覆
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
}
},
--
Gitblit v1.9.1