From 7e394d280c921445ab71a4a368146504595531c7 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期四, 28 八月 2025 21:14:13 +0800
Subject: [PATCH] 搜索
---
src/views/wel/gongkong.vue | 194 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 171 insertions(+), 23 deletions(-)
diff --git a/src/views/wel/gongkong.vue b/src/views/wel/gongkong.vue
index 0e9df4e..311ea3e 100644
--- a/src/views/wel/gongkong.vue
+++ b/src/views/wel/gongkong.vue
@@ -22,13 +22,14 @@
</el-row>
<el-table :data="treecFileData" style="width: 100%">
<el-table-column prop="name" label="鍚嶇О" />
- <el-table-column prop="fileModifyTime" label="鍒涘缓鏃ユ湡" />
+ <el-table-column prop="fileModifyTime" label="鍒涘缓鏃ユ湡" />
<el-table-column prop="fileModifyTime" label="淇敼鏃ユ湡" />
<el-table-column prop="fileSizeDisplay" label="澶у皬" />
<el-table-column fixed="right" label="鎿嶄綔" min-width="120">
<template #default="scope">
<el-button link type="primary" size="small" @click="fileView(scope.row)">鏌ョ湅</el-button>
<el-button link type="primary" size="small" @click="fileEdit(scope.row)">缂栬緫</el-button>
+ <el-button type="primary" text size="small" @click.stop="viewHistory(scope.row, scope.index)">淇敼璁板綍</el-button>
</template>
</el-table-column>
</el-table>
@@ -46,8 +47,30 @@
</div>
</template>
</el-dialog>
+
+ <el-dialog title="淇敼璁板綍" width="900" append-to-body v-model="viewHisModel">
+ <avue-crud :addBtn="false" :option="optionHis" :table-loading="loadingHis" :data="dataHis" ref="crud"
+ @current-change="currentChangeHis" v-model:page="pageHis" @search-change="searchChangeHis" @size-change="sizeChangeHis" @refresh-change="refreshChangeHis" @on-load="onLoadHis">
+
+ <template #menu="scope">
+ <!--<el-button type="primary" :disabled="scope.row.processExecuted==true" text size="default" @click.stop="cancelProcess(scope.row, scope.index)">鎾ら攢</el-button> -->
+ <el-button type="primary" text size="default" @click.stop="hisCompare(scope.row, scope.index)">姣斿</el-button>
+ </template>
+
+ </avue-crud>
+ </el-dialog>
+
+ <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>
+import {
+ getFileChangeList
+} from '@/api/wel/changehis';
+import { pageHeaderEmits } from 'element-plus';
export default {
components: {},
data() {
@@ -63,13 +86,64 @@
label: 'name',
isLeaf: (data) => !data.hasChildren
},
- treeData: [],
current: 1,
size: 10,
fileTotal: 0,
treecFileData: [],
TreeNode: {},
fileRow: {},
+ loadingHis:false,
+ viewHisModel:false,
+
+ queryHis:{},
+ optionHis: {
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ columnBtn:false,
+ gridBtn:false,
+ refreshBtn:false,
+ labelWidth: 120,
+ emptyBtn: false,
+ searchShow: true,
+ searchEnter:true,
+ searchSpan: 4,
+ menu: true,
+ // selection: true,
+ column: [
+ {
+ label: '淇敼浜�',
+ prop: 'name',
+ search: true,
+ searchType: 'input',
+ searchSpan:6,
+ hide: false,
+ viewDisplay: true,
+ },
+ {
+ label: '淇敼鏃堕棿',
+ prop: 'createTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ search: true,
+ searchSpan:12,
+ searchRange: true,
+ hide: false,
+ },
+ ],
+ },
+ dataHis:[],
+ pageHis: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ diffBox: false,
+ content1: "",
+ content2: "",
+ codeDiffFileName1: "",
+ codeDiffFileName2: "",
}
},
computed: {},
@@ -99,6 +173,58 @@
this.fileOptionTitle = "缂栬緫";
this.fileRow = {...row};
this.getFileContent(row);
+ },
+ viewHistory(row){
+ console.log(row);
+ this.viewHisModel = true;
+ this.queryHis.machineFileId = row.id;
+ this.onLoadHis();
+ },
+
+ searchChangeHis(params, done) {
+ let data = {}
+ console.log(params)
+ this.pageHis.currentPage = 1;
+ let fileId = this.queryHis.machineFileId;
+ params.createTimeBegin = params?.createTime?.[0] || '';
+ params.createTimeEnd = params?.createTime?.[1] || '';
+ data = {
+ createTimeBegin: params.createTimeBegin || undefined,
+ createTimeEnd: params.createTimeEnd || undefined,
+ name: params.name || undefined,
+ machineFileId:fileId,
+ }
+ this.queryHis = data
+ this.onLoadHis();
+ done();
+ },
+ currentChangeHis(currentPage) {
+ this.pageHis.currentPage = currentPage;
+ this.onLoadHis();
+ },
+ sizeChangeHis(pageSize) {
+ this.pageHis.pageSize = pageSize;
+ },
+ refreshChangeHis() {
+ this.onLoadHis();
+ },
+ hisCompare(row){
+ //鏂囦欢姣斿
+ this.loading = true;
+ axios({
+ url: '/blade-mdm/gkw/node/his-compare',
+ method: 'get',
+ params: {id: row.id},
+ }).then(
+ res => {
+ this.loading = false;
+ this.content1 = res.data.data.content1;
+ this.content2 = res.data.data.content2;
+ this.codeDiffFileName1 = "淇敼鍓�";
+ this.codeDiffFileName2 = "淇敼鍚�";
+ this.diffBox = true;
+ }
+ );
},
getFileContent(row) {
this.loading = true;
@@ -132,27 +258,27 @@
},
searchTable(TreeNode) {
this.TreeNode = {...TreeNode};
- if(TreeNode.dirType == 'SEND' || TreeNode.dirType == 'REC' || TreeNode.dirType == 'TEMP') {
- var obj = {
- name: this.fileName,
- dirType: TreeNode.dirType,
- machineCode: TreeNode.machineCode,
- current: this.current,
- size: this.size
- }
- axios({
- url: '/blade-mdm/gkw/node/file-page',
- method: 'get',
- params: obj
- }).then(
- res => {
- this.treecFileData = res.data.data.records;
- this.fileTotal = res.data.data.total;
- }
- )
- }else {
- return;
+
+ var obj = {
+ name: this.fileName,
+ dirType: TreeNode.dirType,
+ nodeType: TreeNode.nodeType,
+ nodeId: TreeNode.nodeType!='dir'?TreeNode.id:undefined,
+ machineCode: TreeNode.machineCode,
+ current: this.current,
+ size: this.size
}
+ axios({
+ url: '/blade-mdm/gkw/node/file-page',
+ method: 'get',
+ params: obj
+ }).then(
+ res => {
+ this.treecFileData = res.data.data.records;
+ this.fileTotal = res.data.data.total;
+ }
+ )
+
},
treeLoad () {
axios({
@@ -171,7 +297,29 @@
this.defaultKeys = [res.data.data[firstIndex].id];
}
)
- }
+ },/*
+ sizeChange(size) {
+ this.sizeHis = size;
+ this.onLoad();
+ },*/
+ onLoadHis() {
+ this.loadingHis = true;
+ getFileChangeList(this.pageHis.currentPage, this.pageHis.pageSize, this.queryHis).then(res => {
+ const data = res.data.data
+
+ this.pageHis.total = data.total;
+
+ this.dataHis = data.records;
+ this.loadingHis = false;
+ }, () => {
+ this.dataHis = [];
+ this.loadingHis = false;
+ }).catch(err => {
+ console.log(err)
+ this.dataHis = [];
+ this.loadingHis = false;
+ });
+ },
},
mounted() {
this.treeLoad();
--
Gitblit v1.9.3