diff --git a/.env.development b/.env.development index bfebc85..2655cb4 100644 --- a/.env.development +++ b/.env.development @@ -8,15 +8,20 @@ VITE_APP_ENV = 'development' # 开发环境 VITE_APP_BASE_API = '/dev-api' +# 开发环境 接口代理地址 +VITE_APP_PROXY_API = 'http://192.168.1.222:8080' +# 图片基础地址 +VITE_IMG_URL = 'http://192.168.1.222:8080' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' # 监控地址 -VITE_APP_MONITOR_ADMIN = 'http://192.168.1.222/admin/applications' +VITE_APP_MONITOR_ADMIN = 'http://192.168.1.215/admin/applications' + # SnailJob 控制台地址 -VITE_APP_SNAILJOB_ADMIN = 'http://192.168.1.222/snail-job' +VITE_APP_SNAILJOB_ADMIN = 'http://192.168.1.215/snail-job' VITE_APP_PORT = 5173 @@ -34,4 +39,4 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' VITE_APP_WEBSOCKET = false # sse 开关 -VITE_APP_SSE = true +VITE_APP_SSE = false diff --git a/.env.production b/.env.production index 997a133..b6476de 100644 --- a/.env.production +++ b/.env.production @@ -39,4 +39,4 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' VITE_APP_WEBSOCKET = false # sse 开关 -VITE_APP_SSE = true +VITE_APP_SSE = false diff --git a/package.json b/package.json index ec799bf..db4d543 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "url": "https://gitee.com/JavaLionLi/plus-ui.git" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "2.3.2", "@highlightjs/vue-plugin": "2.1.2", "@vueup/vue-quill": "1.2.0", @@ -73,6 +74,7 @@ "postcss-pxtorem": "^6.1.0", "prettier": "3.8.1", "sass": "1.98.0", + "terser": "^5.46.1", "typescript": "~5.9.3", "unocss": "66.6.6", "unplugin-auto-import": "21.0.0", diff --git a/src/App.vue b/src/App.vue index f6a3658..57a2f04 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ @@ -10,40 +10,10 @@ import { handleThemeStyle } from '@/utils/theme'; import { useAppStore } from '@/store/modules/app'; const appStore = useAppStore(); - onMounted(() => { nextTick(() => { // 初始化主题样式 handleThemeStyle(useSettingsStore().theme); }); }); - -const scale = ref(1); -// 设计稿宽度（你是多少就写多少，一般 1920） -const DESIGN_WIDTH = 1920; - -// 计算缩放 -const setScale = () => { - const clientWidth = document.documentElement.clientWidth; - let ratio = clientWidth / DESIGN_WIDTH; - // 最小缩到 0.7（防止太小看不清） - if (ratio < 0.7) ratio = 0.7; - // 最大不超过 1 - if (ratio > 1) ratio = 1; - scale.value = ratio; -}; - -// 监听窗口变化 -const resizeListener = () => { - setScale(); -}; - -onMounted(() => { - setScale(); - window.addEventListener('resize', resizeListener); -}); - -onUnmounted(() => { - window.removeEventListener('resize', resizeListener); -}); diff --git a/src/api/system/Activity/type.ts b/src/api/system/Activity/type.ts index 5be40b9..d0349ab 100644 --- a/src/api/system/Activity/type.ts +++ b/src/api/system/Activity/type.ts @@ -7,7 +7,7 @@ export interface ActivityVO { /** * 标题 */ - titile: string; + title: string; /** * 作者 @@ -44,7 +44,7 @@ export interface ActivityForm extends BaseEntity { /** * 标题 */ - titile?: string; + title?: string; /** * 作者 @@ -76,7 +76,7 @@ export interface ActivityQuery extends PageQuery { /** * 标题 */ - titile?: string; + title?: string; /** * 作者 diff --git a/src/api/system/InspectionPoint/index.ts b/src/api/system/InspectionPoint/index.ts new file mode 100644 index 0000000..4a809eb --- /dev/null +++ b/src/api/system/InspectionPoint/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { PointVO, PointForm, PointQuery } from '@/api/system/InspectionPoint/type'; + +/** + * 查询巡检点列表 + * @param query + * @returns {*} + */ + +export const listPoint = (query?: PointQuery): AxiosPromise => { + return request({ + url: '/inspection/point/list', + method: 'get', + params: query + }); +}; + +/** + * 查询巡检点详细 + * @param id + */ +export const getPoint = (id: string | number): AxiosPromise => { + return request({ + url: '/inspection/point/' + id, + method: 'get' + }); +}; + +/** + * 新增巡检点 + * @param data + */ +export const addPoint = (data: PointForm) => { + return request({ + url: '/inspection/point', + method: 'post', + data: data + }); +}; + +/** + * 修改巡检点 + * @param data + */ +export const updatePoint = (data: PointForm) => { + return request({ + url: '/inspection/point', + method: 'put', + data: data + }); +}; + +/** + * 删除巡检点 + * @param id + */ +export const delPoint = (id: string | number | Array) => { + return request({ + url: '/inspection/point/' + id, + method: 'delete' + }); +}; diff --git a/src/api/system/InspectionPoint/type.ts b/src/api/system/InspectionPoint/type.ts new file mode 100644 index 0000000..e8fc6ae --- /dev/null +++ b/src/api/system/InspectionPoint/type.ts @@ -0,0 +1,150 @@ +export interface PointVO { + /** + * 主键ID + */ + id: string | number; + + /** + * 巡检点名称 + */ + pointName: string; + + /** + * 巡检项目id + */ + itemId: string | number; + + /** + * 所属路线ID + */ + routeId: string | number; + + /** + * 巡检点位置（经纬度），格式：经度,纬度 + */ + location: string; + + /** + * 打卡方式：9999定位打卡、9998蓝牙打卡、9997NFC打卡 + */ + checkMode: string; + + /** + * 状态：0-开启，1-关闭 + */ + status: string; + + /** + * 备注 + */ + remark: string; + + /** + * 点位编号 + */ + pointCode: string; + + /** + * 是否打卡 0：已打卡 1：未打卡 + */ + isCheck: string; +} + +export interface PointForm extends BaseEntity { + /** + * 主键ID + */ + id?: string | number; + + /** + * 巡检点名称 + */ + pointName?: string; + + /** + * 巡检项目id + */ + itemId?: string | number; + + /** + * 所属路线ID + */ + routeId?: string | number; + + /** + * 巡检点位置（经纬度），格式：经度,纬度 + */ + location?: string; + + /** + * 打卡方式：9999定位打卡、9998蓝牙打卡、9997NFC打卡 + */ + checkMode?: string; + + /** + * 状态：0-开启，1-关闭 + */ + status?: string; + + /** + * 备注 + */ + remark?: string; + + /** + * 点位编号 + */ + pointCode?: string; + + /** + * 是否打卡 0：已打卡 1：未打卡 + */ + isCheck?: string; +} + +export interface PointQuery extends PageQuery { + /** + * 巡检点名称 + */ + pointName?: string; + + /** + * 巡检项目id + */ + itemId?: string | number; + + /** + * 所属路线ID + */ + routeId?: string | number; + + /** + * 巡检点位置（经纬度），格式：经度,纬度 + */ + location?: string; + + /** + * 打卡方式：9999定位打卡、9998蓝牙打卡、9997NFC打卡 + */ + checkMode?: string; + + /** + * 状态：0-开启，1-关闭 + */ + status?: string; + + /** + * 点位编号 + */ + pointCode?: string; + + /** + * 是否打卡 0：已打卡 1：未打卡 + */ + isCheck?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/system/InspectionRecord/type.ts b/src/api/system/InspectionRecord/type.ts index c36412f..9e8c6c2 100644 --- a/src/api/system/InspectionRecord/type.ts +++ b/src/api/system/InspectionRecord/type.ts @@ -67,43 +67,18 @@ export interface RecordForm extends BaseEntity { } export interface RecordQuery extends PageQuery { - /** - * 关联巡检任务ID - */ - taskId?: string | number; - - /** - * 关联巡检计划ID - */ - planId?: string | number; - - /** - * 巡检人员ID - */ - inspectorId?: string | number; - - /** - * 巡检路线ID - */ - routeId?: string | number; - - /** - * 任务开始时间 - */ - startTime?: string; - - /** - * 任务结束时间 - */ - endTime?: string; - /** * 执行状态（字典：inspection_exec_status 0-按时完成 1-超时完成 2-未完成） */ - execStatus?: number; + status?: string; /** * 日期范围参数 */ - params?: any; + taskTime?: string; + + /** + * 任务名称 + */ + taskName?: string; } diff --git a/src/api/system/Questionnaire/type.ts b/src/api/system/Questionnaire/type.ts index 4796b98..9333e4f 100644 --- a/src/api/system/Questionnaire/type.ts +++ b/src/api/system/Questionnaire/type.ts @@ -22,7 +22,7 @@ export interface QuestionnaireVO { /** * 问卷题目结构（JSON数组） */ - content: QuestionComponentItem[]; + content: string | QuestionComponentItem[]; /** * 状态：0-草稿 1-已发布 2-已结束 diff --git a/src/api/system/SdbElectricityDevice/index.ts b/src/api/system/SdbElectricityDevice/index.ts new file mode 100644 index 0000000..b74bba3 --- /dev/null +++ b/src/api/system/SdbElectricityDevice/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ElectricityDeviceVO, ElectricityDeviceForm, ElectricityDeviceQuery } from './type'; + +/** + * 查询电设备列表 + * @param query + * @returns {*} + */ + +export const listElectricityDevice = (query?: ElectricityDeviceQuery): AxiosPromise => { + return request({ + url: '/electricityDevice/list', + method: 'get', + params: query + }); +}; + +/** + * 查询电设备详细 + * @param id + */ +export const getElectricityDevice = (id: string | number): AxiosPromise => { + return request({ + url: '/electricityDevice/' + id, + method: 'get' + }); +}; + +/** + * 新增电设备 + * @param data + */ +export const addElectricityDevice = (data: ElectricityDeviceForm) => { + return request({ + url: '/electricityDevice', + method: 'post', + data: data + }); +}; + +/** + * 修改电设备 + * @param data + */ +export const updateElectricityDevice = (data: ElectricityDeviceForm) => { + return request({ + url: '/electricityDevice', + method: 'put', + data: data + }); +}; + +/** + * 删除电设备 + * @param id + */ +export const delElectricityDevice = (id: string | number | Array) => { + return request({ + url: '/electricityDevice/' + id, + method: 'delete' + }); +}; diff --git a/src/api/system/SdbElectricityDevice/type.ts b/src/api/system/SdbElectricityDevice/type.ts new file mode 100644 index 0000000..65d8087 --- /dev/null +++ b/src/api/system/SdbElectricityDevice/type.ts @@ -0,0 +1,95 @@ +export interface ElectricityDeviceVO { + /** + * id + */ + id: string | number; + + /** + * 设备编码 + */ + deviceCode: string; + + /** + * 安装地址 + */ + address: string; + + /** + * 0.未删除，1.删除 + */ + deleted: number; + + /** + * + */ + url: string; + + /** + * + */ + openid: string | number; +} + +export interface ElectricityDeviceForm extends BaseEntity { + /** + * id + */ + id?: string | number; + + /** + * 设备编码 + */ + deviceCode?: string; + + /** + * 安装地址 + */ + address?: string; + + /** + * 0.未删除，1.删除 + */ + deleted?: number; + + /** + * + */ + url?: string; + + /** + * + */ + openid?: string | number; +} + +export interface ElectricityDeviceQuery extends PageQuery { + /** + * 设备编码 + */ + deviceCode?: string; + + /** + * 安装地址 + */ + address?: string; + + /** + * 0.未删除，1.删除 + */ + deleted?: number; + + /** + * + */ + url?: string; + + /** + * + */ + openid?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/system/SdbTopupRecord/index.ts b/src/api/system/SdbTopupRecord/index.ts new file mode 100644 index 0000000..7b24e0d --- /dev/null +++ b/src/api/system/SdbTopupRecord/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { TopupRecordVO, TopupRecordForm, TopupRecordQuery } from './type'; + +/** + * 查询充值记录列表 + * @param query + * @returns {*} + */ + +export const listTopupRecord = (query?: TopupRecordQuery): AxiosPromise => { + return request({ + url: '/topupRecord/list', + method: 'get', + params: query + }); +}; + +/** + * 查询充值记录详细 + * @param id + */ +export const getTopupRecord = (id: string | number): AxiosPromise => { + return request({ + url: '/topupRecord/' + id, + method: 'get' + }); +}; + +/** + * 新增充值记录 + * @param data + */ +export const addTopupRecord = (data: TopupRecordForm) => { + return request({ + url: '/topupRecord', + method: 'post', + data: data + }); +}; + +/** + * 修改充值记录 + * @param data + */ +export const updateTopupRecord = (data: TopupRecordForm) => { + return request({ + url: '/topupRecord', + method: 'put', + data: data + }); +}; + +/** + * 删除充值记录 + * @param id + */ +export const delTopupRecord = (id: string | number | Array) => { + return request({ + url: '/topupRecord/' + id, + method: 'delete' + }); +}; diff --git a/src/api/system/SdbTopupRecord/type.ts b/src/api/system/SdbTopupRecord/type.ts new file mode 100644 index 0000000..23d5806 --- /dev/null +++ b/src/api/system/SdbTopupRecord/type.ts @@ -0,0 +1,140 @@ +export interface TopupRecordVO { + /** + * 充值记录ID + */ + id: string | number; + + /** + * 用户ID + */ + userId: string | number; + + /** + * 充值金额 + */ + rechargeAmount: number; + + /** + * 充值时间 + */ + rechargeTime: string; + + /** + * 设备ID + */ + deviceCode: string; + + /** + * 订单表 + */ + orderId: string | number; + + /** + * 1.电表 2.水表 + */ + type: number; + + /** + * 订单状态(0.未支付 1.已支付 2.支付中，3.支付失败 4.退款) + */ + status: number; + + /** + * 0.待接收 1.已接收 + */ + getOver: number; +} + +export interface TopupRecordForm extends BaseEntity { + /** + * 充值记录ID + */ + id?: string | number; + + /** + * 用户ID + */ + userId?: string | number; + + /** + * 充值金额 + */ + rechargeAmount?: number; + + /** + * 充值时间 + */ + rechargeTime?: string; + + /** + * 设备ID + */ + deviceCode?: string; + + /** + * 订单表 + */ + orderId?: string | number; + + /** + * 1.电表 2.水表 + */ + type?: number; + + /** + * 订单状态(0.未支付 1.已支付 2.支付中，3.支付失败 4.退款) + */ + status?: number; + + /** + * 0.待接收 1.已接收 + */ + getOver?: number; +} + +export interface TopupRecordQuery extends PageQuery { + /** + * 用户ID + */ + userId?: string | number; + + /** + * 充值金额 + */ + rechargeAmount?: number; + + /** + * 充值时间 + */ + rechargeTime?: string; + + /** + * 设备ID + */ + deviceCode?: string; + + /** + * 订单表 + */ + orderId?: string | number; + + /** + * 1.电表 2.水表 + */ + type?: number; + + /** + * 订单状态(0.未支付 1.已支付 2.支付中，3.支付失败 4.退款) + */ + status?: number; + + /** + * 0.待接收 1.已接收 + */ + getOver?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/system/SdbWaterDevice/index.ts b/src/api/system/SdbWaterDevice/index.ts new file mode 100644 index 0000000..3ee4090 --- /dev/null +++ b/src/api/system/SdbWaterDevice/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { WaterDeviceVO, WaterDeviceForm, WaterDeviceQuery } from './type'; + +/** + * 查询水 设备列表 + * @param query + * @returns {*} + */ + +export const listWaterDevice = (query?: WaterDeviceQuery): AxiosPromise => { + return request({ + url: '/waterDevice/list', + method: 'get', + params: query + }); +}; + +/** + * 查询水 设备详细 + * @param id + */ +export const getWaterDevice = (id: string | number): AxiosPromise => { + return request({ + url: '/waterDevice/' + id, + method: 'get' + }); +}; + +/** + * 新增水 设备 + * @param data + */ +export const addWaterDevice = (data: WaterDeviceForm) => { + return request({ + url: '/waterDevice', + method: 'post', + data: data + }); +}; + +/** + * 修改水 设备 + * @param data + */ +export const updateWaterDevice = (data: WaterDeviceForm) => { + return request({ + url: '/waterDevice', + method: 'put', + data: data + }); +}; + +/** + * 删除水 设备 + * @param id + */ +export const delWaterDevice = (id: string | number | Array) => { + return request({ + url: '/waterDevice/' + id, + method: 'delete' + }); +}; diff --git a/src/api/system/SdbWaterDevice/type.ts b/src/api/system/SdbWaterDevice/type.ts new file mode 100644 index 0000000..c7a85c3 --- /dev/null +++ b/src/api/system/SdbWaterDevice/type.ts @@ -0,0 +1,95 @@ +export interface WaterDeviceVO { + /** + * id + */ + id: string | number; + + /** + * 水表设备编码 + */ + deviceCode: string; + + /** + * 地址 + */ + address: string; + + /** + * 状态 + */ + deleted: number; + + /** + * + */ + url: string; + + /** + * + */ + openid: string | number; +} + +export interface WaterDeviceForm extends BaseEntity { + /** + * id + */ + id?: string | number; + + /** + * 水表设备编码 + */ + deviceCode?: string; + + /** + * 地址 + */ + address?: string; + + /** + * 状态 + */ + deleted?: number; + + /** + * + */ + url?: string; + + /** + * + */ + openid?: string | number; +} + +export interface WaterDeviceQuery extends PageQuery { + /** + * 水表设备编码 + */ + deviceCode?: string; + + /** + * 地址 + */ + address?: string; + + /** + * 状态 + */ + deleted?: number; + + /** + * + */ + url?: string; + + /** + * + */ + openid?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/assets/icons/svg/banshiguanli.svg b/src/assets/icons/svg/banshiguanli.svg index 5d0208a..c2a7875 100644 --- a/src/assets/icons/svg/banshiguanli.svg +++ b/src/assets/icons/svg/banshiguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/baoxiuguanli.svg b/src/assets/icons/svg/baoxiuguanli.svg index 022f3bc..c444857 100644 --- a/src/assets/icons/svg/baoxiuguanli.svg +++ b/src/assets/icons/svg/baoxiuguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/cangku_kucun_o.svg b/src/assets/icons/svg/cangku_kucun_o.svg new file mode 100644 index 0000000..1ec5726 --- /dev/null +++ b/src/assets/icons/svg/cangku_kucun_o.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/cangkuxinxi.svg b/src/assets/icons/svg/cangkuxinxi.svg index ed43013..64148d5 100644 --- a/src/assets/icons/svg/cangkuxinxi.svg +++ b/src/assets/icons/svg/cangkuxinxi.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/chehangguanli.svg b/src/assets/icons/svg/chehangguanli.svg index fa9b5b1..14110a1 100644 --- a/src/assets/icons/svg/chehangguanli.svg +++ b/src/assets/icons/svg/chehangguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/cheliangguanli.svg b/src/assets/icons/svg/cheliangguanli.svg index f82641c..2f7a2b8 100644 --- a/src/assets/icons/svg/cheliangguanli.svg +++ b/src/assets/icons/svg/cheliangguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/cheweiguanli.svg b/src/assets/icons/svg/cheweiguanli.svg index 22680b4..894c9c7 100644 --- a/src/assets/icons/svg/cheweiguanli.svg +++ b/src/assets/icons/svg/cheweiguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/chongzhijilu.svg b/src/assets/icons/svg/chongzhijilu.svg new file mode 100644 index 0000000..778b79f --- /dev/null +++ b/src/assets/icons/svg/chongzhijilu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/dianbiaoguanli.svg b/src/assets/icons/svg/dianbiaoguanli.svg new file mode 100644 index 0000000..94bde32 --- /dev/null +++ b/src/assets/icons/svg/dianbiaoguanli.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/fangkeguanli.svg b/src/assets/icons/svg/fangkeguanli.svg index fc24908..0ef176c 100644 --- a/src/assets/icons/svg/fangkeguanli.svg +++ b/src/assets/icons/svg/fangkeguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/fangwuguanli.svg b/src/assets/icons/svg/fangwuguanli.svg index 2049daa..b55426b 100644 --- a/src/assets/icons/svg/fangwuguanli.svg +++ b/src/assets/icons/svg/fangwuguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/gonggaoguanli.svg b/src/assets/icons/svg/gonggaoguanli.svg index b8fd6af..8904787 100644 --- a/src/assets/icons/svg/gonggaoguanli.svg +++ b/src/assets/icons/svg/gonggaoguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/huodongguanli.svg b/src/assets/icons/svg/huodongguanli.svg index caaa7ea..cb7e496 100644 --- a/src/assets/icons/svg/huodongguanli.svg +++ b/src/assets/icons/svg/huodongguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/jiaofeiguanli.svg b/src/assets/icons/svg/jiaofeiguanli.svg new file mode 100644 index 0000000..d0ea7e8 --- /dev/null +++ b/src/assets/icons/svg/jiaofeiguanli.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/pay.svg b/src/assets/icons/svg/pay.svg index 8932295..e875a77 100644 --- a/src/assets/icons/svg/pay.svg +++ b/src/assets/icons/svg/pay.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/peizhitubiao.svg b/src/assets/icons/svg/peizhitubiao.svg new file mode 100644 index 0000000..bcda187 --- /dev/null +++ b/src/assets/icons/svg/peizhitubiao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/peizhitubiaosvg-.svg b/src/assets/icons/svg/peizhitubiaosvg-.svg deleted file mode 100644 index 8e7bbef..0000000 --- a/src/assets/icons/svg/peizhitubiaosvg-.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/quyuguanli.svg b/src/assets/icons/svg/quyuguanli.svg index 8ce2eee..0537366 100644 --- a/src/assets/icons/svg/quyuguanli.svg +++ b/src/assets/icons/svg/quyuguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/ribao.svg b/src/assets/icons/svg/ribao.svg new file mode 100644 index 0000000..faaf85f --- /dev/null +++ b/src/assets/icons/svg/ribao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shebei.svg b/src/assets/icons/svg/shebei.svg new file mode 100644 index 0000000..a0cd7f9 --- /dev/null +++ b/src/assets/icons/svg/shebei.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shouyintai.svg b/src/assets/icons/svg/shouyintai.svg new file mode 100644 index 0000000..893fca9 --- /dev/null +++ b/src/assets/icons/svg/shouyintai.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shuibiaoguanli.svg b/src/assets/icons/svg/shuibiaoguanli.svg new file mode 100644 index 0000000..878142e --- /dev/null +++ b/src/assets/icons/svg/shuibiaoguanli.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shuidianbiaoguanli.svg b/src/assets/icons/svg/shuidianbiaoguanli.svg new file mode 100644 index 0000000..1c9ee2b --- /dev/null +++ b/src/assets/icons/svg/shuidianbiaoguanli.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/tousuguanli.svg b/src/assets/icons/svg/tousuguanli.svg index 3a10672..83c85be 100644 --- a/src/assets/icons/svg/tousuguanli.svg +++ b/src/assets/icons/svg/tousuguanli.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/wenjuantiaocha.svg b/src/assets/icons/svg/wenjuantiaocha.svg index 251507d..cee6d2f 100644 --- a/src/assets/icons/svg/wenjuantiaocha.svg +++ b/src/assets/icons/svg/wenjuantiaocha.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/xunjiandian.svg b/src/assets/icons/svg/xunjiandian.svg new file mode 100644 index 0000000..e4a9c9e --- /dev/null +++ b/src/assets/icons/svg/xunjiandian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xunjianjianyan.svg b/src/assets/icons/svg/xunjianjianyan.svg new file mode 100644 index 0000000..a17746d --- /dev/null +++ b/src/assets/icons/svg/xunjianjianyan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xunjianjihua.svg b/src/assets/icons/svg/xunjianjihua.svg new file mode 100644 index 0000000..0721ff1 --- /dev/null +++ b/src/assets/icons/svg/xunjianjihua.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xunjianluxian.svg b/src/assets/icons/svg/xunjianluxian.svg new file mode 100644 index 0000000..e163a9d --- /dev/null +++ b/src/assets/icons/svg/xunjianluxian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xunjianrenwu.svg b/src/assets/icons/svg/xunjianrenwu.svg new file mode 100644 index 0000000..9c0f37e --- /dev/null +++ b/src/assets/icons/svg/xunjianrenwu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xunjianshuju.svg b/src/assets/icons/svg/xunjianshuju.svg new file mode 100644 index 0000000..e693795 --- /dev/null +++ b/src/assets/icons/svg/xunjianshuju.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/xunjianxiangmu.svg b/src/assets/icons/svg/xunjianxiangmu.svg new file mode 100644 index 0000000..4d6d084 --- /dev/null +++ b/src/assets/icons/svg/xunjianxiangmu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/yucunkuan.svg b/src/assets/icons/svg/yucunkuan.svg new file mode 100644 index 0000000..6db85cd --- /dev/null +++ b/src/assets/icons/svg/yucunkuan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/yuebao.svg b/src/assets/icons/svg/yuebao.svg new file mode 100644 index 0000000..ba04d07 --- /dev/null +++ b/src/assets/icons/svg/yuebao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/zhangdanguanli.svg b/src/assets/icons/svg/zhangdanguanli.svg new file mode 100644 index 0000000..14889aa --- /dev/null +++ b/src/assets/icons/svg/zhangdanguanli.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/zhoubao.svg b/src/assets/icons/svg/zhoubao.svg new file mode 100644 index 0000000..f15c6dd --- /dev/null +++ b/src/assets/icons/svg/zhoubao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/zhuangxiu.svg b/src/assets/icons/svg/zhuangxiu.svg index 8a15fa6..ca7ead2 100644 --- a/src/assets/icons/svg/zhuangxiu.svg +++ b/src/assets/icons/svg/zhuangxiu.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/images/villageimage.png b/src/assets/images/villageimage.png new file mode 100644 index 0000000..f832825 Binary files /dev/null and b/src/assets/images/villageimage.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 6fe008d..18dd1ab 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -223,6 +223,12 @@ aside { margin-bottom: 10px; } } + +.flex-center { + display: flex; + justify-content: center; + align-items: center; +} /* 默认 1920 以上 */ .container { width: 1400px; diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index d50f46f..cac1e79 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -203,7 +203,9 @@ h6 { box-shadow: var(--app-shadow-sm); border-color: var(--el-border-color-lighter); overflow: hidden; - transition: box-shadow 0.2s ease, transform 0.2s ease; + transition: + box-shadow 0.2s ease, + transform 0.2s ease; } .el-card:hover { diff --git a/src/components/MapContainer/index.vue b/src/components/MapContainer/index.vue new file mode 100644 index 0000000..28db8f1 --- /dev/null +++ b/src/components/MapContainer/index.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/components/Pageheader/index.vue b/src/components/Pageheader/index.vue index d9ec8ef..9b2b26f 100644 --- a/src/components/Pageheader/index.vue +++ b/src/components/Pageheader/index.vue @@ -6,7 +6,7 @@
-
{{ props.title }}
+
{{ title }}
@@ -28,14 +28,15 @@ const showSlot = computed(() => { operate: slots.operate ?? null }; }); - +const route = useRoute(); const props = defineProps({ title: { type: String, - default: '房屋管理' + default: '' } }); +const title = computed(() => (props.title ? props.title : route.meta.title)); defineSlots<{ content?: () => void; operate?: () => void; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 9b41076..c738b86 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,6 +1,6 @@