From c46d8df84b7eefe4cfeb433571112eb6be71a893 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 14:13:10 +0800
Subject: [PATCH] 点位去掉设备类型
---
src/views/system/point/index.vue | 135 ++++++++++++++++++++++++++++++++------------
1 files changed, 97 insertions(+), 38 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 4a8c416..cfceccf 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -1,12 +1,12 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<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 @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -29,8 +29,36 @@
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>
+ <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>
+ <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 type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile" @click="handleImport" style="width: 100%; margin-top: 5px"
+ 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"
@@ -41,10 +69,17 @@
<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" />
- <el-table-column label="鏍囩" align="center" width="90">
+ <el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" 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="180">
@@ -59,13 +94,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">
@@ -86,21 +114,21 @@
<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 }">
@@ -122,8 +150,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>
@@ -147,8 +175,8 @@
</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 +184,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 +194,12 @@
dicts: ['point_tag'],
data() {
return {
+ fileList: [],
+ importFile: null,
+ importUrl: '',
+ importUnitId: null,
+ download: false,
+ upload: false,
deptOptions: [],
// 鎵归噺淇敼琛ㄥ崟
batchEditForm: {
@@ -240,9 +274,39 @@
this.getDeptCascader();
},
methods: {
+ beforeUpload(file) {
+ this.importFile = file
+ this.fileList = [file]
+ return false
+ },
// 鐐逛綅瀵煎叆
- handleImportPoint() {
+ handleImport() {
+ this.upload =true;
+ let formData = new FormData()
+ formData.append("file", this.importFile)
+ importData(formData, this.importUnitId).then(res => {
+ this.$message.success("瀵煎叆鎴愬姛")
+ this.upload = false
+ })
+ },
+ // 鐐逛綅瀵煎嚭
+ 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)
@@ -314,7 +378,8 @@
createTime: null,
updateTime: null,
deleted: null,
- pointTag: []
+ importantTag: null,
+ provinceTag: null
};
this.resetForm("form");
},
@@ -346,10 +411,10 @@
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.open = true;
+ console.log(this.form)
this.title = "淇敼杩愮淮鐐逛綅";
});
},
@@ -394,12 +459,6 @@
}).catch(() => {
});
},
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('x/point/export', {
- ...this.queryParams
- }, `point_${new Date().getTime()}.xlsx`)
- }
}
};
</script>
--
Gitblit v1.8.0