From c393f8b721c1e7f6ea65ff0f3ad3a47dce71cfbc Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 21 Jan 2025 10:20:34 +0800
Subject: [PATCH] 格式异常问题解决
---
src/views/security/security.vue | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 01c307a..c9f1333 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -2,8 +2,9 @@
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
:before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave"
- @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
- @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad">
<template slot="menuLeft">
<el-button size="small" icon="el-icon-delete" plain v-if="permission.security_delete"
@click="handleDelete">删 除
@@ -16,8 +17,7 @@
</el-button>
</template>
<!-- <template slot="activityAreaForm"> -->
- <!-- <map-box ref="OpenLayersMap" @toData="toData" :routeRange="form.activityArea"></map-box> -->
- <!-- <dc-map ref="dcMap" @toData="toData" :range="form.activityArea"></dc-map> -->
+ <!-- <dc-map ref="dcMap" @toData="toData" :range="form.activityArea"></dc-map> -->
<!-- </template> -->
</avue-crud>
@@ -130,6 +130,7 @@
}],
},
{
+ type: 'select',
label: "活动地点",
prop: "place",
span: 24,
@@ -137,6 +138,11 @@
this.placeBox = !this.placeBox
},
overHidden: true,
+ rules: [{
+ required: true,
+ message: "请选择活动地点",
+ trigger: "blur"
+ }],
},
{
label: "经度",
@@ -224,33 +230,53 @@
// type: "map",
// },
{
- label: "开始时间",
- prop: "startTime",
- type: "datetime",
- defaultTime: '00:00:00',
- format: "yyyy-MM-dd HH:mm",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- rules: [{
- required: true,
- message: "请输入开始时间",
- trigger: "blur"
- }],
- width: 120,
- },
- {
- label: "结束时间",
- prop: "endTime",
- type: "datetime",
- defaultTime: '23:59:59',
+ span: 24,
+ label: "时间范围",
+ prop: "datetimerange",
+ type: "datetimerange",
+ // defaultTime: ['00:00', '00:00'],
format: "yyyy-MM-dd HH:mm",
valueFormat: "yyyy-MM-dd HH:mm",
+ startPlaceholder: '开始时间',
+ endPlaceholder: '结束时间',
rules: [{
required: true,
- message: "请输入结束时间",
+ message: "请选择时间范围",
trigger: "blur"
}],
width: 120,
},
+ // {
+ // label: "开始时间",
+ // prop: "startTime",
+ // type: "datetime",
+ // defaultTime: '00:00:00',
+ // format: "yyyy-MM-dd HH:mm",
+ // valueFormat: "yyyy-MM-dd HH:mm:ss",
+ // rules: [{
+ // required: true,
+ // message: "请输入开始时间",
+ // trigger: "blur"
+ // }],
+ // width: 120,
+ // },
+ // {
+ // label: "结束时间",
+ // prop: "endTime",
+ // type: "datetime",
+ // defaultTime: '23:59:59',
+ // format: "yyyy-MM-dd HH:mm",
+ // valueFormat: "yyyy-MM-dd HH:mm",
+ // disabledDate (time) {
+ // return time.getTime() < Date.now()
+ // },
+ // rules: [{
+ // required: true,
+ // message: "请输入结束时间",
+ // trigger: "blur"
+ // }],
+ // width: 120,
+ // },
// {
// label: "",
// prop: "map",
@@ -349,6 +375,9 @@
})
},
rowSave (row, done, loading) {
+ row.startTime = row.datetimerange[0]
+ row.endTime = row.datetimerange[1]
+
row.position = row.longitude + " " + row.latitude
add(row).then(() => {
this.onLoad(this.page)
@@ -363,15 +392,9 @@
})
},
rowUpdate (row, index, done, loading) {
- console.log('row', row)
- if (!row.activityArea) {
- this.$message.warning("请绘制活动区域")
- loading()
- return
- }
- if (!row.activityArea.startsWith("'LINESTRING")) {
- row.activityArea = "'LINESTRING(" + row.activityArea + ")'"
- }
+ row.startTime = row.datetimerange[0]
+ row.endTime = row.datetimerange[1]
+
row.position = row.longitude + " " + row.latitude
update(row).then(() => {
this.onLoad(this.page)
@@ -429,6 +452,7 @@
getDetail(this.form.id).then(res => {
var data = res.data.data
this.form = data
+ this.form['datetimerange'] = [data.startTime, data.endTime]
this.form['longitude'] = data.position.split(" ")[0]
this.form['latitude'] = data.position.split(" ")[1]
this.point = "POINT(" + this.form.longitude + " " + this.form.latitude + ")"
--
Gitblit v1.9.3