From 9c81ab87188929f98abfd56eb3d0aa13e0077990 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 14 九月 2025 19:42:01 +0800
Subject: [PATCH] 删除无用代码
---
src/views/flow/components/TodolistLeft.vue | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index 4df7fae..1e93bce 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -21,7 +21,7 @@
<el-text type="warning">{{row.variables.unlockReason}}</el-text>
<el-text type="danger" v-if="row.variables.hasCuredProgram==='Y' && row.variables.isProcessEditionSame=='N' && row.variables.cureProgramUseable==undefined">宸插浐鍖栫▼搴忓伐搴忕増娆′笉涓�鑷达紝娲惧伐鐗堟:{{row.variables.processEdition}},宸插浐鍖栫増娆★細{{row.variables.curedProcessEdition}}</el-text>
<el-text type="danger" v-if="row.variables.programOnMachine=='Y'">鐜板満缂栧埗</el-text>
- <el-table :data="tableData" border @row-click="showContent" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" max-height="240" highlight-current-row>
+ <el-table :data="tableData" border @row-click="showContent" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" max-height="380" highlight-current-row>
<!-- <el-table-column prop="machineCode" label="鍔犲伐鏈哄簥">
</el-table-column> -->
@@ -31,9 +31,17 @@
<div style="display: flex;align-items: center;">
<span style="margin-right: 8px;">{{ row.name }}</span>
<el-icon v-if="row.fileType === 'other'">
+ <el-tooltip class="box-item" effect="light" content="鍏朵粬鏂囦欢" placement="right">
<FolderOpened />
+ </el-tooltip>
</el-icon>
- <img v-else src="./app.jpg" alt="" width="16" height="16">
+ <el-icon v-if="row.fileType === 'program'">
+ <el-tooltip class="box-item" effect="light" content="绋嬪簭鏂囦欢" placement="right">
+ <Tickets/>
+ </el-tooltip>
+ </el-icon>
+
+ <!--<img v-else src="./app.jpg" alt="" width="16" height="16">-->
</div>
</template>
</el-table-column>
@@ -73,7 +81,7 @@
</el-collapse-item>
</el-collapse>
-->
- <h4>绋嬪簭鍐呭</h4>
+ <h5>绋嬪簭鍐呭</h5>
<div v-html="appContent" class="app-content">
</div>
<el-dialog title="绋嬪簭閫夋嫨" v-model="appDialog" width="400" v-if="appDialog">
@@ -91,7 +99,7 @@
</template>
<script>
-import { getAppList,getFileData, getSelectedAppList, getContent, removeAtt,queryLockRemark } from '@/api/flow/todolist';
+import { getFileData, getSelectedAppList, getContent, removeAtt,queryLockRemark } from '@/api/flow/todolist';
import { exportBlob } from '@/api/common';
import { getToken } from '@/utils/auth';
import NProgress from 'nprogress';
@@ -274,10 +282,21 @@
this.$message.error('鑾峰彇宸查�夌▼搴忓け璐�');
return;
} else {
- this.tableData = res.data.data || [];
+ this.tableData = this.sortTable(res.data.data || []);
}
// this.$emit('selection-change',this.tableData)
})
+ },
+ sortTable(data) {
+ data.sort(function(a,b){
+ if(a.program === b.program){//濡傛灉program鐩稿悓锛屾寜鐓ame鐨勯檷搴�
+ //return a.name - b.name
+ return a.name.localeCompare(b.name)
+ }else{
+ return b.program - a.program
+ }
+ });
+ return data;
},
addApp() {
this.appDialog = true;
@@ -292,12 +311,6 @@
this.selectionList = list;
},
onLoad(page, params = {}) {
- const query = {}
- getAppList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.appData = data.records;
- });
},
add() {
console.log('add')
@@ -354,6 +367,7 @@
<style lang="scss" scoped>
.tool {
+ margin-top:0px;
text-align: right;
margin-bottom: 10px;
}
--
Gitblit v1.9.3