From e02fc11eae8978cb4b33cf8541697efae5eadaed Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 09 八月 2025 17:05:07 +0800
Subject: [PATCH] 修改文字
---
src/views/wel/index.vue | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 254 insertions(+), 45 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 9624d69..18963a0 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -4,7 +4,7 @@
:addBtn="false"
:option="option"
:table-loading="loading"
- :data="data"
+ :data="treeData"
ref="crud"
v-model:search="search"
v-model:page="mypage"
@@ -15,15 +15,31 @@
@tree-load="treeLoad"
@row-click="rowClick"
>
- <template #menu-left>
- <el-button :size="size" type="primary" @click="showAdd()">鏂板鏍硅妭鐐�</el-button>
+ <template #search>
+ <el-row :gutter="24">
+ <el-col :span="6">
+ <el-input v-model="search.name" placeholder="璇疯緭鍏ヨ妭鐐瑰悕绉�" clearable/>
+ </el-col>
+ <el-col :span="6">
+ <el-select v-model="search.nodeType" placeholder="璇疯緭鍏ヨ妭鐐圭被鍨�" clearable>
+ <el-option v-for="item in nodeTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictKey"/>
+ </el-select>
+ </el-col>
+ <el-col :span="6">
+ <el-button type="primary" @click="searchTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Search /></el-icon>鎼滅储</el-button>
+ <el-button :icon="Delete" @click="setClearTree"><el-icon class="el-icon--right" style="margin-right: 6px;"><Delete /></el-icon>娓呯┖</el-button>
+ </el-col>
+ </el-row>
</template>
+ <!-- <template #menu-left>
+ <el-button :size="size" type="primary" @click="showAdd()">鏂板鏍硅妭鐐�</el-button>
+ </template> -->
<template #name="{ row }">
<span>{{row.name}}</span>
<el-button :size="size" text v-if="row.nodeType != 70" icon="el-icon-setting" type="primary" placeholder="淇敼" @click="showEdit(row)" title="淇敼"></el-button>
- <el-button :size="size" text icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
- <el-button :size="size" text v-if="row.nodeType < 60" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" title="鏂板瀛愮骇"></el-button>
- <el-button :size="size" text v-if="row.nodeType == 60" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button>
+ <el-button :size="size" text v-if="row.nodeType != 10" icon="el-icon-delete" type="primary" @click="showDel(row)" placeholder="鍒犻櫎" title="鍒犻櫎"></el-button>
+ <el-button :size="size" text v-if="row.nodeType != 60 && row.nodeType != 70" icon="el-icon-document-add" type="primary" @click="showAdd(row)" placeholder="鏂板瀛愮骇" title="鏂板瀛愮骇"></el-button>
+ <el-button :size="size" text v-if="row.nodeType == 60 || row.nodeType == 50" icon="el-icon-upload" type="primary" @click="showUpload(row)" placeholder="鏂囦欢涓婁紶" title="鏂囦欢涓婁紶"></el-button>
<!-- 娑夊瘑缃戞墠鏈� -->
<el-button :size="size" text v-if="row.nodeType == 70 && isSM" icon="el-icon-pie-chart" type="primary" @click="upgrade(row)" placeholder="鍗囩増" title="鍗囩増"></el-button>
<!-- 宸ユ帶缃戞墠鏈� -->
@@ -48,12 +64,26 @@
<avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
<span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>
<template v-else-if="tabsType == 'tab3'">
- {{fileContent}}
+ <div v-html="convertToHtml(fileContent)"></div>
</template>
+ <template v-else-if="tabsType == 'tab4'">
+ <avue-crud :addBtn="false" :option="tabsFormOption4" :data="tabsForm4" ref="crud4" @selection-change="selectionChange">
+ <template #menu-left>
+ <el-button :size="size" type="primary" @click="comparison" :disabled="selectionList.length != 2">瀵规瘮</el-button>
+ </template>
+ </avue-crud>
+ </template>
+
<el-dialog title="鍗囩増" append-to-body v-model="upgradeModal" width="500">
<avue-form :option="upgradeModalOption" v-model="upgradeModalForm" @submit="upgradeSubmit" @reset-change="upgradeCancel"></avue-form>
</el-dialog>
</basic-container>
+ <!-- 鏂囦欢瀵规瘮 -->
+ <el-drawer title="鏂囦欢瀵规瘮" append-to-body v-model="diffBox" size="100%" class="code-box">
+ <div>
+ <code-diff :old-string="this.content1" :new-string="this.content2" output-format="side-by-side" :hideStat="true" :filename="codeDiffFileName1" :newFilename="codeDiffFileName2"/>
+ </div>
+ </el-drawer>
</template>
<script>
@@ -61,6 +91,13 @@
export default {
data() {
return {
+ diffBox: false,
+ content1: "",
+ content2: "",
+ codeDiffFileName1: "",
+ codeDiffFileName2: "",
+ selectionList: [],
+ targetRow: {},
upgradeModal: false,
file: null,
fileContent: "",
@@ -105,6 +142,10 @@
icon: 'el-icon-warning',
label: '鏂囦欢鍐呭',
prop: 'tab3'
+ }, {
+ icon: 'el-icon-warning',
+ label: '鍘嗗彶璁板綍',
+ prop: 'tab4'
}]
},
tabsFormOption: {
@@ -142,7 +183,7 @@
placeholder: " "
},
{
- label: '鏈�鍚庝慨鏀规椂闂�',
+ label: '淇敼鏃堕棿',
prop: 'updateTime',
disabled: true,
placeholder: " "
@@ -166,7 +207,7 @@
menuPosition: "right",
column: [
{
- label: '鑺傜偣绫诲瀷',
+ label: '鑺傜偣绫诲瀷1',
prop: 'nodeType',
labelWidth: "120",
type: 'select',
@@ -216,8 +257,8 @@
id: "",
parentId:1,
search: {
- keyword: "",
- machineGroupCode: ""
+ name: "",
+ nodeType: ""
},
loading: true,
mypage: {
@@ -225,12 +266,30 @@
current: 1,
total: 0,
},
+ tabsFormOption4: {
+ rowKey: "id",
+ selection: true,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ searchBtn: false,
+ emptyBtn: false,
+ menu: false,
+ column: [
+ {label: '鐗堟湰鍙�',prop: 'versionNumber'},
+ {label: '鍒涘缓鏃堕棿',prop: 'createTime'},
+ {label: '鍒涘缓浜�',prop: 'createUserName'},
+ ]
+ },
+ tabsForm4: {},
option: {
+ highlightCurrentRow: true,
rowKey: "id",
treeProps: {
children: "children",
hasChildren: 'hasChildren',
},
+ defaultExpandAll: false,
lazy: true,
rowKey: 'id',
addBtn: false,
@@ -238,6 +297,8 @@
delBtn: false,
fit: true,
menu: false,
+ searchBtn: false,
+ emptyBtn: false,
column: [
{
label: '鐩綍',
@@ -246,11 +307,29 @@
},
{
label: '鐗堟湰',
- prop: 'abc'
+ prop: 'versionNumber',
+ formatter: (val, value, label) => {
+ if(val.nodeType == '60'){
+ if(value==-1){
+ return '';
+ }else{
+ return value;
+ }
+ }else{
+ return '';
+ }
+ }
},
{
label: '鐗堟',
- prop: 'abc'
+ prop: 'processEdition',
+ formatter: (val, value, label) => {
+ if(val.nodeType == '60'){
+ return value;
+ }else{
+ return '';
+ }
+ }
},
{
label: '鎻忚堪',
@@ -264,34 +343,40 @@
label: '璁惧',
prop: 'machineCode'
},
- {
- label: '鍥哄寲鐘舵��',
- prop: 'abc'
- },
+
{
label: '閿佸畾鐘舵��',
- prop: 'abc'
+ prop: 'isLocked',
+ formatter: (val, value, label) => {
+ if(val.nodeType == '60' || val.nodeType == '70'){
+ if(value==1){
+ return '宸查攣瀹�';
+ }else{
+ return '鏈攣瀹�';
+ }
+ }
+ }
+
},
{
label: '娴佺▼鐘舵��',
prop: 'flowStatus',
- formatter: (val, value, label) => {
- if(val.nodeType != '70'){
- //闈炵▼搴忚妭鐐�
- return '';
- }else{
-
- if(value==0||value==null){
- return '鏈惎鍔�';
- }else if(value == 1){
- return '瀹℃壒涓�';
- }else if(value == 2){
- return '宸查�氳繃';
- }else{
- return '鏈畾涔�';
- }
- }
- },
+ formatter: (val, value, label) => {
+ if(val.nodeType != '60'){
+ //闈炵▼搴忚妭鐐�
+ return '';
+ }else{
+ if(value==0||value==null){
+ return '鏈惎鍔�';
+ }else if(value == 1){
+ return '瀹℃壒涓�';
+ }else if(value == 2){
+ return '宸查�氳繃';
+ }else{
+ return '鏈畾涔�';
+ }
+ }
+ },
},
{
label: '娴嬭瘯绋嬪簭',
@@ -304,7 +389,7 @@
}
],
},
- data: [],
+ treeData: [],
upData: []
};
},
@@ -448,6 +533,68 @@
}
},
methods: {
+ convertToHtml(text) {
+ return text.replace(/\r\n/g, '<br>');
+ },
+ removeHasChildren(treeData) { //鏌ヨ鏃跺�欎娇鐢紝鍒犳帀hasChildren
+ return treeData.map(node => {
+ if (node.children && node.children.length > 0) {
+ node.children = this.removeHasChildren(node.children);
+ }
+ // 鍒犻櫎褰撳墠鑺傜偣鐨� hasChildren 灞炴��
+ const { hasChildren, ...rest } = node;
+ return rest;
+ });
+ },
+ // 閫掑綊鏌ユ壘鐩爣琛岋紙name="鏈哄簥1"锛�
+ findTargetRow(data, targetName) {
+ for (const item of data) {
+ if (item.name === targetName) {
+ return item; // 鎵惧埌鐩爣琛�
+ }
+ if (item.children && item.children.length > 0) {
+ const found = this.findTargetRow(item.children, targetName);
+ if (found) return found; // 鍦ㄥ瓙鑺傜偣涓壘鍒�
+ }
+ }
+ return null; // 鏈壘鍒�
+ },
+ highlightTargetRow() { // 楂樹寒鐩爣琛�
+ const targetName = this.search.name;
+ this.targetRow = this.findTargetRow(this.treeData, targetName);
+ if (this.targetRow && this.$refs.crud) {
+ this.$refs.crud.setCurrentRow(this.targetRow); // 楂樹寒鐩爣琛�
+ }
+ },
+ searchTree() {
+ axios({
+ url: '/blade-mdm/program/node/search-list',
+ method: 'get',
+ params: this.search,
+ }).then(res => {
+ this.option.defaultExpandAll = true;
+ this.treeData = this.removeHasChildren(res.data.data);
+ this.$nextTick(() => {
+ this.highlightTargetRow(); // 璁剧疆褰撳墠琛岄珮浜�
+ this.tabsForm = this.targetRow; //tabs鑺傜偣淇℃伅
+ this.nodeTypeList.forEach(item=> {
+ if(item.dictKey == this.tabsForm.nodeType) {
+ this.tabsForm.nodeTypeName = item.dictValue;
+ }
+ })
+ })
+ if(this.treeData.length == 0) {
+ return;
+ }
+ });
+ },
+ setClearTree() {
+ this.option.defaultExpandAll = false;
+ this.treeData = [];
+ this.$nextTick(()=> {
+ this.onLoad();
+ })
+ },
upgradeSubmit(row,done) { //鍗囩増
axios({
url: '/blade-mdm/program/ncfile/upgrade-process-edition',
@@ -563,12 +710,17 @@
this.tabsForm.nodeTypeName = item.dictValue;
}
})
- if(this.tabsForm.nodeType < 70) {
+ if(this.tabsForm.nodeType != 70) {
this.tabsOption = this.tabsOption1;
}else {
this.tabsOption = this.tabsOption2;
//鑾峰彇鏂囦欢list
this.getFile(row.id);
+ //鑾峰彇鍘嗗彶璁板綍
+ this.getHistory(row.id);
+ //娓呯┖瀵规瘮璁板綍
+ this.content1 = "";
+ this.content2 = "";
}
this.$nextTick(()=> {
this.tabsType = 'tab1';
@@ -578,7 +730,7 @@
tabsHandleChange(tabs) {
this.tabsType = tabs.prop;
},
- showUpload(row) {//鑾峰彇鏂囦欢鍐呭
+ showUpload(row) {//鑾峰彇闄勪欢鍐呭锛堟殏鏃舵病鐢級
this.fileList = [];
this.uploadmodalForm = row;
this.loading = true;
@@ -606,6 +758,39 @@
this.fileContent = res.data.data;
}
);
+ },
+ getHistory(id) { //鏌ョ湅鍘嗗彶璁板綍
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/program/node/history-by-nodeid',
+ method: 'get',
+ params: {id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.tabsForm4 = res.data.data;
+ }
+ );
+ },
+ comparison() { //瀵规瘮
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/program/node/compare-content',
+ method: 'get',
+ params: {id1:this.selectionList[0].id,id2:this.selectionList[1].id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.content1 = res.data.data.content1;
+ this.content2 = res.data.data.content2;
+ this.codeDiffFileName1 = this.selectionList[0].versionNumber;
+ this.codeDiffFileName2 = this.selectionList[1].versionNumber;
+ this.diffBox = true;
+ }
+ );
+ },
+ selectionChange(list) {
+ this.selectionList = list;
},
showEdit(row,done) {
this.modalTitle = "淇敼";
@@ -635,14 +820,20 @@
showAdd (row) { //鏂板瀛愯妭鐐�
if(!row) {
this.modalTitle = "鏂板鏍硅妭鐐�";
- this.modalForm.nodeType = "10";
+ this.modalForm.nodeType = this.nodeTypeList[0].dictKey;
this.modalForm.parentId = 0;
}else {
- if(row.nodeType == 60) {
+ if(row.nodeType == 60) { //绋嬪簭鍖�
return;
}
+ var defalutNodeType = ""; //涓嬩竴绾ц妭鐐圭被鍨�
+ for(var i=0;i<this.nodeTypeList.length;i++) {
+ if(row.nodeType == this.nodeTypeList[i].dictKey) {
+ defalutNodeType = this.nodeTypeList[i+1].dictKey;
+ }
+ }
this.modalTitle = "鏂板瀛愯妭鐐�";
- this.selectedColumn.nodeType = String(Number(row.nodeType) + 10);
+ this.selectedColumn.nodeType = defalutNodeType;
this.selectedColumn.parentId = row.id;
this.selectedColumn.name = "";
this.selectedColumn.id = "";
@@ -696,7 +887,7 @@
res => {
var children = res.data.data || [];
if(parentId == 0) {
- this.data = [...children];
+ this.treeData = [...children];
}else {
this.$refs.crud.$refs.table.store.states.lazyTreeNodeMap.value[parentId] = [...children];
}
@@ -743,13 +934,13 @@
}).then(
res => {
this.loading = false;
- this.data = res.data.data;
- if(this.data.length == 0) {
+ this.treeData = res.data.data;
+ if(this.treeData.length == 0) {
return;
}
this.tabsForm = res.data.data[0]; //鑺傜偣淇℃伅
this.nodeTypeList.forEach(item=> {
- if(item.dictKey == this.data[0].nodeType) {
+ if(item.dictKey == this.treeData[0].nodeType) {
this.tabsForm.nodeTypeName = item.dictValue;
}
})
@@ -785,4 +976,22 @@
margin-left: 10px;
margin-top: 12px;
}
+.highlight-row {
+ background-color: #f0f7ff !important; /* 娴呰摑鑹茶儗鏅� */
+ font-weight: bold; /* 鍔犵矖鏂囧瓧 */
+}
+
+/* 濡傛灉闇�瑕佹偓鍋滄晥鏋� */
+.highlight-row:hover {
+ background-color: #e6f0ff !important;
+}
+</style>
+<style>
+ .highlight-row {
+ background-color: #f0f7ff;
+ font-weight: bold;
+ }
+ .code-box .el-drawer__header {
+ margin-bottom: 0;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3