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 0000000..7583d1a Binary files /dev/null and b/src/assets/images/map-gps.png differ diff --git a/src/assets/images/map-marker.png b/src/assets/images/map-marker.png new file mode 100644 index 0000000..bef19ef Binary files /dev/null and b/src/assets/images/map-marker.png differ 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 @@ + +