From 44920f344fbebaccf84a8e9f9607738e39da5bd4 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 07 八月 2024 15:38:33 +0800
Subject: [PATCH] feat：考核预警
---
src/views/system/point/index.vue | 108 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 64 insertions(+), 44 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index a83c625..83c25d0 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -34,12 +34,22 @@
</el-col>
<el-col :span="1.5">
<el-popover>
- <div>
- <el-select v-model="importUnitId" size="small" placeholder="璐熻矗鍗曚綅">
+ <div class="bottom_">
+ <el-select 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>
+ <div class="bottom_">
+ <el-date-picker
+ size="small"
+ v-model="ywTimes"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="杩愮淮寮�濮嬫椂闂�"
+ end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ </el-date-picker>
+ </div>
+ <div class="bottom_">
<el-upload
ref="upload"
class="upload-demo"
@@ -54,7 +64,7 @@
</el-upload>
</div>
<div>
- <el-button type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile" @click="handleImport" style="width: 100%; margin-top: 5px"
+ <el-button class="bottom_" type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile || ! this.ywTimes || this.ywTimes.length < 2" @click="handleImport"
v-hasPermi="['point:import']">瀵煎叆</el-button>
</div>
<el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">瀵煎叆鐐逛綅</el-button>
@@ -70,30 +80,24 @@
<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" prop="startTime" width="180">
+ <el-table-column label="鐪佸巺鏍囩" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+ <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="endTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
- </template>
+ <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>
<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">
@@ -114,25 +118,30 @@
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
</el-form-item>
- <el-form-item label="鐐逛綅鏍囩" prop="pointTag">
- <el-select v-model="form.pointTag" placeholder="鐐逛綅鏍囩" multiple clearable>
- <el-option v-for="dict in dict.type.point_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
+ <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 }">
</el-cascader>
+ </el-form-item>
+ <el-form-item label="鐐逛綅鏍囩" prop="pointTag">
+ <el-select v-model="form.pointTag" placeholder="鐐逛綅鏍囩" multiple clearable>
+ <el-option v-for="dict in dict.type.point_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
</el-form-item>
<el-form-item label="杩愮淮鍗曚綅" prop="unitId">
<el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
@@ -140,9 +149,14 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐐逛綅鏃跺尯" prop="timezone">
- <el-date-picker @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
- range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ <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">
@@ -169,7 +183,7 @@
</el-select>
</el-form-item>
<el-form-item label="杩愮淮鏃堕棿娈�" prop="timezone">
- <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
+ <el-date-picker v-model="batchEditForm.timezone" type="daterange" align="right"
unlink-panels range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
@@ -194,6 +208,8 @@
dicts: ['point_tag'],
data() {
return {
+ timezone: [],
+ ywTimes: [],
fileList: [],
importFile: null,
importUrl: '',
@@ -249,9 +265,6 @@
pointName: [
{ required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- pointTag: [
- { required: true, message: "鐐逛綅鏍囩涓嶈兘涓虹┖", trigger: "change" }
- ],
deptId: [
{ required: true, message: "鐩戠閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
],
@@ -281,12 +294,19 @@
},
// 鐐逛綅瀵煎叆
handleImport() {
+ if (! this.ywTimes || this.ywTimes.length < 2) {
+ this.$message.error("璇烽�夋嫨杩愮淮鏃堕棿")
+ return
+ }
this.upload =true;
let formData = new FormData()
formData.append("file", this.importFile)
+ formData.append("startTime", this.ywTimes[0])
+ formData.append("endTime", this.ywTimes[1])
importData(formData, this.importUnitId).then(res => {
this.$message.success("瀵煎叆鎴愬姛")
this.upload = false
+ this.getList()
})
},
// 鐐逛綅瀵煎嚭
@@ -340,12 +360,6 @@
this.deptOptions = res.data;
})
},
-
- // 鏃堕棿閫夋嫨鍙戠敓鍙樺寲
- dateChange() {
- this.tempForm.startTime = this.tempForm.timezone[0];
- this.tempForm.endTime = this.tempForm.timezone[1];
- },
getUnitSelect() {
// 杩愮淮鍗曚綅涓嬫媺鍒楄〃
unitSelect().then((res) => {
@@ -378,7 +392,8 @@
createTime: null,
updateTime: null,
deleted: null,
- pointTag: []
+ importantTag: null,
+ provinceTag: null
};
this.resetForm("form");
},
@@ -410,10 +425,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 = "淇敼杩愮淮鐐逛綅";
});
},
@@ -463,6 +479,10 @@
</script>
<style scoped>
+.bottom_ {
+ width: 100%;
+ margin-bottom: 5px;
+}
.col-item {
margin: 5px 0;
display: flex;
--
Gitblit v1.8.0