From c9459d46bcfc8320fe4423eb388855539d45f7bc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 11:08:55 +0800
Subject: [PATCH] 点位时间优化
---
src/views/system/point/index.vue | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index a83c625..2da5721 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>
@@ -75,15 +85,9 @@
<dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
</template>
</el-table-column>
- <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.startTime, '{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="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
- </template>
+ <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" />
@@ -114,11 +118,6 @@
<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-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>-->
@@ -134,15 +133,25 @@
: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="杩愮淮鍗曚綅">
<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 @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 +178,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 +203,8 @@
dicts: ['point_tag'],
data() {
return {
+ timezone: [],
+ ywTimes: [],
fileList: [],
importFile: null,
importUrl: '',
@@ -249,9 +260,6 @@
pointName: [
{ required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- pointTag: [
- { required: true, message: "鐐逛綅鏍囩涓嶈兘涓虹┖", trigger: "change" }
- ],
deptId: [
{ required: true, message: "鐩戠閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
],
@@ -281,12 +289,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()
})
},
// 鐐逛綅瀵煎嚭
@@ -339,12 +354,6 @@
cascader().then(res => {
this.deptOptions = res.data;
})
- },
-
- // 鏃堕棿閫夋嫨鍙戠敓鍙樺寲
- dateChange() {
- this.tempForm.startTime = this.tempForm.timezone[0];
- this.tempForm.endTime = this.tempForm.timezone[1];
},
getUnitSelect() {
// 杩愮淮鍗曚綅涓嬫媺鍒楄〃
@@ -413,6 +422,7 @@
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;
this.title = "淇敼杩愮淮鐐逛綅";
});
@@ -463,6 +473,10 @@
</script>
<style scoped>
+.bottom_ {
+ width: 100%;
+ margin-bottom: 5px;
+}
.col-item {
margin: 5px 0;
display: flex;
--
Gitblit v1.8.0