From 93908a8b61379fff24a0daea92513d4db2466ff7 Mon Sep 17 00:00:00 2001 From: xuhongjie <1943105267@qq.com> Date: Fri, 30 May 2025 14:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A2=E9=99=A9=E5=B7=A5=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/emergency-rescue/index.js | 16 + src/assets/images/map-gps.png | Bin 0 -> 11011 bytes src/assets/images/map-marker.png | Bin 0 -> 3273 bytes src/assets/styles/element-ui.scss | 36 +- src/assets/styles/ruoyi.scss | 6 +- src/assets/styles/variables.module.scss | 3 +- src/components/DictTag/index.vue | 5 +- src/components/mars-work/mapOptions.js | 51 +++ src/components/tableOperation/index.vue | 30 +- src/components/tablePage/index.vue | 59 ++-- src/main.js | 3 +- src/utils/common.js | 36 +- .../emergency-rescue/workOrder-info/index.vue | 12 - .../workOrder-operation/index.vue | 12 - src/views/emergency-rescue/workOrder/index.js | 1 + .../emergency-rescue/workOrder/index.vue | 247 +++++++------- src/views/emergency-rescue/workOrder/info.vue | 0 .../emergency-rescue/workOrder/operation.vue | 321 ++++++++++++++++++ 18 files changed, 665 insertions(+), 173 deletions(-) create mode 100644 src/assets/images/map-gps.png create mode 100644 src/assets/images/map-marker.png create mode 100644 src/components/mars-work/mapOptions.js delete mode 100644 src/views/emergency-rescue/workOrder-info/index.vue delete mode 100644 src/views/emergency-rescue/workOrder-operation/index.vue create mode 100644 src/views/emergency-rescue/workOrder/index.js create mode 100644 src/views/emergency-rescue/workOrder/info.vue create mode 100644 src/views/emergency-rescue/workOrder/operation.vue diff --git a/src/api/emergency-rescue/index.js b/src/api/emergency-rescue/index.js index 246471c..443edc9 100644 --- a/src/api/emergency-rescue/index.js +++ b/src/api/emergency-rescue/index.js @@ -8,4 +8,20 @@ export function getyjList(query) { method: 'get', params: query }) +} +//新增 +export function addyj(data) { + return request({ + url: '/bYjgd/add', + method: 'post', + data + }) +} +// 修改 +export function updateyj(data) { + return request({ + url: '/bYjgd/edit', + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/assets/images/map-gps.png b/src/assets/images/map-gps.png new file mode 100644 index 0000000000000000000000000000000000000000..7583d1ad73abb3c30bbb96434e0cf4b45711d94a GIT binary patch literal 11011 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 literal 0 HcmV?d00001 diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 24da405..f5bfc39 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -1,5 +1,5 @@ // cover some element-ui styles - +@import './variables.module.scss'; .el-breadcrumb__inner, .el-breadcrumb__inner a { font-weight: 400 !important; @@ -113,4 +113,38 @@ display: grid; grid-template-columns: repeat(4, 1fr); /* 创建4列，每列宽度相等 */ } +.el-cascader { + width: 100%; +} +.x-dialog{ + padding: 0; + .el-dialog__header{ + height: 50px; + line-height: 50px; + background-color:$--color-primary ; + padding: 0 10px; + .el-dialog__title{ + font-size: 18px; + color: #fff; + letter-spacing: 1px; + font-family: 'MiSans-Medium'; + } + .el-dialog__close{ + color: #fff; + font-size: 18px; + font-weight: bold; + } + + } + .dialog-data{ + padding: 10px 10px 0 10px; + min-height: 200px; + } + .dialog-footer{ + display: flex; + align-items: center; + justify-content: center; + padding: 10px; + } +} \ No newline at end of file diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index b3240c3..2f59111 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -104,7 +104,7 @@ .pagination-container { display: flex; justify-content: flex-end; - margin-top: 20px; + // margin-top: 20px; background-color: transparent !important; } @@ -232,13 +232,15 @@ } .text-success { - color: #1c84c6; + color: #3ED879; } .text-info { color: #23c6c8; } + + .text-warning { color: #f8ac59; } diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 1e44e46..50df656 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -34,7 +34,7 @@ $base-sub-menu-background: #D8E3FF; $base-sub-menu-hover: rgba(0, 0, 0, 0.06); // 组件变量 -$--color-primary: #409EFF; +$--color-primary: #4776EB; $--color-success: #67C23A; $--color-warning: #E6A23C; $--color-danger: #F56C6C; @@ -71,6 +71,7 @@ $--color-info: #909399; :root { /* 亮色模式变量 */ --sidebar-bg: #{$menuBg}; + --sidebar-text: #{$menuText}; --menu-hover: #{$menuHover}; diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index a966437..7085bad 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -2,8 +2,9 @@
@@ -49,11 +65,15 @@ const clickSub = () => { padding: 0 10px; display: flex; align-items: center; - flex-direction: row-reverse; + justify-content: space-between; gap: 10px; height: 50px; border-bottom: 1px solid #e5eaf3; } + .operation-title { + font-size: 18px; + font-family: "MiSans-Medium"; + } .operation-panel { height: calc(100% - 50px); diff --git a/src/components/tablePage/index.vue b/src/components/tablePage/index.vue index 2c38d23..3c5cb85 100644 --- a/src/components/tablePage/index.vue +++ b/src/components/tablePage/index.vue @@ -3,27 +3,33 @@
+
-
- 录入 - 导出 +
+
+ 录入 + 导出 +
+
+ +
-
- +
@@ -70,14 +76,27 @@ const clickExport = () => { gap: 10px; } .table-list { + padding-bottom: 0px !important; flex: 1; display: flex; flex-direction: column; overflow: hidden; - gap: 25px; + .table-pagination { + flex: 1; + display: flex; + flex-direction: column; + overflow: hidden; + gap: 20px; + } .table-el { flex: 1; overflow: hidden; } + .pagination { + display: flex; + align-items: center; + justify-content: flex-end; + height: 65px; + } } diff --git a/src/main.js b/src/main.js index 7894b9e..1a92a88 100644 --- a/src/main.js +++ b/src/main.js @@ -27,7 +27,7 @@ import './permission' // permission control import { useDict } from '@/utils/dict' import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi' -import{setActiveMenu,getTableHeaderStyle } from "@/utils/common.js" +import{setActiveMenu,getTableHeaderStyle ,getTablerowStyle} from "@/utils/common.js" // 分页组件 import Pagination from '@/components/Pagination' @@ -61,6 +61,7 @@ app.config.globalProperties.selectDictLabel = selectDictLabel app.config.globalProperties.selectDictLabels = selectDictLabels app.config.globalProperties.setActiveMenu = setActiveMenu app.config.globalProperties.getTableHeaderStyle = getTableHeaderStyle +app.config.globalProperties.getTablerowStyle = getTablerowStyle // 全局组件挂载 diff --git a/src/utils/common.js b/src/utils/common.js index 95c2a82..b1c666b 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -1,6 +1,7 @@ import router from "@/router"; - +import axios from "axios"; import cache from "@/plugins/cache.js"; +const gaodeKey = "bd665f6310bb41cdaea4494ec86fcbfa"; /** * 处理如 新增-修改-详情页面设置菜单选中高亮项 * @param {*} path @@ -12,7 +13,7 @@ export function setActiveMenu(path) { /** * 设置表格头部样式 - * @returns + * @returns */ export function getTableHeaderStyle() { return { @@ -20,6 +21,35 @@ export function getTableHeaderStyle() { height: "42px !important", color: "#474A59", fontSize: "16px", - fontFamily: 'MiSans-Medium', + fontFamily: "MiSans-Medium", + }; +} +export function getTablerowStyle() { + return { + color: "#474A59", + padding:"11px 0 !important", + fontSize: "16px", + fontFamily: 'MiSans-Medium' }; } + +export async function gaodeAddress(locations) { + const res = await axios({ + method: "get", + url: `https://restapi.amap.com/v3/geocode/regeo?location=${locations}&key=${gaodeKey}`, + }); + return res.data.regeocode; +} + +export async function gaodePOI(keyword) { + const res = await axios({ + method: "get", + url: `https://restapi.amap.com/v3/place/text`, + params: { + key: gaodeKey, + keywords: keyword, + city: "上海市", + }, + }); + return res.data.pois; +} diff --git a/src/views/emergency-rescue/workOrder-info/index.vue b/src/views/emergency-rescue/workOrder-info/index.vue deleted file mode 100644 index e5cd695..0000000 --- a/src/views/emergency-rescue/workOrder-info/index.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/emergency-rescue/workOrder-operation/index.vue b/src/views/emergency-rescue/workOrder-operation/index.vue deleted file mode 100644 index e74ee1a..0000000 --- a/src/views/emergency-rescue/workOrder-operation/index.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/src/views/emergency-rescue/workOrder/index.js b/src/views/emergency-rescue/workOrder/index.js new file mode 100644 index 0000000..b0dd1c1 --- /dev/null +++ b/src/views/emergency-rescue/workOrder/index.js @@ -0,0 +1 @@ +export { default as operation } from './operation.vue' \ No newline at end of file diff --git a/src/views/emergency-rescue/workOrder/index.vue b/src/views/emergency-rescue/workOrder/index.vue index ac4ef1b..80af5ef 100644 --- a/src/views/emergency-rescue/workOrder/index.vue +++ b/src/views/emergency-rescue/workOrder/index.vue @@ -1,129 +1,151 @@ + +