From e5fae45afc610c0cbc5620f2e9138e2188dcf243 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 16 一月 2025 12:20:29 +0800
Subject: [PATCH] 资产管理权限、工单故障显示优化
---
src/views/system/point/index.vue | 293 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 195 insertions(+), 98 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index bfd3e73..edecbc9 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -1,8 +1,23 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" @submit.native.prevent>
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
- <el-input v-model="queryParams.pointName" placeholder="杈撳叆鐐逛綅鍚嶇О" clearable @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.pointName" placeholder="杈撳叆鐐逛綅鍚嶇О" clearable @clear="handleQuery" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-select
+ v-model="queryParams.unitId"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ clearable
+ @change="handleQuery"
+ >
+ <el-option
+ v-for="unit in unitList"
+ :key="unit.id"
+ :label="unit.value"
+ :value="unit.id"
+ />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
@@ -29,29 +44,39 @@
v-hasPermi="['point:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-bottom" v-loading="download" size="mini" @click="handleExport"
+ <el-button type="primary" plain icon="el-icon-top" v-loading="download" size="mini" @click="handleExport"
v-hasPermi="['point:export']">瀵煎嚭鐐逛綅</el-button>
</el-col>
<el-col :span="1.5">
<el-popover>
- <p>瀵煎叆鐐逛綅鍙仛鏇存柊鎿嶄綔</p>
<div class="bottom_">
+ <p>瀵煎叆鐐逛綅鍙仛鏇存柊鎿嶄綔</p>
+ </div>
+ <div class="bottom_">
+ <el-switch
+ v-model="needUpdateUnit"
+ active-text="淇敼杩愮淮鍗曚綅/鏃堕棿"
+ inactive-text="涓嶄慨鏀硅繍缁村崟浣�/鏃堕棿">
+ </el-switch>
+ </div>
+ <div class="bottom_" v-show="needUpdateUnit">
<el-select @change="getUnitContractTime" v-model="importUnitId" size="small" placeholder="鏇存崲杩愮淮鍗曚綅">
<el-option v-for="unit in unitList" :key="unit.id" :label="unit.value" :value="unit.id"></el-option>
</el-select>
</div>
- <div class="bottom_">
+ <div class="bottom_" v-show="needUpdateUnit">
<el-select @change="showTimeRange" v-model="contractId" size="small" placeholder="杩愮淮鍚堝悓" :disabled="! importUnitId">
<el-option v-for="(time, index) in timeList" :key="index" :label="time.name" :value="time.id"></el-option>
</el-select>
<span style="margin-left: 10px;color: #8a8989" v-show="importUnitId">璇ュ崟浣嶆湁{{timeList.length}}涓悎鍚�</span>
</div>
- <div class="bottom_">
+ <div class="bottom_" v-show="needUpdateUnit">
<el-date-picker
:disabled="! contractId"
size="small"
v-model="ywTimes"
type="daterange"
+ value-format="yyyy-MM-dd"
range-separator="鑷�"
start-placeholder="鏇存崲杩愮淮鏃堕棿"
end-placeholder="鏇存崲杩愮淮鏃堕棿">
@@ -75,17 +100,17 @@
<el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport"
v-hasPermi="['point:import']">瀵煎叆</el-button>
</div>
- <el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">瀵煎叆鐐逛綅</el-button>
+ <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button>
</el-popover>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"-->
<!-- v-hasPermi="['point:edit']">鎵归噺淇敼</el-button>-->
<!-- </el-col>-->
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar @refreshHeader= "getDyColumn" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
+ <el-table :key = "refreshkey" v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" show-overflow-tooltip/>
<el-table-column label="鏍囩" align="center" width="200" show-overflow-tooltip>
@@ -94,13 +119,18 @@
<div>{{ getTagText(scope.row) }}</div>
</template>
</el-table-column>
- <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
+ <el-table-column label="杩愮淮寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
</el-table-column>
- <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="140">
+ <el-table-column label="杩愮淮缁撴潫鏃堕棿" align="center" prop="endTime" width="140">
</el-table-column>
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
+ <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)"
@@ -115,81 +145,106 @@
@pagination="getList" />
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="130px">
- <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
- <el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
- </el-form-item>
- <el-form-item label="閲嶇偣鏍囩" prop="importantTag">
- <el-switch
- style="display: block"
- v-model="form.importantTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="閲嶇偣鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
- <el-option label="閲嶇偣鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <el-form-item label="鐪佸巺鏍囩" prop="provinceTag">
- <el-switch
- style="display: block"
- v-model="form.provinceTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="鐪佸巺鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
- <el-option label="鐪佸巺鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <el-form-item label="閲嶇偣鎸囨尌鍥惧儚鏍囩" prop="importantCommandImageTag">
- <el-switch
- style="display: block"
- v-model="form.importantCommandImageTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable>
- <el-option label="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <!-- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">-->
- <!-- <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>-->
- <!-- </el-form-item>-->
- <el-form-item label="鐩戠閮ㄩ棬" prop="deptId">
- <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
- :props="{ checkStrictly: true }">
- </el-cascader>
- </el-form-item>
- <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
- <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
- <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="杩愮淮鏃堕棿" prop="timezone">
- <el-date-picker
- size="small"
- v-model="timezone"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="杩愮淮寮�濮嬫椂闂�"
- end-placeholder="杩愮淮缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鐐逛綅澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark"/>
- </el-form-item>
- </el-form>
+ <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+ <div style="display: flex;flex-direction: row">
+ <div style="flex: 5; border-right: 1px solid #d3d3d3; padding-right: 10px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
+ <el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
+ </el-form-item>
+ <el-form-item label="鐩戠閮ㄩ棬" prop="deptId">
+ <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
+ :props="{ checkStrictly: true }">
+ </el-cascader>
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
+ <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅" clearable @clear = "clearTime">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩愮淮鏃堕棿" prop="timezone">
+ <el-date-picker
+ size="small"
+ v-model="timezone"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="杩愮淮寮�濮嬫椂闂�"
+ end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鐢ㄦ埛鍚�" prop="remark">
+ <el-input v-model="form.username"/>
+ </el-form-item>
+ <el-form-item label="瀵嗙爜" prop="remark">
+ <el-input v-model="form.password"/>
+ </el-form-item>
+ <el-form-item label="鐐逛綅澶囨敞" prop="remark">
+ <el-input type="textarea" v-model="form.remark"/>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div style="flex: 5">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-form-item label="閲嶇偣:" prop="importantTag">
+ <el-switch
+ v-model="form.importantTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="瑙嗛:" prop="provinceTagVideo">
+ <el-switch
+ v-model="form.provinceTagVideo"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="杞﹁締:" prop="provinceTagCar">
+ <el-switch
+ v-model="form.provinceTagCar"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="浜鸿劯:" prop="provinceTagFace">
+ <el-switch
+ v-model="form.provinceTagFace"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閮ㄧ骇:" prop="deptTag">
+ <el-switch
+ v-model="form.deptTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閮ㄧ骇鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閲嶇偣鎸囨尌鍥惧儚:" prop="importantCommandImageTag">
+ <el-switch
+ v-model="form.importantCommandImageTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ </el-form>
+
+ </div>
+ </div>
+
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -225,21 +280,24 @@
</template>
<script>
+import { addDynamicColumn, deleteDynamicColumnById, editDynamicColumn, getDynamicColumnList } from '@/api/platform/dynamicColumn'
import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint, exportData, importData, timeRange } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
import { getCascader } from '@/api/platform/region'
import { cascader } from '@/api/system/dept'
-
export default {
name: "Point",
- dicts: ['point_tag'],
+ dicts: ['point_tag', 'area_code'],
data() {
return {
+ refreshkey : 0,
+ dynamicColumnList: [],
+ needUpdateUnit: false,
importantTag: false,
provinceTag: false,
importantCommandImageTag: false,
timeList: [],
- timezone: [],
+ timezone: null,
ywTimes: [],
fileList: [],
importFile: null,
@@ -317,18 +375,41 @@
this.getUnitSelect();
// this.getCascader();
this.getDeptCascader();
+ this.getDyColumn();
},
methods: {
+ clearTime() {
+ console.log("鐢熸晥")
+ this.timezone = '';
+ },
+ getDyColumn() {
+ // 鏌ヨ鍔ㄦ�佸垪
+ let params = {
+ tableName: 't_yw_point'
+ }
+ getDynamicColumnList(params).then(res => {
+ this.dynamicColumnList = res.data
+ this.refreshkey+=1
+ console.log("鍔犺浇鍔ㄦ�佸垪"+this.refreshkey)
+ })
+ },
+ getDynamicValue(row, propName) {
+ let target = row.dynamicColumnList.filter(item => item.propName === propName)
+ return target && target.length > 0 ? target[0].columnValue : ''
+ },
getTagText(row) {
let text = '';
// 妫�鏌ユ瘡涓爣绛撅紝濡傛灉涓簍rue锛屽垯娣诲姞鍒皌ext涓�
- if (row.importantTag) text += '閲嶇偣鐐逛綅 ';
- if (row.provinceTag) text += '鐪佸巺鐐逛綅 ';
- if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚 ';
-
+ if (row.importantTag) text += '閲嶇偣鐐逛綅銆�';
+ if (row.provinceTagVideo) text += '鐪佸巺瑙嗛銆�';
+ if (row.provinceTagCar) text += '鐪佸巺杞﹁締銆�';
+ if (row.provinceTagFace) text += '鐪佸巺浜鸿劯銆�';
+ if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚銆�';
+ if (row.deptTag) text += '閮ㄧ骇銆�';
+ text === '' ? '鏅�氱偣浣�' : text
// 杩斿洖鎷兼帴鍚庣殑鏂囨湰鍜屽浐瀹氭枃瀛�
- return text ==='' ? '鏅�氱偣浣�' : text
+ return text.replace(/銆�$/, '')
},
getUnitContractTime(unitId) {
this.ywTimes = []
@@ -359,6 +440,7 @@
formData.append("startTime", this.ywTimes[0] ? this.ywTimes[0] : '')
formData.append("endTime", this.ywTimes[1] ? this.ywTimes[1] : '')
formData.append("unitId", this.importUnitId ? this.importUnitId : -1)
+ formData.append("needUpdateUnit", this.needUpdateUnit)
importData(formData).then(res => {
this.$message.success("瀵煎叆鎴愬姛")
this.upload = false
@@ -403,7 +485,12 @@
handleEditBatch() {
this.batchOpen = true;
},
-
+ // 杩愮淮鍏徃涓嬫媺鏁版嵁
+ selectUnit() {
+ workList(this.queryParams).then(res => {
+ this.unitList = res.data;
+ })
+ },
// 鑾峰彇鍖哄幙绾ц仈
getCascader() {
getCascader().then(res => {
@@ -448,8 +535,11 @@
createTime: null,
updateTime: null,
deleted: null,
- importantTag: null,
- provinceTag: null
+ importantTag: false,
+ provinceTagVideo: false,
+ provinceTagCar: false,
+ provinceTagFace: false,
+ deptTag: false,
};
this.resetForm("form");
},
@@ -493,6 +583,13 @@
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
+ if (this.timezone && this.timezone.length > 0) {
+ this.form.startTime = this.timezone[0]
+ this.form.endTime = this.timezone[1]
+ } else {
+ this.form.startTime = null
+ this.form.endTime = null
+ }
if (this.form.deptId && this.form.deptId.length > 0) {
this.form.deptId = this.form.deptId[this.form.deptId.length - 1]
}
@@ -537,7 +634,7 @@
<style scoped>
.bottom_ {
width: 100%;
- margin-bottom: 5px;
+ margin-bottom: 8px;
}
.col-item {
margin: 5px 0;
--
Gitblit v1.8.0