From 1cccf113a2bb2c2da38ee9c7e3ac01337b1b976f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 28 Dec 2022 09:37:54 +0800
Subject: [PATCH] 整体样式风格修改
---
vue.config.js | 2
package-lock.json | 11 +++++
src/views/security/security.vue | 54 +++++++++++++++++++--------
package.json | 1
src/views/panorama/panorama.vue | 18 +++++++++
5 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 606a612..e78fa44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2187,6 +2187,17 @@
}
}
},
+ "avue-plugin-map": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmmirror.com/avue-plugin-map/-/avue-plugin-map-1.0.1.tgz",
+ "integrity": "sha512-QpGiCJZxF/DptoJrZnZWwQSxA2oBI7S8Wog3CEh9EhwrAKb+I0Ct8PWO+hBH2Q+tXTv/glhSWMh9aUbQa0/YIg==",
+ "requires": {
+ "axios": "^0.18.0",
+ "element-ui": "^2.4.6",
+ "vue": "^2.5.17",
+ "vue-router": "^3.0.1"
+ }
+ },
"avue-plugin-ueditor": {
"version": "0.1.7",
"resolved": "https://registry.npmmirror.com/avue-plugin-ueditor/-/avue-plugin-ueditor-0.1.7.tgz",
diff --git a/package.json b/package.json
index e01e97e..df00d4e 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
},
"dependencies": {
"@dvgis/dc-sdk": "^2.17.0",
+ "avue-plugin-map": "^1.0.1",
"avue-plugin-ueditor": "^0.1.4",
"axios": "^0.18.0",
"babel-polyfill": "^6.26.0",
diff --git a/src/views/panorama/panorama.vue b/src/views/panorama/panorama.vue
index cf40d4e..c41642b 100644
--- a/src/views/panorama/panorama.vue
+++ b/src/views/panorama/panorama.vue
@@ -80,6 +80,24 @@
}],
},
{
+ label: "所属辖区",
+ prop: "deptId",
+ type: "tree",
+ dicUrl: "api/blade-system/dept/lazy-list",
+ props:{
+ label:'deptName',
+ value:'id',
+ children:'children'
+ },
+ search: true,
+ searchSpan:4,
+ rules: [{
+ required: true,
+ message: "请选择所属辖区",
+ trigger: "blur"
+ }]
+ },
+ {
label: "链接地址",
prop: "vrUrl",
type: "input",
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 2250a4e..27d5f51 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -33,6 +33,7 @@
<script>
import {getPage, getDetail, add, update, remove} from "@/api/security/security";
+ import AvueMap from 'avue-plugin-map';
import {mapGetters} from "vuex";
export default {
@@ -50,6 +51,7 @@
option: {
height: 'auto',
calcHeight: 30,
+ labelWidth: "100",
dialogWidth: 950,
tip: false,
searchShow: true,
@@ -68,8 +70,23 @@
searchSpan:4,
},
{
+ label: "负责单位",
+ prop: "company",
+ },
+ {
label: "负责人",
prop: "person",
+ },
+ {
+ label: "联系方式",
+ prop: "contact",
+ },
+ {
+ label: "活动地点",
+ prop: "place",
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: false,
},
{
label: "所属辖区",
@@ -95,13 +112,6 @@
// type: "map",
// },
{
- label: "地址",
- prop: "place",
- // addDisplay: false,
- // editDisplay: false,
- // viewDisplay: false,
- },
- {
label: "开始时间",
prop: "startTime",
type: "datetime",
@@ -119,8 +129,8 @@
prop: "endTime",
type: "datetime",
defaultTime: '23:59:59',
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm",
rules: [{
required: true,
message: "请输入结束时间",
@@ -128,17 +138,29 @@
}],
},
{
- label: "经纬度",
- prop: "position",
- type: "input",
- hide:true
- },
- {
label: "活动内容",
prop: "content",
},
{
- label: "申报人数",
+ label: "经纬度",
+ prop: "position",
+ type: "input",
+ span: 9,
+ hide:true
+ },
+ {
+ label: "",
+ prop: "map",
+ labelWidth: 10,
+ searchSpan: 0,
+ // maxlength: 5,
+ hide: true,
+ span: 3,
+ // display:false,
+ component: "AvueMap",
+ },
+ {
+ label: "人数",
prop: "number",
},
{
diff --git a/vue.config.js b/vue.config.js
index a9b61c7..a11a55f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@
proxy: {
'/api': {
//本地服务接口地址
- target: 'http://192.168.0.115:82/',
+ target: 'http://192.168.2.125:82/',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3