内蒙运维系统-代码提交20240221

App.vue

@@ -1,8 +1,6 @@
 <script>
 	export default {
 		onLaunch: function() {
-
-			
 			// #ifdef APP-PLUS
 			try {
 				let loginTime = uni.getStorageSync("loginTime");
@@ -60,4 +58,4 @@
 	@import "uview-ui/index.scss";
 	/*app全局样式*/
 	@import 'static/style/app.scss';
-</style>
+</style>

api/home.js

@@ -83,44 +83,78 @@ const navButtons = [{
 		value: 0,
 	},
 	{
-		name: '行政区',
-		img: '/static/images/home/contact.png',
-		url: '/pages/home/region',
+		name: '发起巡查',
+		img: '/static/images/home/history_order.png',
+		url: '/pages/yjxt/check/dangerareacheck?type=1&id=',
+		badge: false,
+		value: 0,
+	}
+]
+
+const yjNavButtons = [{
+		name: '登记清单',
+		img: '/static/images/yj/resident.png',
+		url: '/pages/yjxt/resident/dangerarearesidentrecordlist',
 		badge: false,
 		value: 0,
 	},
 	{
-		name: '危险区',
-		img: '/static/images/home/contact.png',
-		url: '/pages/home/dangerarea',
+		name: '危险区查询',
+		img: '/static/images/yj/dangerarea.png',
+		url: '/pages/yjxt/dangerarea/dangerarea',
 		badge: false,
 		value: 0,
 	},
 	{
-		name: '转移路线',
-		img: '/static/images/home/contact.png',
-		url: '/pages/home/leaveline',
+		name: '巡查信息',
+		img: '/static/images/yj/check.png',
+		url: '/pages/yjxt/check/dangerareachecklist?type=1&warnId=',
 		badge: false,
 		value: 0,
 	},
+	{
+		name: '监测预警',
+		img: '/static/images/yj/warn.png',
+		url: '/pages/yjxt/warn/yjwarn',
+		badge: false,
+		value: 0,
+	}
 ]
 
 //获取系统管理员导航按钮
-const sysAdminNavButton = [false,true,true,true,true,true,true,true,true,false,false,true,true,true,true];
+const sysAdminNavButton = [false, true, true, true, true, true, true, true, true, false, false, true, false, false,
+	false, false, false
+];
 
 //获取盟市管理员导航按钮
-const orgAdminNavButton = [false,true,true,true,true,true,true,true,true,false,false,true,true,true,true];
+const orgAdminNavButton = [false, true, true, true, true, true, true, true, true, false, false, true, false, false,
+	false, false, false
+];
 
 //获取运维公司管理员导航按钮
-const companyAdminNavButton = [true,true,true,true,true,true,true,false,false,true,true,true,true,true,true];
+const companyAdminNavButton = [true, true, true, true, true, true, true, false, false, true, true, true, false, false,
+	false, false, false
+];
 
 //获取运维公司技术员导航按钮
-const companyServicePersonNavButton = [true,false,true,true,true,true,true,false,false,true,true,true,true,true,true];
+const companyServicePersonNavButton = [true, false, true, true, true, true, true, false, false, true, true, true, false,
+	false, false, false, false
+];
+
+//获取运应急管理人员导航按钮
+const yjAdminNavButton = [true, true, true, true];
+
+//获取运应急人员导航按钮
+const yjServicePersonNavButton = [true, true, true, false];
+
 
 export default {
 	navButtons,
+	yjNavButtons,
 	sysAdminNavButton,
 	orgAdminNavButton,
 	companyAdminNavButton,
-	companyServicePersonNavButton
-}
+	companyServicePersonNavButton,
+	yjAdminNavButton,
+	yjServicePersonNavButton
+}

api/role.js

@@ -4,4 +4,5 @@ export const role = {
 	'orgAdmin': 'org_admin',
 	'companyAdmin': 'company_admin',
 	'companyServciePerson': 'company_servcie_person',
+	'yjServicePerson': 'org_yj_service_person',
 }

api/user.js

@@ -2,6 +2,7 @@ import http from '@/http/api.js'
 
 // 获取token
 const token = (tenantId, username, password, type) => {
+	  
 	return http.request({
 		url: '/galaxy-auth/oauth/token',
 		method: 'POST',

common/setting.js

@@ -7,15 +7,13 @@ module.exports = {
 	// 应用logo，支持本地路径和网络路径
 	logo: '/static/images/logo.png',
 	// 版本号
-	version: '1.0.17',
+	version: '1.1.0',
+	userType: 'app',
 	// 开发环境接口Url
-	//devUrl: 'http://127.0.0.1:40004',
-	devUrl: 'http://111.204.228.227:20002/api',
-	//devUrl: 'https://nmwx.dahengsi.com:20001/api',
+	devUrl: 'http://127.0.0.1:40004',
 	// 线上环境接口Url
-	//prodUrl: 'http://116.113.33.54:20002/api',
-	prodUrl: 'http://111.204.228.227:20002/api',
-	//prodUrl: 'https://nmwx.dahengsi.com:20001/api',
+	//prodUrl: 'https://wx.dahengsi.com:44301/api',
+	prodUrl: 'https://nmwx.dahengsi.com:20001/api',
 	// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
 	contentType: 'application/json;charset=UTF-8',
 	// 后端返回状态码
@@ -28,8 +26,8 @@ module.exports = {
 	clientId: 'shzhjcyjptywxt',
 	// 客户端密钥
 	clientSecret: 'shzhjcyjptywxt_secret_82828800',
-	//oss: 'http://172.9.0.165:80/oss/galaxy/',
-	oss: 'http://111.204.228.227:20002/oss/galaxy/',
-	//oss: 'https://nmwx.dahengsi.com:20001/oss/galaxy/',
-	img: 'http://111.204.228.227:20002/img/',
+	//oss: 'https://wx.dahengsi.com:44301/oss/galaxy/',
+	oss: 'https://nmwx.dahengsi.com:20001/oss/galaxy/',
+	//img: 'https://wx.dahengsi.com:44301/img/',
+	img: 'https://nmwx.dahengsi.com:20001/img/',
 }

http/api.js

@@ -1,6 +1,7 @@
 import {
 	clientId,
-	clientSecret
+	clientSecret,
+	userType
 } from '@/common/setting'
 import {
 	options
@@ -18,6 +19,8 @@ http.interceptors.request.use((config) => { // 可使用async await 做异步操
 	}
 	// 客户端认证参数
 	config.header['Authorization'] = 'Basic ' + Base64.encode(clientId + ':' + clientSecret);
+	config.header['User-Type']=userType;
+
 
 	// 额外参数
 	// config.data = config.data || {};

manifest.json

@@ -87,6 +87,11 @@
         "usingComponents" : true,
         "unipush" : {
             "enable" : false
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "现场巡检操作定位"
+            }
         }
     },
     "mp-alipay" : {

pages.json

@@ -13,13 +13,13 @@
 			}
 		},
 		{
-				"path": "pages/home/start/start",
-				"style": {
-					"navigationBarTitleText": "开始页",
-					"enablePullDownRefresh": false,
-					"navigationStyle": "custom"
-				}
-			},
+			"path": "pages/home/start/start",
+			"style": {
+				"navigationBarTitleText": "开始页",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/check-order/checkorderlist",
 			"style": {
@@ -36,7 +36,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		
 		{
 			"path": "pages/check-order/servicepersoncheckorderlist",
 			"style": {
@@ -384,7 +383,6 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
 		},
 		{
 			"path": "pages/report-forms/contact",
@@ -393,7 +391,6 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
 		},
 		{
 			"path": "pages/news/noticelist",
@@ -418,114 +415,209 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
+		}, 
+		{
 			"path": "pages/user/profile",
 			"style": {
 				"navigationBarTitleText": "个人资料",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
+		}, 
+		{
 			"path": "pages/user/about",
 			"style": {
 				"navigationBarTitleText": "关于",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
+		}, 
+		{
 			"path": "pages/user/font-setting",
 			"style": {
 				"navigationBarTitleText": "字体设置",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
+		}, 
+		{
 			"path": "pages/user/modify-password",
 			"style": {
 				"navigationBarTitleText": "修改密码",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
+		},
+		{
 			"path": "pages/login/login-account",
 			"style": {
 				"navigationBarTitleText": "账号登录",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
+		},
+		{
 			"path": "pages/system/setting",
 			"style": {
 				"navigationBarTitleText": "设置",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
-			"path": "pages/home/dangerarea",
+		},
+		{
+			"path": "pages/yjxt/check/dangerareacheck",
 			"style": {
-				"navigationBarTitleText": "危险区",
+				"navigationBarTitleText": "巡查巡检",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
-			"path": "pages/home/dangerareamap",
+		},
+		{
+			"path": "pages/yjxt/check/dangerareachecklist",
 			"style": {
-				"navigationBarTitleText": "危险区地图",
+				"navigationBarTitleText": "巡查巡检",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		},{
-			"path": "pages/home/region",
+		},
+		{
+			"path": "pages/yjxt/check/dangerareacheckdetail",
 			"style": {
-				"navigationBarTitleText": "行政区",
+				"navigationBarTitleText": "巡查巡检",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
-			"path": "pages/home/regionmap",
+		},
+		
+		{
+			"path": "pages/yjxt/warn/yjwarnlist",
 			"style": {
-				"navigationBarTitleText": "行政区地图",
+				"navigationBarTitleText": "预警响应",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		},{
-			"path": "pages/home/leaveline",
+		},
+		{
+			"path": "pages/yjxt/warn/yjwarnqr",
+			"style": {
+				"navigationBarTitleText": "预警二维码",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/transfer/residenttransferrecord",
+			"style": {
+				"navigationBarTitleText": "转移登记",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/transfer/transferresidentlist",
+			"style": {
+				"navigationBarTitleText": "转移人员清单",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/resident/dangerarearesidentrecord",
+			"style": {
+				"navigationBarTitleText": "群众登记",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/resident/dangerarearesidentrecordlist",
+			"style": {
+				"navigationBarTitleText": "登记清单",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/dangerarea/dangerarea",
+			"style": {
+				"navigationBarTitleText": "危险区",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/dangerarea/dangerareamap",
+			"style": {
+				"navigationBarTitleText": "危险区地图",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/dangerarealeaveline/leaveline",
 			"style": {
 				"navigationBarTitleText": "转移路线",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		}, {
-			"path": "pages/home/leavelinemap",
+		},
+		{
+			"path": "pages/yjxt/dangerarealeaveline/leavelinemap",
 			"style": {
 				"navigationBarTitleText": "转移路线地图",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
-		},{
-            "path" : "pages/yjxt/warnmanage",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "预警管理",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-    ],
+		},
+		{
+			"path": "pages/yjxt/warn/yjwarndetail",
+			"style": {
+				"navigationBarTitleText": "预警详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/resident/dangerarearesidentlocation",
+			"style": {
+				"navigationBarTitleText": "定位补录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/resident/dangerarearesidentfamilylist",
+			"style": {
+				"navigationBarTitleText": "家庭成员表",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/dangerarea/dangerareaqr",
+			"style": {
+				"navigationBarTitleText": "危险区二维码",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/region/region",
+			"style": {
+				"navigationBarTitleText": "行政区",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/yjxt/warn/yjwarn",
+			"style": {
+				"navigationBarTitleText": "监测预警",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
@@ -557,4 +649,4 @@
 			}
 		]
 	}
-}
+}

pages/home/start/start.vue

@@ -1,14 +1,21 @@
 <template>
 	<view style="padding-top: 20px;">
-		<uni-card title="运维系统">
+		<uni-card>
 			<uni-row>
-				<uni-col :span="14">
-					<view style="height: 160px;width: 100%;margin-bottom: 10px;align-items: center;overflow:hidden">
-						<image class="yj-img" :src="ywxtImgUrl" mode="heightFix"></image>
-					</view>
+				<uni-col :span="24">
+					<uni-card style="background-color: lavender;">
+						<view
+							style="height: 140px;display: flex;justify-content: center;flex-direction: column;align-items: center;">
+							<image class="yj-img" :src="yjxtImgUrl" mode="heightFix"></image>
+							<text style="color: black;font-size: 40px;font-weight: 200;;">运维系统</text>
+						</view>
+						<!-- 			<view style="height: 160px;width: 100%;margin-bottom: 10px;align-items: center;overflow:hidden">
+							<image class="yj-img" :src="ywxtImgUrl" mode="heightFix"></image>
+						</view> -->
+					</uni-card>
 				</uni-col>
-				<uni-col :span="10">
-					<view class="tag">
+<!-- 				<uni-col :span="10">
+					<view class="tag" style="margin-top: 10px;">
 						<view>
 							<uni-tag :inverted="true" text="维修直填报" type="primary" />
 						</view>
@@ -25,29 +32,31 @@
 							<uni-tag :inverted="true" text="通讯录" type="primary" />
 						</view>
 					</view>
-				</uni-col>
+				</uni-col> -->
 			</uni-row>
-
-
 			<view class="yw-button" @click="onYwxtClick()">
 				<view class="btn-items">
-					<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
+					<uni-icons class="input-uni-icon" type="person" size="18" color="white" />
 					<text>进入运维系统</text>
-					<uni-icons class="input-uni-icon" type="arrow-right" size="18" color="white" />
+					<uni-icons class="input-uni-icon" type="arrow-right" size="18" color="coral" />
 				</view>
 			</view>
 		</uni-card>
-		<uni-card title="应急系统">
+		<uni-card>
 			<uni-row>
-				<uni-col :span="14">
-					<view style="height: 160px;width: 100%;margin-bottom: 10px;align-items: center;overflow:hidden">
-						<image class="yj-img" :src="yjxtImgUrl" mode="heightFix"></image>
-					</view>
+				<uni-col :span="24">
+					<uni-card style="background-color: lavender;">
+						<view
+							style="height: 140px;display: flex;justify-content: center;flex-direction: column;align-items: center;">
+							<!-- <image class="yj-img" :src="yjxtImgUrl" mode="heightFix"></image> -->
+							<text style="color: black;font-size: 40px;font-weight: 200;;">应急系统</text>
+						</view>
+					</uni-card>
 				</uni-col>
-				<uni-col :span="10">
-					<view class="tag">
+<!-- 				<uni-col :span="10">
+					<view class="tag" style="margin-top: 10px;">
 						<view>
-							<uni-tag :inverted="true" text="群众注册" type="primary" />
+							<uni-tag :inverted="true" text="群众登记" type="primary" />
 						</view>
 						<view>
 							<uni-tag :inverted="true" text="监测预警" type="primary" />
@@ -62,18 +71,16 @@
 							<uni-tag :inverted="true" text="巡查检查" type="primary" />
 						</view>
 					</view>
-				</uni-col>
+				</uni-col> -->
 			</uni-row>
 			<view class="yj-button" @click="onYjxtClick()">
 				<view class="btn-items">
-					<uni-icons class="input-uni-icon" type="info" size="18" color="coral" />
+					<uni-icons class="input-uni-icon" type="person" size="18" color="white" />
 					<text>进入应急系统</text>
-					<uni-icons class="input-uni-icon" type="arrow-right" size="18" color="white" />
-
+					<uni-icons class="input-uni-icon" type="arrow-right" size="18" color="coral" />
 				</view>
 			</view>
 		</uni-card>
-
 	</view>
 </template>
 
@@ -85,37 +92,45 @@
 	export default {
 		data() {
 			return {
-				ywxtImgUrl: img + 'ywxt.png',
-				yjxtImgUrl: img + 'yjxt.png',
+				ywxtImgUrl: 'http://oiyo.oss-cn-beijing.aliyuncs.com/image/source/10d13c8b-4315-11ee-8df3-f0def1489016.jpg?Expires=1708232878&OSSAccessKeyId=LTAI5tPaSKSSyqthdx96Ky7b&Signature=dixmseuqD9XJoPau8ThB8SpS2kk%3D',
+				yjxtImgUrl: 'http://oiyo.oss-cn-beijing.aliyuncs.com/image/source/10d13c8b-4315-11ee-8df3-f0def1489016.jpg?Expires=1708232878&OSSAccessKeyId=LTAI5tPaSKSSyqthdx96Ky7b&Signature=dixmseuqD9XJoPau8ThB8SpS2kk%3D',
 			}
 		},
-		computed: {
-
-		},
-		created(){
-
-		},
+		created() {},
 		methods: {
 			onYwxtClick() {
-	
 				uni.setStorageSync("SubSystemSelectInfo", {
-					ywxt: 1,
-					yjxt: 0,
+					subSystem: 1,
 				});
+				uni.setTabBarItem({
+					"index": 1,
+					"iconPath": "static/images/tabbar/workbench.png",
+					"selectedIconPath": "static/images/tabbar/workbench_selected.png",
+					"text": "管理工作台",
+				})
 				uni.switchTab({
 					url: '/pages/home/home'
 				})
 			},
 			onYjxtClick() {
-	
 				uni.setStorageSync("SubSystemSelectInfo", {
-					ywxt: 0,
-					yjxt: 1,
+					subSystem: 2,
 				});
+				uni.setTabBarItem({
+					"index": 1,
+					"iconPath": "static/images/tabbar/warn.png",
+					"selectedIconPath": "static/images/tabbar/warn_selected.png",
+					"text": "监测预警",
+				})
 				uni.switchTab({
 					url: '/pages/home/home'
 				})
-			}
+			},
+			// toDangerAreaCheck() {
+			// 	uni.navigateTo({
+			// 		url: '/pages/yjxt/dangerareacheck?id=&type=0'
+			// 	})
+			// }
 		}
 	}
 </script>
@@ -139,21 +154,19 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-		width: 60%;
+		width: 100%;
 		height: 40px;
 		margin-left: 5px;
 		margin-top: 3px;
 		margin-bottom: 3px;
 		border-radius: 20px;
-		background-color: mediumpurple;
+		background-color: royalblue;
 		padding-left: 20px;
 
-
-
 		.btn-items {
 			display: flex;
 			flex-direction: row;
-			justify-content: flex-start;
+			justify-content: center;
 			align-items: center;
 
 			text {
@@ -166,7 +179,7 @@
 	}
 
 	.yw-button:active {
-		background-color: plum;
+		background-color: gray;
 	}
 
 	.yj-img {
@@ -177,23 +190,23 @@
 
 	.yj-button {
 		display: flex;
-		flex-direction: row;
-		justify-content: start;
-		width: 60%;
+		flex-direction: column;
+		justify-content: center;
+		width: 100%;
 		height: 40px;
 		margin-left: 5px;
 		margin-top: 3px;
 		margin-bottom: 3px;
 		border-radius: 20px;
-		background-color: mediumpurple;
+		background-color: royalblue;
 		padding-left: 20px;
 
 		.btn-items {
 			display: flex;
 			flex-direction: row;
-			justify-content: flex-start;
+			justify-content: center;
 			align-items: center;
-
+         
 			text {
 				margin-left: 5px;
 				margin-right: 5px;
@@ -205,6 +218,6 @@
 	}
 
 	.yj-button:active {
-		background-color: plum;
+		background-color: gray;
 	}
 </style>

pages/login/login-account.vue

@@ -7,7 +7,7 @@
 					style="width: 100%;margin-bottom: 80rpx;display: flex;flex-direction: column;align-items: center;">
 					<text style="font-size: 32rpx;">内蒙古自治区</text>
 					<text style="font-size: 32rpx;margin-top: 5rpx;">
-						山洪灾害预警监测平台运维系统
+						监测预警防御平台
 					</text>
 				</view>
 				<view class="cell">
@@ -111,6 +111,7 @@
 		methods: {
 			submit() {
 				this.$u.api.token(this.tenantId, this.username, md5(this.password)).then(data => {
+					console.log("token "+JSON.stringify(data))
 					let dt = new Date();
 					uni.setStorageSync("loginTime", dt.getTime());
 					if (this.rememberPw) {

pages/report-forms/orgcheckorderreportcount.vue

@@ -9,11 +9,11 @@
 		<view class="container">
 			<uni-table ref="order_table" border stripe type="" emptyText="暂无更多数据">
 				<uni-tr>
-					<uni-th width="140" align="center">机构名称</uni-th>
-					<uni-th align="center">任务数量</uni-th>
-					<uni-th align="center">未确认</uni-th>
-					<uni-th align="center">处理中</uni-th>
-					<uni-th align="center">已处理</uni-th>
+					<uni-th width="140" align="center"><view style="text-align: center;color: black;">机构名称</view></uni-th>
+					<uni-th align="center"><view style="text-align: center;color: black;">任务数量</view></uni-th>
+					<uni-th align="center"><view style="text-align: center;color: black;">未确认</view></uni-th>
+					<uni-th align="center"><view style="text-align: center;color: black;">处理中</view></uni-th>
+					<uni-th align="center"><view style="text-align: center;color: black;">已处理</view></uni-th>
 				</uni-tr>
 				<uni-tr v-for="(item, index) in tableData" :key="index">
 					<uni-td>

pages/yjxt/warnmanage.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

static/style/app.scss

@@ -31,6 +31,60 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
+	
+	.line{
+	   	display: flex;
+	   	flex-direction: row;
+	   	justify-content: flex-start;
+	   	align-items: center;
+	   	flex-wrap: wrap;
+		
+		.block {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+		}
+		
+		.title{
+			padding-left: 2px;
+			padding-right: 5px;
+			font-size: 0.9rem;
+			color: black;
+		}
+		
+		.text{
+			padding-left: 2px;
+			padding-right: 5px;
+			font-size: 0.8rem;
+			color: black;
+		}
+		
+		.lable {
+			font-size: 0.8rem;
+			min-width: 50px;
+			color: black;
+		}
+		
+		.content {
+			margin-left: 5px;
+			font-size: 0.8rem;
+			color: gray;
+		}
+		
+		.text-ellipsis {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		
+		.text-underline {
+			text-decoration-line: underline;
+		}
+		
+	}
+	
+
 }
 
 .item-title-run-status-icon {
@@ -48,6 +102,16 @@
 	font-size: 0.9rem;
 }
 
+.item-title-warn-name-ellipsis {
+	overflow: hidden;
+	margin-left: 10rpx;
+	font-size: 0.8rem;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	color: coral;
+	text-decoration-line: underline;
+}
+
 .item-title-rtu-code {
 	margin-left: 10rpx;
 	font-size: 0.8rem;
@@ -88,6 +152,12 @@
 	text-decoration-line: underline;
 }
 
+.text-under-line{
+	text-decoration-line: underline;
+}
+
+
+
 .item-text-content-ellipsis {
 	overflow: hidden;
 	margin-left: 5px;
@@ -97,6 +167,27 @@
 	text-overflow: ellipsis;
 }
 
+.view-btn{
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	border-radius: 7px;
+	width: 100px;
+	height: 30px;
+		
+	.view-btn-text {
+		color: black;
+		font-size: 0.7rem;
+	}
+}
+
+.view-border{
+	border-width: 1px;
+	border-color: deepskyblue;
+	border-style: solid;	
+}
+
 .item-button-group {
 	padding-top: 4px;
 	display: flex;
@@ -130,7 +221,12 @@
 			color: black;
 			font-size: 0.6rem;
 		}
-
+		
+		
+	}
+	
+	.mid-size{
+		width: 120px;
 	}
 	
 	.item-button-disabled {
@@ -171,7 +267,13 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
-	padding-bottom: 10px;
+	padding-bottom: 5px;
+}
+
+.search-block .name{
+	margin-top: 5px;
+	padding-left: 10px;
+	padding-right: 10px;
 }
 
 .search-block .adcd-adnm{
@@ -463,4 +565,202 @@
 	border-radius: 10px;
 	background-color: $u-content-color;
 }
+
+.view-flex-rs {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.view-flex-rc {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-cc {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-block {
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-start;
+	align-items: center;
+}
+
+.view-flex-block-center {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-inline {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	flex-wrap: wrap;
+}
+	
+.view-flex-inline-center {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.view-flex-inline-end {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+	align-items: center;
+	flex-wrap: wrap;
+}
+	
+.list-item-title {
+	margin-left: 5rpx;
+	font-size: 0.7rem;
+	font-weight: bold;
+}
+	
+.list-item-sub-title {
+	margin-left: 5rpx;
+	font-size: 0.6rem;
+	color: gray;
+}
+	
+	.list-item-text{
+		padding-left: 2px;
+		padding-right: 5px;
+		font-size: 0.7rem;
+	}
+	
+	.list-item-text-ellipsis {
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	
+	
+	.footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 1;
+		height: 100rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		background-color: whitesmoke;
+	
+		.ipt {
+			width: 380rpx;
+			height: 77rpx;
+			background: #f7f7f7;
+			border-radius: 38px;
+			padding: 0 37rpx;
+			box-sizing: border-box;
+			margin-right: 20rpx;
+		}
+	
+		.control {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+	
+			.block {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex: 1;
+			}
+	
+			.icon {
+				height: auto;
+			}
+	
+			.c {
+				width: 41rpx;
+				margin-right: 10rpx;
+			}
+	
+			.s {
+				width: 36rpx;
+			}
+	
+			.t {
+				width: 31rpx;
+			}
+		}
+	}
+	
+.img-container {
+	margin-bottom: 0px;
+	width: 100px;
+	height: 100px;
+
+	.note-image-box {
+		margin-top: 0px;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 10px;
+
+		.note-image-item {
+			position: relative;
+			width: 100%;
+			height: 0;
+			padding-top: 100%;
+			box-sizing: border-box;
+			// background-color: #18B566;
+
+			.close-icon {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				right: 0px;
+				top: 0px;
+				width: 22px;
+				height: 22px;
+				border-radius: 50%;
+				background-color: #d5d5d5;
+				z-index: 2;
+			}
+
+			.image-box {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 0px;
+				right: 0px;
+				border: 0px;
+				left: 0px;
+				border: 1px #eee solid;
+				border-radius: 5px;
+				overflow: hidden;
+				width: 99%;
+				height: 99%;
+
+			}
+
+
+		}
+	}
+}
+	
 /* end--演示页面使用的统一样式--end */

unpackage/dist/build/app-plus/static/style/app.scss

@@ -14,9 +14,11 @@
 }
 
 .container {
-	padding: 0 0 150rpx;
+	padding: 0 0 10rpx;
 }
 
+
+
 .items-line{
 	display: flex;
 	flex-direction: row;
@@ -29,6 +31,60 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
+	
+	.line{
+	   	display: flex;
+	   	flex-direction: row;
+	   	justify-content: flex-start;
+	   	align-items: center;
+	   	flex-wrap: wrap;
+		
+		.block {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+		}
+		
+		.title{
+			padding-left: 2px;
+			padding-right: 5px;
+			font-size: 0.9rem;
+			color: black;
+		}
+		
+		.text{
+			padding-left: 2px;
+			padding-right: 5px;
+			font-size: 0.8rem;
+			color: black;
+		}
+		
+		.lable {
+			font-size: 0.8rem;
+			min-width: 50px;
+			color: black;
+		}
+		
+		.content {
+			margin-left: 5px;
+			font-size: 0.8rem;
+			color: gray;
+		}
+		
+		.text-ellipsis {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		
+		.text-underline {
+			text-decoration-line: underline;
+		}
+		
+	}
+	
+
 }
 
 .item-title-run-status-icon {
@@ -46,6 +102,16 @@
 	font-size: 0.9rem;
 }
 
+.item-title-warn-name-ellipsis {
+	overflow: hidden;
+	margin-left: 10rpx;
+	font-size: 0.8rem;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	color: coral;
+	text-decoration-line: underline;
+}
+
 .item-title-rtu-code {
 	margin-left: 10rpx;
 	font-size: 0.8rem;
@@ -86,6 +152,12 @@
 	text-decoration-line: underline;
 }
 
+.text-under-line{
+	text-decoration-line: underline;
+}
+
+
+
 .item-text-content-ellipsis {
 	overflow: hidden;
 	margin-left: 5px;
@@ -95,6 +167,27 @@
 	text-overflow: ellipsis;
 }
 
+.view-btn{
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	border-radius: 7px;
+	width: 100px;
+	height: 30px;
+		
+	.view-btn-text {
+		color: black;
+		font-size: 0.7rem;
+	}
+}
+
+.view-border{
+	border-width: 1px;
+	border-color: deepskyblue;
+	border-style: solid;	
+}
+
 .item-button-group {
 	padding-top: 4px;
 	display: flex;
@@ -128,7 +221,12 @@
 			color: black;
 			font-size: 0.6rem;
 		}
-
+		
+		
+	}
+	
+	.mid-size{
+		width: 120px;
 	}
 	
 	.item-button-disabled {
@@ -169,7 +267,13 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
-	padding-bottom: 10px;
+	padding-bottom: 5px;
+}
+
+.search-block .name{
+	margin-top: 5px;
+	padding-left: 10px;
+	padding-right: 10px;
 }
 
 .search-block .adcd-adnm{
@@ -461,4 +565,202 @@
 	border-radius: 10px;
 	background-color: $u-content-color;
 }
+
+.view-flex-rs {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.view-flex-rc {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-cc {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-block {
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-start;
+	align-items: center;
+}
+
+.view-flex-block-center {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-inline {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	flex-wrap: wrap;
+}
+	
+.view-flex-inline-center {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.view-flex-inline-end {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+	align-items: center;
+	flex-wrap: wrap;
+}
+	
+.list-item-title {
+	margin-left: 5rpx;
+	font-size: 0.7rem;
+	font-weight: bold;
+}
+	
+.list-item-sub-title {
+	margin-left: 5rpx;
+	font-size: 0.6rem;
+	color: gray;
+}
+	
+	.list-item-text{
+		padding-left: 2px;
+		padding-right: 5px;
+		font-size: 0.7rem;
+	}
+	
+	.list-item-text-ellipsis {
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	
+	
+	.footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 1;
+		height: 100rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		background-color: whitesmoke;
+	
+		.ipt {
+			width: 380rpx;
+			height: 77rpx;
+			background: #f7f7f7;
+			border-radius: 38px;
+			padding: 0 37rpx;
+			box-sizing: border-box;
+			margin-right: 20rpx;
+		}
+	
+		.control {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+	
+			.block {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex: 1;
+			}
+	
+			.icon {
+				height: auto;
+			}
+	
+			.c {
+				width: 41rpx;
+				margin-right: 10rpx;
+			}
+	
+			.s {
+				width: 36rpx;
+			}
+	
+			.t {
+				width: 31rpx;
+			}
+		}
+	}
+	
+.img-container {
+	margin-bottom: 0px;
+	width: 100px;
+	height: 100px;
+
+	.note-image-box {
+		margin-top: 0px;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 10px;
+
+		.note-image-item {
+			position: relative;
+			width: 100%;
+			height: 0;
+			padding-top: 100%;
+			box-sizing: border-box;
+			// background-color: #18B566;
+
+			.close-icon {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				right: 0px;
+				top: 0px;
+				width: 22px;
+				height: 22px;
+				border-radius: 50%;
+				background-color: #d5d5d5;
+				z-index: 2;
+			}
+
+			.image-box {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 0px;
+				right: 0px;
+				border: 0px;
+				left: 0px;
+				border: 1px #eee solid;
+				border-radius: 5px;
+				overflow: hidden;
+				width: 99%;
+				height: 99%;
+
+			}
+
+
+		}
+	}
+}
+	
 /* end--演示页面使用的统一样式--end */

unpackage/resources/__UNI__1ED82EA/www/static/style/app.scss

@@ -14,9 +14,11 @@
 }
 
 .container {
-	padding: 0 0 150rpx;
+	padding: 0 0 10rpx;
 }
 
+
+
 .items-line{
 	display: flex;
 	flex-direction: row;
@@ -29,6 +31,60 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
+	
+	.line{
+	   	display: flex;
+	   	flex-direction: row;
+	   	justify-content: flex-start;
+	   	align-items: center;
+	   	flex-wrap: wrap;
+		
+		.block {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+		}
+		
+		.title{
+			padding-left: 2px;
+			padding-right: 5px;
+			font-size: 0.9rem;
+			color: black;
+		}
+		
+		.text{
+			padding-left: 2px;
+			padding-right: 5px;
+			font-size: 0.8rem;
+			color: black;
+		}
+		
+		.lable {
+			font-size: 0.8rem;
+			min-width: 50px;
+			color: black;
+		}
+		
+		.content {
+			margin-left: 5px;
+			font-size: 0.8rem;
+			color: gray;
+		}
+		
+		.text-ellipsis {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+		
+		.text-underline {
+			text-decoration-line: underline;
+		}
+		
+	}
+	
+
 }
 
 .item-title-run-status-icon {
@@ -46,6 +102,16 @@
 	font-size: 0.9rem;
 }
 
+.item-title-warn-name-ellipsis {
+	overflow: hidden;
+	margin-left: 10rpx;
+	font-size: 0.8rem;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	color: coral;
+	text-decoration-line: underline;
+}
+
 .item-title-rtu-code {
 	margin-left: 10rpx;
 	font-size: 0.8rem;
@@ -86,6 +152,12 @@
 	text-decoration-line: underline;
 }
 
+.text-under-line{
+	text-decoration-line: underline;
+}
+
+
+
 .item-text-content-ellipsis {
 	overflow: hidden;
 	margin-left: 5px;
@@ -95,6 +167,27 @@
 	text-overflow: ellipsis;
 }
 
+.view-btn{
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	border-radius: 7px;
+	width: 100px;
+	height: 30px;
+		
+	.view-btn-text {
+		color: black;
+		font-size: 0.7rem;
+	}
+}
+
+.view-border{
+	border-width: 1px;
+	border-color: deepskyblue;
+	border-style: solid;	
+}
+
 .item-button-group {
 	padding-top: 4px;
 	display: flex;
@@ -128,7 +221,12 @@
 			color: black;
 			font-size: 0.6rem;
 		}
-
+		
+		
+	}
+	
+	.mid-size{
+		width: 120px;
 	}
 	
 	.item-button-disabled {
@@ -169,7 +267,13 @@
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
-	padding-bottom: 10px;
+	padding-bottom: 5px;
+}
+
+.search-block .name{
+	margin-top: 5px;
+	padding-left: 10px;
+	padding-right: 10px;
 }
 
 .search-block .adcd-adnm{
@@ -461,4 +565,202 @@
 	border-radius: 10px;
 	background-color: $u-content-color;
 }
+
+.view-flex-rs {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.view-flex-rc {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-cc {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-block {
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-start;
+	align-items: center;
+}
+
+.view-flex-block-center {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+
+.view-flex-inline {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	flex-wrap: wrap;
+}
+	
+.view-flex-inline-center {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.view-flex-inline-end {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+	align-items: center;
+	flex-wrap: wrap;
+}
+	
+.list-item-title {
+	margin-left: 5rpx;
+	font-size: 0.7rem;
+	font-weight: bold;
+}
+	
+.list-item-sub-title {
+	margin-left: 5rpx;
+	font-size: 0.6rem;
+	color: gray;
+}
+	
+	.list-item-text{
+		padding-left: 2px;
+		padding-right: 5px;
+		font-size: 0.7rem;
+	}
+	
+	.list-item-text-ellipsis {
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+	
+	
+	.footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 1;
+		height: 100rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		background-color: whitesmoke;
+	
+		.ipt {
+			width: 380rpx;
+			height: 77rpx;
+			background: #f7f7f7;
+			border-radius: 38px;
+			padding: 0 37rpx;
+			box-sizing: border-box;
+			margin-right: 20rpx;
+		}
+	
+		.control {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+	
+			.block {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex: 1;
+			}
+	
+			.icon {
+				height: auto;
+			}
+	
+			.c {
+				width: 41rpx;
+				margin-right: 10rpx;
+			}
+	
+			.s {
+				width: 36rpx;
+			}
+	
+			.t {
+				width: 31rpx;
+			}
+		}
+	}
+	
+.img-container {
+	margin-bottom: 0px;
+	width: 100px;
+	height: 100px;
+
+	.note-image-box {
+		margin-top: 0px;
+		display: flex;
+		flex-wrap: wrap;
+		padding: 10px;
+
+		.note-image-item {
+			position: relative;
+			width: 100%;
+			height: 0;
+			padding-top: 100%;
+			box-sizing: border-box;
+			// background-color: #18B566;
+
+			.close-icon {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				right: 0px;
+				top: 0px;
+				width: 22px;
+				height: 22px;
+				border-radius: 50%;
+				background-color: #d5d5d5;
+				z-index: 2;
+			}
+
+			.image-box {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: absolute;
+				top: 0px;
+				right: 0px;
+				border: 0px;
+				left: 0px;
+				border: 1px #eee solid;
+				border-radius: 5px;
+				overflow: hidden;
+				width: 99%;
+				height: 99%;
+
+			}
+
+
+		}
+	}
+}
+	
 /* end--演示页面使用的统一样式--end */

utils/func.js

@@ -6,20 +6,27 @@ const install = (Vue, vm) => {
 		vm.$u.vuex('userInfo', userInfo)
 		vm.$u.vuex('accessToken', userInfo.access_token)
 		vm.$u.vuex('isLogin', true)
-		if (userInfo.role_name === 'sys_admin' || userInfo.role_name === 'org_admin') {
-			uni.redirectTo({
-				url: '/pages/home/start/start'
+		if (userInfo.role_name === 'org_yj_service_person') {
+			//应急人员
+			uni.setStorageSync("SubSystemSelectInfo", {
+				subSystem: 2,
+			});
+			uni.switchTab({
+				url: '/pages/home/home'
 			})
 		} else {
 			uni.setStorageSync("SubSystemSelectInfo", {
-				ywxt: 1,
-				yjxt: 0,
+				subSystem: 1,
 			});
-			
 			uni.switchTab({
 				url: '/pages/home/home'
 			})
-		}
+		 }
+		  //else {
+		// 	uni.redirectTo({
+		// 		url: '/pages/home/start/start'
+		// 	})
+		// }
 	}
 
 	// 退出登录