From d5894106a09ea9bc900bad176c177763a1df0568 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期五, 27 十二月 2024 14:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 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 88008d6..5552afc 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
@@ -13,23 +13,29 @@
@current-change="currentChange"
>
<template slot="menuLeft">
- <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
+ <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
</el-button>
- <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delClickHandler">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delClickHandler">鍒犻櫎
</el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
</el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
+ <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
</el-button>
- <el-button icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</template>
<template slot="menu" slot-scope="{row,index}">
- <el-button icon="el-icon-edit" plain size="small" type="text" @click="editClickHandler(row)">淇敼
+ <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="text" @click="editClickHandler(row)">淇敼
</el-button>
- <el-button icon="el-icon-delete" plain size="small" type="text" @click="delRowClickHandler(row)">鍒犻櫎
+ <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="text" @click="delRowClickHandler(row)">鍒犻櫎
</el-button>
+ </template>
+
+ <template #icon="{ row }">
+ <span class="avue-icon">
+ <icon-show :name="row.imagePath"></icon-show>
+ </span>
</template>
</avue-crud>
@@ -56,6 +62,12 @@
</el-form-item>
</el-col>
<el-col :span="24">
+ <el-form-item label="鍥炬爣锛�" prop="imagePath">
+ <input-icon v-model="form.imagePath" placeholder="璇烽�夋嫨鍥炬爣">
+ </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>
@@ -63,14 +75,14 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
- <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button size="small" @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
@@ -92,13 +104,13 @@
</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 {mapGetters} from "vuex";
export default {
name: "index",
@@ -117,6 +129,10 @@
label: '鍚嶇О',
prop: 'id',
sortable: true,
+ },
+ {
+ label: '鍥炬爣',
+ prop: 'icon'
},
{
label: '鏍囩',
@@ -186,25 +202,35 @@
},
}
},
+ computed:{
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
+ delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
+ editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
+ exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
+ importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
+ viewTheScopeBtn: this.vaildData(this.permission[this.$route.query.id].viewTheScope, false),
+ };
+ },
+ },
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();
},
// 琛ㄦ牸澶氶��
@@ -215,13 +241,13 @@
// 鏉℃暟
sizeChange(val) {
this.page.pageSize = val;
- this.getTreeList();
+ this.getList();
},
// 椤电爜
currentChange(val) {
this.page.currentPage = val;
- this.getTreeList();
+ this.getList();
},
// 琛屽崟閫�
@@ -267,7 +293,7 @@
deleteStatus(this.selectList).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
- this.getTreeList();
+ this.getList();
}
})
}).catch(() => {
@@ -290,7 +316,7 @@
deleteStatus(list).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
- this.getTreeList();
+ this.getList();
}
})
}).catch(() => {
@@ -323,7 +349,7 @@
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);
--
Gitblit v1.9.3