From bcf398d588c873875e680541431c267d611ef557 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 12 五月 2025 13:36:02 +0800
Subject: [PATCH] 导出与自定义标签
---
src/views/system/work-order/distribute/index.vue | 15 ++
src/views/system/data-manage/data-detail/list.js | 8 +
src/views/system/data-manage/data-detail/index.vue | 228 ++++++++++++++++++++++++++++++++++++++++++---
src/api/platform/dynamicColumn.js | 37 +++++++
README.md | 2
5 files changed, 273 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 00c0ab8..b90fad3 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
## 寮�鍙�
-
+npm
```bash
# 鍏嬮殕椤圭洰
git clone https://gitee.com/y_project/RuoYi-Vue
diff --git a/src/api/platform/dynamicColumn.js b/src/api/platform/dynamicColumn.js
index b5464f3..0bd49c1 100644
--- a/src/api/platform/dynamicColumn.js
+++ b/src/api/platform/dynamicColumn.js
@@ -7,6 +7,15 @@
method: "GET"
})
}
+export const updateDynamicValue = (data)=>{
+ return axios({
+ url: "/data/center/videoMinistryVideoAvailable/updateDynamicValue",
+ method: "PUT",
+ data: data
+ })
+}
+
+
// 閫氳繃id鍒犻櫎鍔ㄦ�佸垪
export const deleteDynamicColumnById = (params) => {
@@ -33,3 +42,31 @@
data: params
})
}
+
+// 娣诲姞鍔ㄦ�佸垪
+export const addDynamicColumnByPath = (pathName,params) => {
+ return axios({
+ url: "/api/dynamic-column/addByTableName",
+ method: "POST",
+ data: params,
+ params: pathName
+ })
+}
+
+// 淇敼鍔ㄦ�佸垪
+export const editDynamicColumnByPath = (pathName,params) => {
+ return axios({
+ url: "/api/dynamic-column/updateByTableName",
+ method: "PUT",
+ data: params,
+ params: pathName
+ })
+}
+// 鑾峰彇鍔ㄦ�佸垪鍒楄〃
+export const getDynamicColumnListByTableName = (params) => {
+ return axios({
+ url: "/api/dynamic-column/listByTableName",
+ method: "GET",
+ params:params
+ })
+}
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index 6f8e038..d7cb53c 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -98,14 +98,34 @@
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <right-toolbar style="position: absolute;right: 0px" v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery"
- :columns="showList"></right-toolbar>
+
+
+ <right-toolbar style="position: absolute;right: 0px" v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery"
+ :columns="showList"></right-toolbar>
+ <div>
+ <el-tooltip v-show="needDynamicColumn" style="position: absolute" class="item" effect="dark" content="鑷畾涔夊垪" placement="top">
+ <el-button size="mini" circle icon="el-icon-collection-tag" @click="addDynamicColumn()" />
+ </el-tooltip>
+ </div>
+
</div>
- <div v-show="exportUrl" style="margin-bottom: 5px">
- <el-button slot="reference" type="primary" size="mini" @click="handleExport(exportUrl)" plain
- v-hasPermi="['platform:platform:export']">瀵煎嚭
- </el-button>
+ <div v-show="exportUrl" style="margin-bottom: 5px" >
+ <el-form :model="exportParam" :inline="true">
+ <el-form-item label="鍒楅�夋嫨">
+ <el-select v-model="exportParam.id" size="small">
+ <el-option v-for="option in dynamicColumnList" :key="option.id" :label="option.labelValue" :value="option.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒楀��">
+ <el-input v-model="exportParam.value" size="small" placeholder="鑷畾涔夊垪鍊�"/>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="handleExport(exportUrl)" plain v-hasPermi="['platform:platform:export']">瀵煎嚭
+ </el-button>
+ </el-form-item>
+ </el-form>
+
</div>
<div v-show="index === 'image_resource_security'" style="margin-bottom: 5px">
@@ -119,10 +139,21 @@
<el-table v-loading="loading" :data="tableData.list">
<!-- <el-table-column :prop="item.prop" :label="item.label" :width="item.width" v-for="(item, index) in tableHead"-->
<!-- :key="index" v-if="showListPD(item)">-->
- <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead"
+ <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead"
:key="index" v-if="showListPD(item)">
<template slot-scope="scope">
<span :class="{'error-text': scope.row[item.error]}"> {{ scope.row[item.prop] }} </span>
+ </template>
+ </el-table-column>
+ <el-table-column v-for="(column, index) in dynamicColumnList" :key="index" :label="column.labelValue" :prop="column.propName" align="center">
+ <template slot-scope="scope">
+ {{ getDynamicValue(scope.row, column.propName) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['point:edit']">淇敼</el-button>
</template>
</el-table-column>
</el-table>
@@ -183,7 +214,57 @@
</div>
</el-dialog>
+ <el-dialog
+ title="娣诲姞鍔ㄦ�佸垪"
+ :visible.sync="showDynamicColumn"
+ width="500px"
+ :before-close="dynamicColumnClose">
+ <div>
+ <div style="margin-bottom: 8px">
+ <el-button style="float: right" type="primary" @click="addColumn" size="small">鏂板涓�鏉�</el-button>
+ </div>
+ <div v-for="(dynamicColumn, index) in dynamicColumnList" :key="index">
+ <el-form :inline="true" size="small">
+ <el-form-item label="鍒楀悕" prop="labelValue">
+ <div style="display: flex; flex-direction: row">
+ <el-input v-model="dynamicColumn.labelValue"></el-input>
+ <el-button style="margin-left: 8px" type="danger" @click="delColumn(dynamicColumn.id, index)">鍒犻櫎</el-button>
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button size="small" @click="closeAdd">鍙� 娑�</el-button>
+ <el-button type="primary" size="small" :disabled="!dynamicColumnList || dynamicColumnList.length < 1" @click="saveColumns">淇� 瀛�</el-button>
+ </span>
+ </el-dialog>
+
+ <el-dialog
+ title="淇敼"
+ :visible.sync="showUpdateDynamicColumn"
+ width="500px"
+ :before-close="updateValueDynamicColumnClose">
+ <div v-for="(dynamicColumn, index) in updateDynamicList" :key="index">
+ <el-form :inline="true" size="small">
+ <el-form-item :label="dynamicColumn.labelValue" :prop="dynamicColumn.propName" label-width="100px">
+ <div style="display: flex; flex-direction: row">
+ <el-input v-model="dynamicColumn.columnValue"></el-input>
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button size="small" @click="closeEdit">鍙� 娑�</el-button>
+ <el-button type="primary" size="small" @click="updateValue">纭</el-button>
+ </span>
+ </el-dialog>
+
</div>
+
+
+
</template>
<script>
@@ -191,7 +272,7 @@
import {carData, equipment, faceData, videoData} from "./list";
import {listSecurity, updateSecurity} from '@/api/platform/resource-security';
import {getToken} from "@/utils/auth";
-
+import {deleteDynamicColumnById,editDynamicColumnByPath,getDynamicColumnListByTableName,updateDynamicValue} from '@/api/platform/dynamicColumn';
export default {
name: "Platform",
computed: {
@@ -201,6 +282,20 @@
},
data() {
return {
+ //瀵煎嚭鍙傛暟
+ exportParam: {
+ id: '',
+ value: ''
+ },
+ //澶嶅師鐢�
+ saveDynamicColumnList:[],
+ dynamicColumnList: [],
+ showDynamicColumn:false,
+ showUpdateDynamicColumn:false,
+ updateDynamicList:[],
+ upDateDynamicListNew:[],
+ id: null,
+
// 瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -277,6 +372,7 @@
cardList: [],
index: null,
exportUrl: null,
+ needDynamicColumn:null,
};
},
@@ -298,13 +394,15 @@
if (this.$route.query.type === '1') {
let data = videoData.table.filter(item => item.index === this.$route.query.index)[0]
+ console.log(data)
this.tableHead = data.columns;
this.cardList = data.card;
this.showList = data.showList;
this.optionsStatus = data.optionsStatus;
this.options = data.options;
this.optionsName = data.optionsName;
- this.exportUrl = data.exportUrl
+ this.exportUrl = data.exportUrl;
+ this.needDynamicColumn = data.needDynamicColumn;
}
if (this.$route.query.type === '2') {
let data = carData.table.filter(item => item.index === this.$route.query.index)[0]
@@ -315,6 +413,7 @@
this.options = data.options;
this.optionsName = data.optionsName;
this.exportUrl = data.exportUrl
+ this.needDynamicColumn = data.needDynamicColumn;
}
if (this.$route.query.type === '3') {
let data = faceData.table.filter(item => item.index === this.$route.query.index)[0]
@@ -325,6 +424,7 @@
this.options = data.options;
this.optionsName = data.optionsName;
this.exportUrl = data.exportUrl
+ this.needDynamicColumn = data.needDynamicColumn;
}
if (this.$route.query.type === '4') {
let data = equipment.table.filter(item => item.index === this.$route.query.index)[0]
@@ -335,12 +435,102 @@
this.options = data.options;
this.optionsName = data.optionsName;
this.exportUrl = data.exportUrl
+ this.needDynamicColumn = data.needDynamicColumn;
}
this.getList();
+ this.getDyColumn();
},
methods: {
- getColor(value, prop) {
+ closeAdd(){
+ this.dynamicColumnList = JSON.parse(JSON.stringify(this.saveDynamicColumnList));
+ this.showDynamicColumn = false;
+ },
+ closeEdit(){
+ this.showUpdateDynamicColumn = false;
+ },
+ addDynamicColumn() {
+ this.showDynamicColumn = true
+ },
+ saveColumns() {
+ let params = {
+ pathName: this.$route.query.ruleName,
+ }
+ console.log(params.pathName)
+ editDynamicColumnByPath(params,this.dynamicColumnList).then(res => {
+ this.$message.success("淇濆瓨鎴愬姛")
+ this.$emit('refreshHeader');
+ this.showDynamicColumn = false
+ //閲嶆柊鍒锋柊椤甸潰
+ this.getDyColumn()
+ this.getList()
+ })
+ },
+ addColumn() {
+ this.dynamicColumnList.push({
+ id: null,
+ labelValue: '',
+ })
+ },
+ handleUpdate(row){
+ this.showUpdateDynamicColumn = true;
+ //row 璧嬪�肩粰鍏冪礌
+ console.log(row)
+ if("褰曞儚鍙敤鐜�" === this.$route.query.ruleName){
+ this.id = row.id;
+ }else {
+ this.id = row.no;
+ }
+ //娣辨嫹璐�
+ this.updateDynamicList = JSON.parse(JSON.stringify(row.dynamicColumnList));
+ console.log(updateDynamicList)
+ },
+ updateValue(){
+ let data = {
+ id:this.id,
+ dynamicColumnVOList:this.updateDynamicList,
+ }
+ updateDynamicValue(data).then(res =>{
+ this.$message.success("淇敼鎴愬姛")
+ this.getList();
+ this.showUpdateDynamicColumn = false;
+ })
+ },
+ delColumn(id, index) {
+ if(id) {
+ deleteDynamicColumnById(id).then(res => {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getDyColumn();
+ this.$emit('refreshHeader');
+ })
+ }else {
+ this.dynamicColumnList.splice(index,1)
+ }
+ },
+ getDyColumn() {
+ // 鏌ヨ鍔ㄦ�佸垪
+ let params = {
+ pathName: this.$route.query.ruleName,
+ }
+
+ getDynamicColumnListByTableName(params).then(res => {
+ this.dynamicColumnList = res.data
+ //澶嶅師鐢�
+ this.saveDynamicColumnList = JSON.parse(JSON.stringify(this.dynamicColumnList));
+ this.refreshkey+=1
+ })
+ },
+ getDynamicValue(row, propName) {
+ let target = row.dynamicColumnList.filter(item => item.propName === propName)
+ return target && target.length > 0 ? target[0].columnValue : ''
+ },
+ dynamicColumnClose() {
+ this.showDynamicColumn = false
+ },
+ updateValueDynamicColumnClose() {
+ this.showUpdateDynamicColumn = false
+ },
+ getColor(value, prop) {
// 榛樿棰滆壊
return 'red';
},
@@ -403,6 +593,7 @@
this.tableData = response.data;
this.total = response.total;
this.loading = false;
+
});
},
// 鍙栨秷鎸夐挳
@@ -441,11 +632,14 @@
this.upload.open = true;
},
handleExport(url) {
- this.download(url, {
- ...this.queryParams,
- }, this.$route.query.ruleName+`_${new Date().getTime()}.xlsx`, {
- timeout: 60000
- })
+ const filteredParams = { ...this.queryParams };
+ filteredParams.exportParam = this.exportParam;
+ console.log(filteredParams)
+ // this.download(url, {
+ // filteredParams,
+ // }, this.$route.query.ruleName+`_${new Date().getTime()}.xlsx`, {
+ // timeout: 60000
+ // })
},
/** 涓嬭浇妯℃澘 */
importTemplate() {
@@ -535,4 +729,8 @@
width: 150px;
margin: 0 30px;
}
+.custom-label-form-item .el-form-item__label {
+ width: 100px ; /* 鍥哄畾瀹藉害涓� 100px */
+ text-align: right; /* 鍙�夛細璁╂枃鏈彸瀵归綈 */
+}
</style>
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index 0a9412b..8427568 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -513,7 +513,9 @@
},
{
title: "瑙嗛鐐逛綅鍦ㄧ嚎鐜�",
+ exportUrl: '/data/center/pointOnlineVideo/export',
index: 'site_online',
+ needDynamicColumn: true,
columns: [
{
label: '鍥芥爣鐮�',
@@ -613,7 +615,9 @@
},
{
title: "褰曞儚鍙敤鐜�",
+ exportUrl: '/data/center/recordingAvailability/export',
index: 'video_available',
+ needDynamicColumn:true,
columns: [
{
label: "琛屾斂鍖哄煙",
@@ -1853,7 +1857,9 @@
},
{
title: '杞﹁締鐐逛綅鍦ㄧ嚎鐜�',
+ exportUrl: '/data/center/pointOnlineCar/export',
index: 'site_online',
+ needDynamicColumn: true,
columns: [
{
label: '鍥芥爣鐮�',
@@ -2995,7 +3001,9 @@
},
{
title: '浜鸿劯鐐逛綅鍦ㄧ嚎鐜�',
+ exportUrl: '/data/center/pointOnlineFace/export',
index: 'site_online',
+ needDynamicColumn: true,
columns: [
{
label: '鍥芥爣鐮�',
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index 320c762..f9177b6 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -137,7 +137,14 @@
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName"/>
<el-table-column label="浜х敓鏃堕棿" align="center" prop="createTime"/>
<el-table-column v-if="queryParams.status === 'DISTRIBUTED'" label="涓嬪彂浜�" align="center" prop="realName"/>
- <el-table-column v-if="queryParams.status === 'DISTRIBUTED'" label="涓嬪彂鏃堕棿" align="center" prop="distributeTime"/>
+ <el-table-column v-if="queryParams.status === 'DISTRIBUTED'" label="涓嬪彂鏃堕棿" align="center" prop="distributeTime"/>0
+ <el-table-column label="鎿嶄綔" align="center" v-if="queryParams.status === 'WAIT_DISTRIBUTE'">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" @click="delWorkOrderClick(scope.row)" v-show="scope.row.status === 'WAIT_DISTRIBUTE'">
+ 鍒犻櫎
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@@ -204,11 +211,13 @@
import {distributeWorkOrder, fastDistribute, addWorkOrder, updateWorkOrder, selectedIdsDistribute, errorTypeAll} from '@/api/platform/work-order'
import {workList} from "@/api/platform/unit";
import { pointSelectData } from "@/api/platform/point";
+import {delWorkOrder} from "../../../../api/platform/work-order";
export default {
dicts: ['error_type'],
name: 'Work-order-distribute',
data() {
return {
+ showDel:false,
errorTypeList: [], // 鐢ㄤ簬瀛樺偍閫変腑鐨勯」鐩甀D
showSearch: true,
selectedIdsDistributeForm: {
@@ -320,6 +329,10 @@
},
},
methods: {
+ delWorkOrderClick(row){
+ delWorkOrder(row.id)
+ this.page()
+ },
getErrorList() {
errorTypeAll().then(errorRes => {
this.errorTypeList = errorRes.data;
--
Gitblit v1.8.0