From 1908a80cd8224860bb704486fa78a18cc9a06bf7 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@126.com>
Date: 星期一, 24 一月 2022 17:42:19 +0800
Subject: [PATCH] 问题修改
---
src/views/system/config/index.vue | 2
src/views/device/peripheralUnit/index.vue | 36 +++++++++---------
src/views/system/oss/config.vue | 2
src/views/system/post/index.vue | 3 +
src/views/demo/tree/index.vue | 2
src/views/monitor/logininfor/index.vue | 2
src/views/monitor/operlog/index.vue | 2
src/views/system/oss/index.vue | 2
src/views/basics/manufacturer/index.vue | 6 +-
src/views/basics/school/index.vue | 8 +++-
src/views/device/equipment/index.vue | 2
src/views/tool/gen/index.vue | 2
src/views/demo/demo/index.vue | 2
src/views/system/notice/index.vue | 2
src/views/device/batch/index.vue | 4 +-
src/views/device/equipmentLog/index.vue | 2
16 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/src/views/basics/manufacturer/index.vue b/src/views/basics/manufacturer/index.vue
index b8b5b61..2a7b12a 100644
--- a/src/views/basics/manufacturer/index.vue
+++ b/src/views/basics/manufacturer/index.vue
@@ -100,7 +100,7 @@
<el-table-column label="鍘傚晢浠ｇ爜" align="center" prop="code" />
<el-table-column label="鑱旂郴鏂瑰紡" align="center" prop="phone" />
<el-table-column label="閭" align="center" prop="mailbox" />
- <el-table-column label="鑱旂郴鍦板潃" align="center" prop="contactAddress" />
+ <el-table-column label="鑱旂郴鍦板潃" align="center" prop="contactAddress" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -139,7 +139,7 @@
<el-form-item label="鍘傚晢浠ｇ爜" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�" />
</el-form-item>
- <el-form-item label="鑱旂郴鏂瑰紡" prop="phone">
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" />
</el-form-item>
<el-form-item label="閭" prop="mailbox">
@@ -322,7 +322,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
+ this.$modal.confirm(`鏄惁纭鍒犻櫎鍘傚晢浠ｇ爜涓�${row.code}鐨勫巶鍟嗭紵`).then(() => {
this.loading = true;
return delManufacturer(ids);
}).then(() => {
diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue
index 49eb915..0ce859a 100644
--- a/src/views/basics/school/index.vue
+++ b/src/views/basics/school/index.vue
@@ -313,6 +313,7 @@
created() {
this.getProvince().then(res => {
this.provinceList = res
+ this.provinceFormList = res
})
this.getList();
},
@@ -385,6 +386,10 @@
getSchool(id).then(response => {
this.loading = false;
this.form = response.data;
+ listCity(this.form.provinceCode)
+ .then(res => {
+ this.cityFormList = res.data
+ })
this.open = true;
this.title = "淇敼瀛︽牎";
});
@@ -417,7 +422,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
+ this.$modal.confirm(`鏄惁纭鍒犻櫎瀛︽牎浠ｇ爜涓�${row.code}鐨勫鏍★紵`).then(() => {
this.loading = true;
return delSchool(ids);
}).then(() => {
@@ -452,7 +457,6 @@
},
// 鏌ヨ鏉′欢鐪佷唤鏀瑰彉
provinceQueryChange(v) {
- this.queryParams.cityCode = undefined
this.getCity(v).then(res => {
this.cityList = res
})
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 50ab3c0..8434907 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -388,7 +388,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曡〃缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delDemo(ids);
}).then(() => {
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index f9b611f..603d4d8 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -275,7 +275,7 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鏍戣〃缂栧彿涓�"' + row.id + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delTree(row.id);
}).then(() => {
diff --git a/src/views/device/batch/index.vue b/src/views/device/batch/index.vue
index 849c95b..d5b0c59 100644
--- a/src/views/device/batch/index.vue
+++ b/src/views/device/batch/index.vue
@@ -86,7 +86,7 @@
<span>{{ parseTime(scope.row.arrivalDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
- <el-table-column label="鎵规璇存槑" align="center" prop="illustrate" />
+ <el-table-column label="鎵规璇存槑" align="center" prop="illustrate" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -302,7 +302,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
+ this.$modal.confirm(`鏄惁纭鍒犻櫎鐢熶骇鎵规涓�"${row.batch}"鐨勭敓浜ф壒娆★紵`).then(() => {
this.loading = true;
return delBatch(ids);
}).then(() => {
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 9be7e15..0cac510 100644
--- a/src/views/device/equipment/index.vue
+++ b/src/views/device/equipment/index.vue
@@ -496,7 +496,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒狅紵').then(() => {
+ this.$modal.confirm(`鏄惁纭鍒犲簭鍒楀彿涓�${this.formatZero(row.serialNumber, 4)}鐨勬寚鎺ц澶囷紵`).then(() => {
this.loading = true;
return delEquipment(ids);
}).then(() => {
diff --git a/src/views/device/equipmentLog/index.vue b/src/views/device/equipmentLog/index.vue
index e9bb106..872e809 100644
--- a/src/views/device/equipmentLog/index.vue
+++ b/src/views/device/equipmentLog/index.vue
@@ -200,7 +200,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁惧鑱旀満鏃ュ織缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delEquipmentLog(ids);
}).then(() => {
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index 287644f..d350538 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -119,19 +119,19 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="澶栬浠ｇ爜" align="center" prop="code"/>
- <el-table-column label="澶栬鍚嶇О" align="center" prop="name"/>
+ <el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code"/>
+ <el-table-column label="澶栬鍚嶇О" align="center" prop="name" show-overflow-tooltip/>
<el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText"/>
- <el-table-column label="鍘傚晢浠ｇ爜" align="center" prop="vendorCode_dictText"/>
- <el-table-column label="娉㈢壒鐜�" align="center" prop="baudRate">
+ <el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText"/>
+ <el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate">
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
</template>
</el-table-column>
- <el-table-column label="璇绘暟鎸囦护" align="center" width="180" prop="readInstruction"/>
- <el-table-column label="鍥炴暟闀垮害" align="center" prop="loopLength"/>
- <el-table-column label="鍔熻兘鎻忚堪" align="center" min-width="180" show-overflow-tooltip prop="description"/>
+ <el-table-column label="闂鎸囦护" align="center" width="180" prop="readInstruction"/>
+ <el-table-column label="杩斿洖闀垮害" width="80" align="center" prop="loopLength"/>
+ <el-table-column label="鍔熻兘鎻忚堪" align="center" min-width="300" show-overflow-tooltip prop="description"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -213,11 +213,11 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璇绘暟鎸囦护" prop="readInstruction">
- <el-input v-model="form.readInstruction" placeholder="璇疯緭鍏ヨ鏁版寚浠�" :disabled="disabled"/>
+ <el-form-item label="闂鎸囦护" prop="readInstruction">
+ <el-input v-model="form.readInstruction" placeholder="璇疯緭鍏ラ棶璇㈡寚浠�" :disabled="disabled"/>
</el-form-item>
- <el-form-item label="鍥炴暟闀垮害" prop="loopLength">
- <el-input v-model="form.loopLength" placeholder="璇疯緭鍏ュ洖鏁伴暱搴�" :disabled="disabled"/>
+ <el-form-item label="杩斿洖闀垮害" prop="loopLength">
+ <el-input v-model="form.loopLength" placeholder="璇疯緭鍏ヨ繑鍥為暱搴�" :disabled="disabled"/>
</el-form-item>
<el-form-item label="鍔熻兘鎻忚堪" prop="description">
<el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :disabled="disabled"/>
@@ -271,10 +271,10 @@
callback(new Error('鏈�澶氳緭鍏�32涓瓧绗�'));
return
}
- if (!(/^[A-Za-z]+$/.test(value))) {
- callback(new Error('鍙兘杈撳叆鑻辨枃瀛楃'));
- return
- }
+ // if (!(/^[A-Za-z]+$/.test(value))) {
+ // callback(new Error('鍙兘杈撳叆鑻辨枃瀛楃'));
+ // return
+ // }
callback();
};
return {
@@ -338,11 +338,11 @@
{required: true, message: "娉㈢壒鐜囦笉鑳戒负绌�", trigger: "change"}
],
readInstruction: [
- {required: true, message: "璇绘暟鎸囦护涓嶈兘涓虹┖", trigger: "blur"},
+ {required: true, message: "闂鎸囦护涓嶈兘涓虹┖", trigger: "blur"},
{max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
],
loopLength: [
- {required: true, message: "鍥炴暟闀垮害涓嶈兘涓虹┖", trigger: "blur"}
+ {required: true, message: "杩斿洖闀垮害涓嶈兘涓虹┖", trigger: "blur"}
],
filePath: [
{required: true, message: "闄勪欢涓嶈兘涓虹┖", trigger: "blur"}
@@ -486,7 +486,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
+ this.$modal.confirm(`鏄惁纭鍒犻櫎澶栬浠ｇ爜涓�${row.code}鐨勫璁惧崟鍏冿紵`).then(() => {
this.loading = true;
return delPeripheralUnit(ids);
}).then(() => {
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 4759aa0..373e75d 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -195,7 +195,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const infoIds = row.infoId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁块棶缂栧彿涓�"' + infoIds + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
return delLogininfor(infoIds);
}).then(() => {
this.getList();
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 432ea1b..c74c125 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -282,7 +282,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const operIds = row.operId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鏃ュ織缂栧彿涓�"' + operIds + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
return delOperlog(operIds);
}).then(() => {
this.getList();
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index b1c1f5e..694da80 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -322,7 +322,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const configIds = row.configId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鍙傛暟缂栧彿涓�"' + configIds + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
return delConfig(configIds);
}).then(() => {
this.getList();
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index e9ce3ba..8e46a70 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -302,7 +302,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const noticeIds = row.noticeId || this.ids
- this.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
return delNotice(noticeIds);
}).then(() => {
this.getList();
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index a3df93b..58c0fe6 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -372,7 +372,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ossConfigIds = row.ossConfigId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎瀵硅薄瀛樺偍閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎?').then(() => {
this.loading = true;
return delOssConfig(ossConfigIds);
}).then(() => {
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index 51f9663..473d146 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -329,7 +329,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ossIds = row.ossId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎?').then(() => {
this.loading = true;
return delOss(ossIds);
}).then(() => {
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index d4694d0..5aaeb82 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -109,6 +109,7 @@
<el-button
size="mini"
type="text"
+ class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:post:remove']"
@@ -293,7 +294,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const postIds = row.postId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎宀椾綅缂栧彿涓�"' + postIds + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
return delPost(postIds);
}).then(() => {
this.getList();
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index d0ba0c0..fff031d 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -321,7 +321,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const tableIds = row.tableId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎琛ㄧ紪鍙蜂负"' + tableIds + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() {
return delTable(tableIds);
}).then(() => {
this.getList();
--
Gitblit v1.9.1