From 55dee1e07a1569f57b38655e175dbda49a0699a8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 12 八月 2024 11:42:12 +0800
Subject: [PATCH] 样式调整
---
src/views/system/point/index.vue | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 2da5721..e39645e 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -34,13 +34,21 @@
</el-col>
<el-col :span="1.5">
<el-popover>
+ <p>瀵煎叆鐐逛綅鍙仛鏇存柊鎿嶄綔</p>
<div class="bottom_">
- <el-select v-model="importUnitId" size="small" placeholder="杩愮淮鍗曚綅">
+ <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_">
+ <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_">
<el-date-picker
+ :disabled="! contractId"
size="small"
v-model="ywTimes"
type="daterange"
@@ -48,6 +56,11 @@
start-placeholder="杩愮淮寮�濮嬫椂闂�"
end-placeholder="杩愮淮缁撴潫鏃堕棿">
</el-date-picker>
+ </div>
+ <div class="bottom_">
+ <el-checkbox v-model="provinceTag">閲嶇偣鐐逛綅</el-checkbox>
+ <el-checkbox v-model="importantTag">鐪佸巺</el-checkbox>
+ <el-checkbox v-model="importantCommandImageTag">閲嶇偣鎸囨尌鍥惧儚</el-checkbox>
</div>
<div class="bottom_">
<el-upload
@@ -70,19 +83,26 @@
<el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">瀵煎叆鐐逛綅</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>
+<!-- <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>
</el-row>
<el-table 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="90" show-overflow-tooltip>
+ <el-table-column label="閲嶇偣鏍囩" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
+ <div v-if="scope.row.importantTag === 'important'">閲嶇偣鐐逛綅</div>
+ <div v-else-if="scope.row.importantTag === 'normal'">鏅�氱偣浣�</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐪佸巺鏍囩" align="center" width="90" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <div v-if="scope.row.provinceTag === 'province'">鐪佸巺鐐逛綅</div>
+ <div v-else-if="scope.row.provinceTag === 'normal'">鏅�氱偣浣�</div>
</template>
</el-table-column>
<el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
@@ -91,13 +111,6 @@
</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="category">
- <template slot-scope="scope">
- <div v-if="scope.row.category === 1">瑙嗛鐩戞帶</div>
- <div v-else-if="scope.row.category === 2">杞﹁締璇嗗埆</div>
- <div v-else-if="scope.row.category === 3">浜鸿劯璇嗗埆</div>
- </template>
- </el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -118,16 +131,21 @@
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
</el-form-item>
+ <el-form-item label="閲嶇偣鏍囩" prop="importantTag">
+ <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
+ <el-option label="閲嶇偣鐐逛綅" value="important" />
+ <el-option label="鏅�氱偣浣�" value="normal" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐪佸巺鏍囩" prop="provinceTag">
+ <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
+ <el-option label="鐪佸巺鐐逛綅" value="province" />
+ <el-option label="鏅�氱偣浣�" value="normal" />
+ </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="category">
- <el-select v-model="form.category" placeholder="璁惧绫诲瀷">
- <el-option label="浜鸿劯璇嗗埆" value="2" />
- <el-option label="瑙嗛鐩戞帶" value="1" />
- <el-option label="杞﹁締鐩戞帶" value="3" />
- </el-select>
- </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 }">
@@ -193,7 +211,7 @@
</template>
<script>
-import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint, exportData, importData } from "@/api/platform/point";
+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'
@@ -203,12 +221,17 @@
dicts: ['point_tag'],
data() {
return {
+ importantTag: false,
+ provinceTag: false,
+ importantCommandImageTag: false,
+ timeList: [],
timezone: [],
ywTimes: [],
fileList: [],
importFile: null,
importUrl: '',
importUnitId: null,
+ contractId: null,
download: false,
upload: false,
deptOptions: [],
@@ -282,6 +305,22 @@
this.getDeptCascader();
},
methods: {
+ getUnitContractTime(unitId) {
+ this.ywTimes = []
+ this.contractId = null;
+ timeRange(unitId).then(res => {
+ this.timeList = res.data;
+ })
+ },
+ showTimeRange(contractId) {
+ let a = this.timeList.filter(item => item.id === contractId)
+ if (a.length < 1) {
+ this.ywTimes = []
+ return
+ }
+ let target = a[0]
+ this.ywTimes = [target.startTime, target.endTime]
+ },
beforeUpload(file) {
this.importFile = file
this.fileList = [file]
@@ -298,6 +337,9 @@
formData.append("file", this.importFile)
formData.append("startTime", this.ywTimes[0])
formData.append("endTime", this.ywTimes[1])
+ formData.append("provinceTag", this.provinceTag)
+ formData.append("importantTag", this.importantTag)
+ formData.append("importantCommandImageTag", this.importantCommandImageTag)
importData(formData, this.importUnitId).then(res => {
this.$message.success("瀵煎叆鎴愬姛")
this.upload = false
@@ -387,7 +429,8 @@
createTime: null,
updateTime: null,
deleted: null,
- pointTag: []
+ importantTag: null,
+ provinceTag: null
};
this.resetForm("form");
},
@@ -419,11 +462,11 @@
const id = row.id || this.ids
getPoint(id).then(response => {
this.form = response.data;
- this.form.pointTag = response.data.pointTags;
this.form.deptId = response.data.deptIds
this.form.category = this.form.category + ''
this.timezone = [response.data.startTime, response.data.endTime]
this.open = true;
+ console.log(this.form)
this.title = "淇敼杩愮淮鐐逛綅";
});
},
--
Gitblit v1.8.0