From fddb638d56f73bc7104ee7e6e98a88fab1f488c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Sat, 14 Sep 2024 14:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/system/ApiList.js | 56 +++ config.js | 4 +- pages.json | 3 +- pages/index.vue | 251 ++++++++------ store/index.js | 4 +- store/modules/tijiaoList.js | 35 ++ utils/request.js | 2 +- views/jiashicangshenhe/jiashicangshenhe.vue | 356 +++++++++++++++----- views/yemianxianqging/yemianxianqging.vue | 116 ++++--- 9 files changed, 588 insertions(+), 239 deletions(-) create mode 100644 api/system/ApiList.js create mode 100644 store/modules/tijiaoList.js diff --git a/api/system/ApiList.js b/api/system/ApiList.js new file mode 100644 index 0000000..a4e23d7 --- /dev/null +++ b/api/system/ApiList.js @@ -0,0 +1,56 @@ +import request from '@/utils/request' + +// 分页条件查询事件数据 +export function massEventsList(params) { + return request({ + url: '/api/earlyWarningAudit/massEvents/colonyPage', + method: 'get', + params + }) +} +// 获取代办事项 +export function eventPageCount(params) { + return request({ + url: '/api/earlyWarningAudit/massEvents/eventPageCount', + method: 'get', + params + }) +} +//根据事件的innerEventId分页查询审核工单列表 +export function massEventsinfo(params) { + return request({ + url: `/api/earlyWarningAudit/massEvents/auditList/${params}`, + method: 'get', + }) +} +export function massEventsinfoTow(innerEventId,params) { + return request({ + url: `/api/earlyWarningAudit/massEvents/auditList/${innerEventId}`, + method: 'get', + params + }) +} +// 查询事件详情 +export function getByInnerEventId(params) { + return request({ + url: `/api/earlyWarningAudit/massEvents/getByInnerEventId/${params}`, + method: 'get', + }) +} +// 修改事件标题 +export function massEventsedit(data) { + return request({ + url: `/api/earlyWarningAudit/massEvents/edit`, + method: 'post', + data + }) +} +// 事件提级或退回 +export function eventChangeIsReport(data) { + return request({ + url: `/api/earlyWarningAudit/massEvents/eventChangeIsReport`, + method: 'post', + data + }) +} + diff --git a/config.js b/config.js index 4ac93cd..4471211 100644 --- a/config.js +++ b/config.js @@ -1,7 +1,7 @@ // 应用全局配置 module.exports = { - baseUrl: 'https://vue.ruoyi.vip/prod-api', - // baseUrl: 'http://localhost:8080', + // baseUrl: 'https://vue.ruoyi.vip/prod-api', + baseUrl: 'http://192.168.0.115:9102', // 应用信息 appInfo: { // 应用名称 diff --git a/pages.json b/pages.json index d3fa29d..1189370 100644 --- a/pages.json +++ b/pages.json @@ -6,7 +6,8 @@ "path": "pages/index", "style": { "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + "navigationBarTextStyle": "white" ,// 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + "onReachBottonDistance":50 // 距离底部50px时，触发onReachBottom事件 } }, { diff --git a/pages/index.vue b/pages/index.vue index 18b8e03..e02e015 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -10,93 +10,104 @@ - + - - - - - - {{navbarValue}} + + + + - - + + + - - + + + src="@/static/images/contimg/icon-0-3.png"> - - + + + src="@/static/images/contimg/icon-0-1.png"> - - + + + + src="@/static/images/contimg/icon-0-4.png"> - - + + + src="@/static/images/contimg/icon-0-2.png"> + - + @@ -264,9 +319,9 @@ font-size: 30rpx; font-weight: bold; color: #35393D; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; } } diff --git a/store/index.js b/store/index.js index cb58786..814c5cb 100644 --- a/store/index.js +++ b/store/index.js @@ -1,13 +1,15 @@ import Vue from 'vue' import Vuex from 'vuex' import user from '@/store/modules/user' +import tijiaoList from '@/store/modules/tijiaoList' import getters from './getters' Vue.use(Vuex) const store = new Vuex.Store({ modules: { - user + user, + tijiaoList }, getters }) diff --git a/store/modules/tijiaoList.js b/store/modules/tijiaoList.js new file mode 100644 index 0000000..bfacbd4 --- /dev/null +++ b/store/modules/tijiaoList.js @@ -0,0 +1,35 @@ + + +const tijiaoList = { + state: { + shijianList:[] + + }, + + mutations: { + + SET_STATE: (state, List) => { + state.shijianList = List + }, + DELETE_STATE: (state, List) => { + state.shijianList = [] + }, + }, + + actions: { + //存 + setstate({ commit }, userInfo) { + commit('SET_STATE', userInfo) + }, + //删除 + Deletestate({ commit }, userInfo) { + commit('DELETE_STATE') + }, + + + + + } +} + +export default tijiaoList diff --git a/utils/request.js b/utils/request.js index 5aa70f3..92cf609 100644 --- a/utils/request.js +++ b/utils/request.js @@ -10,7 +10,7 @@ import { tansParams } from '@/utils/common' -let timeout = 10000 +let timeout = 50000 const baseUrl = config.baseUrl const request = config => { diff --git a/views/jiashicangshenhe/jiashicangshenhe.vue b/views/jiashicangshenhe/jiashicangshenhe.vue index cb0b6a8..26e3e12 100644 --- a/views/jiashicangshenhe/jiashicangshenhe.vue +++ b/views/jiashicangshenhe/jiashicangshenhe.vue @@ -6,15 +6,15 @@ - + - 关于大阳山景区交通拥堵问题 + {{Objitem.title}} - + - 修改标题 + {{tabscurrentShow?'修改标题':'查看标题'}} @@ -23,7 +23,7 @@ 预警时间: - 2024-02-22 09:00:30 + {{Objitem.eventTime}} @@ -31,7 +31,7 @@ 预警因素: - 2024-02-22 09:00:30 + {{Objitem.warnFactor}} @@ -39,100 +39,270 @@ 预警类别: - {{navbarValue}} + {{Objitem.msgTypeName}} - - - 事件数量: + + + + + 事件来源: + + + {{Objitem.scenceName}} + - - 2024-02-22 09:00:30 + + + 案件类型: + + + {{ObjitemTow.caseType}} + + + + + 位置描述: + + + {{ObjitemTow.caseAddress}} + + + + + 诉求内容: + + + {{ObjitemTow.caseContent}} + - - 事件逐条审核{{"("+8+")"}}条 + + + + + 事件数量: + + + {{listtotle}} + + + + + 审核数量: + + + {{$store.state.tijiaoList.shijianList.length}} + + + + 事件逐条审核{{"("+listtotle+")"}}条 + + - + - - - + + + 重新上报驾驶舱 - + 退回算法重训练 + + + + + + + + + 当前标题： + + + {{this.Objitem.title}} + + + 历史标题： + + + {{this.Objitem.titleBefore}} + + + + + + @@ -141,11 +311,13 @@ .indexcontent { width: 100%; height: 100%; + .indexcontent-box { .indexcontent-bottom { width: 100%; padding: 20rpx; border-radius: 10rpx; + .indexcontentbttom-item { padding: 25rpx; width: 100%; @@ -164,15 +336,15 @@ font-weight: bold; color: #35393D; overflow: hidden; - + } .indexcontentbttom-item-top-icon { + height: 50rpx; display: flex; align-items: center; justify-content: center; font-size: 20rpx; - padding: 3rpx; border-radius: 5rpx; color: #4379D6; background-color: #e5e3e8; @@ -185,28 +357,30 @@ margin: 20rpx 0; display: grid; grid-template-columns: 18% auto; - view{ + + view { font-size: 25rpx; color: #35393D; line-height: 30rpx; } - - .indexcontentbttom-item-bottom-left{ + + .indexcontentbttom-item-bottom-left { color: #595F66; text-align: left; } - - .indexcontentbttom-item-bottom-rigth{ + + .indexcontentbttom-item-bottom-rigth { font-weight: bold; } - .leibie{ + + .leibie { color: #E72C2C; } } - - .indexcontentbttom-item-bottom-bottom{ - background: rgba(67,121,214,0.1); - border-radius: 10rpx ; + + .indexcontentbttom-item-bottom-bottom { + background: rgba(67, 121, 214, 0.1); + border-radius: 10rpx; width: 100%; height: 69rpx; text-align: center; @@ -217,8 +391,9 @@ } } } - .dibuaBtn{ - position: sticky; + + .dibuaBtn { + position: absolute; bottom: 0; left: 0; width: 100%; @@ -229,21 +404,34 @@ grid-column-gap: 20rpx; color: #ffffff; background-color: #ffffff; - view{ + + view { text-align: center; line-height: 60rpx; height: 60rpx; border-radius: 10rpx; } - .dibuaBtn-lanse{ + + .dibuaBtn-lanse { background-color: #4379D6; } - .dibuaBtn-hongse{ + + .dibuaBtn-hongse { background-color: #E72C2C; } } } + .popup-box { + width: 600rpx; + } + + .lishi-box { + width: 600rpx; + display: grid; + grid-template-columns: 25% 70%; + } + .u-nav-slot { font-size: 22rpx; } @@ -252,4 +440,8 @@ width: 50rpx; height: 50rpx; } + + .lishi-box-jiacu { + font-weight: bold; + } \ No newline at end of file diff --git a/views/yemianxianqging/yemianxianqging.vue b/views/yemianxianqging/yemianxianqging.vue index bd890b3..d6cab5d 100644 --- a/views/yemianxianqging/yemianxianqging.vue +++ b/views/yemianxianqging/yemianxianqging.vue @@ -8,7 +8,7 @@ - 关于大阳山景区交通拥堵问题 + {{item.caseTitle}} @@ -16,7 +16,7 @@ - C23123101322 + {{item.caseSerial}} @@ -24,7 +24,7 @@ - 高新区何山路124号四季花园小区 + {{item.caseAddress}} @@ -32,14 +32,17 @@ - 2024-02-22 09:00:30 + {{item.caseDate}} - - + + 非同一事件 - + + 同一事件 @@ -51,64 +54,64 @@ @@ -145,7 +148,7 @@ } - + } @@ -176,16 +179,21 @@ } .indexcontentbttom-item-bottom-bottom { - background: rgba(245,154,35,0.1); + background: rgba(245, 154, 35, 0.1); border-radius: 10rpx; width: 100%; height: 69rpx; text-align: center; line-height: 69rpx; color: #F59A23; + display: flex; + align-items: center; + justify-content: center; } - .lvse{ + + .lvse { background: rgba(0, 170, 0, 0.1); + color: #2baa04; } }