From a4a6032a323343837d3cfe86dd8f8cca1260d759 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 28 四月 2024 17:04:31 +0800
Subject: [PATCH] 点位完善
---
src/views/system/point/index.vue | 114 +++++++++++++++++++++++--------------
src/api/system/dept.js | 8 ++
2 files changed, 78 insertions(+), 44 deletions(-)
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 277263c..70be0eb 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -65,3 +65,11 @@
method: 'get'
})
}
+
+// 鑾峰彇绾ц仈鏁版嵁
+export function cascader() {
+ return request({
+ url: '/system/dept/cascader',
+ method: 'get'
+ })
+}
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index c8b775e..4e213ab 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -88,9 +88,11 @@
<el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐐逛綅绫诲瀷" align="center" prop="pointType" />
- <el-table-column label="鏍囩" align="center" prop="tag" >
- <span>{{important}}</span>
+ <el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200"/>
+ <el-table-column label="鏍囩" align="center" width="90">
+ <template slot-scope="scope">
+ <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">
@@ -113,7 +115,7 @@
</el-table-column>
<el-table-column label="杩愮淮鐘舵��" align="center" prop="status" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -147,15 +149,19 @@
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
</el-form-item>
- <el-form-item label="鐐逛綅鏍囩" prop="tag">
- <el-select v-model="form.tag" placeholder="鐐逛綅鏍囩">
- <el-option label="鏅�氱偣浣�" value="鏅�氱偣浣�"/>
- <el-option label="閲嶇偣鐐逛綅" value="閲嶇偣鐐逛綅"/>
+ <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>
+<!-- <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"/>
@@ -163,12 +169,14 @@
<el-option label="杞﹁締鐩戞帶" value="3"/>
</el-select>
</el-form-item>
- <el-form-item label="鐩戠閮ㄩ棬" prop="category">
- <el-select v-model="form.deptName" placeholder="鐩戠閮ㄩ棬">
- <el-option label="鐪佸巺" value="鐪佸巺"/>
- <el-option label="鑷础鑽ｅ幙鍏畨灞�" value="鑷础鑽ｅ幙鍏畨灞�"/>
- <el-option label="鑷础瀵岄『鍏畨灞�" value="鑷础瀵岄『鍏畨灞�"/>
- </el-select>
+ <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="unitId">
<el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
@@ -242,12 +250,15 @@
<script>
import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
-import { getCascader } from '../../../api/platform/region'
+import { getCascader } from '@/api/platform/region'
+import { cascader } from '@/api/system/dept'
export default {
name: "Point",
+ dicts: ['point_tag'],
data() {
return {
+ deptOptions: [],
// 鎵归噺淇敼琛ㄥ崟
batchEditForm: {
ids: [],
@@ -264,7 +275,6 @@
editingIndex: null,
// 閬僵灞�
loading: true,
- important: '閲嶇偣鐐逛綅',
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -310,10 +320,10 @@
pointName: [
{ required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- region: [
- { required: true, message: "鐐逛綅鎵�鍦ㄥ湴涓嶈兘涓虹┖", trigger: "change" }
+ pointTag: [
+ { required: true, message: "鐐逛綅鏍囩涓嶈兘涓虹┖", trigger: "change" }
],
- deptName: [
+ deptId: [
{ required: true, message: "鐩戠閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
],
category: [
@@ -331,7 +341,8 @@
created() {
this.getList();
this.getUnitSelect();
- this.getCascader();
+ // this.getCascader();
+ this.getDeptCascader();
},
methods: {
// 鐐逛綅瀵煎叆
@@ -364,6 +375,12 @@
getCascader() {
getCascader().then(res => {
this.regionList = res.data;
+ })
+ },
+ // 鑾峰彇閮ㄩ棬绾ц仈
+ getDeptCascader() {
+ cascader().then(res => {
+ this.deptOptions = res.data;
})
},
// 鐐逛綅椤逛慨鏀瑰畬鎴�
@@ -426,12 +443,13 @@
startTime: null,
endTime: null,
unitId: null,
+ deptId: [],
status: null,
remark: null,
createTime: null,
updateTime: null,
deleted: null,
- pointDetail: ""
+ pointTag: []
};
this.resetForm("form");
},
@@ -463,33 +481,41 @@
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.timezone = [this.form.startTime, this.form.endTime]
- if (this.form.pointDetail) {
- this.tempFormList = JSON.parse(this.form.pointDetail)
- }
+ this.form.category = this.form.category + ''
this.open = true;
this.title = "淇敼杩愮淮鐐逛綅";
});
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- if (this.tempFormList) {
- this.form.pointDetail = JSON.stringify(this.tempFormList)
- }
- if (this.form.id != null) {
- updatePoint(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addPoint(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.reset()
- this.getList();
- });
- }
+ this.$refs['form'].validate(valid => {
+ if(valid) {
+ if (this.form.deptId && this.form.deptId.length > 0) {
+ this.form.deptId = this.form.deptId[this.form.deptId.length - 1]
+ }
+ let category = JSON.parse(JSON.stringify(this.form.category));
+ this.form.category = parseInt(category)
+ if (this.form.id != null) {
+ updatePoint(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addPoint(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.reset()
+ this.getList();
+ });
+ }
+ } else {
+ console.log("error")
+ }
+ })
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
--
Gitblit v1.8.0