更新代码

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
+	})
+}
+

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: {
     // 应用名称

pages.json

@@ -6,7 +6,8 @@
 			"path": "pages/index",
 			"style": {
 				"navigationStyle": "custom", // 隐藏系统导航栏
-				"navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+				"navigationBarTextStyle": "white" ,// 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+				"onReachBottonDistance":50    // 距离底部50px时，触发onReachBottom事件
 			}
 		},
 		{

pages/index.vue

@@ -10,15 +10,16 @@
 			<u-tabs :list="list1" :scrollable="false" lineWidth="30" @change="utabschange"
 				:current='tabscurrent'></u-tabs>
 		</view>
-		<view class="indexcontent-box">
+		<scroll-view class="indexcontent-box" @scrolltolower="lowerBottom" scroll-y="true">
 			<view class="indexcontent-bottom">
-				<u-search placeholder="请输入搜索内容" v-model="searchkeyword" @search="searchSou" @clear="qingkong"
-					:showAction="false"></u-search>
+				<u-search placeholder="请输入搜索内容" v-model="massEventsObj.title" @search="searchSou" @clear="qingkong"
+					showAction animation @custom="searchSou"></u-search>
+				<template class="" v-if="contentList.length !=0">
 					<view class="indexcontentbttom-item" v-for="item in contentList">
 						<view class="indexcontentbttom-item-left">
 							<view class="indexcontentbttom-item-left-1 indexcontentbttom-item-left-jiti">
 								<view class="indexcontentbttom-item-left-1-left">
-								{{navbarValue}}
+									{{item.msgTypeName}}
 								</view>
 								<view class="indexcontentbttom-item-left-1-right">
 									{{item.title}}
@@ -29,7 +30,7 @@
 									<u-icon name="map" size="18" color="#AEBAC8" class="icon"></u-icon>
 								</view>
 								<view class="smofontsiez">
-								{{item.diqu}}
+									{{item.warnFactor}}
 								</view>
 							</view>
 							<view class="indexcontentbttom-item-left-2 indexcontentbttom-item-left-jiti">
@@ -37,66 +38,76 @@
 									<u-icon name="clock" size="18" color="#AEBAC8" class="" class="icon"></u-icon>
 								</view>
 								<view class="smofontsiez">
-								{{item.shijian}}
+									{{item.eventTime}}
 								</view>
 							</view>
 						</view>
 						<view class="indexcontentbttom-item-rigth" @click="nextblack(item)">
-						审核
+							{{tabscurrent==0?'审核':'查看'}}
 						</view>
 					</view>
+				</template>
+				<u-empty mode="list" v-else>
+				</u-empty>
 			</view>
 
-			<u-tabbar :value="navbarValue" @change="change1" :fixed="true" :placeholder="true" :safeAreaInsetBottom="true">
-				<u-tabbar-item text="群体事件" name="群体事件">
+
+			<u-tabbar :value="tabValue" @change="change1" :fixed="true" :placeholder="true" :safeAreaInsetBottom="true">
+				<u-tabbar-item text="群体事件" name="群体事件-1">
 					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-0.png">
 					</image>
 					<image class="u-page__item__slot-icon" slot="inactive-icon"
 						src="@/static/images/contimg/icon-0-0.png"></image>
 				</u-tabbar-item>
-				<u-tabbar-item text="紧急事件" name="紧急事件">
-					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-1.png">
+				<u-tabbar-item text="同人同诉" name="同人同诉-2">
+					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-3.png">
 					</image>
 					<image class="u-page__item__slot-icon" slot="inactive-icon"
-						src="@/static/images/contimg/icon-0-1.png"></image>
+						src="@/static/images/contimg/icon-0-3.png"></image>
 				</u-tabbar-item>
-				<u-tabbar-item text="一人多诉" name="一人多诉">
-					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-2.png">
+				<u-tabbar-item text="紧急事件" name="紧急事件-3">
+					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-1.png">
 					</image>
 					<image class="u-page__item__slot-icon" slot="inactive-icon"
-						src="@/static/images/contimg/icon-0-2.png"></image>
+						src="@/static/images/contimg/icon-0-1.png"></image>
 				</u-tabbar-item>
-				<u-tabbar-item text="同人同诉" name="同人同诉">
-					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-3.png">
+				
+				<u-tabbar-item text="重点人员" name="重点人员-4">
+					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-4.png">
 					</image>
 					<image class="u-page__item__slot-icon" slot="inactive-icon"
-						src="@/static/images/contimg/icon-0-3.png"></image>
+						src="@/static/images/contimg/icon-0-4.png"></image>
 				</u-tabbar-item>
-				<u-tabbar-item text="重点人员" name="重点人员">
-					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-4.png">
+				<u-tabbar-item text="一人多诉" name="一人多诉-5">
+					<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-2.png">
 					</image>
 					<image class="u-page__item__slot-icon" slot="inactive-icon"
-						src="@/static/images/contimg/icon-0-4.png"></image>
+						src="@/static/images/contimg/icon-0-2.png"></image>
 				</u-tabbar-item>
+			
 			</u-tabbar>
-		</view>
+		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import {
+		massEventsList,
+		eventPageCount
+	} from '@/api/system/ApiList.js'
 	export default {
 		data() {
 			return {
-				searchkeyword: "",
 				tabscurrent: 0,
 				navbarValue: "群体事件",
+				tabValue: "群体事件-1",
 				list1: [{
-					name: '已退回',
+					name: '待审核',
 					badge: {
 						value: 5,
 					}
 				}, {
-					name: '已提级',
+					name: '已上报',
 					badge: {
 						value: 0,
 					}
@@ -108,49 +119,15 @@
 					}
 
 				}, ],
-				contentList: [
-
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+				massEventsObj: {
+					msgType: "1", //事件类型编码【群体事件】1【同人同诉】2【紧急事件】3【重点人员】4【一人多诉】5
+					isReport: null, //为未通过 2为已办结 3为作废
+					size: 10,
+					current: 1,
+					title: ""
 				},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-				]
+				pagesLogin: "",
+				contentList: []
 			}
 		},
 
@@ -159,29 +136,107 @@
 			// 顶部导航栏
 			utabschange(e) {
 				this.tabscurrent = e.index
+				this.massEventsObj.current = 1
+				this.massEventsObj.title = ""
+				this.getList()
 				console.log(e);
 			},
 			//搜索
 			searchSou() {
-				console.log(this.searchkeyword);
+				this.massEventsObj.current = 1
+				this.getList()
 			},
 			//清空
-			qingkong() {},
+			qingkong() {
+				this.massEventsObj.title = ""
+				this.getList()
+			},
 			// 跳转
 			nextblack(item) {
 				console.log(item);
+				//navbarValue 头部标题
+				//tabscurrent 区分待审核0, 已上报1 重训练2
+				// item
 				uni.navigateTo({
-					url:`/views/jiashicangshenhe/jiashicangshenhe?navbarValue=${this.navbarValue}`
+					url: `/views/jiashicangshenhe/jiashicangshenhe?navbarValue=${this.navbarValue}&tabscurrent=${this.tabscurrent}&innerEventId=${item.innerEventId}`
 				})
 			},
 			//切换
 			change1(e) {
-				this.navbarValue = e
+				this.navbarValue = e.split("-")[0]
+				// 标题
+				this.massEventsObj.title = ""
+				// 类型
+				this.massEventsObj.msgType = e.split("-")[1]
+				// 页码
+				this.massEventsObj.current = 1
+				// 头部类型
+				this.massEventsObj.isReport = null
+				// tab
+				this.tabValue = e
+				// 头部归位
 				this.tabscurrent = 0
-				console.log(e);
+				this.geteventPageCount()
+				this.getList()
+			},
+			// 触底刷新
+			//触底加载
+			lowerBottom() {
+				console.log("触底加载")
+
+				if (this.massEventsObj.current < this.pagesLogin) {
+					++this.massEventsObj.current
+					this.getList("触底")
+				} else {
+					console.log("到底了");
+					uni.showToast({
+						title: '暂无更多',
+						icon: 'none',
+						duration: 1000
+					});
 				}
 			},
-		onLoad: function() {}
+			//获取list
+			getList(type) {
+
+				if (this.tabscurrent == 0) {
+					this.massEventsObj.isReport = null
+					this.massEventsObj.toBeReviewed = 0
+				} else {
+					this.massEventsObj.toBeReviewed = null
+					this.massEventsObj.isReport = this.tabscurrent
+				}
+				massEventsList(this.massEventsObj).then(res => {
+
+
+					if (type == "触底") {
+						this.contentList = this.contentList.concat(res.data.records)
+						this.pagesLogin = res.data.pages
+					} else {
+						this.contentList = res.data.records
+						this.pagesLogin = res.data.pages
+					}
+				})
+			},
+			// 获取待审核数量
+			geteventPageCount(){
+				eventPageCount({msgType:this.massEventsObj.msgType}).then(res=>{
+					console.log(res);
+					this.list1[0].badge.value = res.data
+				})
+			}
+
+		},
+		onLoad: function() {
+			this.getList()
+			this.geteventPageCount()
+			this.$store.dispatch("Deletestate")
+		},
+		onShow() {
+			this.getList()
+			this.geteventPageCount()
+			this.$store.dispatch("Deletestate")
+		}
 	}
 </script>
 
@@ -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;
 							}
 
 						}

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
 })

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

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 => {

views/jiashicangshenhe/jiashicangshenhe.vue

@@ -6,15 +6,15 @@
 
 		<view class="indexcontent-box">
 			<view class="indexcontent-bottom">
-				<view class="indexcontentbttom-item" v-for="item in contentList">
+				<view class="indexcontentbttom-item">
 					<view class="indexcontentbttom-item-top">
 						<view class="indexcontentbttom-item-text">
-							关于大阳山景区交通拥堵问题
+							{{Objitem.title}}
 						</view>
-						<view class="indexcontentbttom-item-top-icon">
+						<view class="indexcontentbttom-item-top-icon" @click="biaotishow">
 							<u-icon name="edit-pen" size="18" color="#4379D6" class="icon"></u-icon>
 							<view class="">
-								修改标题
+								{{tabscurrentShow?'修改标题':'查看标题'}}
 							</view>
 						</view>
 					</view>
@@ -23,7 +23,7 @@
 							预警时间:
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth">
-							2024-02-22 09:00:30
+							{{Objitem.eventTime}}
 						</view>
 					</view>
 					<view class="indexcontentbttom-item-bottom">
@@ -31,7 +31,7 @@
 							预警因素:
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth">
-							2024-02-22 09:00:30
+							{{Objitem.warnFactor}}
 						</view>
 					</view>
 					<view class="indexcontentbttom-item-bottom">
@@ -39,100 +39,270 @@
 							预警类别:
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth leibie">
-							{{navbarValue}}
+							{{Objitem.msgTypeName}}
 						</view>
 					</view>
+					<view class="" v-show="Objitem.msgTypeName=='紧急事件'">
+						
+						<view class="indexcontentbttom-item-bottom">
+							<view class="indexcontentbttom-item-bottom-left">
+								事件来源:
+							</view>
+							<view class="indexcontentbttom-item-bottom-rigth ">
+								{{Objitem.scenceName}}
+							</view>
+						</view>
+						<view class="indexcontentbttom-item-bottom">
+							<view class="indexcontentbttom-item-bottom-left">
+								案件类型:
+							</view>
+							<view class="indexcontentbttom-item-bottom-rigth ">
+								{{ObjitemTow.caseType}}
+							</view>
+						</view>
+						<view class="indexcontentbttom-item-bottom">
+							<view class="indexcontentbttom-item-bottom-left">
+								位置描述:
+							</view>
+							<view class="indexcontentbttom-item-bottom-rigth ">
+								{{ObjitemTow.caseAddress}}
+							</view>
+						</view>
+						<view class="indexcontentbttom-item-bottom">
+							<view class="indexcontentbttom-item-bottom-left">
+								诉求内容:
+							</view>
+							<view class="indexcontentbttom-item-bottom-rigth ">
+								{{ObjitemTow.caseContent}}
+							</view>
+						</view>
+					</view>
+					
+					<view class="" v-show="Objitem.msgTypeName!='紧急事件'">
 						<view class="indexcontentbttom-item-bottom">
 							<view class="indexcontentbttom-item-bottom-left">
 								事件数量:
 							</view>
 							<view class="indexcontentbttom-item-bottom-rigth">
-							2024-02-22 09:00:30
+								{{listtotle}}
+							</view>
+						</view>
+						<view class="indexcontentbttom-item-bottom" v-show="tabscurrentShow ">
+							<view class="indexcontentbttom-item-bottom-left">
+								审核数量:
+							</view>
+							<view class="indexcontentbttom-item-bottom-rigth">
+								{{$store.state.tijiaoList.shijianList.length}}
 							</view>
 						</view>
 						<view class="indexcontentbttom-item-bottom-bottom" @click="nextblack">
-						事件逐条审核{{"("+8+")"}}条
+							事件逐条审核{{"("+listtotle+")"}}条
+						</view>
 					</view>
+					
 				</view>
 			</view>
 
 		</view>
 
-		<view class="dibuaBtn">
-			<view class="dibuaBtn-lanse">
+		<view class="dibuaBtn" v-show="tabscurrentShow">
+			<view class="dibuaBtn-lanse" @click="Chongxinshangbao(1)">
 				重新上报驾驶舱
 			</view>
-			<view class="dibuaBtn-hongse">
+			<view class="dibuaBtn-hongse" @click="Chongxinshangbao(2)">
 				退回算法重训练
 			</view>
 		</view>
+		<!-- 修改标题 -->
+		<u-modal :show="popupshow" :title="tabscurrentShow?'修改标题':'查看标题'" showCancelButton @cancel="close"
+			@confirm="confirm">
+			<view class="slot-content">
+				<view class="popup-box" v-show="tabscurrentShow">
+					<u--textarea v-model="textareavalue2" placeholder="请输入内容" count
+						class="popup-box-textarea"></u--textarea>
+				</view>
+				<view class="lishi-box" v-show="!tabscurrentShow">
+					<view class="">
+						当前标题：
+					</view>
+					<view class="lishi-box-jiacu">
+						{{this.Objitem.title}}
+					</view>
+					<view class="" v-show="this.Objitem.titleBefore">
+						历史标题：
+					</view>
+					<view class="lishi-box-jiacu" v-show="this.Objitem.titleBefore">
+						{{this.Objitem.titleBefore}}
+					</view>
+				</view>
+			</view>
+		</u-modal>
+		<!-- 	<u-popup :show="popupshow" @close="close" @open="open" round="10" :closeable="true" mode="center">
+			
+		</u-popup> -->
+		<!-- 查看标题 -->
 	</view>
 </template>
 
 <script>
+	import {
+		massEventsinfo,
+		getByInnerEventId,
+		massEventsedit,
+		eventChangeIsReport
+	} from '@/api/system/ApiList.js'
 	export default {
 		data() {
 			return {
 				navbarValue: "群体事件",
-				contentList: [
+				tabscurrent: 0,
+				popupshow: false,
+				textareavalue2: "",
+				innerEventId: "",
+				Objitem: {},
+				ObjitemTow: {},
+				listtotle: ""
 
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+			}
 		},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+		computed: {
+
+			tabscurrentShow() {
+				console.log("进来");
+				console.log(this.tabscurrent);
+				return this.tabscurrent == 0
 			},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
 		},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+		methods: {
+			// 跳转
+			nextblack(item) {
+				console.log(item);
+				uni.navigateTo({
+					url: `/views/yemianxianqging/yemianxianqging?innerEventId=${this.innerEventId}&tabscurrent=${this.tabscurrent}`
+				})
 			},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+			// 查看修改标题
+			biaotishow(item) {
+				this.popupshow = true
+				this.textareavalue2 = this.Objitem.title
 			},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+			// 弹出层确定
+			confirm() {
+				if (this.tabscurrentShow) {
+					console.log("这里");
+					if (this.textareavalue2 != "" && this.textareavalue2 != this.Objitem.title) {
+						this.Objitem.title = this.textareavalue2
+						massEventsedit(this.Objitem).then(res => {
+							if (res.code == 200) {
+								this.getByInnerEventIdmy()
+								uni.showToast({
+									title: '修改成功',
+									icon: 'none',
+									duration: 1000
+								});
+							}
+						})
+
+					} else {
+						let title = ""
+						if (this.textareavalue2 == "") {
+							title = "标题不能为空"
+						}
+						if (this.textareavalue2 == this.Objitem.title) {
+							title = "请修改标题后提交"
+
+						}
+						uni.showToast({
+							title,
+							icon: 'none',
+							duration: 1000
+						});
+
+					}
+					this.popupshow = false
+				} else {
+					//查看
+					this.popupshow = false
+				}
 			},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+			// 打开弹窗
+			close() {
+				this.popupshow = false
+				this.textareavalue2 = ""
+				// console.log('close');
 			},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+			// 获取个数
+			getList() {
+				massEventsinfo(this.innerEventId).then(res => {
+					this.listtotle = res.data.total
+					this.ObjitemTow = res.data.records[0]
+				})
 			},
-				]
-			
+			// 获取详情
+			getByInnerEventIdmy() {
+				getByInnerEventId(this.innerEventId).then(res => {
+					if (res.code == 200) {
+						this.Objitem = res.data
 					}
+				})
 			},
+			// 退回或者提交
+			Chongxinshangbao(isReport) {
+				if(this.Objitem.msgTypeName == "紧急事件"){
+					this.$store.state.tijiaoList.shijianList = [this.ObjitemTow.caseSerial]
+				} 
+				if(this.$store.state.tijiaoList.shijianList.length == 0){
+					uni.showToast({
+						title:"请选择工单上报!",
+						icon: 'none',
+						duration: 1000
+					});
+					return
+				}
+				let obj = {
+					caseSerial: this.$store.state.tijiaoList.shijianList,
+					innerEventId: this.innerEventId,
+					isReport
+				}
+				eventChangeIsReport(obj).then(res => {
+					if (res.code == 200) {
+						let title = ""
+						if (isReport == 1) {
+							title = "重新上报驾驶舱成功"
+						}
+						if (isReport == 2) {
+							title = "退回算法重训练成功"
 
-		methods: {
-			// 跳转
-			nextblack(item) {
-				console.log(item);
-				uni.navigateTo({
-					url:`/views/yemianxianqging/yemianxianqging?tiaoshu=${8}`
+						}
+						uni.showToast({
+							title,
+							icon: 'none',
+							duration: 1000
+						});
+						this.$store.dispatch("Deletestate")
+						setTimeout(function() {
+							uni.navigateBack({
+								delta: 2
+							});
+						}, 1000);
+					}
 				})
+			}
 		},
 
-		},
+
 		onLoad: function(opcent) {
+			//navbarValue 区分事件类型
+			//tabscurrent 0已退回 1已提及 2重训练
 			this.navbarValue = opcent.navbarValue
+			this.tabscurrent = opcent.tabscurrent
+			this.innerEventId = opcent.innerEventId
+			this.getByInnerEventIdmy()
+			this.getList()
+		},
+		onShow() {
+			this.getByInnerEventIdmy()
+			this.getList()
 		}
 	}
 </script>
@@ -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%;
@@ -168,11 +340,11 @@
 						}
 
 						.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,6 +357,7 @@
 						margin: 20rpx 0;
 						display: grid;
 						grid-template-columns: 18% auto;
+
 						view {
 							font-size: 25rpx;
 							color: #35393D;
@@ -199,6 +372,7 @@
 						.indexcontentbttom-item-bottom-rigth {
 							font-weight: bold;
 						}
+
 						.leibie {
 							color: #E72C2C;
 						}
@@ -217,8 +391,9 @@
 				}
 			}
 		}
+
 		.dibuaBtn {
-			position: sticky;
+			position: absolute;
 			bottom: 0;
 			left: 0;
 			width: 100%;
@@ -229,21 +404,34 @@
 			grid-column-gap: 20rpx;
 			color: #ffffff;
 			background-color: #ffffff;
+
 			view {
 				text-align: center;
 				line-height: 60rpx;
 				height: 60rpx;
 				border-radius: 10rpx;
 			}
+
 			.dibuaBtn-lanse {
 				background-color: #4379D6;
 			}
+
 			.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;
+	}
 </style>

views/yemianxianqging/yemianxianqging.vue

@@ -8,7 +8,7 @@
 				<view class="indexcontentbttom-item" v-for="item in contentList">
 					<view class="indexcontentbttom-item-top">
 						<view class="indexcontentbttom-item-text">
-							关于大阳山景区交通拥堵问题
+							{{item.caseTitle}}
 						</view>
 					</view>
 					<view class="indexcontentbttom-item-bottom">
@@ -16,7 +16,7 @@
 							<u-icon name="file-text" size="18" color="#595F66" class="icon"></u-icon>
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth">
-							C23123101322 
+							{{item.caseSerial}}
 						</view>
 					</view>
 					<view class="indexcontentbttom-item-bottom">
@@ -24,7 +24,7 @@
 							<u-icon name="map" size="18" color="#595F66" class="icon"></u-icon>
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth">
-							高新区何山路124号四季花园小区
+							{{item.caseAddress}}
 						</view>
 					</view>
 					<view class="indexcontentbttom-item-bottom">
@@ -32,14 +32,17 @@
 							<u-icon name="clock" size="18" color="#595F66" class="icon"></u-icon>
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth">
-							2024-02-22 09:00:30
+							{{item.caseDate}}
 						</view>
 					</view>
 
-					<view class="indexcontentbttom-item-bottom-bottom"  @click="nextblack">
+					<view class="indexcontentbttom-item-bottom-bottom" @click="nextblack(item)" v-show="item.isReport">
 						非同一事件
 					</view>
-					<view class="indexcontentbttom-item-bottom-bottom lvse" :class="" @click="nextblack">
+					<view class="indexcontentbttom-item-bottom-bottom lvse" :class="" @click="nextblack(item)"
+						v-show="!item.isReport">
+						<u-icon name="tags" size="24" color="#2baa04" class="" class="icon"
+							v-show="item.caseSerialShow"></u-icon>
 						同一事件
 					</view>
 				</view>
@@ -51,64 +54,64 @@
 </template>
 
 <script>
+	import {
+		massEventsinfoTow
+	} from '@/api/system/ApiList.js'
 	export default {
 		data() {
 			return {
 				tiaoshu: 0,
 				contentList: [
 
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
-					},
-					{
-						title: "太阳山拥堵问题",
-						diqu: "高新区何山路124号四季花园小区",
-						shijian: "2023-07-30 14:25:3"
+				],
+
+				massEventsObj: {
+					current: 1,
+					size: 1000
 				},
-				]
+				shijianList: [],
+				innerEventId: "",
+				tabscurrent:""
 
 			}
 		},
 		methods: {
 			nextblack(item) {
-				console.log(item);
+				if(this.tabscurrent != 0) return
+				item.caseSerialShow = !item.caseSerialShow
+				if (!item.caseSerialShow) {
+					this.shijianList = this.shijianList.filter((obj) => {
+						return obj != item.caseSerial;
+					});
+				} else {
+					this.shijianList.push(item.caseSerial)
+				}
+				this.$store.dispatch("setstate", this.shijianList)
+				console.log(this.shijianList);
+				console.log(this.$store.state.tijiaoList.shijianList);
+			},
+			getList() {
+				massEventsinfoTow(this.innerEventId, this.massEventsObj).then(res => {
+					let storeList = this.$store.state.tijiaoList.shijianList
+					this.shijianList = storeList
+					this.tiaoshu = res.data.total
+					this.contentList = res.data.records
+					
+					this.contentList = this.contentList.map((obj) => {
+						const caseSerialShow = storeList.includes(obj.caseSerial);
+						return {
+							...obj,
+							caseSerialShow
+						};
+					});
 
+				})
 			},
 		},
 		onLoad(opent) {
-			this.tiaoshu = opent.tiaoshu
+			this.innerEventId = opent.innerEventId
+			this.tabscurrent = opent.tabscurrent
+			this.getList()
 		}
 	}
 </script>
@@ -183,9 +186,14 @@
 						text-align: center;
 						line-height: 69rpx;
 						color: #F59A23;
+						display: flex;
+						align-items: center;
+						justify-content: center;
 					}
+
 					.lvse {
 						background: rgba(0, 170, 0, 0.1);
+						color: #2baa04;
 					}
 
 				}