diff --git a/src/api/emergency-rescue/index.js b/src/api/emergency-rescue/index.js
index 443edc9..79f65b6 100644
--- a/src/api/emergency-rescue/index.js
+++ b/src/api/emergency-rescue/index.js
@@ -1,27 +1,50 @@
-
-import request from '@/utils/request'
+import request from "@/utils/request";
// 查询参数列表
export function getyjList(query) {
return request({
- url: '/bYjgd/page',
- method: 'get',
- params: query
- })
+ url: "/bYjgd/page",
+ method: "get",
+ params: query,
+ });
}
//新增
export function addyj(data) {
return request({
- url: '/bYjgd/add',
- method: 'post',
- data
- })
+ url: "/bYjgd/add",
+ method: "post",
+ data,
+ });
}
// 修改
export function updateyj(data) {
return request({
- url: '/bYjgd/edit',
- method: 'post',
- data
- })
-}
\ No newline at end of file
+ url: "/bYjgd/edit",
+ method: "post",
+ data,
+ });
+}
+//删除
+export function delyj(query) {
+ return request({
+ url: "/bYjgd/delete",
+ method: "DELETE",
+ params: query,
+ });
+}
+//详情
+export function getyjById(id) {
+ return request({
+ url: `/bYjgd/${id}`,
+ method: "get",
+ });
+}
+
+//组织架构
+export function getDetListById(query) {
+ return request({
+ url: "/dept/tree",
+ method: "get",
+ params: query,
+ });
+}
diff --git a/src/assets/images/visualization/-s-标题底纹_1@2x.png b/src/assets/images/visualization/panel-block-title.png
similarity index 100%
rename from src/assets/images/visualization/-s-标题底纹_1@2x.png
rename to src/assets/images/visualization/panel-block-title.png
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 852cbe4..37975cc 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -139,7 +139,8 @@
.dialog-data{
padding: 10px 10px 0 10px;
min-height: 200px;
-
+ max-height: 800px;
+ overflow-y: auto;
}
.dialog-footer{
display: flex;
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 7085bad..8bbe216 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -16,7 +16,7 @@
:index="index"
:type="item.elTagType"
:class="item.elTagClass"
- >{{ item.label + " " }}{{item.elTagType}}
+ >{{ item.label + " " }}
@@ -80,4 +80,11 @@ function handleArray(array) {
.el-tag + .el-tag {
margin-left: 10px;
}
+.el-tag {
+
+font-size: 14px;
+/* color: #FFFFFF; */
+padding:0 12px;
+font-weight: 500;
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1e59417..4397c37 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -11,6 +11,7 @@ const useUserStore = defineStore(
id: '',
name: '',
avatar: '',
+ deptId:'',
roles: [],
permissions: []
}),
@@ -47,6 +48,7 @@ const useUserStore = defineStore(
this.roles = ['ROLE_DEFAULT']
}
this.id = user.userId
+ this.deptId = user.deptId
this.name = user.userName
this.avatar = avatar
resolve(res)
diff --git a/src/views/emergency-rescue/workOrder/index.vue b/src/views/emergency-rescue/workOrder/index.vue
index 0ba0fa8..b11950e 100644
--- a/src/views/emergency-rescue/workOrder/index.vue
+++ b/src/views/emergency-rescue/workOrder/index.vue
@@ -84,13 +84,21 @@
align="center"
key="gdLevel"
prop="gdLevel"
- />
+ >
+
+
+
+
+ >
+
+ {{ parseTime(scope.row.createTime) }}
+
+
@@ -156,17 +168,29 @@
-
+
diff --git a/src/views/visualization/emergency/components/containerBottom.vue b/src/views/visualization/emergency/components/containerBottom.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/visualization/emergency/components/containerLeft.vue b/src/views/visualization/emergency/components/containerLeft.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/visualization/emergency/components/containerRight.vue b/src/views/visualization/emergency/components/containerRight.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/visualization/emergency/index.vue b/src/views/visualization/emergency/index.vue
index e5c8928..11e0a2e 100644
--- a/src/views/visualization/emergency/index.vue
+++ b/src/views/visualization/emergency/index.vue
@@ -1,5 +1,18 @@
+
+
+
{
});
};
-const inintEntity = (data, fill=false, height, ) => {
+const inintEntity = (data, fill = false, height) => {
const polylineGraphic = new mars3d.graphic.PolygonEntity({
positions: data.positions,
style: {
- fill:fill,
+ fill: fill,
materialType: "Image2",
materialOptions: {
image: areaBg,
@@ -48,9 +61,9 @@ const inintEntity = (data, fill=false, height, ) => {
},
workMaterialType: "Image",
stRotationDegree: 6,
- outline:fill,
- outlineWidth:2,
- outlineColor:"#8EF4FF",
+ outline: fill,
+ outlineWidth: 2,
+ outlineColor: "#8EF4FF",
height: height,
},
});
@@ -86,7 +99,7 @@ const initStyleFeatures = async () => {
url: "/lib/geoJson/park-rectangle.json",
});
const arr = mars3d.Util.geoJsonToGraphics(jsonData); // 解析geojson
- inintEntity(arr[0], false);
+ inintEntity(arr[0], false);
};
/**
@@ -124,8 +137,42 @@ onUnmounted(() => {
});
-