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 | 148 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 110 insertions(+), 38 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 671d55c..2da5721 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -29,8 +29,46 @@
v-hasPermi="['point:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-top" size="mini" @click="handleImportPoint"
- v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button>
+ <el-button type="primary" plain icon="el-icon-bottom" v-loading="download" size="mini" @click="handleExport"
+ v-hasPermi="['point:export']">瀵煎嚭鐐逛綅</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-popover>
+ <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 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"
+ drag
+ :action="importUrl"
+ :file-list="fileList"
+ :before-upload="beforeUpload"
+ >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ <div class="el-upload__tip" slot="tip">鍙兘涓婁紶xls/xlsx鏂囦欢</div>
+ </el-upload>
+ </div>
+ <div>
+ <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>
+ </el-popover>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"
@@ -47,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" />
@@ -86,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>-->
@@ -106,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">
@@ -122,8 +159,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -141,14 +178,14 @@
</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>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitBatchEdit">纭� 瀹�</el-button>
<el-button @click="cancelBatchEdit">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitBatchEdit">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -156,7 +193,7 @@
</template>
<script>
-import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint } from "@/api/platform/point";
+import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint, exportData, importData } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
import { getCascader } from '@/api/platform/region'
import { cascader } from '@/api/system/dept'
@@ -166,6 +203,14 @@
dicts: ['point_tag'],
data() {
return {
+ timezone: [],
+ ywTimes: [],
+ fileList: [],
+ importFile: null,
+ importUrl: '',
+ importUnitId: null,
+ download: false,
+ upload: false,
deptOptions: [],
// 鎵归噺淇敼琛ㄥ崟
batchEditForm: {
@@ -215,9 +260,6 @@
pointName: [
{ required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- pointTag: [
- { required: true, message: "鐐逛綅鏍囩涓嶈兘涓虹┖", trigger: "change" }
- ],
deptId: [
{ required: true, message: "鐩戠閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
],
@@ -240,9 +282,46 @@
this.getDeptCascader();
},
methods: {
+ beforeUpload(file) {
+ this.importFile = file
+ this.fileList = [file]
+ return false
+ },
// 鐐逛綅瀵煎叆
- handleImportPoint() {
+ 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()
+ })
+ },
+ // 鐐逛綅瀵煎嚭
+ handleExport() {
+ this.download = true
+ exportData(this.queryParams).then(res => {
+ // 灏嗕簩杩涘埗鏁版嵁杞崲涓� Blob 瀵硅薄
+ let blob = new Blob([res], { type: 'application/octet-stream' });
+ // 鍒涘缓涓嬭浇閾炬帴
+ let downloadLink = document.createElement('a');
+ downloadLink.href = URL.createObjectURL(blob);
+ downloadLink.setAttribute('download', "鐐逛綅鏇存崲杩愮淮鍗曚綅.xlsx"); // 璁剧疆涓嬭浇鏂囦欢鐨勬枃浠跺悕
+ downloadLink.style.display = 'none';
+ // 娣诲姞鍒伴〉闈㈠苟瑙﹀彂涓嬭浇
+ document.body.appendChild(downloadLink);
+ downloadLink.click();
+ document.body.removeChild(downloadLink);
+ this.download = false
+ })
},
cos(value) {
console.log(value)
@@ -275,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() {
// 杩愮淮鍗曚綅涓嬫媺鍒楄〃
@@ -349,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 = "淇敼杩愮淮鐐逛綅";
});
@@ -394,17 +468,15 @@
}).catch(() => {
});
},
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('x/point/export', {
- ...this.queryParams
- }, `point_${new Date().getTime()}.xlsx`)
- }
}
};
</script>
<style scoped>
+.bottom_ {
+ width: 100%;
+ margin-bottom: 5px;
+}
.col-item {
margin: 5px 0;
display: flex;
--
Gitblit v1.8.0