diff --git a/src/router/index.js b/src/router/index.js index 3b834fc..133e67c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -74,7 +74,7 @@ export const constantRoutes = [ { path: '', component: Layout, - redirect: 'screen', + redirect: 'index', children: [ { path: 'index', diff --git a/src/views/xj/inspection/diease-line/index.vue b/src/views/xj/inspection/diease-line/index.vue index 27f1fce..381438f 100644 --- a/src/views/xj/inspection/diease-line/index.vue +++ b/src/views/xj/inspection/diease-line/index.vue @@ -2,60 +2,356 @@ * @Author: SunTao 328867980@qq.com * @Date: 2025-03-25 11:10:16 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2025-04-08 13:56:59 + * @LastEditTime: 2025-05-09 09:21:07 * @FilePath: \znxjxt-ui\src\views\xj\inspection\diease-line\index.vue * @Description: 地图展示病害-首页 --> @@ -66,9 +362,42 @@ export default { height: calc(100vh - 5.3rem); padding: 0.5rem; - .map-diease-map { + .diease-form { width: 100%; - height: 100%; + height: 6%; + } + + .diease-container { + width: 100%; + height: 94%; + display: flex; + + .diease-left, + .diease-right { + width: 50%; + height: 100%; + box-sizing: border-box; + display: flex; + flex-direction: column; + padding: 0 1rem; + + } + + .diease-right { + + .card-item { + width: 100%; + height: 40rem; + } + } } } + +/* 分页样式 */ +.pagination-part { + width: 100%; + display: flex; + padding-top: 1rem; + justify-content: flex-end; +} diff --git a/src/views/xj/inspection/disease-management/index.vue b/src/views/xj/inspection/disease-management/index.vue index ea2ba6e..8cacaf9 100644 --- a/src/views/xj/inspection/disease-management/index.vue +++ b/src/views/xj/inspection/disease-management/index.vue @@ -2,7 +2,7 @@ * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Date: 2024-10-08 10:58:25 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2025-05-06 10:08:17 + * @LastEditTime: 2025-05-09 09:49:23 * @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management\index.vue * @Description: 巡检信息管理-病害管理 --> @@ -154,7 +154,7 @@ @@ -204,39 +204,14 @@ - - - - - - - - - - - + - + @@ -359,10 +334,8 @@ 起始桩号: {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号: {{ currentImageItem.stakeEnd || "暂无数据" }} 病害类型: - {{ currentImageItem.defectTypeName || "暂无数据" }} - 病害面积:{{ currentImageItem.targetArea }}平方米 病害长度:{{ - currentImageItem.targetLen * 1 <= 0 ? "暂无数据" : `${currentImageItem.targetLen}米` }} - + {{ currentImageItem.defectTypeName || "暂无数据" }} + @@ -1182,8 +1155,6 @@ export default { */ showScreenImg(item) { this.currentImageItem = item; - console.log(item, "ddddd"); - this.showImageDialog = true; }, @@ -1194,16 +1165,15 @@ export default { */ updateRects() { this.rects = []; - this.rectsItem = {}; - const rects = this.currentImageItem?.rect?.split(",").map(Number) || []; - this.rects = [ - { - left: rects[0], - top: rects[1], - width: rects[2], - height: rects[3], - }, - ]; + const rects = JSON.parse(this.currentImageItem?.rect) + this.rects = rects.map((item) => { + return { + left: item[0], + top: item[1], + width: item[2], + height: item[3], + } + }) }, /** diff --git a/src/views/xj/inspection/map-diease/index.vue b/src/views/xj/inspection/map-diease/index.vue index f7036da..94e17ac 100644 --- a/src/views/xj/inspection/map-diease/index.vue +++ b/src/views/xj/inspection/map-diease/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2025-03-25 11:10:16 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2025-04-15 17:13:01 + * @LastEditTime: 2025-05-08 11:10:01 * @FilePath: \znxjxt-ui\src\views\xj\inspection\map-diease\index.vue * @Description: 地图展示筛选病害-首页 --> @@ -10,109 +10,49 @@
- + - - + + - 筛选 + 筛选
- + - + - +
- +
- + - +
@@ -143,10 +83,6 @@ export default { rules: { maxLength: [ { required: false, message: "请选择路段", trigger: "blur" }, - { - pattern: /^\d+$/, - message: "请输入非负整数", - }, ], }, // 道路名称下拉数据 @@ -361,7 +297,7 @@ export default { * @description: 点击地图点位 * @return {void} */ - featureSelect(e) {}, + featureSelect(e) { }, /** * @description: 关闭查看图片弹窗 diff --git a/vue.config.js b/vue.config.js index 90fb436..effccd9 100644 --- a/vue.config.js +++ b/vue.config.js @@ -40,7 +40,7 @@ module.exports = { // 内网 // target: `http://10.60.5.83:8080`, // target: `http://192.168.1.188:8080`, - target: `http://localhost:8080`, + target: `http://localhost:8081`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''