zc

api/commonality/permission.js

@@ -0,0 +1,13 @@
+import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,apiResquestTimer } from '@/api/request/request.js'
+
+/*查询用户列表-下拉列表
+* userName : '', 名称
+* userType: '',  0.系统 1.老师 2.学生
+*/
+export const systemUserDropList = (data) => {
+	return apiResquest({
+		url: `/system/user/dropList`,
+		method: 'POST',
+		data: { ...data }
+	})
+};

api/request/config.js

@@ -1,13 +1,13 @@
 const config = {
-	// base_url: 'http://192.168.1.8/api',//V3
-	 base_url: 'http://192.168.1.9:8080',//柴
+	// base_url: 'http://192.168.1.43/api', //43服务器
+	base_url: 'http://192.168.1.8/api',//1.8服务器
+	 // base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	//base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
-	// base_url: 'http://192.168.1.43/api', //43服务器
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.zjznai.com/labAppTest/',//43服务器线上

api/safetyExamine/index.js

@@ -1,90 +0,0 @@
-import { apiResquest } from '../request/request.js'
-import { apiResquestForm } from '../request/request.js'
-import { apiResquestJsonList } from '../request/request.js'
-import { apiResquestFormVideo } from '../request/request.js'
-import { apiResquestTimer } from '../request/request.js'
-
-
-//登录
-export const login = (data) => {
-	return apiResquest({
-		url: `/auth/appletLogin`,
-		method: 'POST',
-		data: { ...data }
-	})
-};
-
-//查询公共配置
-export const configInfo = (data) => {
-	return apiResquest({
-		url: `/auth/configInfo`,
-		method: 'GET',
-		data: data,
-	})
-};
-
-/*                分类获取公共配置
-* category        1.系统参数 2.公共配置
-* configType      1.基础配置 2.管控一体机 3.化学品终端 4.小程序配置 5.开发配置 6.首页配置
-*/
-export function getConfigByType(data) {
-	return apiResquest({
-		url: '/system/config/info/getConfigByType',
-		method: 'post',
-		data: {
-			...data
-		}
-	})
-}
-
-//查询人员身份标识
-export const getGentleIdentifier = (data) => {
-	return apiResquest({
-		url: `/security/checkSet/getGentle`,
-		method: 'GET',
-		data: data,
-	})
-};
-
-//查询小程序布局配置
-export const systemAppletLayoutSelect = (data) => {
-	return apiResquest({
-    url: '/system/applet/layout/select',
-		method: 'GET',
-		data: data,
-	})
-};
-//查询权限字段
-export const systemAppletRolePermission = (data) => {
-	return apiResquest({
-    url: '/system/applet/role/permission',
-		method: 'GET',
-		data: data,
-	})
-};
-
-
-
-
-
-/************************未调试************************/
-
-
-
-//获取离开检查配置
-export const outSubjectPhoto  = (id,data) => {
-    return apiResquestForm({
-        url: `/base/app/lab/api/outSubjectPhoto`,
-        method: 'GET',
-        data: data,
-    })
-};
-
-//分级管控未完成工作列表
-export const gradingControl  = (data) => {
-    return apiResquest({
-        url: `/base/app/lab/manage/havingList`,
-        method: 'POST',
-        data: {...data}
-    })
-};

api/basicsModules/index.js

@@ -1,8 +1,5 @@
-import { apiResquest } from '../request/request.js'
-import { apiResquestForm } from '../request/request.js'
-import { apiResquestJsonList } from '../request/request.js'
-import { apiResquestFormVideo } from '../request/request.js'
-import { apiResquestTimer } from '../request/request.js'
+import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,apiResquestTimer } from '@/api/request/request.js'
+
 
 
 //登录
@@ -70,41 +67,6 @@ export const laboratoryAppletGetSubDetailInfo = (data) => {
 		data: data,
 	})
 };
-//实验室-查询传感器状态
-export const iotAppSensorFindBySubId = (data) => {
-	return apiResquest({
-		url: `/iot/app/sensor/findBySubId`,
-		method: 'GET',
-		data: data,
-	})
-};
-//实验室-查询硬件设备
-export const iotAppHardwareFindByType = (data) => {
-	return apiResquest({
-		url: `/iot/app/hardware/findByType`,
-		method: 'POST',
-		data: { ...data }
-	})
-};
-
-
-//实验室-硬件设备-开关
-export const iotAppHardwareOperatingHardware = (data) => {
-	return apiResquest({
-		url: `/iot/app/hardware/operatingHardware`,
-		method: 'GET',
-		data: data,
-	})
-};
-
-//实验室-查询物联设备
-export const iotAppDeviceFindByType = (data) => {
-	return apiResquest({
-		url: `/iot/app/device/findByType`,
-		method: 'POST',
-		data: { ...data }
-	})
-};
 //实验室-查询喇叭列表
 export const iotAppSpeakerFindHorn = (data) => {
 	return apiResquest({

component/homeConfigurationSlot.vue

@@ -5,7 +5,7 @@
 	<homeConfigurationSlot v-if="homeConfigData[2]" :homeConfig="homeConfigData[2]"></homeConfigurationSlot>
 	<homeConfigurationSlot v-if="homeConfigData[3]" :homeConfig="homeConfigData[3]"></homeConfigurationSlot>
 	
- 	import { homeConfigurationSlot } from '@/component/homeConfigurationSlot'
+ 	import { homeConfigurationSlot } from '@/pages/component/homeConfigurationSlot'
 	import { getHomeConfig } from '@/utils/homeConfig.js'
 
 	components: {
@@ -57,7 +57,7 @@
 					<view class="grading_c">{{item.name}}</view>
 					<view class="grading_r" v-if="item.route === 'gradingControl'" @click="buttonClick(item)">
 						{{gradingCount>0?gradingCount+'项工作待完成':''}}
-						<img src="@/images/basicsModules/icon_wdwg_gd.png" />
+						<img src="@/pages/images/icon_wdwg_gd.png" />
 					</view>
 				</view>
 			</permissionsSlot>
@@ -69,8 +69,7 @@
 	import {
 		outSubjectPhoto,
 		gradingControl
-	} from '@/api/basicsModules/index.js'
-	// import {} from '@/api/safetyExamine/index.js'
+	} from '@/pages/api/index.js'
 	export default {
 		name: "homeConfigurationSlot",
 		props: {

component/mineConfigurationSlot.vue

@@ -2,7 +2,7 @@
  个人中心按钮匹配组件
 	<mineConfigurationSlot :mineConfig="mineConfigData"></mineConfigurationSlot>
 
-	import { mineConfigurationSlot } from '@/component/mineConfigurationSlot'
+	import { mineConfigurationSlot } from '@/pages/component/mineConfigurationSlot'
 	import { getMineConfig } from '@/utils/mineConfig'
 
 	components: {
@@ -40,7 +40,7 @@
 						:class="ifFaceFeature==''?'colorA':'marginType'">
 						{{ifFaceFeature==''?'去认证':'已认证'}}
 					</view>
-					<img class="right-img" src="@/images/basicsModules/icon_04.png">
+					<img class="right-img" src="@/pages/images/icon_04.png">
 				</view>
 			</permissionsSlot>
 		</view>
@@ -50,7 +50,7 @@
 <script>
 	import {
 		fingerprintQueryList
-	} from '@/api/basicsModules/index.js'
+	} from '@/pages/api/index.js'
 	export default {
 		name: "mineConfigurationSlot",
 		props: {

component/navbar.vue

@@ -12,8 +12,6 @@
 				</view>
 			</view>
 		</view>
-
-	
 	</view>
 </template>
  

component/tabBar.vue

@@ -4,20 +4,20 @@
 		<view class="tab-bar-box">
 			<view class="null-box"></view>
 			<view class="tba-bar-min-box" @click="tabBarGoPage(1)">
-				<img src="@/images/basicsModules/btn_sy_xz.png" v-if="currentRoute == 'pages/home/home'">
-				<img src="@/images/basicsModules/btn_sy_zc.png" v-else>
+				<img src="@/pages/images/btn_sy_xz.png" v-if="currentRoute == 'pages/views/home/home'">
+				<img src="@/pages/images/btn_sy_zc.png" v-else>
 				<view :class="currentRoute == 'pages/home'?'primary':''">首页</view>
 			</view>
 			<view class="null-box"></view>
 			<view class="tba-bar-min-box" @click="tabBarGoPage(2)">
-				<img src="@/images/basicsModules/btn_xx_xz.png" v-if="currentRoute == 'pages/information/information'">
-				<img src="@/images/basicsModules/btn_xx_zc.png" v-else>
+				<img src="@/pages/images/btn_xx_xz.png" v-if="currentRoute == 'pages/views/information/information'">
+				<img src="@/pages/images/btn_xx_zc.png" v-else>
 				<view :class="currentRoute == 'pages/information/information'?'primary':''">消息</view>
 			</view>
 			<view class="null-box"></view>
 			<view class="tba-bar-min-box" @click="tabBarGoPage(3)">
-				<img src="@/images/basicsModules/btn_wd_xz.png" v-if="currentRoute == 'pages/mine/mine'">
-				<img src="@/images/basicsModules/btn_wd_zc.png" v-else>
+				<img src="@/pages/images/btn_wd_xz.png" v-if="currentRoute == 'pages/views/mine/mine'">
+				<img src="@/pages/images/btn_wd_zc.png" v-else>
 				<view :class="currentRoute == 'pages/mine'?'primary':''">我的</view>
 			</view>
 			<view class="null-box"></view>
@@ -70,21 +70,21 @@
 
 			tabBarGoPage(type) {
 				if (type === 1) {
-					if (this.currentRoute !== 'pages/home/home') {
+					if (this.currentRoute !== 'pages/views/home/home') {
 						uni.redirectTo({
-							url: '/pages/home/home',
+							url: '/pages/views/home/home',
 						});
 					}
 				} else if (type === 2) {
-					if (this.currentRoute !== 'pages/information/information') {
+					if (this.currentRoute !== 'pages/views/information/information') {
 						uni.redirectTo({
-							url: '/pages/information/information',
+							url: '/pages/views/information/information',
 						});
 					}
 				} else if (type === 3) {
-					if (this.currentRoute !== 'pages/mine/mine') {
+					if (this.currentRoute !== 'pages/views/mine/mine') {
 						uni.redirectTo({
-							url: '/pages/mine/mine',
+							url: '/pages/views/mine/mine',
 						});
 					}
 				}

component/topWarn.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-    import { selectTriggerInfo,evacuate,closeRiskPlan } from '@/api/basicsModules/index.js'
+    import { selectTriggerInfo,evacuate,closeRiskPlan } from '@/pages/api/index.js'
 
 	export default {
 		data() {
@@ -96,7 +96,7 @@
 				  groupId:this.groupId,
 				}
 				uni.navigateTo({
-					url:'/pages_manage/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+					url:'/pages_manage/views/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
 				});
 			},
 			//获取报警信息
@@ -122,7 +122,7 @@
 						// 	  riskPlanId:data.data[i].riskPlanId,
 						// 	}
 						// 	uni.navigateTo({
-						// 		url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+						// 		url:'/pages/views/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
 						// 	});
 						// 	return
 						// }
@@ -137,7 +137,7 @@
 							  groupId:data.data[i].groupId,
 							}
 							uni.navigateTo({
-								url:'/pages_manage/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+								url:'/pages_manage/views/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
 							});
 							return
 						}

pages/demoPage.vue

@@ -1,92 +0,0 @@
-<!-- 我的 -->
-<template>
-	<view id="demoPage">
-		<view class="button-view">下载</view>
-
-		<uni-file-picker ref="files" :auto-upload="false" />
-		<button @click="upload">上传文件</button>
-		<view class="button-view"></view>
-		<view class="button-view">预览</view>
-		<view class="button-view">录音</view>
-	</view>
-</template>
-
-<script>
-	import {
-		systemFileUpload
-	} from '@/api/basicsModules/index.js'
-
-	export default {
-		data() {
-			return {
-
-				imageValue: []
-			}
-		},
-		onLoad() {
-
-		},
-		onShow() {
-
-		},
-		methods: {
-			upload() {
-				this.$refs.files.upload()
-			},
-			// 获取上传状态
-			select(e) {
-				console.log('选择文件：', e)
-			},
-			// 获取上传进度
-			progress(e) {
-				console.log('上传进度：', e)
-			},
-
-			// 上传成功
-			success(e) {
-				console.log('上传成功')
-			},
-
-			// 上传失败
-			fail(e) {
-				console.log('上传失败：', e)
-			},
-			//上传
-			async commonUploading(e) {
-				console.log('e', e);
-				return
-
-				let self = this;
-				const {
-					data
-				} = await systemFileUpload();
-				if (data.code == 200) {
-
-				}
-			},
-			// commonUploading(e) {
-			// 	let self = this;
-			// 	let str = "";
-			// 	console.log(e.target.files[0])
-			// 	let param = new FormData();
-			// 	param.append('api_name', `uploadImg`);
-			// 	param.append('openid', localStorage.getItem("openid"));
-			// 	param.append('cover', e.target.files[0]);
-			// 	let formData = new FormData();
-			// 	formData.append("file", file);
-			// 	systemFileUpload
-			// },
-		},
-	}
-</script>
-<style lang="stylus" scoped>
-	#demoPage {
-		.button-view {
-			width: 100rpx;
-			margin: 100rpx auto;
-			background: #dedede;
-			border-radius: 4rpx;
-			text-align: center;
-		}
-	}
-</style>

pages/home/home.vue

@@ -10,16 +10,16 @@
 	// #ifdef MP-WEIXIN
 	import {
 		manageHome
-	} from '@/pages/home/manageWorkbench'
+	} from '@/pages/views/home/manageWorkbench'
 	import {
 		userHome
-	} from '@/pages/home/studentWorkbench.vue'
+	} from '@/pages/views/home/studentWorkbench.vue'
 	import {
 		supplierHome
-	} from '@/pages/home/supplierWorkbench.vue'
+	} from '@/pages/views/home/supplierWorkbench.vue'
 	import {
 		tabBar
-	} from '@/component/tabBar.vue'
+	} from '@/pages/component/tabBar.vue'
 	// #endif
 	export default {
 		name: "home",
@@ -33,10 +33,10 @@
 		// #endif
 		// #ifdef H5
 		components: {
-			"manageHome": () => import('@/pages/home/manageWorkbench.vue'),
-			"userHome": () => import('@/pages/home/studentWorkbench.vue'),
-			"supplierHome": () => import('@/pages/home/supplierWorkbench.vue'),
-			"tabBar": () => import('@/component/tabBar.vue'),
+			"manageHome": () => import('@/pages/views/home/manageWorkbench.vue'),
+			"userHome": () => import('@/pages/views/home/studentWorkbench.vue'),
+			"supplierHome": () => import('@/pages/views/home/supplierWorkbench.vue'),
+			"tabBar": () => import('@/pages/component/tabBar.vue'),
 		},
 		// #endif
 		data() {
@@ -45,7 +45,7 @@
 			}
 		},
 		onLoad() {
-			console.log('permissionsVerify', this.permissionsVerify)
+			
 		},
 		onShow() {
 			if (uni.getStorageSync('token') && uni.getStorageSync('userId') && uni.getStorageSync('userType')) {

pages/home/manageWorkbench.vue

@@ -7,11 +7,11 @@
     <homeConfigurationSlot v-for="(item,index) in homeConfigData" :key="index" :homeConfig="item"></homeConfigurationSlot>
     <!--安全报警-->
     <view class="for-title-p" @click="goSecurityAlertList" v-if="alarmList[0]">
-      <img class="left-img" src="@/images/basicsModules/icon_aqbj.png">
+      <img class="left-img" src="@/pages/images/icon_aqbj.png">
       <view class="name-view">安全报警</view>
       <view class="num-view">{{alarmList.length}}</view>
       <view class="null-view"></view>
-      <img class="right-img" src="@/images/basicsModules/icon_04.png">
+      <img class="right-img" src="@/pages/images/icon_04.png">
     </view>
     <view class="for-max-box" v-if="alarmList[0]">
       <view class="for-box" v-for="(item,index) in alarmList" :key="index">
@@ -23,12 +23,12 @@
         </view>
         <view class="address-box"><span>{{ item.subDiyVo.typeName }}</span>{{ item.subDiyVo.deptName }}</view>
         <view class="address-box-two">
-          <img src="@/images/basicsModules/icon_14.png">
+          <img src="@/pages/images/icon_14.png">
           <view>{{ item.subDiyVo.subAddrrStr }}</view>
         </view>
         <view class="for-img-box">
           <view class="for-img-min-box" v-for="(minItem,index) in item.sensorSet" :key="index">
-            <img src="@/images/basicsModules/icon_15.png">
+            <img src="@/pages/images/icon_15.png">
             <view>{{ minItem }}</view>
           </view>
         </view>
@@ -37,22 +37,22 @@
     </view>
     <!--我的实验室-->
     <view class="for-title-p">
-      <img class="left-img" src="@/images/basicsModules/icon_sy_wdsys.png">
+      <img class="left-img" src="@/pages/images/icon_sy_wdsys.png">
       <view class="name-view">我的实验室</view>
     </view>
     <view class="for-max-box">
-      <img class="null-img" v-if="!dataList[0]" src="@/images/basicsModules/null-data-1.png">
+      <img class="null-img" v-if="!dataList[0]" src="@/pages/images/null-data-1.png">
       <view class="for-box" v-for="(item,index) in dataList" :key="index" @click="tableButton('subDetail',item)">
         <view class="title-box">
           <view :style="'border:1rpx solid '+item.levelColor+';background:#fff;color:'+item.levelColor+';'">
             {{ item.levelName }}
           </view>
             <view>{{ item.subName}}</view>
-          <img src="@/images/basicsModules/icon_04.png">
+          <img src="@/pages/images/icon_04.png">
         </view>
         <view class="address-box"><span>{{ item.typeName }}</span>{{ item.deptName }}</view>
         <view class="address-box-two">
-          <img src="@/images/basicsModules/icon_14.png">
+          <img src="@/pages/images/icon_14.png">
           <view>{{ item.buildName}} {{ item.floorName}} {{ item.subName}} {{ item.roomName}}</view>
         </view>
       </view>
@@ -64,13 +64,13 @@
 <script>
   import {getSafeWarnList, laboratoryAppletSubList,
     systemAppletLayoutSelect,laboratoryAppletGetSubDetailInfo
-  } from '@/api/basicsModules/index.js'
+  } from '@/pages/api/index.js'
   import {getHomeConfig} from '@/utils/homeConfig'
 	// #ifdef MP-WEIXIN
-	import {tabBar} from '@/component/tabBar.vue'
-	import {topWarn} from '@/component/topWarn.vue'
-	import {navBar} from '@/component/navbar.vue'
-	import {homeConfigurationSlot} from '@/component/homeConfigurationSlot'
+	import {tabBar} from '@/pages/component/tabBar.vue'
+	import {topWarn} from '@/pages/component/topWarn.vue'
+	import {navBar} from '@/pages/component/navbar.vue'
+	import {homeConfigurationSlot} from '@/pages/component/homeConfigurationSlot'
 	// #endif
   export default {
     name: 'manageWorkbench',
@@ -84,10 +84,10 @@
 		// #endif
 		// #ifdef H5
 		components: {
-			"tabBar": () => import('@/component/tabBar.vue'),
-			"topWarn": () => import('@/component/topWarn.vue'),
-			"navBar": () => import('@/component/navbar.vue'),
-			"homeConfigurationSlot": () => import('@/component/homeConfigurationSlot.vue'),
+			"tabBar": () => import('@/pages/component/tabBar.vue'),
+			"topWarn": () => import('@/pages/component/topWarn.vue'),
+			"navBar": () => import('@/pages/component/navbar.vue'),
+			"homeConfigurationSlot": () => import('@/pages/component/homeConfigurationSlot.vue'),
 		},
 		// #endif
     data() {
@@ -180,7 +180,7 @@
 	    const {data} = await laboratoryAppletGetSubDetailInfo({infoId:infoId});
 	    if (data.code == 200) {
 			uni.navigateTo({
-				url: '/pages_manage/laboratory/infoPage?infoData='+encodeURIComponent(JSON.stringify(data.data))
+				url: '/pages_manage/views/laboratory/infoPage?infoData='+encodeURIComponent(JSON.stringify(data.data))
 			});
 	    }
 	  },

pages/home/studentWorkbench.vue

@@ -8,14 +8,14 @@
 
 	<view class="big-icon-button-box">
       <view class="left-box">
-        <img class="left-top-img" @click="goNull" src="@/images/basicsModules/img_bg_cjcx.png">
-        <img class="left-bottom-img" @click="goPage('meViolation')" src="@/images/basicsModules/img_bg_wgjl.png">
+        <img class="left-top-img" @click="goNull" src="@/pages/images/img_bg_cjcx.png">
+        <img class="left-bottom-img" @click="goPage('meViolation')" src="@/pages/images/img_bg_wgjl.png">
       </view>
-      <img class="right-img" @click="goNull" src="@/images/basicsModules/img_bg_jfmx.png">
+      <img class="right-img" @click="goNull" src="@/pages/images/img_bg_jfmx.png">
     </view>
     <view class="bottom-max-box">
       <view class="bottom-title">
-        <img src="@/images/basicsModules/icon_sy_wdzs.png">
+        <img src="@/pages/images/icon_sy_wdzs.png">
         <view>我的证书</view>
       </view>
       <view class="bottom-big-box">
@@ -34,10 +34,10 @@
 </template>
 
 <script>
-import { myViolationCount,queryMyCert,outSubjectPhoto,gradingControl,getGentleIdentifier,systemAppletLayoutSelect} from '@/api/basicsModules/index.js'
-import { tabBar } from '@/component/tabBar.vue'
-import { navBar } from '@/component/navbar.vue'
-import { homeConfigurationSlot } from '@/component/homeConfigurationSlot'
+import { myViolationCount,queryMyCert,outSubjectPhoto,gradingControl,getGentleIdentifier,systemAppletLayoutSelect} from '@/pages/api/index.js'
+import { tabBar } from '@/pages/component/tabBar.vue'
+import { navBar } from '@/pages/component/navbar.vue'
+import { homeConfigurationSlot } from '@/pages/component/homeConfigurationSlot'
 import { getHomeConfig } from '@/utils/homeConfig'
 export default {
   components: {
@@ -106,7 +106,7 @@ export default {
         onlyFromCamera: true,
         success: function (res) {
           uni.navigateTo({
-            url: '/pages_student/mine/codeSuccess?q='+encodeURIComponent(JSON.stringify(res.result))
+            url: '/pages_student/views/mine/codeSuccess?q='+encodeURIComponent(JSON.stringify(res.result))
           });
         }
       });
@@ -145,40 +145,40 @@ export default {
     goPage(type){
       if(type == 'meViolation'){//我的违规
         uni.navigateTo({
-          url: '/pages_student/workbench/meViolation',
+          url: '/pages_student/views/views/workbench/meViolation',
         });
       }else if(type == 'photoInspection'){//离开检查
         this.outSubjectPhoto();
       }else if(type == 'resultInquiry'){//成绩查询
         uni.navigateTo({
-          url: '/pages_student/workbench/resultInquiry',
+          url: '/pages_student/views/workbench/resultInquiry',
         });
       }else if(type == 'casuallyPat'){//随手拍
         uni.navigateTo({
-          url: '/pages/casuallyPat',//随手拍
+          url: '/pages/views/casuallyPat',//随手拍
         });
       }else if(type == 'safeAccess'){//安全准入
         uni.navigateTo({
-          url: '/pages_student/workbench/safeAccess/safeAccess',
+          url: '/pages_student/views/views/workbench/safeAccess/safeAccess',
         });
       }else if(type == 'examList'){//在线考试
         uni.navigateTo({
-          url: '/pages_student/workbench/exam/examList',
+          url: '/pages_student/views/workbench/exam/examList',
         });
       }else if(type == 'grading'){
         uni.navigateTo({
-          url: '/pages_student/gradingControl/gradingControl',//分级管控
+          url: '/pages_student/views/gradingControl/gradingControl',//分级管控
         });
       }else if(type == 'safetyInspect'){//安全检查
 
 		this.getGentleIdentifier();
         // uni.navigateTo({
-        //   url: '/pages_manage/workbench/problemRectification/rectifyList',//安全检查
+        //   url: '/pages_manage/views/workbench/problemRectification/rectifyList',//安全检查
         // });
 
       }else if(type == 'gas'){//气瓶管理
         uni.navigateTo({
-          url: '/pages_student/gasManage/gasManage',
+          url: '/pages_student/views/gasManage/gasManage',
         });
       }else if(type == 'none'){
 		  uni.showToast({
@@ -206,7 +206,7 @@ export default {
             sourceRiskUrl:"",
           };
           uni.navigateTo({
-            url: '/pages_student/workbench/photoInspection?newData='+encodeURIComponent(JSON.stringify(obj)),
+            url: '/pages_student/views/workbench/photoInspection?newData='+encodeURIComponent(JSON.stringify(obj)),
           });
         }else if(data.data == false){
           //不需要检查
@@ -230,7 +230,7 @@ export default {
             sourceRiskUrl:data.data.sourceRiskUrl,
           };
           uni.navigateTo({
-            url: '/pages_student/workbench/photoInspection?newData='+encodeURIComponent(JSON.stringify(obj)),
+            url: '/pages_student/views/workbench/photoInspection?newData='+encodeURIComponent(JSON.stringify(obj)),
           });
         }
       }
@@ -261,7 +261,7 @@ export default {
 		  uni.setStorageSync('gentleIdentifierData',data.data)
 		  if(pageType){
 			  uni.navigateTo({
-			    url: '/pages/safetyExamineWorkbench',
+			    url: '/pages/views/safetyExamineWorkbench',
 			  });
 		  }else{
 			  uni.showToast({

pages/home/supplierWorkbench.vue

@@ -3,9 +3,9 @@
   <view class="supplier" style="display: flex;flex-direction: column;flex: 1;">
     <view v-if="pageType==0">
       <view class="supplier_h" @click="handleClick('mine')">
-        <img src="@/images/basicsModules/img_gysglpt_bg.png">
-        <img src="@/images/basicsModules/img_gysglpt_icom.png">
-        <img src="@/images/basicsModules/icon_04.png">
+        <img src="@/pages/images/img_gysglpt_bg.png">
+        <img src="@/pages/images/img_gysglpt_icom.png">
+        <img src="@/pages/images/icon_04.png">
         <view>{{form.companyName}}</view>
       </view>
       <view class="supplier_tab">
@@ -27,9 +27,9 @@
       <scroll-view scroll-y @scrolltolower="scrollGet" class="for-max-box">
         <view class="for-big-box">
           <view class="backlog" @click="handleClick('backlog')">
-            <img class="backlog_l" src="@/images/basicsModules/icon_glpt_dbqd.png">
+            <img class="backlog_l" src="@/pages/images/icon_glpt_dbqd.png">
             <view class="backlog_c">待办清单</view>
-            <img class="backlog_r"  src="@/images/basicsModules/icon_wdwg_gd.png">
+            <img class="backlog_r"  src="@/pages/images/icon_wdwg_gd.png">
           </view>
           <view class="for-box" @click="goInfo(item)" v-for="(item,index) in dataList" :key="index">
             <view class="for-title-box">
@@ -40,21 +40,21 @@
               <view  v-if="item.remark=='gq'" ><text v-for="(item2,index2) in item.detailListVO" :key="index2" v-if="index2<2">{{item2.airName}}-{{item2.configName}}*{{item2.bottleNumber}}<text>{{index2<1?' ':'...'}}</text></text></view>
             </view>
             <view class="for-address-box">
-              <img src="@/images/basicsModules/icon_wtzg_xx.png">
+              <img src="@/pages/images/icon_wtzg_xx.png">
               <view >{{item.campus}}-{{item.building}}-{{item.room}}</view>
             </view>
             <view class="for-time-box">
-              <img src="@/images/basicsModules/icon_wtzg_sj.png">
+              <img src="@/pages/images/icon_wtzg_sj.png">
               <view>{{item.createTime}}</view>
             </view>
           </view>
         </view>
-        <img class="null-img" v-if="!dataList[0]" src="@/images/basicsModules/null-data-1.png">
+        <img class="null-img" v-if="!dataList[0]" src="@/pages/images/null-data-1.png">
       </scroll-view>
-      <img class="supernatant"  @click="handleClick('recycle')"  src="@/images/basicsModules/icon_glpt_gqhsjl.png">
+      <img class="supernatant"  @click="handleClick('recycle')"  src="@/pages/images/icon_glpt_gqhsjl.png">
     </view>
     <view class="empty" v-if="emptyList==4 && pageType==0">
-      <img class="for-back-img" src="@/images/basicsModules/img_ysrygl_zwsj.png">
+      <img class="for-back-img" src="@/pages/images/img_ysrygl_zwsj.png">
       <view>暂无数据</view>
     </view>
     <hasten-page v-if="pageType==1"></hasten-page>
@@ -66,10 +66,10 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import { supplierDetail,storageListTaskIndex} from '@/api/basicsModules/index.js'
-import { hastenPage } from '@/pages/supplier/hasten.vue'
-import { rejectPage } from '@/pages/supplier/reject.vue'
-import { forbiddenPage } from '@/pages/supplier/forbidden.vue'
+import { supplierDetail,storageListTaskIndex} from '@/pages/api/index.js'
+import { hastenPage } from '@/pages/views/supplier/hasten.vue'
+import { rejectPage } from '@/pages/views/supplier/reject.vue'
+import { forbiddenPage } from '@/pages/views/supplier/forbidden.vue'
 export default {
   name: "rectifyList",
   components: {
@@ -120,15 +120,15 @@ export default {
     goInfo(d){
       if(d.remark=='gq'){
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageAirDetail?item='+encodeURIComponent(JSON.stringify(d))
+          url:'/pages_supplier/views/backlogManage/backlogManageAirDetail?item='+encodeURIComponent(JSON.stringify(d))
         });
       }else if(d.remark=='hs'){
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageRecycleDetail?item='+encodeURIComponent(JSON.stringify(d))
+          url:'/pages_supplier/views/backlogManage/backlogManageRecycleDetail?item='+encodeURIComponent(JSON.stringify(d))
         });
       }else if(d.remark=='wt'){
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageIssueDetail?item='+encodeURIComponent(JSON.stringify(d))
+          url:'/pages_supplier/views/backlogManage/backlogManageIssueDetail?item='+encodeURIComponent(JSON.stringify(d))
         });
       }
 
@@ -136,27 +136,27 @@ export default {
     handleClick(doType) {
       if(doType=='people'){
         uni.navigateTo({
-          url:'/pages_supplier/transportPerson/transportPerson'
+          url:'/pages_supplier/views/transportPerson/transportPerson'
         });
       }else if(doType=='car'){
         uni.navigateTo({
-          url:'/pages_supplier/transportCar/transportCar'
+          url:'/pages_supplier/views/transportCar/transportCar'
         });
       }else if(doType=='bottle'){
         uni.navigateTo({
-          url:'/pages_supplier/gasManage/gasManage'
+          url:'/pages_supplier/views/gasManage/gasManage'
         });
       }else if(doType=='mine'){
         uni.navigateTo({
-          url: '/pages_supplier/mine/mine?state='+this.state
+          url: '/pages_supplier/views/mine/mine?state='+this.state
         });
       }else if(doType=='backlog'){//待办清单
         uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManage'
+          url:'/pages_supplier/views/backlogManage/backlogManage'
         });
       }else if(doType=='recycle'){//供气回收
         uni.navigateTo({
-          url:'/pages_supplier/gasRecycle/gasRecycle'
+          url:'/pages_supplier/views/gasRecycle/gasRecycle'
         });
       }
 

pages/information/information.vue

@@ -3,7 +3,7 @@
 	<view id="information">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="for-info-box" v-for="(item,index) in dataList" :key="index" @click="goInfoPage(item)">
-				<img src="@/images/basicsModules/icon_xx_tz.png">
+				<img src="@/pages/images/icon_xx_tz.png">
 				<view class="right-box">
 					<view class="top-box">
 						<view>{{item.userName}}</view>
@@ -22,11 +22,11 @@
 <script>
 	import {
 		systemNoticeGetNoticeList
-	} from '@/api/basicsModules/index.js'
+	} from '@/pages/api/index.js'
 	// #ifdef MP-WEIXIN
 	import {
 		tabBar
-	} from '@/component/tabBar.vue'
+	} from '@/pages/component/tabBar.vue'
 	// #endif
 	export default {
 		// #ifdef MP-WEIXIN
@@ -36,7 +36,7 @@
 		// #endif
 		// #ifdef H5
 		components: {
-			"tabBar": () => import('@/component/tabBar.vue'),
+			"tabBar": () => import('@/pages/component/tabBar.vue'),
 		},
 		// #endif
 		data() {

pages/information/notPassInfo.vue

@@ -52,8 +52,8 @@
 			<view class="word-box" v-if="item.materialType==1">
 				<view class="word-box-title">{{item.materialName}}</view>
 				<view class="word-box-min" v-for="(minItem,minIndex) in item.upList" :key="minIndex" @click="lookItem(minItem)">
-					<img src="@/images/Version2.3/icon_pdf.png" v-if="minItem.type == 'pdf'">
-					<img src="@/images/Version2.3/icon_word.png" v-if="minItem.type == 'doc' || minItem.type == 'docx'">
+					<img src="@/pages/images/Version2.3/icon_pdf.png" v-if="minItem.type == 'pdf'">
+					<img src="@/pages/images/Version2.3/icon_word.png" v-if="minItem.type == 'doc' || minItem.type == 'docx'">
 					<img :src="configUrl+minItem.url" v-if="minItem.type == 'png' || minItem.type == 'jpg' || minItem.type == 'jpeg' || minItem.type == 'gif'">
 					<view>{{minItem.name}}</view>
 				</view>
@@ -150,7 +150,7 @@
 			//重新提交
 			bottomButtonClick(){
 				uni.navigateTo({
-				    url:'/pages_student/workbench/safeAccess/newApplication?item='+encodeURIComponent(JSON.stringify(this.subjectData))
+				    url:'/pages_student/views/workbench/safeAccess/newApplication?item='+encodeURIComponent(JSON.stringify(this.subjectData))
 				});
 			},
 			async getRead() {

pages/login/login.vue

@@ -11,19 +11,19 @@
 			</view>
 			<view class="input-max-box-one">
 				<view class="input-box">
-					<img src="@/images/basicsModules/img_log_in_account.png" />
+					<img src="@/pages/images/img_log_in_account.png" />
 					<input type="text" v-model="username" placeholder="请输入账号" maxlength="20">
 				</view>
 			</view>
 			<view class="input-max-box-two">
 				<view class="input-box">
-					<img src="@/images/basicsModules/img_log_in_password.png" />
+					<img src="@/pages/images/img_log_in_password.png" />
 					<input type="password" v-model="password" placeholder="请输入密码" maxlength="20">
 				</view>
 			</view>
 			<view class="check-box" @click="checkboxChange">
-				<img v-if="checkedType" src="@/images/basicsModules/icon_13.png" />
-				<img v-if="!checkedType" src="@/images/basicsModules/icon_12.png" />
+				<img v-if="checkedType" src="@/pages/images/icon_13.png" />
+				<img v-if="!checkedType" src="@/pages/images/icon_12.png" />
 				<view>记住我</view>
 			</view>
 			<view class="button-box" @click="login">登录</view>
@@ -42,7 +42,7 @@
 		getConfigByType,
 		getGentleIdentifier,
 		systemAppletRolePermission
-	} from '@/api/basicsModules/index.js'
+	} from '@/pages/api/index.js'
 	import {
 		Encrypt,
 		Decrypt
@@ -52,7 +52,7 @@
 			return {
 				identityStatus: 1,
 				// username:"dedsudiyu",//学生
-				username: "sudiyu",//教职工
+				username: "admin",//教职工
 				password: "zd123456",
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),
@@ -77,7 +77,6 @@
 		},
 		onShow() {
 			// this.getConfigInfo();
-			console.log(navigator.userAgent.toLowerCase())
 		},
 		methods: {
 			//顶部tab点击
@@ -116,11 +115,11 @@
 					]).then((result) => {
 						if (uni.getStorageSync('codeData')) {
 							uni.redirectTo({
-								url: '/pages/saoCode/saoCode',
+								url: '/pages/views/saoCode/saoCode',
 							});
 						} else {
 							uni.redirectTo({
-								url: '/pages/home/home',
+								url: '/pages/views/home/home',
 							});
 						}
 					}).catch((error) => {

pages/mine/mine.vue

@@ -6,7 +6,7 @@
 			<view class="top-max-box-two" v-if="userType==1">
 				<view class="user-img-box" @click="selectImage">
 					<img v-if="userData.avatar" :src="baseUrl+userData.avatar">
-					<img v-else src="@/images/basicsModules/icon_01.png">
+					<img v-else src="@/pages/images/icon_01.png">
 					<view>{{userData.avatar?'编辑':'未上传'}}</view>
 				</view>
 				<view class="name-box">
@@ -20,7 +20,7 @@
 				<view class="top-max-box-one">
 					<view class="user-img-box" @click="selectImage">
 						<img v-if="userData.avatar" :src="userData.avatarUrl">
-						<img v-else src="@/images/basicsModules/icon_01.png">
+						<img v-else src="@/pages/images/icon_01.png">
 						<view>{{userData.avatar?'编辑':'未上传'}}</view>
 					</view>
 					<view class="name-box">
@@ -38,7 +38,7 @@
 					<view class="min-num-box" @click="goUserPage('none')">
 						<view class="min-num-view color-one">{{creditScore}}</view>
 						<view class="bottom-min-num-view">
-							<img class="img-one" src="@/images/basicsModules/icon_wd_xyf.png">
+							<img class="img-one" src="@/pages/images/icon_wd_xyf.png">
 							<view>信用分</view>
 						</view>
 					</view>
@@ -46,7 +46,7 @@
 					<view class="min-num-box" @click="goUserPage('none')">
 						<view class="min-num-view color-two">{{bonusPoints}}</view>
 						<view class="bottom-min-num-view">
-							<img class="img-two" src="@/images/basicsModules/icon_wd_jlf.png">
+							<img class="img-two" src="@/pages/images/icon_wd_jlf.png">
 							<view>奖励分</view>
 						</view>
 					</view>
@@ -54,7 +54,7 @@
 					<view class="min-num-box" @click="goUserPage(3)">
 						<view class="min-num-view">扫一扫</view>
 						<view class="bottom-min-num-view">
-							<img class="img-two" src="@/images/basicsModules/icon_wd_dh.png">
+							<img class="img-two" src="@/pages/images/icon_wd_dh.png">
 							<view>兑换礼品</view>
 						</view>
 					</view>
@@ -82,17 +82,17 @@
 		fingerprintQueryList,
 		systemAppletLayoutSelect,
 		systemUserProfile
-	} from '@/api/basicsModules/index.js'
+	} from '@/pages/api/index.js'
 	import {
 		getMineConfig
 	} from '@/utils/mineConfig'
 	// #ifdef MP-WEIXIN
 	import {
 		tabBar
-	} from '@/component/tabBar.vue'
+	} from '@/pages/component/tabBar.vue'
 	import {
 		mineConfigurationSlot
-	} from '@/component/mineConfigurationSlot'
+	} from '@/pages/component/mineConfigurationSlot'
 	// #endif
 
 
@@ -105,8 +105,8 @@
 		// #endif
 		// #ifdef H5
 		components: {
-			"tabBar": () => import('@/component/tabBar.vue'),
-			"mineConfigurationSlot": () => import('@/component/mineConfigurationSlot.vue'),
+			"tabBar": () => import('@/pages/component/tabBar.vue'),
+			"mineConfigurationSlot": () => import('@/pages/component/mineConfigurationSlot.vue'),
 		},
 		// #endif
 		data() {
@@ -182,18 +182,18 @@
 				let self = this;
 				if (type == 1) {
 					uni.navigateTo({
-						url: '/pages_student/mine/creditPoints',
+						url: '/pages_student/views/mine/creditPoints',
 					});
 				} else if (type == 2) {
 					uni.navigateTo({
-						url: '/pages_student/mine/rewardPoints',
+						url: '/pages_student/views/mine/rewardPoints',
 					});
 				} else if (type == 3) {
 					uni.scanCode({
 						onlyFromCamera: true,
 						success: function(res) {
 							uni.navigateTo({
-								url: '/pages_student/integralManage/codeSuccess?q=' +
+								url: '/pages_student/views/integralManage/codeSuccess?q=' +
 									encodeURIComponent(JSON.stringify(res.result))
 							});
 						}
@@ -323,7 +323,7 @@
 						let res = JSON.parse(uploadFileRes.data);
 						if (res.code == 200) {
 							uni.navigateTo({
-								url: '/pages_basics/avatar?src=' + config.base_url + res.data.url,
+								url: '/pages_basics/views/avatar?src=' + config.base_url + res.data.url,
 							});
 
 
@@ -355,7 +355,7 @@
 			/*background:#ffffff;*/
 			.user-top-max-box-one {
 				overflow hidden;
-				background url("@/images/basicsModules/img_wd_bg.png") no-repeat;
+				background url("@/pages/images/img_wd_bg.png") no-repeat;
 				background-size: 100%;
 				height: 350rpx;
 
@@ -500,7 +500,7 @@
 			}
 
 			.top-max-box-two {
-				background url("@/images/basicsModules/img_wd_bg.png");
+				background url("@/pages/images/img_wd_bg.png");
 				background-size: 100%;
 				height: 245rpx;
 

pages/pages_patrolInspector/chemicalCabinetQRcode.vue

@@ -30,31 +30,31 @@
 				<view class="cabinet_t" @click="handleClick('door')"><view></view><view>{{infoData.cabinetName}}</view></view>
 				<view class="cabinet_b">
 					<view class="cabinet_l"> 
-						<view class="cabinet_l_li" v-for="(item,index) in infoData.leftList">
+						<view class="cabinet_l_li" v-for="(item,index) in infoData.leftList" :key="index">
 							<view class="cabinet_l_li_t">{{item.doorName}}</view>
 							<view class="cabinet_l_li_m">数 量：{{item.chemicalNum}}</view>
 							<view class="cabinet_l_li_b">
 								<view class="cabinet_l_li_b_l">管理员：</view>
 								<view class="cabinet_l_li_b_r">
-									<view v-for="(item2,index2) in item.cabinetAdminModelList">{{item2.userName}}</view>
+									<view v-for="(item2,index2) in item.cabinetAdminModelList" :key="index2">{{item2.userName}}</view>
 								</view>
 							</view>
 						</view>
 					</view>
 					<view class="cabinet_r">
-						<view class="cabinet_l_li" v-for="(item,index) in infoData.rightList">
+						<view class="cabinet_l_li" v-for="(item,index) in infoData.rightList" :key="index">
 							<view class="cabinet_l_li_t">{{item.doorName}}</view>
 							<view class="cabinet_l_li_m">数 量：{{item.chemicalNum}}</view>
 							<view class="cabinet_l_li_b">
 								<view class="cabinet_l_li_b_l">管理员：</view>
 								<view class="cabinet_l_li_b_r">
-									<view v-for="(item2,index2) in item.cabinetAdminModelList">{{item2.userName}}</view>
+									<view v-for="(item2,index2) in item.cabinetAdminModelList" :key="index2">{{item2.userName}}</view>
 								</view>
 							</view>
 						</view>
 					</view>
-					<img v-if="infoData.cabinetDoorModelList.length==1" class="left-handle" src="@/images/basicsModules/handle-icon.png">
-					<img v-if="infoData.cabinetDoorModelList.length<=2" class="right-handle" src="@/images/basicsModules/handle-icon.png">
+					<img v-if="infoData.cabinetDoorModelList.length==1" class="left-handle" src="@/pages/images/handle-icon.png">
+					<img v-if="infoData.cabinetDoorModelList.length<=2" class="right-handle" src="@/pages/images/handle-icon.png">
 				</view>
 			</view>
 		</view>
@@ -64,7 +64,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {chemicalAppletCabinetDetail} from '@/api/basicsModules/index.js'
+import {chemicalAppletCabinetDetail} from '@/pages/api/index.js'
 export default {
   name: "rectifyList",
   components: {
@@ -99,7 +99,7 @@ export default {
 		  let self=this;
 		  if(doType=='door'){
 			 uni.navigateTo({
-			     url: '/pages/pages_patrolInspector/chemicalCatalogue'
+			     url: '/pages/views/pages_patrolInspector/chemicalCatalogue'
 			 });
 		  }
 	    },
@@ -224,7 +224,7 @@ export default {
 			position: relative;
 			width: 500rpx;
 			height: 650rpx;
-			background: url("@/images/basicsModules/doors-icon.png")  no-repeat center 0px;
+			background: url("@/pages/images/doors-icon.png")  no-repeat center 0px;
 			background-position: center 0px;
 			background-size: cover;
 			padding: 12rpx 16rpx 0;

pages/pages_patrolInspector/chemicalCatalogue.vue

@@ -6,7 +6,7 @@
 		<view class="list">
 			<view class="list_li" v-if="item.stockAppletList.length>0" v-for="(item,index) in  dataList" :key="index">
 				<view class="list_li_title">{{item.doorName}}</view>
-				<view class="list_li_li"  v-for="(item2,index2) in  item.stockAppletList">
+				<view class="list_li_li"  v-for="(item2,index2) in  item.stockAppletList" :key="index2">
 					<view class="list_li_li_t">{{item2.chemicalName}}</view>
 					<view class="list_li_li_b"><text>数量：</text><text>{{item2.chemicalNum}}</text></view>
 					<view class="list_li_li_b"><text>CAS号：</text><text>{{item2.casNum}}</text></view>
@@ -14,14 +14,14 @@
 				</view>
 			</view>
 		</view>
-		<img class="null-img" v-if="!dataList[0]" src="@/images/basicsModules/null-data-1.png">
+		<img class="null-img" v-if="!dataList[0]" src="@/pages/images/null-data-1.png">
 	</scroll-view>
   </view>
 </template>
 
 <script>
 import { config } from '@/api/request/config.js'
-import {chemicalAppletGetCabinetByChemical} from '@/api/basicsModules/index.js'
+import {chemicalAppletGetCabinetByChemical} from '@/pages/api/index.js'
 export default {
   name: "rectifyList",
   components: {

pages/pages_patrolInspector/chemicalDetail.vue

@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<viw class="list-tow" v-if="pageType==1" >
-			<view class="list-tow-li" v-for="(item,index) in newData.chemicalUseList">
+			<view class="list-tow-li" v-for="(item,index) in newData.chemicalUseList" :key="index">
 				<view class="list-tow-li-t">
 					<view class="list-tow-li-t-l"></view>
 					<view class="list-tow-li-t-c">{{item.collectTime}}</view>
@@ -65,7 +65,7 @@
 
 <script>
 import { config } from '@/api/request/config.js'
-import {chemicalAppletGetStockDetail} from '@/api/basicsModules/index.js'
+import {chemicalAppletGetStockDetail} from '@/pages/api/index.js'
 export default {
   name: "rectifyList",
   components: {