FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!59
This commit is contained in:
高嵩
2023-04-19 14:51:48 +08:00
parent 031a564acf d99ab3a17a
commit 9ac1a8ac21
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
-2
View File
@@ -84,9 +84,7 @@
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span> <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+2 -1
View File
@@ -87,7 +87,7 @@
<span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span> <span>{{ getPrcName(scope.row.prcType,scope.row.taskInfo) }}</span>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPrcName(scope.row.prcType) }}</span> <span>{{ getPrcNameFilter(scope.row) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -203,6 +203,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.processList = res.list || [] this.processList = res.list || []
console.log(this.processList)
this.total = res.count this.total = res.count
}, e => { }, e => {
}) })