From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期四, 16 一月 2025 18:20:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 69 +++++++++++++++++++++++----------- 1 files changed, 46 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 7a7bc2e..2eecb0d 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,32 +13,45 @@ @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" class="button-custom-icon" plain size="small" type="primary" + @click="addClickHandler"> + <icon-show :name="permissionList.addBtn.source"></icon-show> + 鍒涘缓 </el-button> - <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delClickHandler">鍒犻櫎 + <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="delClickHandler"> + <icon-show :name="permissionList.delBtn.source"></icon-show> + 鍒犻櫎 </el-button> - <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭 + <el-button v-if="permissionList.viewTheScopeBtn" class="button-custom-icon" plain size="small" type="primary" @click="checkViewClickHandler"> + <icon-show :name="permissionList.viewTheScopeBtn.source"></icon-show> + 鏌ョ湅浣跨敤鑼冨洿 </el-button> - <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆 + <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="uploadClickHandler"> + <icon-show :name="permissionList.importBtn.source"></icon-show> + 瀵煎叆 </el-button> - <el-button icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿 + <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler"> + <icon-show :name="permissionList.exportBtn.source"></icon-show> + 瀵煎嚭 </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" size="small" type="text" + @click="editClickHandler(row)"> + <icon-show :name="permissionList.editBtn.source"></icon-show> + 缂栬緫 </el-button> - <el-button icon="el-icon-delete" plain size="small" type="text" @click="delRowClickHandler(row)">鍒犻櫎 + <el-button v-if="permissionList.delBtn" plain size="small" type="text" @click="delRowClickHandler(row)"> + <icon-show :name="permissionList.delBtn.source"></icon-show> + 鍒犻櫎 </el-button> </template> <template #icon="{ row }"> - <span class="avue-icon avue-icon--small"> - <svg v-if="row.icon && row.icon.indexOf('#')==-1" aria-hidden="true"> - <use :xlink:href="row.icon"></use> - </svg> - <i v-else :class="row.icon"></i> - </span> + <span class="avue-icon"> + <icon-show :name="row.imagePath"></icon-show> + </span> </template> </avue-crud> @@ -65,9 +78,9 @@ </el-form-item> </el-col> <el-col :span="24"> - <el-form-item label="鍥炬爣锛�" prop="icon"> - <avue-input-icon v-model="form.icon" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣"> - </avue-input-icon> + <el-form-item label="鍥炬爣锛�" prop="imagePath"> + <input-icon v-model="form.imagePath" placeholder="璇烽�夋嫨鍥炬爣"> + </input-icon> </el-form-item> </el-col> <el-col :span="24"> @@ -78,8 +91,8 @@ </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> @@ -113,13 +126,12 @@ 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"; +import {mapGetters} from "vuex"; export default { name: "index", data() { return { - iconList: iconList, loading: false, data: [], option: { @@ -206,6 +218,19 @@ }, } }, + 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].SEARCH, false), + }; + }, + }, created() { this.getList(); }, @@ -216,8 +241,6 @@ this.data = data; this.page.total = res.data.total; this.loading = false; - }).catch(err => { - this.$message.error(err); }); }, @@ -253,7 +276,7 @@ this.lastIndex = newIndex; }, () => { - this.selectList = []; + this.selectList = [row]; } ); }, -- Gitblit v1.9.3