From 335f64eb5df1a9117d31ed3b1c24ce6e921f64ea Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 09:50:11 +0800
Subject: [PATCH] 修改版本号问题
---
src/views/wel/index.vue | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 2 deletions(-)
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 9b69456..09fed39 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -66,10 +66,24 @@
<template v-else-if="tabsType == 'tab3'">
<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>
@@ -77,6 +91,12 @@
export default {
data() {
return {
+ diffBox: false,
+ content1: "",
+ content2: "",
+ codeDiffFileName1: "",
+ codeDiffFileName2: "",
+ selectionList: [],
targetRow: {},
upgradeModal: false,
file: null,
@@ -122,6 +142,10 @@
icon: 'el-icon-warning',
label: '鏂囦欢鍐呭',
prop: 'tab3'
+ }, {
+ icon: 'el-icon-warning',
+ label: '鍘嗗彶璁板綍',
+ prop: 'tab4'
}]
},
tabsFormOption: {
@@ -159,7 +183,7 @@
placeholder: " "
},
{
- label: '鏈�鍚庝慨鏀规椂闂�',
+ label: '淇敼鏃堕棿',
prop: 'updateTime',
disabled: true,
placeholder: " "
@@ -242,6 +266,22 @@
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",
@@ -663,6 +703,11 @@
this.tabsOption = this.tabsOption2;
//鑾峰彇鏂囦欢list
this.getFile(row.id);
+ //鑾峰彇鍘嗗彶璁板綍
+ this.getHistory(row.id);
+ //娓呯┖瀵规瘮璁板綍
+ this.content1 = "";
+ this.content2 = "";
}
this.$nextTick(()=> {
this.tabsType = 'tab1';
@@ -672,7 +717,7 @@
tabsHandleChange(tabs) {
this.tabsType = tabs.prop;
},
- showUpload(row) {//鑾峰彇鏂囦欢鍐呭
+ showUpload(row) {//鑾峰彇闄勪欢鍐呭锛堟殏鏃舵病鐢級
this.fileList = [];
this.uploadmodalForm = row;
this.loading = true;
@@ -700,6 +745,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 = "淇敼";
@@ -900,4 +978,7 @@
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