From 8e72a751a792f98e53d81604f76be88448d2fa04 Mon Sep 17 00:00:00 2001
From: wangchenxing <877161328@qq.com>
Date: Fri, 7 Feb 2025 16:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/indexpage/yjWz/warehouse.js               |   9 +-
 api/login.js                                  |   3 +-
 components/tabbar/tabbar.vue                  |   4 +-
 config.js                                     |   6 +-
 pages/index.vue                               | 142 ++++++++++++------
 pages/indexpage/YJgoods/wzDiaoBo/wzDiaoBo.vue |   6 +-
 pages/indexpage/YJplan/YJplan.vue             |   3 +-
 .../Yjcar/carXiangQing/carXiangQing.vue       |   3 +
 pages/indexpage/fireMan/list/list.vue         |   1 +
 pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue |   4 +-
 .../sheBeiSheShiDetail/sheBeiSheShiDetail.vue |   7 +-
 .../XunJianDetail/XunJianDetail.vue           |   3 +
 .../zdwxy/dangerDetail/dangerDetail.vue       |   4 +
 pages/login.vue                               |   8 +-
 pages/message/mineNews/lishiNews.vue          |   4 +-
 pages/message/mineNews/mineNews.vue           |   6 +-
 store/modules/user.js                         |   7 +-
 17 files changed, 155 insertions(+), 65 deletions(-)

diff --git a/api/indexpage/yjWz/warehouse.js b/api/indexpage/yjWz/warehouse.js
index 201c35e..9ddd97e 100644
--- a/api/indexpage/yjWz/warehouse.js
+++ b/api/indexpage/yjWz/warehouse.js
@@ -2,13 +2,20 @@ import request from '@/utils/request'
 
 // 查询物资库目录列表
 export function listWarehouse(query) {
+	return request({
+		url: '/material/warehouse/listOnlySelf',
+		method: 'get',
+		params: query
+	})
+}
+// 查询物资库目录列表
+export function listWarehouseAll(query) {
 	return request({
 		url: '/material/warehouse/list',
 		method: 'get',
 		params: query
 	})
 }
-
 // 查询物资库目录详细
 export function getWarehouse(id) {
 	return request({
diff --git a/api/login.js b/api/login.js
index aef34c8..3cca8b6 100644
--- a/api/login.js
+++ b/api/login.js
@@ -9,7 +9,8 @@ export function login(cas, password, code, uuid) {
 		uuid
 	}
 	return request({
-		'url': '/auth/login',
+		// 'url': '/auth/login',
+		'url': '/auth/loginApp',
 		headers: {
 			isToken: false
 		},
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 4d742dd..409415f 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<u-tabbar :value="value1" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false">
+		<u-tabbar :value="value1" :fixed="true" :placeholder="true" :safeAreaInsetBottom="true">
+			<!-- <u-tabbar :value="value1" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false"> -->
 			<u-tabbar-item :badge="`${item.menuName === '工作待办' ? $store.state.mine.xiaoxi : 0}`"
 				v-for="(item, index) in isMenu" :key="index" :text="item.menuName" :name="item.menuName"
 				@click="click1(item.path)">
@@ -55,6 +56,7 @@
 		height: calc(45px + constant(safe-area-inset-bottom));
 		height: 45px;
 		position: fixed;
+		// sticky
 		left: 0;
 		right: 0;
 		bottom: 0;
diff --git a/config.js b/config.js
index 7f9dc21..550f405 100644
--- a/config.js
+++ b/config.js
@@ -4,9 +4,9 @@ module.exports = {
 	//三门峡版本
 
 // 36.112.48.53:88/emergency/api
-	baseUrl: 'http://36.112.48.53:88/emergency/api',
-	// baseUrl: 'http://localhost:8083',
-
+	// baseUrl: 'http://36.112.48.53:88/emergency/api',
+	baseUrl: 'http://192.168.1.100:8080',
+	// baseUrl: 'http://192.168.1.5:8083',
 	//图片上传
 	baseUrlImg: 'http://36.112.48.53:88/emergencyManage',
 
diff --git a/pages/index.vue b/pages/index.vue
index fc37544..e1bc2c9 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -79,14 +79,14 @@
 			<view class="new box">
 				<view style="background-color: #fff;width: 100%;">
 					<!-- 头部 -->
-					<view class="sortHead">
+				<!-- 	<view class="sortHead">
 						<image src="../static/images/Yjplan/sort.png"
 							style="width: 36rpx;height: 36rpx;margin-right: 22rpx;"></image>
 						<span class="sortTitle">最近一次演练计划</span>
-					</view>
+					</view> -->
 					<!-- 卡片 -->
-					<view class="sortCard">
-						<view>
+					<!-- <view class="sortCard"> -->
+						<!-- <view>
 							<view class="unfinishlist">
 								<view class="content" style="border-left: 13rpx #FFD777 solid;margin-left: 4rpx; ">
 									<view class="name">{{ backlog.drillName }}</view>
@@ -105,7 +105,7 @@
 								</view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 
@@ -182,7 +182,7 @@
 			<!-- <update @showF="ShowON" :show="$store.state.updateApp.isTrue" :versionNum="$store.state.updateApp.newVesion"
 				:downloadUrl="$store.state.updateApp.url" :versionContent="$store.state.updateApp.MiaoShu"></update> -->
 		</view>
-		<Tabbar :value="'首页'"></Tabbar>
+		<!-- <Tabbar :value="'首页'"></Tabbar> -->
 	</view>
 </template>
 <script>
@@ -262,39 +262,89 @@
 			this.getConfigKeyData();
 		},
 		methods: {
+			// goback() {
+			//   const pages = getCurrentPages(); // 获取页面栈
+			//   console.log(pages);  // 打印页面栈
+			
+			//   // 如果页面栈大于 1，执行返回操作
+			//   if (pages.length > 1) {
+			//     uni.navigateBack();  // 返回上一页
+			//     console.log("返回上一页");
+			//   } else {
+			//     console.log("已经在首页，无法返回");
+			
+			//     // 如果没有历史记录，可以退出或关闭 WebView
+			//     if (window.JSBridge && window.JSBridge.exit) {
+			//       // 如果你有 JSBridge 可以调用它的退出方法
+			//       window.JSBridge.exit();
+			//     } else if (window.history.length > 1) {
+			//       // 如果浏览器历史记录大于 1，使用 window.history.back()
+			//       window.history.back();
+			//     } else {
+			//       // 没有历史记录，调用 App 的退出方法或者关闭窗口
+			//       if (window.exitApp) {
+			//         window.exitApp();  // 调用 App 的退出接口
+			//       } else {
+			//         // 如果没有 exitApp 方法，可以尝试关闭窗口
+			//         window.close();
+			//       }
+			//     }
+			//   }
+			// }
 			goback() {
+				window.location.href="/nljzVue/#/"
+			},
 				
-				// this.$router.go(-3)
-				// window.history.back()
-				// window.JSBridge.exit();
+// 				// this.$router.go(-3)
+// 				// window.history.back()
+// 				// window.JSBridge.exit();
 	
-		// 获取当前页面栈
-const pages = getCurrentPages();
-console.log(pages);  // 打印页面栈
-
-
+// 		// 获取当前页面栈
+// const pages = getCurrentPages();
+// console.log(pages);  // 打印页面栈
+// uni.closeWebview();
+// window.location.href="http://36.112.48.53:88/nljzVue/#/";
+// window.location.replace("http://36.112.48.53:88/nljzVue/#/");
+// window.location.href="http://36.112.48.53:88/nljzVue/#/"
 // 如果页面栈大于 1，执行返回操作
 
-if (pages.length > 1) {
-  // uni.navigateBack(1);
-window.history.back();
-  console.log("pages.length",pages.length);
-} else {
-  console.log('已经在首页，无法返回');
-window.history.back();
-console.log('已执行back');
-// this.$router.go(-2)
-// console.log('已执行$router');
-// uni.navigateBack(1);
-// console.log('已执行navigateBack');
-// window.JSBridge.exit();
-// console.log('已执行exit');
-// window.close();
-// console.log('已执行close');
-}
-
-
-			},
+// if (pages.length > 1) {
+//   // uni.navigateBack(1);
+// window.history.back();
+//   console.log("pages.length",pages.length);
+// } else {
+//   console.log('已经在首页，无法返回');
+// window.history.back();
+// console.log('已执行back');
+// // this.$router.go(-2)
+// // console.log('已执行$router');
+// // uni.navigateBack(1);
+// // console.log('已执行navigateBack');
+// // window.JSBridge.exit();
+// // console.log('已执行exit');
+// // window.close();
+// // console.log('已执行close');
+// }
+
+// if (window.exitApp) {
+// 	console.log("1111")
+//     window.exitApp();  // 调用 App 的退出接口
+//   } else if (window.WebViewBridge) {
+// 	  console.log("2222")
+//     window.WebViewBridge.close();  // 调用 App 的 WebView 关闭方法
+//   } else {
+//     // 如果没有 WebViewBridge 接口，使用历史记录返回
+//     if (window.history.length > 1) {
+// 		console.log("33333")
+//       window.history.back();
+//     } else {
+// 		console.log("44444")
+// 		window.exitApp()
+//       // window.close();  // 如果没有历史记录，关闭当前窗口
+//     }
+	// }
+
+			// },
 			getYanLian() {
 				backlog().then(res => {
 					this.backlog = res[0];
@@ -322,15 +372,16 @@ console.log('已执行back');
 						`/pages/indexpage/YJgoods/wzYvJing/wzYvJing?ckId=${item.houseId}&ckName=${item.houseName}`);
 				}
 			},
-			getGongGao() {
-				listNotice().then(res => {
-					this.gonggao = res.rows
-						.map(item => {
-							return item.noticeContent;
-						})
-						.join(' ');
-				});
-			},
+	getGongGao() {
+	  listNotice().then(res => {
+	    this.gonggao = res.rows
+	      .map(item => {
+	        // 使用正则表达式移除 HTML 标签
+	        return item.noticeContent.replace(/<[^>]+>/g, ''); // 这是去掉所有HTML标签的正则
+	      })
+	      .join(' ');
+	  });
+	},
 			getCar() {
 				listCountByAll().then(res => {
 					this.cardata = res.data;
@@ -368,6 +419,8 @@ console.log('已执行back');
 				this.$store.commit('setshowOverPop', false);
 			},
 			getquanxian() {
+				console.log("item.menuName000")
+				console.log("saveMenu", this.$store.state.user.saveMenu);
 				this.$store.state.user.saveMenu.map(item => {
 					if (item.menuName === '首页') {
 						//过滤不显示的按钮
@@ -381,6 +434,7 @@ console.log('已执行back');
 						});
 					}
 				});
+				console.log("indexQuanXian",this.indexQuanXian)
 			},
 			changeGrid(path) {
 				// console.log(path);
@@ -521,7 +575,7 @@ console.log('已执行back');
 
 	.zhuye {
 		width: 100%;
-
+		height: 100%;
 		.swiper {
 			height: 427rpx;
 			width: 100vw;
diff --git a/pages/indexpage/YJgoods/wzDiaoBo/wzDiaoBo.vue b/pages/indexpage/YJgoods/wzDiaoBo/wzDiaoBo.vue
index b50eb5f..5e21ac8 100644
--- a/pages/indexpage/YJgoods/wzDiaoBo/wzDiaoBo.vue
+++ b/pages/indexpage/YJgoods/wzDiaoBo/wzDiaoBo.vue
@@ -268,7 +268,7 @@
 
 <script>
 //查询仓库列表
-import { listWarehouse, listCategory } from '@/api/indexpage/yjWz/warehouse.js';
+import { listWarehouse, listCategory,listWarehouseAll } from '@/api/indexpage/yjWz/warehouse.js';
 //查询库存物资
 import { listStock, getStock } from '@/api/indexpage/yjWz/kuCun.js';
 import { listDictionary, getCategory, addOrUpdateOutList } from '@/api/indexpage/yjWz/wzCuKu.js';
@@ -411,7 +411,7 @@ export default {
 		getHouseListIn() {
 			this.houseListIn = [];
 			this.queryParamsHouse.deptId = this.form.inUnitId;
-			listWarehouse(this.queryParamsHouse).then(res => {
+			listWarehouseAll(this.queryParamsHouse).then(res => {
 				this.houseListIn = res.rows;
 			});
 		},
@@ -502,7 +502,7 @@ export default {
 
 		getChangKu() {
 			//发场库请求
-			listWarehouse().then(res => {
+			listWarehouseAll().then(res => {
 				this.titlelist = res.rows;
 			});
 		},
diff --git a/pages/indexpage/YJplan/YJplan.vue b/pages/indexpage/YJplan/YJplan.vue
index 19e9290..1f6240a 100644
--- a/pages/indexpage/YJplan/YJplan.vue
+++ b/pages/indexpage/YJplan/YJplan.vue
@@ -261,13 +261,14 @@
 			getDict() {
 				getDicts('emergency_plan_type').then(res => {
 					let dataInfo = res.data;
+					console.log('emergency_plan_type',res.data);
 					this.planTypeList = dataInfo.map(item => {
 						return {
 							text: item.dictLabel,
 							value: item.dictValue
 						};
 					});
-
+					
 					console.log(this.planTypeList, 'this.planTypeList');
 				});
 				getDicts('filing_status').then(res => {
diff --git a/pages/indexpage/Yjcar/carXiangQing/carXiangQing.vue b/pages/indexpage/Yjcar/carXiangQing/carXiangQing.vue
index b8ff6e4..8b20a03 100644
--- a/pages/indexpage/Yjcar/carXiangQing/carXiangQing.vue
+++ b/pages/indexpage/Yjcar/carXiangQing/carXiangQing.vue
@@ -1,5 +1,8 @@
 <template>
 	<view>
+		<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="" :autoBack="true">
+		
+		</u-navbar>
 		<u-sticky bgColor="#fff" style="padding: 20rpx;"><u-search placeholder="请输入车牌号" :clearabled="false" v-model="keyword" :showAction="false"></u-search></u-sticky>
 		<view style="    display: flex;flex-wrap: wrap;justify-content: space-between; align-items: center;padding: 10rpx 30rpx;">
 			<!-- 车队 -->
diff --git a/pages/indexpage/fireMan/list/list.vue b/pages/indexpage/fireMan/list/list.vue
index 52e9670..5ed377a 100644
--- a/pages/indexpage/fireMan/list/list.vue
+++ b/pages/indexpage/fireMan/list/list.vue
@@ -23,6 +23,7 @@
 									<u-tag borderColor="#f36f0d" type="warning" text="队员" plain shape="circle"
 										v-else></u-tag>
 								</view>
+								<view class="left-name-type">{{ item1.telephone.split('-')[0] }}</view>
 							</view>
 							<!-- <u-icon name="arrow-right" color="#C7C7C7"></u-icon> -->
 						</view>
diff --git a/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue b/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue
index 3c93fb8..592f367 100644
--- a/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue
+++ b/pages/indexpage/sheBeiSheShi/sheBeiSheShi.vue
@@ -46,7 +46,8 @@
 							<image src="../../../static/images/implement/area.png" mode="scaleToFill" />
 							<view>{{ item.facilitiesAddress }}</view>
 						</view>
-						<view class="right-area">
+						
+						<view class="right-area" v-if="item.toUseDate!=null">
 							<image src="../../../static/images/implement/time.png" mode="scaleToFill" />
 							<view>
 								<text>投入使用时间:</text>
@@ -138,6 +139,7 @@
 				let result = await facilitiesList(params);
 				this.triggered = false;
 				if (result.code == 200) {
+					console.log("result",result)
 					this.facilitiesLists = result.rows;
 					if (this.facilitiesLists.length < result.total) {
 						this.loadmoreStatus = 'loadmore';
diff --git a/pages/indexpage/sheBeiSheShi/sheBeiSheShiDetail/sheBeiSheShiDetail.vue b/pages/indexpage/sheBeiSheShi/sheBeiSheShiDetail/sheBeiSheShiDetail.vue
index 04bf876..dcf97b0 100644
--- a/pages/indexpage/sheBeiSheShi/sheBeiSheShiDetail/sheBeiSheShiDetail.vue
+++ b/pages/indexpage/sheBeiSheShi/sheBeiSheShiDetail/sheBeiSheShiDetail.vue
@@ -1,5 +1,8 @@
 <template>
   <view class="sheBeiSheShiDetail-container">
+	  <u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="设备管理" :autoBack="true">
+	  
+	  </u-navbar>
     <u-swiper
       indicator
       class="swiper-top"
@@ -84,7 +87,7 @@
         <text>近期报修</text>
       </view>
 
-      <view class="collapse-lsit" v-if="facilitiesRepair.length > 0">
+      <!-- <view class="collapse-lsit" v-if="facilitiesRepair.length > 0">
         <u-collapse
           accordion
           :border="false"
@@ -135,7 +138,7 @@
             </view>
           </u-collapse-item>
         </u-collapse>
-      </view>
+      </view> -->
       <view class="detail-bottom">
         <u-button
           class="detail-bottom-btn"
diff --git a/pages/indexpage/sheShiXunJian/XunJianDetail/XunJianDetail.vue b/pages/indexpage/sheShiXunJian/XunJianDetail/XunJianDetail.vue
index e9558c7..69493ea 100644
--- a/pages/indexpage/sheShiXunJian/XunJianDetail/XunJianDetail.vue
+++ b/pages/indexpage/sheShiXunJian/XunJianDetail/XunJianDetail.vue
@@ -1,5 +1,8 @@
 <template>
 	<view class="sheBeiSheShiDetail-container">
+	<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="设施巡检" :autoBack="true">
+	
+	</u-navbar>
 		<u-swiper indicator class="swiper-top" :list="swiperList" height="150" circular :autoplay="false" radius="5"
 			bgColor="#ffffff"></u-swiper>
 		<view class="detail-info">
diff --git a/pages/indexpage/zdwxy/dangerDetail/dangerDetail.vue b/pages/indexpage/zdwxy/dangerDetail/dangerDetail.vue
index 5c4be59..bcad145 100644
--- a/pages/indexpage/zdwxy/dangerDetail/dangerDetail.vue
+++ b/pages/indexpage/zdwxy/dangerDetail/dangerDetail.vue
@@ -1,5 +1,9 @@
 <template>
 	<view>
+		
+		<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="" :autoBack="true">
+		
+		</u-navbar>
 		<!-- <u-sticky bgColor="#fff">
 			<u-tabs lineWidth="37" gutter="25" :activeStyle="{
 					color: '#303133',
diff --git a/pages/login.vue b/pages/login.vue
index 9b18716..7106e23 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -195,6 +195,7 @@ export default {
 				.then(() => {
 					this.xianshiPage = false;
 					this.$modal.closeLoading();
+							console.log("afterLogin");
 					// 登录成功后，处理函数
 					this.loginSuccess();
 				})
@@ -206,19 +207,24 @@ export default {
 		},
 		// 登录成功后，处理函数
 		loginSuccess(result) {
+			console.log("afterGetInfo");
 			// 设置用户信息
 			this.$store.dispatch('GetInfo').then(res => {
+					console.log("beforeIndex");
 				console.log(this.$store.getters.userId);
 				//链接websocket
 				// this.$store.dispatch('websocketInit');
 				//开屏提示消息
 				// this.$store.dispatch('getNewsList');
 				//获取app是否更新的
-				this.$store.dispatch('getNewsApplist');
+				// this.$store.dispatch('getNewsApplist');
+				console.log("beforeIndex");
 				this.$tab.reLaunch('/pages/index');
+				console.log("afterIndex");
 				//获取消息条数
 				this.$store.dispatch('getNewsListOne');
 			});
+			
 		}
 	}
 };
diff --git a/pages/message/mineNews/lishiNews.vue b/pages/message/mineNews/lishiNews.vue
index d71d791..d529492 100644
--- a/pages/message/mineNews/lishiNews.vue
+++ b/pages/message/mineNews/lishiNews.vue
@@ -6,9 +6,9 @@
 		<u-sticky bgColor="#fff">
 			<uni-datetime-picker v-model="datetimerange" type="datetimerange" rangeSeparator="至" @change="souSuoRiQi()">
 				<view style="padding-left: 15rpx;padding-right: 15rpx; width: 100%;">
-					<view style="background-color: rgb(255, 255, 255); display: flex; width: 100%; height: 80rpx; padding-left: 18rpx;align-items: center;">
+				<!-- 	<view style="background-color: rgb(255, 255, 255); display: flex; width: 100%; height: 80rpx; padding-left: 18rpx;align-items: center;">
 						<u-button icon="search" type="primary" style="width: 20%;margin: 0px 10px 0px 10px;" size="mini" shape="circle" text="按日期范围"></u-button>
-					</view>
+					</view> -->
 				</view>
 			</uni-datetime-picker>
 		</u-sticky>
diff --git a/pages/message/mineNews/mineNews.vue b/pages/message/mineNews/mineNews.vue
index 4e522b2..46de171 100644
--- a/pages/message/mineNews/mineNews.vue
+++ b/pages/message/mineNews/mineNews.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="">
 		<!-- //导航栏 -->
-		<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="工作待办" :autoBack="false">
-			<view slot="left"></view>
+		<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="工作待办" :autoBack="true">
+		
 			<view slot="right" style="display: flex;align-items: center;flex-direction: column;" @click="lishi()">
 				<svgImage height="36rpx" name="lishi"></svgImage>
 				<span style="font-size: 18rpx; font-weight: 600;margin-right: 10rpx;color: #1296db;">历史待办</span>
@@ -61,7 +61,7 @@
 				<!-- <u-button type="primary" text="确定已读" @click="getXiaoXi2(newobj.id)"></u-button> -->
 			</u-popup>
 		</view>
-		<Tabbar :value="'工作待办'"></Tabbar>
+		<!-- <Tabbar :value="'工作待办'"></Tabbar> -->
 	</view>
 </template>
 
diff --git a/store/modules/user.js b/store/modules/user.js
index 9fcbab4..7e7cbbd 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -81,12 +81,15 @@ const user = {
 					let menu = []
 					// 取出主菜单
 					appMenuList1.map(item => {
-						if (item.status === "0" || 0) {
-							if (item.parentId === "0" || 0) {
+						console.log("item.status,",item.status)
+						if (item.status == "0" || 0) {
+							if (item.parentId == "0" || 0) {
+								console.log("此菜单已加入主菜单目录",item)
 								return menu.push(item)
 							}
 						}
 					})
+					console.log("menu",menu)
 					//把主菜单的子菜单栏目放在主菜单下
 					menu.map(item => {
 						item.children2 = []