From 5c2f48d14c7606405082a35dd9224983c86b74d5 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 05 十二月 2024 18:04:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index ec3de1a..40ce6de 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -21,8 +21,7 @@
</el-button>
<el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
</el-button>
- <el-button icon="el-icon-check" plain size="small" type="primary"
- @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</template>
@@ -33,7 +32,14 @@
</el-button>
</template>
-
+ <template #icon="{ row }">
+ <span class="avue-icon avue-icon--small" style="display: block">
+ <svg v-if="row.imagePath && row.imagePath.indexOf('#')==0" aria-hidden="true">
+ <use :xlink:href="row.imagePath"></use>
+ </svg>
+ <i v-else :class="row.imagePath"></i>
+ </span>
+ </template>
</avue-crud>
<!-- 鏂板 淇敼 -->
@@ -43,10 +49,10 @@
:visible.sync="visible"
append-to-body="true"
class="avue-dialog"
- width="40%"
+ width="500px"
@close="visibleCloseHandler"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="small">
<el-row>
<el-col :span="24">
<el-form-item label="鍚嶇О锛�" prop="id">
@@ -59,6 +65,12 @@
</el-form-item>
</el-col>
<el-col :span="24">
+ <el-form-item label="鍥炬爣锛�" prop="imagePath">
+ <avue-input-icon v-model="form.imagePath" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
+ </avue-input-icon>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
<el-form-item label="鎻忚堪锛�" prop="description">
<el-input v-model="form.description" :rows="2" type="textarea"></el-input>
</el-form-item>
@@ -66,14 +78,14 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
<el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
</span>
</el-dialog>
<!-- 瀵煎叆 -->
<upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
- @updata="getTreeList"></upload-file>
+ @updata="getList"></upload-file>
<!-- 鏌ョ湅浣跨敤鑼冨洿 -->
<el-dialog
@@ -95,18 +107,19 @@
</avue-crud>
</el-dialog>
</basic-container>
-
</template>
<script>
import {gridStatus, addSave, editSave, deleteStatus, exportStatus, listUsed} from "@/api/modeling/statusPool/api";
import func from "@/util/func";
import basicOption from "@/util/basic-option";
+import iconList from "@/config/iconList";
export default {
name: "index",
data() {
return {
+ iconList: iconList,
loading: false,
data: [],
option: {
@@ -120,6 +133,10 @@
label: '鍚嶇О',
prop: 'id',
sortable: true,
+ },
+ {
+ label: '鍥炬爣',
+ prop: 'icon'
},
{
label: '鏍囩',
@@ -143,6 +160,7 @@
searchMenuSpan: 8,
refreshBtn: false,
selection: false,
+ header:false,
column: [
{
label: '鍚嶇О',
@@ -189,24 +207,21 @@
}
},
created() {
- this.getTreeList();
+ this.getList();
},
methods: {
- // 宸︿晶鏍戣姹�
- getTreeList() {
+ getList() {
gridStatus(this.page.currentPage, this.page.pageSize).then(res => {
const data = res.data.data;
this.data = data;
this.page.total = res.data.total;
this.loading = false;
- }).catch(err => {
- this.$message.error(err);
});
},
// 琛ㄦ牸鍒锋柊
handleRefresh() {
- this.getTreeList();
+ this.getList();
},
// 琛ㄦ牸澶氶��
@@ -217,13 +232,13 @@
// 鏉℃暟
sizeChange(val) {
this.page.pageSize = val;
- this.getTreeList();
+ this.getList();
},
// 椤电爜
currentChange(val) {
this.page.currentPage = val;
- this.getTreeList();
+ this.getList();
},
// 琛屽崟閫�
@@ -269,7 +284,7 @@
deleteStatus(this.selectList).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
- this.getTreeList();
+ this.getList();
}
})
}).catch(() => {
@@ -292,7 +307,7 @@
deleteStatus(list).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
- this.getTreeList();
+ this.getList();
}
})
}).catch(() => {
@@ -325,14 +340,12 @@
if (res.data.code === 200) {
this.$message.success(res.data.obj);
this.loading = true;
- this.getTreeList();
+ this.getList();
this.visible = false;
} else {
this.$message.error(res.data.obj);
}
- }).catch(error => {
- this.$message.error(error);
- });
+ })
} else {
return false;
}
@@ -391,7 +404,6 @@
this.checkViewData = this.checkViewDataSearch;
return done();
}
- ;
this.checkViewData = this.checkViewData.filter(item => {
return item.name && item.name.includes(name);
--
Gitblit v1.9.3