.gitignore

@@ -1,5 +1,3 @@
 /.hbuilderx
 .hbuilderx
 /unpackage
-.idea
-/.idea

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,5 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/v3-H5.iml" filepath="$PROJECT_DIR$/.idea/v3-H5.iml" />
+    </modules>
+  </component>
+</project>

.idea/v3-H5.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="5264e573-3c9e-4faf-aaf1-757af63c3042" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/api/request/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/api/request/config.js" afterDir="false" />
+    </list>
+    <ignored path="$PROJECT_DIR$/.tmp/" />
+    <ignored path="$PROJECT_DIR$/temp/" />
+    <ignored path="$PROJECT_DIR$/tmp/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FUSProjectUsageTrigger">
+    <session id="672935100">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="2" />
+          <entry key="project.open.time.0" value="1" />
+          <entry key="project.open.time.1" value="1" />
+          <entry key="project.opened" value="2" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths>
+      <path value="$PROJECT_DIR$/uni_modules/mmmm-image-tools/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/qiun-data-charts/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/uni-data-picker/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/uni-datetime-picker/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/uni-load-more/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/uni-popup/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/uni-section/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/uni-swipe-action/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/uni-transition/package.json" />
+      <path value="$PROJECT_DIR$/uni_modules/zb-table/package.json" />
+    </packageJsonPaths>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="1912" />
+    <option name="y" value="-8" />
+    <option name="width" value="1936" />
+    <option name="height" value="1056" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="v3-H5" type="b2602c69:ProjectViewProjectNode" />
+              <item name="v3-H5" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="v3-H5" type="b2602c69:ProjectViewProjectNode" />
+              <item name="v3-H5" type="462c0819:PsiDirectoryNode" />
+              <item name="pages_safetyCheck" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="v3-H5" type="b2602c69:ProjectViewProjectNode" />
+              <item name="v3-H5" type="462c0819:PsiDirectoryNode" />
+              <item name="pages_safetyCheck" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="v3-H5" type="b2602c69:ProjectViewProjectNode" />
+              <item name="v3-H5" type="462c0819:PsiDirectoryNode" />
+              <item name="pages_safetyCheck" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="demo" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../v3-小程序" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="5264e573-3c9e-4faf-aaf1-757af63c3042" name="Default Changelist" comment="" />
+      <created>1757034652411</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1757034652411</updated>
+      <workItem from="1757034653583" duration="15000" />
+      <workItem from="1776128843943" duration="24000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="39000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24973656" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Terminal" order="8" />
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+</project>

api/apiDemo/index.js

@@ -161,7 +161,7 @@ export const gasApplyList  = (data) => {
         data: data,
     })
 };
-//气瓶申请-数量验证
+//气瓶申请-数量校验
 export const gasApplyVerify = (data) => {
     return apiResquest({
         url: `/airbottle/task/listSubjectDetal`,
@@ -585,7 +585,7 @@ export const supplierDetail  = (data) => {
         data: data,
     })
 };
-//供应商名称验证
+//供应商名称校验
 export const supplierCheck  = (data) => {
     return apiResquest({
         url: `/airbottle/supplier/check`,
@@ -767,7 +767,7 @@ export const approvalDetail  = (data) => {
         data: data,
     })
 };
-//查询所列表
+//查询院系列表
 export const departmentsList  = (data) => {
     return apiResquest({
         url: `/base/app/sysuser/api/departments/list`,
@@ -776,7 +776,7 @@ export const departmentsList  = (data) => {
     })
 };
 
-//根据所查询楼栋列表
+//根据院系查询楼栋列表
 export const buildingList  = (data) => {
     return apiResquest({
         url: `/base/app/sysuser/api/building/list`,
@@ -1108,7 +1108,7 @@ export const addPhotoInspection = (data) => {
     })
 };
 
-//员工卡上传
+//学生卡上传
 export const commitCrad = (data) => {
     return apiResquestJsonList({
         url: `/base/app/lab/api/commit/crad`,
@@ -1736,7 +1736,7 @@ export const getDeviceListBySub  = (data) => {
     })
 };
 
-//根据账户查询所与楼栋
+//根据账户查询学院与楼栋
 export const treeselectByUser  = (data) => {
     return apiResquest({
         url: `/system/dept/treeselectByUser`,
@@ -1745,7 +1745,7 @@ export const treeselectByUser  = (data) => {
     })
 };
 
-//根据账户查询所与楼栋
+//根据账户查询学院与楼栋
 export const getBuilding  = (id) => {
     return apiResquest({
         url: `/laboratory/building/lablayout?showHazard=false&deptId=`+id,
@@ -1889,7 +1889,7 @@ export const dataStatistics  = (data) => {
         data: data,
     })
 };
-//巡查计划-查询是否所用户
+//巡查计划-查询是否院级用户
 export const isSCollege  = (data) => {
     return apiResquest({
         url: `/security/collegCheck/isSCollege`,
@@ -1961,7 +1961,7 @@ export const checkGroupDetail  = (data) => {
         data: data,
     })
 };
-//巡查计划--查询所数据
+//巡查计划--查询学院数据
 export const conditionCollegeInfo  = (data) => {
     return apiResquest({
         url: `/laboratory/subject/conditionCollegeInfo`,
@@ -1977,7 +1977,7 @@ export const conditionSubjectInfo  = (data) => {
         data: {...data}
     })
 };
-//巡查计划--全院所/实验室数量
+//巡查计划--全校学院/实验室数量
 export const getAllSubNum  = (data) => {
     return apiResquest({
         url: `/laboratory/subject/getAllSubNum`,
@@ -2315,7 +2315,7 @@ export const hxpCabinetApp  = (data) => {
 
 
 //公共---------------------------------------------------------------------------
-// 获取所
+// 获取院系
 export const listDepartments = (data) => {
     return apiResquestForm({
         url: '/system/dept/departments/list',
@@ -2323,7 +2323,7 @@ export const listDepartments = (data) => {
     })
 };
 
-//根据所id查询楼栋
+//根据学院id查询楼栋
 export const getBuildingList  = (data) => {
     return apiResquest({
         url: `/system/dept/`+data+`/building/list`,
@@ -2347,4 +2347,4 @@ export const buildBySubList  = (data) => {
         method: 'GET',
         data: data
     })
-};
+};

api/commonality/permission.js

@@ -2,7 +2,7 @@ import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,ap
 
 /*查询用户列表-下拉列表
 * userName : '', 名称
-* userType: '',  0.系统 1.职工 2.员工
+* userType: '',  0.系统 1.老师 2.学生
 */
 export const systemUserDropList = (data) => {
 	return apiResquest({

api/index.js

@@ -1,6 +1,6 @@
 import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,apiResquestTimer } from '@/api/request/request.js'
 
-//实验室-列表-获取所列表下拉列表
+//实验室-列表-获取学院列表下拉列表
 export const systemDeptDropList = (data) => {
 	return apiResquest({
 		url: `/system/dept/dropList`,
@@ -18,8 +18,8 @@ export const laboratoryBigViewGetBuildByBigView = (data) => {
 };
 
 
-/*根据所区/楼栋/楼层查询实验室列表
-  deptId:'所区查询'
+/*根据校区/楼栋/楼层查询实验室列表
+  deptId:'校区查询'
   buildId:'楼栋查询'
   floorId:'楼层查询'
 */
@@ -32,7 +32,7 @@ export const laboratorySubRelInfoGetListByFloor = (data) => {
 	})
 };
 
-//根据所id查询实验室列表
+//根据学院id查询实验室列表
 export const laboratorySubRelInfoGetRelList = (data) => {
 	return apiResquest({
 		url: `/laboratory/subRelInfo/getRelList`,
@@ -40,7 +40,7 @@ export const laboratorySubRelInfoGetRelList = (data) => {
 		data: { ...data }
 	})
 };
-//根据所id查询实验室列表-带权限
+//根据学院id查询实验室列表-带权限
 export const laboratorySubRelInfoGetRelListByCondition = (data) => {
 	return apiResquest({
 		url: `/laboratory/subRelInfo/getRelListByCondition`,
@@ -189,7 +189,7 @@ export const checkPlanAdd  = (data) => {
         data: {...data}
     })
 };
-//巡查计划--全院所/实验室数量
+//巡查计划--全校学院/实验室数量
 export const getAllSubNum  = (data) => {
     return apiResquest({
         url: `/laboratory/subject/getAllSubNum`,
@@ -197,7 +197,7 @@ export const getAllSubNum  = (data) => {
         data: data,
     })
 };
-//巡查计划-查询是否所用户
+//巡查计划-查询是否院级用户
 export const isSCollege  = (data) => {
     return apiResquest({
         url: `/security/collegCheck/isSCollege`,
@@ -205,7 +205,7 @@ export const isSCollege  = (data) => {
         data: data,
     })
 };
-//巡查计划-选择所-带实验室数量
+//巡查计划-选择学院-带实验室数量
 export const laboratorySubRelInfoConditionCollegeInfo  = (data) => {
     return apiResquest({
         url: `/laboratory/subRelInfo/conditionCollegeInfo`,
@@ -213,7 +213,7 @@ export const laboratorySubRelInfoConditionCollegeInfo  = (data) => {
         data: data,
     })
 };
-//巡查计划-选择全院-带所和实验室数量
+//巡查计划-选择全校-带学院和实验室数量
 export const laboratorySubRelInfoGetAllSubNum  = (data) => {
     return apiResquest({
         url: `/laboratory/subRelInfo/getAllSubNum`,
@@ -368,4 +368,4 @@ export const subjectList = (data) => {
         method: 'GET',
         data: data
     })
-};
+};

api/request/config.js

@@ -1,7 +1,7 @@
 const config = {
 	/************************************ 后台服务地址 ************************************/
-
-	base_url: 'https://192.168.166.11/api', //安科院
+	
+	// base_url: 'https://192.168.166.11/api', //安科院
 	// 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.88/labSystem',//1.88服务器
@@ -15,7 +15,7 @@ const config = {
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
+	base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labapp/',//43服务器线上
 	// base_url: 'http://lasfl.sxau.edu.cn/api',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址
@@ -28,18 +28,18 @@ const config = {
 	// base_url: 'http://172.16.0.65/api/', //西北农林
 	//base_url: 'https://lab.zjznai.com/labapp/', //43测试
 	// base_url: 'https://metersphere.zjznai.com/labSystem/', //中国海关
-
+	
 	/************************************ 图片服务地址 ************************************/
 	//(imagesUrl.styl 文件内还需要配置一次css相关地址注意是否与imagesUrl.styl一致)
 	imagesUrl: 'https://zj-wechat.oss-cn-beijing.aliyuncs.com/xcx_images/xcx_v3/',
 	/************************************ 扫一扫 ************************************/
-	//1.MSDS说明书			2.安全制度			3.危险源详情 地址配置
+	//1.MSDS说明书			2.安全制度			3.危险源详情 地址配置 
 	saoCodeTypeUrl: 'http://192.168.1.88/labSystem/admin/#/codeHtml?',
-	/************************************ 院管理员身份ID ************************************/
+	/************************************ 校级管理员身份ID ************************************/
   schoolId:'2033722203831459841',
-	/************************************ 所管理员身份ID ************************************/
+	/************************************ 院级管理员身份ID ************************************/
   collegeId:'2033725238494289921',
-	/************************************ 版本标识-用于区别各院所差异化代码 ************************************/
+	/************************************ 版本标识-用于区别各学校差异化代码 ************************************/
 	VERSION_DIFFERENCE_FIELD :'xiBeiNongLinDaXue',
 	/************************************ H5统一认证地址-用于H5版本统一认证 ************************************/
 	UNIFIED_CERTIFICATION_URL:'https://labcontrol.nwafu.edu.cn/api/auth/cas/logout/applet',

pages.json

@@ -294,7 +294,7 @@
 						"navigationBarTitleText": "进出详情"
 					}
 				},
-				/* 分级管控 */
+				/* 分级管控 */ 
 				{
 					"path": "views/gradingControl/gradingControl", //分级管控
 					"style": {
@@ -336,7 +336,7 @@
 			]
 		},
 		{
-			/* 员工端分包 */
+			/* 学生端分包 */
 			"root": "pages_student", //分包根路径
 			"name": "student", //分包名字可写可不写
 			"pages": [
@@ -593,4 +593,4 @@
 		"navigationBarTextStyle": "white", //导航文字颜色
 		"navigationBarBackgroundColor": "#0183FA" //导航背景色
 	}
-}
+}

pages/api/index.js

@@ -119,7 +119,7 @@ export const systemMineUserEdit = (data) => {
 };
 /*查询用户列表-下拉列表
 * userName : '', 名称
-* userType: '',  0.系统 1.职工 2.员工
+* userType: '',  0.系统 1.老师 2.学生
 */
 export const systemUserDropList = (data) => {
 	return apiResquest({
@@ -197,7 +197,7 @@ export const reportAppStatisticsLabNumberPeople = (data) => {
 	})
 };
 
-//所人员设备列表
+//学院人员设备列表
 export const reportAppStatisticsPersonDeviceSafety = (data) => {
 	return apiResquest({
     url: '/report/app/statistics/personDeviceSafety',
@@ -482,7 +482,7 @@ export const creditAppletGetMyPointsLogInfo  = (data) => {
         data: {...data}
     })
 };
-//实验室-列表-获取所列表下拉列表
+//实验室-列表-获取学院列表下拉列表
 export const systemDeptDropList = (data) => {
 	return apiResquest({
 		url: `/system/dept/dropList`,
@@ -586,4 +586,4 @@ export const laboratoryAppletCheckPassOrNo = (data) => {
 		method: 'GET',
 		data: data,
 	})
-};
+};

pages/views/dataBoard/equipmentControlOverdue.vue

@@ -8,7 +8,7 @@
 					<view class="table-th">
 						<view class="table-th-li">
 							<view>排行</view>
-							<view>所单位</view>
+							<view>学院单位</view>
 							<view>设备总数(台)</view>
 							<view>超期服役数(台)</view>
 						</view>
@@ -31,7 +31,7 @@
 				<view class="table-border">
 					<view class="table-th">
 						<view class="table-th-li">
-							<view>所单位</view>
+							<view>学院单位</view>
 							<view>5年内(台)</view>
 							<view>10年内(台)</view>
 							<view>12年内(台)</view>
@@ -51,7 +51,7 @@
 			</view>
 			<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 		</view>
-
+		
 	</scroll-view>
 </template>
 
@@ -167,7 +167,7 @@
 					}
 				}
 			},
-
+			
 			dateClick(index) {
 				this.dateIndex = index;
 			},

pages/views/dataBoard/hazardSources.vue

@@ -114,7 +114,7 @@
 					},
 					{
 						name: 'deptSortName',
-						label: '所单位',
+						label: '学院单位',
 						fixed: true,
 						width: 80,
 						align: 'center',
@@ -391,4 +391,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/views/dataBoard/hazardousChemicals.vue

@@ -104,7 +104,7 @@
 					},
 					{
 						name: 'deptSortName',
-						label: '所单位',
+						label: '学院单位',
 						fixed: true,
 						width: 80,
 						align: 'center',
@@ -415,4 +415,4 @@
 			overflow: hidden;
 		}
 	}
-</style>
+</style>

pages/views/dataBoard/labPage.vue

@@ -120,7 +120,7 @@
 						scrollShow: true,
 						itemCount: 4,
 						fontColor: '#fff',
-
+						
 					},
 					yAxis: {
 						gridType: "dash",
@@ -134,7 +134,7 @@
 				chartData: {},
 				column: [{
 						name: 'deptSortName',
-						label: '所单位',
+						label: '学院单位',
 						fixed: true,
 						width: 80,
 						align: 'center',

pages/views/dataBoard/securityHidden.vue

@@ -59,7 +59,7 @@
 				</view>
 			</uni-card>
 		</view>
-		<!--所单位 -->
+		<!--学院单位 -->
 		<view class="table-three" v-if="chartIndex!=0 && curTabTow==1">
 			<uni-card>
 				<view style="height: 200px">
@@ -167,7 +167,7 @@
 					},
 					{
 						name: 'deptSortName',
-						label: '所单位',
+						label: '学院单位',
 						fixed: true,
 						width: 80,
 						align: 'center',
@@ -229,7 +229,7 @@
 					},
 					{
 						name: 'deptSortName',
-						label: '所单位',
+						label: '学院单位',
 						fixed: true,
 						width: 80,
 						align: 'center',
@@ -244,7 +244,7 @@
 				dataListTow: [],
 				dataListThree: [],
 				total: 0,
-				tabTextTow: ['一级指标', '所单位'],
+				tabTextTow: ['一级指标', '学院单位'],
 				curTabTow: 0,
 				pickerList: [],
 				pickerIndex: 0,
@@ -417,7 +417,7 @@
 						},
 						{
 							name: 'deptSortName',
-							label: '所单位',
+							label: '学院单位',
 							fixed: true,
 							width: 80,
 							align: 'center',
@@ -496,7 +496,7 @@
 						},
 						{
 							name: 'deptSortName',
-							label: '所单位',
+							label: '学院单位',
 							fixed: true,
 							width: 80,
 							align: 'center',
@@ -1017,4 +1017,4 @@
 		}
 
 	}
-</style>
+</style>

pages/views/dataBoard/warningDispose.vue

@@ -86,7 +86,7 @@
 					},
 					{
 						name: 'deptSortName',
-						label: '所单位',
+						label: '学院单位',
 						fixed: true,
 						width: 80,
 						align: 'center',
@@ -526,4 +526,4 @@
 			margin-left: 30rpx;
 		}
 	}
-</style>
+</style>

pages/views/demo/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="button-view" @click="saoCodeButton()">扫码</view>
 		<view class="button-view" @click="goPage('pages_basics')">基础分包</view>
-		<view class="button-view" @click="goPage('pages_student')">员工端分包</view>
+		<view class="button-view" @click="goPage('pages_student')">学生端分包</view>
 		<view class="button-view" @click="goPage('pages_manage')">管理端分包</view>
 		<view class="button-view" @click="goPage('pages_safetyCheck')">安全检查分包</view>
 		<view class="button-view" @click="goPage('mqtt')">mqtt测试</view>

pages/views/home/home.vue

@@ -53,14 +53,14 @@
 					// isInitPwd 初始密码 true 是
 					// isTutorExist 导师 true 有
 					// isPhoneExist 电话 true 有
-					// userType 1教职工 2员工
+					// userType 1教职工 2学生
 					if(data.data.userType == 1 && !data.data.isPhoneExist){
 						//教职工
 						uni.redirectTo({
 							url: '/pages_basics/views/completeInformation/completeInformation',
 						});
 					}else if(data.data.userType == 2 &&(!data.data.isTutorExist || !data.data.isPhoneExist)){
-						//员工
+						//学生
 						uni.redirectTo({
 							url: '/pages_basics/views/completeInformation/completeInformation',
 						});

pages/views/information/notPassInfo.vue

@@ -16,7 +16,7 @@
 			</view>
 		</view>
 		<view class="user-info-box">
-			<view class="user-info-box_title"><view style="color: red;">*</view>身份信息：(关联员工信息材料)</view>
+			<view class="user-info-box_title"><view style="color: red;">*</view>身份信息：(关联学生信息材料)</view>
 			<view class="user-info-box-min">
 				<view>申请人：</view>
 				<view>{{subjectData.sysUser.nickName}}</view>

pages/views/login/login.vue

@@ -123,7 +123,7 @@
 						uni.setStorageSync('token', data.data.token);
 						uni.setStorageSync('userId', data.data.userId);
 						uni.setStorageSync('isInitPwd', true);
-						// userType 0-系统 1-教职工 2-员工 3-大屏
+						// userType 0-系统 1-教职工 2-学生 3-大屏
 						uni.setStorageSync('userType', data.data.userType == 0 || data.data.userType == 1 ? '1' :
 							(data.data.userType == 2 ? '2' : (data.data.userType == 3 ? '3' : 'none')));
 						if (this.checkedType) {
@@ -273,23 +273,23 @@
 					data
 				} = await securityDataStatisticsGetUserIdentity();
 				if(data.schoolAdmin){
-					//院管理员
+					//校级管理员
 					uni.setStorageSync('identityData',{
 						type:'schoolAdmin'
 					});
 				}else if(data.collegeAdmin){
-					//所级管理员
+					//院级管理员
 					uni.setStorageSync('identityData',{
 						type:'collegeAdmin'
 					});
 				}else if(data.schoolGroup){
-					//院督导组
+					//校级督导组
 					uni.setStorageSync('identityData',{
 						type:'schoolGroup',
 						groupIds:data.groupIds
 					});
 				}else if(data.collegeGroup){
-					//所级督导组
+					//院级督导组
 					uni.setStorageSync('identityData',{
 						type:'collegeGroup',
 						groupIds:data.groupIds

pages/views/login/patrolLogin.vue

@@ -113,7 +113,7 @@
 						uni.setStorageSync('token', data.data.token);
 						uni.setStorageSync('userId', data.data.userId);
 						uni.setStorageSync('isInitPwd', true);
-						// userType 0-系统 1-教职工 2-员工 3-大屏
+						// userType 0-系统 1-教职工 2-学生 3-大屏
 						uni.setStorageSync('userType', data.data.userType == 0 || data.data.userType == 1 ? '1' :
 							(data.data.userType == 2 ? '2' : (data.data.userType == 3 ? '3' : 'none')));
 						if (this.checkedType) {
@@ -249,23 +249,23 @@
 					data
 				} = await securityDataStatisticsGetUserIdentity();
 				if(data.schoolAdmin){
-					//院管理员
+					//校级管理员
 					uni.setStorageSync('identityData',{
 						type:'schoolAdmin'
 					});
 				}else if(data.collegeAdmin){
-					//所级管理员
+					//院级管理员
 					uni.setStorageSync('identityData',{
 						type:'collegeAdmin'
 					});
 				}else if(data.schoolGroup){
-					//院督导组
+					//校级督导组
 					uni.setStorageSync('identityData',{
 						type:'schoolGroup',
 						groupIds:data.groupIds
 					});
 				}else if(data.collegeGroup){
-					//所级督导组
+					//院级督导组
 					uni.setStorageSync('identityData',{
 						type:'collegeGroup',
 						groupIds:data.groupIds

pages/views/login/ssoCertification.vue

@@ -24,7 +24,7 @@
 		name: "ssoCertification",
 		data() {
 			return {
-
+				
 			}
 		},
 		onLoad(option) {
@@ -45,7 +45,7 @@
 						url: '/pages/views/login/login',
 					});
 				}, 2000);
-
+				
 			}
 		},
 		mounted() {
@@ -60,7 +60,7 @@
 					uni.setStorageSync('dataBoardType', false);
 					uni.setStorageSync('userId', data.data.userId);
 					uni.setStorageSync('isInitPwd', true);
-					// userType 0-系统 1-教职工 2-员工 3-大屏
+					// userType 0-系统 1-教职工 2-学生 3-大屏
 					uni.setStorageSync('userType', data.data.userType == 0 || data.data.userType == 1 ? '1' :
 						(data.data.userType == 2 ? '2' : (data.data.userType == 3 ? '3' : 'none')));
 					//等待配置与字段获取到后跳转
@@ -107,7 +107,7 @@
 					});
 				}
 			},
-
+			
 			//查询公共配置
 			async getConfigInfo() {
 				const {
@@ -183,23 +183,23 @@
 					data
 				} = await securityDataStatisticsGetUserIdentity();
 				if(data.schoolAdmin){
-					//院管理员
+					//校级管理员
 					uni.setStorageSync('identityData',{
 						type:'schoolAdmin'
 					});
 				}else if(data.collegeAdmin){
-					//所级管理员
+					//院级管理员
 					uni.setStorageSync('identityData',{
 						type:'collegeAdmin'
 					});
 				}else if(data.schoolGroup){
-					//院督导组
+					//校级督导组
 					uni.setStorageSync('identityData',{
 						type:'schoolGroup',
 						groupIds:data.groupIds
 					});
 				}else if(data.collegeGroup){
-					//所级督导组
+					//院级督导组
 					uni.setStorageSync('identityData',{
 						type:'collegeGroup',
 						groupIds:data.groupIds
@@ -220,4 +220,4 @@
 		text-align: center;
 		line-height:200rpx;
 	}
-</style>
+</style>

pages/views/pages_patrolInspector/chemicalCabinetQRcode.vue

@@ -13,7 +13,7 @@
 			</view>
 			<view class="basics">
 				<view class="basics_li">
-					<view class="basics_li_l">所：</view>
+					<view class="basics_li_l">学院：</view>
 					<view class="basics_li_r">{{infoData.deptName}}</view>
 				</view>
 				<view class="basics_li">
@@ -418,4 +418,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/views/pages_patrolInspector/chemicalDetail.vue

@@ -31,7 +31,7 @@
 				<view class="list-li"><text>归属人：</text><text>{{newData.belongName}}</text></view>
 			</view>
 			<view class="list-border">
-				<view class="list-li"><text>所：</text><text>{{newData.deptName}}</text></view>
+				<view class="list-li"><text>学院：</text><text>{{newData.deptName}}</text></view>
 				<view class="list-li"><text>楼栋：</text><text>{{newData.buildName}}-{{newData.floorName}}</text></view>
 				<view class="list-li"><text>实验室：</text><text>{{newData.subName}}({{newData.subRoom}})</text></view>
 				<view class="list-li"><text>存储位置：</text><text>{{newData.cabinetName}}-{{newData.doorName}}-{{newData.layers}}层</text></view>

pages/views/pages_patrolInspector/courseQRcode.vue

@@ -8,7 +8,7 @@
 				<view class="basics_li_r"><text>{{infoData.courseName}}</text></view>
 			</view>
 			<view class="basics_li">
-				<view class="basics_li_l">主讲职工：</view>
+				<view class="basics_li_l">主讲老师：</view>
 				<view class="basics_li_r">{{infoData.lecturerName}}</view>
 			</view>
 			<view class="basics_li">

pages/views/pupilPage/pupilHome.vue

@@ -1,4 +1,4 @@
-<!-- 员工首页 -->
+<!-- 学生首页 -->
 <template>
 	<view class="pupilHome" :style="{paddingTop:navHeight+'rpx'}">
 		<!-- <nav-bar :title="title" :background="background"></nav-bar> -->
@@ -12,7 +12,7 @@
 					<img v-else class="user-img" :src="imagesUrl('commonality/icon_01.png')">
 				</view>
 				<view class="user-name-box">
-					<view>{{userData.userName}} {{userData.userType==1?'职工':(userData.userType==2?'员工':(userData.userType==3?'系统用户':''))}}</view>
+					<view>{{userData.userName}} {{userData.userType==1?'老师':(userData.userType==2?'学生':(userData.userType==3?'系统用户':''))}}</view>
 					<view>{{userData.deptName}}</view>
 				</view>
 				<view class="user-button" @click="goMine()">设置</view>
@@ -32,7 +32,7 @@
 				<!-- <view class="home-button-mark"></view> -->
 			</view>
 			<view class="home-button-box-2" v-if="subAdmin==1">
-				<view class="home-button-box-min"
+				<view class="home-button-box-min" 
 				@click="goPage('remoteDoorOpening')" style="background-color: #DFF0FF;margin-right:20rpx;">
 					<img class="home-button-img" :src="imagesUrl('home/img_sy_yckm@1x.png')">
 					<view class="home-button-min">
@@ -373,7 +373,7 @@
 				border-bottom-left-radius: 30rpx;
 			}
 		}
-
+		
 		.home-page {
 			z-index:1;
 			// flex: 1;
@@ -382,7 +382,7 @@
 			overflow-y: scroll;
 			overflow-x: hidden;
 			padding-bottom:120rpx;
-
+			
 			.user-max-box{
 				z-index: 5;
 				display: flex;

pages/views/teacherPage/laboratoryList.vue

@@ -4,7 +4,7 @@
 		<view class='top-search-value-max-box'>
 			<view class='top-search-value-box'>
 				<img :src="imagesUrl('commonality/icon_sys_ss@1x.png')" @click="searchValueClick()">
-				<input class="input-box" v-model="queryParams.searchValue"
+				<input class="input-box" v-model="queryParams.searchValue" 
 							 maxlength="10" placeholder="搜索实验室/房间号"
 							 type="text" @confirm="searchValueClick()">
 				<view v-if="queryParams.searchValue" class="button-box" @click="delSearchValue">清除</view>
@@ -85,7 +85,7 @@
 				total: 0,
 				dataList: [],
 				getDataType: false,
-				//所系选择器数据
+				//院系选择器数据
 				facultyList: [],
 				facultyArray: [],
 				facultyIndex: "",
@@ -125,7 +125,7 @@
 		onShow() {
 		},
 		methods: {
-			//选择所
+			//选择学院
 			facultyChange: function(e) {
 				if (this.facultyArray[0]) {
 					this.facultyIndex = parseInt(e.target.value);
@@ -149,7 +149,7 @@
 					this.getList();
 				}
 			},
-			//获取所系
+			//获取院系
 			async systemDeptDropList() {
 				const {
 					data

pages/views/teacherPage/teacherHome.vue

@@ -14,7 +14,7 @@
 					<img v-else class="user-img" :src="imagesUrl('commonality/icon_01.png')">
 				</view>
 				<view class="user-name-box">
-					<view>{{userData.userName}} {{userData.userType==1?'职工':(userData.userType==2?'员工':(userData.userType==3?'系统用户':''))}}</view>
+					<view>{{userData.userName}} {{userData.userType==1?'老师':(userData.userType==2?'学生':(userData.userType==3?'系统用户':''))}}</view>
 					<view>{{userData.deptName}}</view>
 				</view>
 				<view class="user-button-a" @click="saoCode()">
@@ -307,7 +307,7 @@
 							mask: true,
 							icon: "none",
 							position: "center",
-							title: '您不是院/所级管理员或督导组成员,无法使用该功能.',
+							title: '您不是校/院级管理员或督导组成员,无法使用该功能.',
 							duration: 2000
 						});
 					} */
@@ -315,7 +315,7 @@
 					//安全考试
 					uni.navigateTo({
 						url: "/pages_basics/views/deviceCageSitePage?pageType=3",
-					});
+					});	
 				} else if (type == 'securityAdmittance') {
 					//安全准入
 					uni.navigateTo({
@@ -386,7 +386,7 @@
 						url: "/pages_basics/views/earlyWarningManage/earlyWarningList",
 					});
 				}
-			},
+			}, 
 			/* 扫一扫*/
 			saoCode() {
 				scanCode('home');
@@ -816,4 +816,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/views/teacherPage/teacherMine.vue

@@ -222,10 +222,10 @@
 					this.faceImg=data.data.faceImg;
 					this.signatureUrl=data.data.signature
 					uni.setStorageSync('faceImg', data.data.faceImg);
-
+					
 				}
 			},
-			//查询员工-信用分/奖励分
+			//查询学生-信用分/奖励分
 			async creditAppletGetMyPointsLogInfo() {
 				const {
 					data
@@ -235,7 +235,7 @@
 					this.$set(this,'creditScore',data.data.creditScore);
 				}
 			},
-
+			
 			//退出按钮
 			clickOut() {
 				let self = this;

pages_basics/views/chemicalsInfo/chemicalsInfo.vue

@@ -71,7 +71,7 @@
 			</view>
 			<view class="info-big-box">
 				<view class="info-box">
-					<view>所</view>
+					<view>学院</view>
 					<view>:</view>
 					<view>{{newData.deptName}}</view>
 				</view>
@@ -92,7 +92,7 @@
 			<view class="for-max-big-box" v-for="(item,index) in dataList" :key="index">
 				<view class="for-title-box">
 					<view class="time-box">{{item.joinOutTime}}</view>
-					<view class="position-top-right"
+					<view class="position-top-right" 
 					:class="item.type == 0?'colorF':(
 					item.type == 1?'colorD':(
 					item.type == 3?'colorD':(
@@ -451,7 +451,7 @@
 						right:-15rpx;
 						background-color: #F5F5F5;
 						border-radius:50%;
-
+						
 					}
 				}
 				.for-info-box{

pages_basics/views/completeInformation/completeInformation.vue

@@ -22,7 +22,7 @@
 			<view class="text-max-box">
 				<view class="text-top-box">
 					<view>*</view>
-					<view>所在所</view>
+					<view>所在学院</view>
 				</view>
 				<view class="text-bottom-p">{{newData.deptName?newData.deptName:'-'}}</view>
 			</view>
@@ -67,7 +67,7 @@
 					<view>导师</view>
 				</view>
 				<input class="button-bottom-p" :always-embed="true" :cursor-spacing="10"
-				:disabled="true" v-model="form.supervisorName"
+				:disabled="true" v-model="form.supervisorName" 
 				maxlength="30" focus placeholder="请选择导师" @click="userButton()">
 			</view>
 			<view class="text-max-box" v-if="newData.userType == 2 && newData.tutorUserName">
@@ -150,7 +150,7 @@
 			}
 		},
 		onLoad(option) {
-
+			
 		},
 		onShow() {
 			this.systemUserDetail();
@@ -163,7 +163,7 @@
 					this.systemUserSelectByPage();
 				}
 			},
-
+			
 			//获取验证码
 			getCode() {
 				let self = this;
@@ -246,7 +246,7 @@
 							duration: 3000
 						});
 						return
-					}
+					} 
 				}else if(this.newData.userType == 2){
 					if(!this.newData.mobile && !this.newData.tutorUserName){
 						if(!this.form.mobile){
@@ -309,7 +309,7 @@
 								duration: 3000
 							});
 							return
-						}
+						} 
 					}
 				}
 				uni.showModal({
@@ -465,7 +465,7 @@
 		.bottom-input-max-box{
 			flex:1;
 			overflow-x: hidden;
-			overflow-y: scroll;
+			overflow-y: scroll; 
 			background-color: #FFFFFF;
 			.text-max-box{
 				.text-top-box{
@@ -530,7 +530,7 @@
 						color:#333;
 					}
 				}
-
+				
 				.input-button-box {
 					display: flex;
 					margin-left:30rpx;
@@ -543,7 +543,7 @@
 						padding: 0 30rpx;
 						margin-right: 18rpx;
 					}
-
+				
 					view {
 						width: 200rpx;
 						line-height: 100rpx;
@@ -551,12 +551,12 @@
 						font-size: 30rpx;
 						border-radius: 10rpx;
 					}
-
+				
 					.checkButton {
 						color: #333;
 						background-color: #E8E8E8;
 					}
-
+				
 					.noCheckButton {
 						color: #fff;
 						background-color: #0183FA;

pages_manage/api/index.js

@@ -1,6 +1,6 @@
 import { apiResquest,apiResquestForm,apiResquestJsonList,apiResquestFormVideo,apiResquestTimer } from '@/api/request/request.js'
 
-//实验室-列表-获取所列表下拉列表
+//实验室-列表-获取学院列表下拉列表
 export const systemDeptDropList = (data) => {
 	return apiResquest({
 		url: `/system/dept/dropList`,

pages_manage/views/emergencyEvacuationBig.vue

@@ -141,7 +141,7 @@
 					</view>
 					<!-- #ifdef MP-WEIXIN -->
 					<view class="broadcast_m">
-						<view class="broadcast_m_t"
+						<view class="broadcast_m_t" 
 						:class="liveType?'broadcast_m_t_back_a':'broadcast_m_t_back_b'"
 							@longpress.stop="recordButton" @touchmove.stop="cancelButton" @touchend.stop="sendButton">
 							{{liveType?'松开发送':'按住说话'}}
@@ -206,7 +206,7 @@
 				//页面状态
 				pageType: "1",
 				deptIndex: 0,
-				//所楼栋数据
+				//院系楼栋数据
 				buildingList: [],
 				buildingName: "",
 				buildingId: "",
@@ -1340,35 +1340,35 @@
 				// 彻底阻止所有默认行为
 				event.preventDefault();
 				event.stopPropagation();
-
+				
 				this.touchStartY = event.touches[0].clientY;
 				this.hasMoved = false;
 				this.moveDirection = null;
 				this.hasTriggeredMethod3 = false;
-
+				
 				// 设置长按定时器
 				this.longPressTimer = setTimeout(() => {
 					this.isLongPress = true;
 					this.startRecord(); // 执行方法1
 				}, 300); // 300ms触发长按
 			},
-
+				
 			// 触摸移动
 			handleTouchMove(event) {
 				// 彻底阻止所有默认行为
 				event.preventDefault();
 				event.stopPropagation();
-
+				
 				if (!this.isLongPress) return;
-
+				
 				const currentY = event.touches[0].clientY;
 				const deltaY = currentY - this.touchStartY;
-
+				
 				// 检测滑动方向（向上滑动为负值）
 				if (Math.abs(deltaY) > 75) { // 增加阈值避免误触
 					this.hasMoved = true;
 					this.moveDirection = deltaY < 0 ? 'up' : 'down';
-
+					
 					// 向上滑动执行方法3（确保只触发一次）
 					if (this.moveDirection === 'up' && !this.hasTriggeredMethod3) {
 						this.hasTriggeredMethod3 = true;
@@ -1376,22 +1376,22 @@
 					}
 				}
 			},
-
+				
 			// 触摸结束
 			handleTouchEnd() {
 				// 清除长按定时器
 				clearTimeout(this.longPressTimer);
-
+				
 				if (this.isLongPress) {
 					this.stopRecord(); // 执行方法2
 				}
-
+				
 				// 重置状态
 				this.isLongPress = false;
 				this.hasMoved = false;
 				this.moveDirection = null;
 			},
-
+			
 			// 关键：禁用上下文菜单（长按菜单）
 			handleContextMenu(e) {
 				e.preventDefault();
@@ -2081,7 +2081,7 @@
 			margin: 50rpx auto;
 			border-radius: 20rpx;
 		}
-
+		
 		.device-type {
 			margin-top:20rpx;
 			border-radius:20rpx;
@@ -2091,7 +2091,7 @@
 			display: flex;
 			justify-content: flex-start;
 			flex-wrap: wrap;
-
+		
 			>view {
 				//width: 356rpx;
 				height: 60rpx;
@@ -2101,13 +2101,13 @@
 				padding-left: 10rpx;
 				padding-right: 10rpx;
 				box-sizing: border-box;
-
+		
 				>img:nth-of-type(1) {
 					width: 42rpx;
 					height: 42rpx;
 					margin-right: 12rpx;
 				}
-
+		
 				>view {
 					font-family: PingFang SC;
 					font-weight: 500;
@@ -2116,23 +2116,23 @@
 					line-height: 60rpx;
 					width: 560rpx;
 				}
-
+		
 				>img:nth-of-type(2) {
 					width: 24rpx;
 					height: 22rpx;
 				}
 			}
-
+		
 			>view:nth-child(2n) {
 				border-right: none;
 				padding-left: 20rpx;
 				box-sizing: border-box;
 			}
-
+		
 			>view:nth-last-child(1) {
 				border-bottom: none;
 			}
-
+		
 			>view:nth-last-child(2) {
 				border-bottom: none;
 			}
@@ -2201,11 +2201,11 @@
 			color: #FFFFFF;
 			background-size: 100%;
 		}
-
+	
 		.broadcast_m_t_back_b {
 			background: url($imagesUrl+'commonality/icon_sskz_azsh_1.png');
 			color: #0183FA;
 			background-size: 100%;
 		}
 	}
-</style>
+</style>

pages_manage/views/laboratory/meLaboratory.vue

@@ -73,7 +73,7 @@
 				total: 0,
 				dataList: [],
 				getDataType: false,
-				//所选择器数据
+				//院系选择器数据
 				facultyList: [],
 				facultyArray: [],
 				facultyIndex: "",
@@ -101,7 +101,7 @@
 		onShow() {
 		},
 		methods: {
-			//选择所
+			//选择学院
 			facultyChange: function(e) {
 				if (this.facultyArray[0]) {
 					this.facultyIndex = parseInt(e.target.value);
@@ -125,7 +125,7 @@
 					this.getList();
 				}
 			},
-			//获取所
+			//获取院系
 			async systemDeptDropList() {
 				const {
 					data

pages_manage/views/laboratory/safetyCardScan.vue

@@ -39,7 +39,7 @@
 				<view class="lab-info-r">{{newData.subArea?newData.subArea+'㎡':'未配置'}}</view>
 			</view>
 			<view class="liability-unit">
-				<view>所单位</view>
+				<view>学院单位</view>
 				<view>{{newData.deptName}}</view>
 			</view>
 			<view class="small-title-new" @click="unfoldPackUp('subAdminShowType')">
@@ -143,7 +143,7 @@
 	import {
 
 	} from '@/pages/api/index.js'
-
+	
 	import {
 		securityAppCheckPlanScanCode,
 	} from '@/pages_safetyCheck/api/index.js'
@@ -842,11 +842,11 @@
 			z-index: 200;
 			background: rgba(0, 0, 0, 0.2);
 			top: 0;
-
+		
 			.null-box {
 				flex: 1;
 			}
-
+		
 			.shade_n {
 				position: absolute;
 				bottom: 0;
@@ -856,7 +856,7 @@
 				background: #FFFFFF;
 				border-radius: 20rpx 20rpx 0rpx 0rpx;
 				overflow-y: auto;
-
+		
 				.title {
 					display: flex;
 					justify-content: space-between;
@@ -864,24 +864,24 @@
 					padding: 0 50rpx 0 284rpx;
 					box-sizing: border-box;
 					border-bottom: 1rpx solid #E0E0E0;
-
+		
 					>view {
 						font-size: 30rpx;
 						color: #3D3D3D;
 						line-height: 90rpx;
 						text-align: left;
 					}
-
+		
 					>img {
 						width: 24rpx;
 						height: 12rpx;
 					}
 				}
-
+		
 				.batch {
 					padding: 0 30rpx;
 					box-sizing: border-box;
-
+		
 					.batch-li {
 						display: flex;
 						justify-content: space-between;
@@ -889,7 +889,7 @@
 						border-bottom: 1rpx solid #E0E0E0;
 						padding: 20rpx 0 16rpx 0rpx;
 						box-sizing: border-box;
-
+		
 						.batch-li-l {
 							>text:nth-of-type(1) {
 								display: block;
@@ -898,7 +898,7 @@
 								line-height: 42rpx;
 								text-align: left;
 							}
-
+		
 							>text:nth-of-type(2) {
 								display: block;
 								font-size: 28rpx;
@@ -908,7 +908,7 @@
 								margin-top: 6rpx;
 							}
 						}
-
+		
 						.batch-li-r {
 							font-size: 28rpx;
 							color: #666666;
@@ -917,7 +917,7 @@
 							display: flex;
 							justify-content: flex-start;
 							align-items: center;
-
+		
 							>img {
 								width: 24rpx;
 								height: 24rpx;

pages_manage/views/laboratory/scanCodeCheck.vue

@@ -45,7 +45,7 @@
 				queryParams: {
 					page: 1,
 					pageSize: 100,
-					checkCategory: '', //1院巡查 2所自查
+					checkCategory: '', //1校院巡查 2学院自查
 					subId: '',
 				},
 				checkPlanSetVoList: null,
@@ -58,7 +58,7 @@
 			}
 		},
 		created() {
-
+			
 		},
 		mounted() {
 			if(uni.getStorageSync('identityData')){
@@ -163,7 +163,7 @@
 						return item.checkPlanSetVoList.length != 0
 					});
 					data.data.records = list2
-
+			
 					if (data.data.records.length == 1) { //一个计划
 						this.$set(this, 'planId', data.data.records[0].planId);
 						this.$set(this, 'planTitle', data.data.records[0].planTitle);
@@ -202,7 +202,7 @@
 						// #endif
 							this.dialogTtile = '批次';
 						}
-
+			
 					} else if (data.data.records.length==0) {
 						this.dialogStatus = 0;
 						// #ifdef WEB
@@ -263,7 +263,7 @@
 						});
 						return
 					}
-
+			
 				}
 			},
 			//查询检查项
@@ -290,7 +290,7 @@
 						infoData.planTitle = self.planTitle;
 						infoData.checkTypeName = self.checkTypeName;
 						infoData.crossCheck = self.crossCheck;
-
+						
 						infoData.roomNum = upData.roomNum;
 						infoData.subId = data.data.records[0].subId;
 						infoData.manageId = data.data.records[0].manageId;
@@ -305,7 +305,7 @@
 						});
 					} else {
 						self.securityAppCheckSetOptionList(item,2);
-
+						
 					}
 				}else if (data.code == 200 && checkStatus==2) {//查询检查中数据
 					if (data.data.records[0]) {
@@ -352,10 +352,10 @@
 
 		},
 		onHide() {
-
+		
 		},
 		beforeDestroy() {
-
+			
 		},
 	}
 </script>
@@ -370,11 +370,11 @@
 		z-index: 200;
 		background: rgba(0, 0, 0, 0.2);
 		top: 0;
-
+	
 		.null-box {
 			flex: 1;
 		}
-
+	
 		.shade_n {
 			position: absolute;
 			bottom: 0;
@@ -384,7 +384,7 @@
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 0rpx 0rpx;
 			overflow-y: auto;
-
+	
 			.title {
 				display: flex;
 				justify-content: space-between;
@@ -392,24 +392,24 @@
 				padding: 0 50rpx 0 284rpx;
 				box-sizing: border-box;
 				border-bottom: 1rpx solid #E0E0E0;
-
+	
 				>view {
 					font-size: 30rpx;
 					color: #3D3D3D;
 					line-height: 90rpx;
 					text-align: left;
 				}
-
+	
 				>img {
 					width: 24rpx;
 					height: 12rpx;
 				}
 			}
-
+	
 			.batch {
 				padding: 0 30rpx;
 				box-sizing: border-box;
-
+	
 				.batch-li {
 					display: flex;
 					justify-content: space-between;
@@ -417,7 +417,7 @@
 					border-bottom: 1rpx solid #E0E0E0;
 					padding: 20rpx 0 16rpx 0rpx;
 					box-sizing: border-box;
-
+	
 					.batch-li-l {
 						>text:nth-of-type(1) {
 							display: block;
@@ -426,7 +426,7 @@
 							line-height: 42rpx;
 							text-align: left;
 						}
-
+	
 						>text:nth-of-type(2) {
 							display: block;
 							font-size: 28rpx;
@@ -436,7 +436,7 @@
 							margin-top: 6rpx;
 						}
 					}
-
+	
 					.batch-li-r {
 						font-size: 28rpx;
 						color: #666666;
@@ -445,7 +445,7 @@
 						display: flex;
 						justify-content: flex-start;
 						align-items: center;
-
+	
 						>img {
 							width: 24rpx;
 							height: 24rpx;

pages_safetyCheck/api/index.js

@@ -64,7 +64,7 @@ export const securityAppCheckPhotoList = (data) => {
 		data: { ...data }
 	})
 };
-//安全检查-院检查/所自查列表
+//安全检查-校级检查/学院自查列表
 export const securityAppCheckPlanTitleList = (data) => {
     return apiResquest({
         url: '/security/appCheckPlan/titleList',
@@ -72,7 +72,7 @@ export const securityAppCheckPlanTitleList = (data) => {
        data: { ...data }
     })
 };
-//安全检查-院检查/所自查列表
+//安全检查-校级检查/学院自查列表
 export const securityAppCheckPlanAppTitleList = (data) => {
     return apiResquest({
         url: '/security/appCheckPlan/appTitleList',
@@ -277,7 +277,7 @@ export const securityAppCheckDangerGetCheckDangerBySub = (data) => {
 
 
 
-//实验室-列表-获取所列表下拉列表
+//实验室-列表-获取学院列表下拉列表
 export const systemDeptDropList = (data) => {
 	return apiResquest({
 		url: `/system/dept/dropList`,
@@ -295,8 +295,8 @@ export const laboratoryBigViewGetBuildByBigView = (data) => {
 };
 
 
-/*根据院区/楼栋/楼层查询实验室列表
-  deptId:'院区查询'
+/*根据校区/楼栋/楼层查询实验室列表
+  deptId:'校区查询'
   buildId:'楼栋查询'
   floorId:'楼层查询'
 */
@@ -309,7 +309,7 @@ export const laboratorySubRelInfoGetListByFloor = (data) => {
 	})
 };
 
-//根据所id查询实验室列表
+//根据学院id查询实验室列表
 export const laboratorySubRelInfoGetRelList = (data) => {
 	return apiResquest({
 		url: `/laboratory/subRelInfo/getRelList`,
@@ -317,7 +317,7 @@ export const laboratorySubRelInfoGetRelList = (data) => {
 		data: { ...data }
 	})
 };
-//根据所id查询实验室列表-带权限
+//根据学院id查询实验室列表-带权限
 export const laboratorySubRelInfoGetRelListByCondition = (data) => {
 	return apiResquest({
 		url: `/laboratory/subRelInfo/getRelListByCondition`,
@@ -459,7 +459,7 @@ export const checkPlanAdd  = (data) => {
         data: {...data}
     })
 };
-//巡查计划--全院所/实验室数量
+//巡查计划--全校学院/实验室数量
 export const getAllSubNum  = (data) => {
     return apiResquest({
         url: `/laboratory/subject/getAllSubNum`,
@@ -467,7 +467,7 @@ export const getAllSubNum  = (data) => {
         data: data,
     })
 };
-//巡查计划-查询是否所用户
+//巡查计划-查询是否院级用户
 export const isSCollege  = (data) => {
     return apiResquest({
         url: `/security/collegCheck/isSCollege`,
@@ -475,7 +475,7 @@ export const isSCollege  = (data) => {
         data: data,
     })
 };
-//巡查计划-选择所-带实验室数量
+//巡查计划-选择学院-带实验室数量
 export const laboratorySubRelInfoConditionCollegeInfo  = (data) => {
     return apiResquest({
         url: `/laboratory/subRelInfo/conditionCollegeInfo`,
@@ -483,7 +483,7 @@ export const laboratorySubRelInfoConditionCollegeInfo  = (data) => {
         data: data,
     })
 };
-//巡查计划-选择全院-带所和实验室数量
+//巡查计划-选择全校-带学院和实验室数量
 export const laboratorySubRelInfoGetAllSubNum  = (data) => {
     return apiResquest({
         url: `/laboratory/subRelInfo/getAllSubNum`,
@@ -662,4 +662,4 @@ export const securityAppCheckDangerBuildAndFloorList = (data) => {
         method: 'POST',
         data: {...data}
     })
-};
+};

pages_safetyCheck/views/inspectManage/conductInspections.vue

@@ -8,7 +8,7 @@
 				</view>
 				<view class="list-li" style="margin-bottom: 20rpx;border:none;">
 					<view>
-						{{newData.roomNum?newData.roomNum:''}}房间＆{{newData.buildName?newData.buildName:'楼栋'}}＆{{newData.deptName?newData.deptName:'所单位'}}
+						{{newData.roomNum?newData.roomNum:''}}房间＆{{newData.buildName?newData.buildName:'楼栋'}}＆{{newData.deptName?newData.deptName:'学院单位'}}
 					</view>
 				</view>
 				<view class="list-li">
@@ -78,17 +78,17 @@
 		</view> -->
 		<view class="sub-btn" v-if="!checkItemModuleType">
 			<!-- #ifdef MP-WEIXIN -->
-
+			
 			<view
 				class="broadcast_m no-long-press"
-				@longpress.stop="recordButton(item,$event)"
+				@longpress.stop="recordButton(item,$event)" 
 				@touchmove.stop="cancelButton"
-				@touchend.stop="sendButton(item,$event)"
+				@touchend.stop="sendButton(item,$event)" 
 			></view>
-			<!-- <img
-				@longpress.stop="recordButton(item,$event)"
+			<!-- <img 
+				@longpress.stop="recordButton(item,$event)" 
 				@touchmove.stop="cancelButton"
-				@touchend.stop="sendButton(item,$event)"
+				@touchend.stop="sendButton(item,$event)" 
 				:src="imagesUrl('safetyCheck/icon_aqjc_luyin.png')" /> -->
 			<!-- #endif -->
 			<!-- #ifdef WEB -->
@@ -100,7 +100,7 @@
 				@touchcancel="handleTouchEnd"
 				@contextmenu.prevent="handleContextMenu"
 			></view>
-			<!-- <img
+			<!-- <img 
 				@touchstart="handleTouchStart"
 				@touchmove="handleTouchMove"
 				@touchend="handleTouchEnd"
@@ -203,7 +203,7 @@
 		methods: {
 			//折叠展开
 			inspectDot() {
-
+				
 				this.newData.inspectDot = !this.newData.inspectDot
 			},
 			//检查记录
@@ -317,7 +317,7 @@
 							this.$set(this.form, 'photoList', []);
 							this.$set(this.form, 'voiceList', []);
 						}
-
+						
 					}
 				}
 			},
@@ -395,7 +395,7 @@
 				} = await securityAppCheckPhotoGetCheckNumBySub(obj);
 				if (data.code == 200) {
 					this.$set(this, 'hazardCheckNum', data.data);
-
+			
 				}
 			},
 			//滚动事件
@@ -788,19 +788,19 @@
 				// 彻底阻止所有默认行为
 				event.preventDefault();
 				event.stopPropagation();
-
+				
 				this.touchStartY = event.touches[0].clientY;
 				this.hasMoved = false;
 				this.moveDirection = null;
 				this.hasTriggeredMethod3 = false;
-
+				
 				// 设置长按定时器
 				this.longPressTimer = setTimeout(() => {
 					this.isLongPress = true;
 					this.startRecord(); // 执行方法1
 				}, 300); // 300ms触发长按
 			},
-
+				
 			// 触摸移动
 			handleTouchMove(event) {
 				console.log("按下")
@@ -808,12 +808,12 @@
 				// 彻底阻止所有默认行为
 				event.preventDefault();
 				event.stopPropagation();
-
+				
 				if (!this.isLongPress) return;
-
+				
 				const currentY = event.touches[0].clientY;
 				const deltaY = currentY - this.touchStartY;
-
+				
 				// 检测滑动方向（向上滑动为负值）
 				if (Math.abs(deltaY) > 75) { // 增加阈值避免误触
 					uni.showToast({
@@ -823,7 +823,7 @@
 					});
 					this.hasMoved = true;
 					this.moveDirection = deltaY < 0 ? 'up' : 'down';
-
+					
 					// 向上滑动执行方法3（确保只触发一次）
 					if (this.moveDirection === 'up' && !this.hasTriggeredMethod3) {
 						this.hasTriggeredMethod3 = true;
@@ -831,23 +831,23 @@
 					}
 				}
 			},
-
+				
 			// 触摸结束
 			handleTouchEnd() {
 				// 清除长按定时器
 				clearTimeout(this.longPressTimer);
-
+				
 				uni.hideToast(); //结束录音、隐藏Toast提示框
 				if (this.isLongPress) {
 					this.stopRecord(); // 执行方法2
 				}
-
+				
 				// 重置状态
 				this.isLongPress = false;
 				this.hasMoved = false;
 				this.moveDirection = null;
 			},
-
+			
 			// 关键：禁用上下文菜单（长按菜单）
 			handleContextMenu(e) {
 				e.preventDefault();
@@ -876,7 +876,7 @@
 			line-height: 80rpx;
 			text-align: center;
 		}
-
+		
 		.list {
 			width: 750rpx;
 			margin: 20rpx 0rpx 0;
@@ -958,7 +958,7 @@
 				width: 750rpx;
 				background: #fff;
 				overflow: hidden;
-
+			
 				.describe-n {
 					width: 690rpx;
 					min-height: 180rpx;
@@ -1047,7 +1047,7 @@
 					line-height: 40rpx;
 					text-align: left;
 				}
-
+				
 			}
 		}
 
@@ -1076,7 +1076,7 @@
 			min-height: 100rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
-
+			
 			overflow: hidden;
 
 			.voice_t {

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -7,7 +7,7 @@
 					<view class="title-l-t">{{optionData.planTitle}}</view>
 					<view class="title-l-b">
 						<view v-if="optionData.checkCategory">
-							{{optionData.checkCategory==1?'院巡查':(optionData.checkCategory==2?'所自查':'')}}
+							{{optionData.checkCategory==1?'校院巡查':(optionData.checkCategory==2?'学院自查':'')}}
 						</view>
 						<view v-if="optionData.checkTypeName">{{optionData.checkTypeName}}</view>
 						<view v-if="optionData.crossCheck==1">交叉互检</view>
@@ -47,7 +47,7 @@
 						@click="levelClick(item.levelId)" v-for="(item,index) in levelList">{{item.levelName}}</view>
 				</view>
 				<view class="uni-data-picker-box" v-if="tabIndexTow == 1">
-					<uni-data-picker
+					<uni-data-picker 
 					placeholder="请选择楼栋/楼层" v-model="classes"
 					@change="bindPickerChange" :localdata="dataListTow" ref='picker'>
 					</uni-data-picker>
@@ -165,7 +165,7 @@
 				//<!----复查相关暂时注释----结束---->
 				// tabListTow: ['检查任务', '隐患整改'],
 				tabIndexTow: 0,
-				//所选择
+				//学院选择
 				deptData: {
 					index: null,
 					list: [],
@@ -676,7 +676,7 @@
 					}
 				}
 			},
-			//所选择
+			//学院选择
 			deptChange(e) {
 				let self = this;
 				self.deptData.list.forEach(function(item, index) {
@@ -694,7 +694,7 @@
 				this.$set(this.queryParams, 'page', 1);
 				this.getList();
 			},
-			//获取所
+			//获取院系
 			async systemDeptDropList() {
 				const {
 					data
@@ -1136,7 +1136,7 @@
 					}
 					.no-check-dept{
 						color:#999;
-					}
+					}	
 				}
 				.triangle {
 					margin:25rpx 20rpx 0 20rpx;
@@ -1152,7 +1152,7 @@
 				justify-content: flex-start;
 				align-items: center;
 				margin: 18rpx 20rpx 0 0;
-
+			
 				.level-r-A {
 					border-radius: 50rpx 50rpx 50rpx 50rpx;
 					border: 1rpx solid #E0E0E0;
@@ -1166,7 +1166,7 @@
 					text-align: center;
 					margin-right: 10rpx;
 				}
-
+			
 				.level-r-B {
 					border-radius: 50rpx 50rpx 50rpx 50rpx;
 					border: 1rpx solid #0183FA;
@@ -1181,13 +1181,13 @@
 					margin-right: 10rpx;
 				}
 			}
-
+			
 			#levelColor-A {
 				background: rgba(255, 0, 0, 0.2);
 				color: #FF0000;
 				border: 1rpx solid #FF0000;
 			}
-
+			
 			#levelColor-B {
 				background: #F5F5F5;
 				color: #333333;
@@ -1415,7 +1415,7 @@
 			width: 160rpx;
 			height: 160rpx;
 		}
-
+		
 		.shade-box {
 			height: 100%;
 			width: 100%;
@@ -1425,11 +1425,11 @@
 			z-index: 200;
 			background: rgba(0, 0, 0, 0.2);
 			top: 0;
-
+		
 			.null-box {
 				flex: 1;
 			}
-
+		
 			.shade_n {
 				position: absolute;
 				bottom: 0;
@@ -1439,7 +1439,7 @@
 				background: #FFFFFF;
 				border-radius: 20rpx 20rpx 0rpx 0rpx;
 				overflow-y: auto;
-
+		
 				.title {
 					display: flex;
 					justify-content: space-between;
@@ -1447,24 +1447,24 @@
 					padding: 0 50rpx 0 284rpx;
 					box-sizing: border-box;
 					border-bottom: 1rpx solid #E0E0E0;
-
+		
 					>view {
 						font-size: 30rpx;
 						color: #3D3D3D;
 						line-height: 90rpx;
 						text-align: left;
 					}
-
+		
 					>img {
 						width: 24rpx;
 						height: 12rpx;
 					}
 				}
-
+		
 				.batch {
 					padding: 0 30rpx;
 					box-sizing: border-box;
-
+		
 					.batch-li {
 						display: flex;
 						justify-content: space-between;
@@ -1472,7 +1472,7 @@
 						border-bottom: 1rpx solid #E0E0E0;
 						padding: 20rpx 0 16rpx 0rpx;
 						box-sizing: border-box;
-
+		
 						.batch-li-l {
 							>text:nth-of-type(1) {
 								display: block;
@@ -1481,7 +1481,7 @@
 								line-height: 42rpx;
 								text-align: left;
 							}
-
+		
 							>text:nth-of-type(2) {
 								display: block;
 								font-size: 28rpx;
@@ -1491,7 +1491,7 @@
 								margin-top: 6rpx;
 							}
 						}
-
+		
 						.batch-li-r {
 							font-size: 28rpx;
 							color: #666666;
@@ -1500,7 +1500,7 @@
 							display: flex;
 							justify-content: flex-start;
 							align-items: center;
-
+		
 							>img {
 								width: 24rpx;
 								height: 24rpx;

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -8,7 +8,7 @@
 				</view>
 				<view class="list-li" style="margin-bottom: 20rpx;border:none;">
 					<view>
-						{{newData.roomNum?newData.roomNum:''}}房间＆{{newData.buildName?newData.buildName:'楼栋'}}＆{{newData.deptName?newData.deptName:'所单位'}}
+						{{newData.roomNum?newData.roomNum:''}}房间＆{{newData.buildName?newData.buildName:'楼栋'}}＆{{newData.deptName?newData.deptName:'学院单位'}}
 					</view>
 				</view>
 
@@ -118,19 +118,19 @@
 			<!-- <img @click="saoCode()" v-if="pageType==0" :src="imagesUrl('safetyCheck/icon_aqjc_saoma.png')"> -->
 			<img @click="submitBtn(1)" v-if="pageType==0 && newData.checkSetProgress !=100 && !hiddenDangerRecordStatus && optionData.manageStatus !=2"
 				 :src="imagesUrl('safetyCheck/icon_aqjc_bianji.png')" />
-			<img @click="submitBtn(2)" v-if="pageType==0 && newData.checkSetProgress !=100 && optionData.manageStatus !=2" style="margin-left: 60rpx;"
+			<img @click="submitBtn(2)" v-if="pageType==0 && newData.checkSetProgress !=100 && optionData.manageStatus !=2" style="margin-left: 60rpx;" 
 				:src="imagesUrl('safetyCheck/icon_aqjc_jiancha.png')" />
-			<!-- 整改 -->
+			<!-- 整改 -->	
 			<img @click="submitBtn(1)" v-if="pageType==2 && !hiddenDangerRecordStatus && !newData.finishRectify"
 				:src="imagesUrl('safetyCheck/icon_aqjc_bianji.png')" />
 			<img @click="submitBtn(2)" v-if="pageType==2 && !hiddenDangerRecordStatus && !newData.finishRectify"
-				:src="imagesUrl('safetyCheck/icon_aqjc_zhenggai.png')" />
-			<!-- 复查 -->
+				:src="imagesUrl('safetyCheck/icon_aqjc_zhenggai.png')" />		
+			<!-- 复查 -->	
 			<img @click="submitBtn(2)" v-if="pageType==1 && !hiddenDangerRecordStatus"
-				:src="imagesUrl('safetyCheck/icon_aqjc_fucha.png')" />
+				:src="imagesUrl('safetyCheck/icon_aqjc_fucha.png')" />	
 		</view>
 		<view v-if="pageType==0" class="inspectRecord" @click="inspectRecordClick()">检查记录</view>
-
+		
 	</view>
 
 </template>

pages_safetyCheck/views/planDetail.vue

@@ -6,7 +6,7 @@
 				<view class="title-t">{{newData.planTitle}}</view>
 				<view class="title-b">
 					<view v-if="newData.checkCategory">
-						{{newData.checkCategory==1?'院巡查':(newData.checkCategory==2?'所自查':'')}}
+						{{newData.checkCategory==1?'校院巡查':(newData.checkCategory==2?'学院自查':'')}}
 					</view>
 					<view v-if="newData.checkTypeName">{{newData.checkTypeName}}</view>
 					<view v-if="newData.crossCheck==1">交叉互检</view>

pages_safetyCheck/views/safetyCheck.vue

@@ -105,13 +105,13 @@
 				patrolLoginType:uni.getStorageSync('patrolLoginType'),
 				pageType: 0,
 				tabText: [{
-						name: '院检查',
-						title: '院检查计划',
+						name: '校级检查',
+						title: '学校检查计划',
 						img: this.imagesUrl('safetyCheck/icon_aqjc_xjjc@1x.png'),
 					},
 					{
-						name: '所自查',
-						title: '所自查计划',
+						name: '学院自查',
+						title: '学院自查计划',
 						img: this.imagesUrl('safetyCheck/icon_aqjc_xxzc@1x.png'),
 					},
 					// {
@@ -125,12 +125,12 @@
 						img: this.imagesUrl('safetyCheck/icon_aqjc_ssp@1x.png'),
 					},
 				],
-				//院/所
+				//校级/院级
 				curTab: 0,
 				queryParams: {
 					page: 1,
 					pageSize: 20,
-					checkCategory: 1, //1院巡查 2所自查
+					checkCategory: 1, //1校院巡查 2学院自查
 				},
 				total: 0,
 				dataList: [],
@@ -156,7 +156,7 @@
 
 		},
 		methods: {
-
+			
 			//退出按钮
 			clickOut() {
 				let self = this;
@@ -281,9 +281,9 @@
 					}else{
 						this.$set(this, "securityCheck", false)
 					}
-				}
+				} 
 			},
-
+			
 			//顶部tab点击
 			tabClick(index) {
 				this.$set(this.queryParams, 'page', 1);
@@ -292,12 +292,12 @@
 				if (this.curTab != index) {
 					this.$set(this, 'dataList', []);
 					if (index == 0) {
-						//院检查
+						//校级检查
 						this.$set(this, 'curTab', index);
 						this.$set(this.queryParams, 'checkCategory', 1);
 						this.getList()
 					} else if (index == 1) {
-						//所自查
+						//学院自查
 						this.$set(this, 'curTab', index);
 						this.$set(this.queryParams, 'checkCategory', 2);
 						this.getList()
@@ -695,11 +695,11 @@
 			z-index: 200;
 			background: rgba(0, 0, 0, 0.2);
 			top: 0;
-
+		
 			.null-box {
 				flex: 1;
 			}
-
+		
 			.shade_n {
 				position: absolute;
 				bottom: 0;
@@ -709,7 +709,7 @@
 				background: #FFFFFF;
 				border-radius: 20rpx 20rpx 0rpx 0rpx;
 				overflow-y: auto;
-
+		
 				.title {
 					display: flex;
 					justify-content: space-between;
@@ -717,24 +717,24 @@
 					padding: 0 50rpx 0 284rpx;
 					box-sizing: border-box;
 					border-bottom: 1rpx solid #E0E0E0;
-
+		
 					>view {
 						font-size: 30rpx;
 						color: #3D3D3D;
 						line-height: 90rpx;
 						text-align: left;
 					}
-
+		
 					>img {
 						width: 24rpx;
 						height: 12rpx;
 					}
 				}
-
+		
 				.batch {
 					padding: 0 30rpx;
 					box-sizing: border-box;
-
+		
 					.batch-li {
 						display: flex;
 						justify-content: space-between;
@@ -742,7 +742,7 @@
 						border-bottom: 1rpx solid #E0E0E0;
 						padding: 20rpx 0 16rpx 0rpx;
 						box-sizing: border-box;
-
+		
 						.batch-li-l {
 							>text:nth-of-type(1) {
 								display: block;
@@ -751,7 +751,7 @@
 								line-height: 42rpx;
 								text-align: left;
 							}
-
+		
 							>text:nth-of-type(2) {
 								display: block;
 								font-size: 28rpx;
@@ -761,7 +761,7 @@
 								margin-top: 6rpx;
 							}
 						}
-
+		
 						.batch-li-r {
 							font-size: 28rpx;
 							color: #666666;
@@ -770,7 +770,7 @@
 							display: flex;
 							justify-content: flex-start;
 							align-items: center;
-
+		
 							>img {
 								width: 24rpx;
 								height: 24rpx;

pages_safetyCheck/views/snapshotManage/laboratorySearch.vue

@@ -6,7 +6,7 @@
 				<view class="search">
 					<view class="search-r">
 						<img :src="imagesUrl('commonality/icon_aqjc_ss.png')" @click="searchBtn">
-						<input type="text" v-model="queryParams.searchValue" placeholder="所单位、实验室名称或房间号" name="search"
+						<input type="text" v-model="queryParams.searchValue" placeholder="学院单位、实验室名称或房间号" name="search"
 							@confirm='searchBtn' confirm-type='search' maxlength="50"
 							placeholder-style="color: #333333;font-size:24rpx;">
 						<view v-if="queryParams.searchValue" class="left-icons" @click="delSearchValue()">
@@ -42,7 +42,7 @@
 								{{item.manageStatus==2?'已完成':'未完成'}}</view>
 						</view>
 					</view>
-
+			
 				</view>
 				<view class="get-data-null-p" v-if="getDataType">- 没有更多数据 -</view>
 			</view>
@@ -73,7 +73,7 @@
 					</view>
 				</view>
 			</view> -->
-
+			
 
 		</scroll-view>
 	</view>
@@ -418,7 +418,7 @@
 			padding: 0 30rpx;
 			box-sizing: border-box;
 			margin-top: 120rpx;
-
+		
 			.list-li {
 				width: 690rpx;
 				min-height: 240rpx;
@@ -433,13 +433,13 @@
 					align-items: center;
 					height: 90rpx;
 					border-bottom: 2rpx dashed #D8D8D8;
-
+		
 					.list-li-t-l {
 						width: 40rpx;
 						height: 40rpx;
 						margin-right: 16rpx;
 					}
-
+		
 					.list-li-t-c {
 						width: 264rpx;
 						font-size: 30rpx;
@@ -451,7 +451,7 @@
 						white-space: nowrap;
 						margin-right: 24rpx;
 					}
-
+		
 					.list-li-t-r {
 						display: flex;
 						justify-content: flex-start;
@@ -459,7 +459,7 @@
 						width: 200rpx;
 						height: 40rpx;
 						margin-left: 10rpx;
-
+		
 						>text {
 							display: inline-block;
 							flex: 1;
@@ -473,20 +473,20 @@
 						}
 					}
 				}
-
+		
 				.list-li-b {
 					overflow: hidden;
 					.list-li-b-t {
 						display: flex;
 						justify-content: flex-start;
 						align-items: center;
-
+		
 						>img {
 							width: 28rpx;
 							height: 26rpx;
 							margin-right: 16rpx;
 						}
-
+		
 						font-size: 28rpx;
 						color: #666666;
 						line-height: 30rpx;
@@ -495,26 +495,26 @@
 						overflow: hidden;
 						text-overflow: ellipsis;
 						white-space: nowrap;
-
+		
 					}
-
+		
 					.list-li-b-b {
 						display: flex;
 						justify-content: space-between;
 						align-items: center;
 						margin-top: 20rpx;
-
+		
 						.list-li-b-b-l {
 							display: flex;
 							justify-content: flex-start;
 							align-items: center;
-
+		
 							>img {
 								width: 28rpx;
 								height: 26rpx;
 								margin-right: 16rpx;
 							}
-
+		
 							font-size: 28rpx;
 							color: #666666;
 							line-height: 30rpx;
@@ -523,7 +523,7 @@
 							text-overflow: ellipsis;
 							white-space: nowrap;
 						}
-
+		
 						.finished {
 							width: 110rpx;
 							height: 40rpx;
@@ -534,7 +534,7 @@
 							line-height: 40rpx;
 							text-align: center;
 						}
-
+		
 						.notFinished {
 							width: 110rpx;
 							height: 40rpx;

pages_safetyCheck/views/snapshotManage/snapshotDetail.vue

@@ -8,7 +8,7 @@
 					<view>{{newData.subName}}({{newData.subRoom?newData.subRoom:''}})</view>
 				</view>
 				<view class="items-li">
-					<view>所单位</view>
+					<view>学院单位</view>
 					<view>{{newData.deptName}}</view>
 				</view>
 				<view class="items-li">

pages_safetyCheck/views/snapshotManage/snapshotList.vue

@@ -19,7 +19,7 @@
 						<img class="srearch-r" :src="imagesUrl('commonality/icon_wd_gd@1x.png')">
 					</view>
 					<view class="list-li" style="margin-bottom: 20rpx;border:none;">
-						<view>{{form.subRoom?form.subRoom:''}}房间＆{{form.buildName?form.buildName:'楼栋'}}＆{{form.deptName?form.deptName:'所单位'}}</view>
+						<view>{{form.subRoom?form.subRoom:''}}房间＆{{form.buildName?form.buildName:'楼栋'}}＆{{form.deptName?form.deptName:'学院单位'}}</view>
 					</view>
 					<view class="list-li">
 						<view>现场照片</view>

pages_student/api/demoIndex.js

@@ -35,7 +35,7 @@ export const accessReview  = (data) => {
         data: {...data}
     })
 };
-//查询所列表
+//查询院系列表
 export const departmentsList  = (data) => {
     return apiResquest({
         url: `/base/app/sysuser/api/departments/list`,
@@ -43,7 +43,7 @@ export const departmentsList  = (data) => {
         data: data,
     })
 };
-//根据所查询楼栋列表
+//根据院系查询楼栋列表
 export const buildingList  = (data) => {
     return apiResquest({
         url: `/base/app/sysuser/api/building/list`,
@@ -58,4 +58,4 @@ export const mySecuritySubjectList  = (data) => {
         method: 'GET',
         data: data,
     })
-};
+};

pages_student/views/accessApplication/chooseALaboratory.vue

@@ -4,7 +4,7 @@
 		<view class="picker-box">
 			<picker @change="facultyChange" :value="facultyIndex" :range="faculty">
 				<view class="picker-min-box">
-					<view class="left-box">请选择所：</view>
+					<view class="left-box">请选择院系：</view>
 					<view>{{faculty[facultyIndex]}}</view>
 					<img :src="imagesUrl('commonality/icon_04.png')">
 				</view>
@@ -45,7 +45,7 @@
 			return {
 				//空数据展示
 				nullType: false,
-				faculty: ['暂无所数据'],
+				faculty: ['暂无院系数据'],
 				facultyList: [],
 				facultyIndex: 0,
 				building: ['暂无实验楼数据'],
@@ -62,7 +62,7 @@
 		},
 		methods: {
 
-			//查询所
+			//查询院系
 			async getDepartmentsList() {
 				let self = this;
 				const {
@@ -79,7 +79,7 @@
 						this.facultyList = data.data;
 						this.getDuildingList(this.facultyList[0].deptId)
 					} else {
-						this.faculty = ['暂无所数据'];
+						this.faculty = ['暂无院系数据'];
 						this.facultyIndex = 0;
 						this.facultyList = [];
 						this.building = ['暂无实验楼数据'];

utils/index.js

@@ -24,10 +24,10 @@ export function pageRestrictVerify(str) {
   }
 }
 
-/*            硬件控制与视频监控权限验证(院管理员/所管理员/实验室管理员)
+/*            硬件控制与视频监控权限验证(校级管理员/院级管理员/实验室管理员)
   subAdminId          传入的实验室管理员ID
-  schoolId            院管理员身份ID
-  collegeId           所管理员身份ID
+  schoolId            校级管理员身份ID
+  collegeId           院级管理员身份ID
   userInfo.position   当前用户身份ID (系统用户为NULL)
   userInfo.userId     当前用户userID
 */
@@ -39,7 +39,7 @@ export function itoOrVideoLimits(subAdminId) {
   //   //如果是管理员(系统用户)
   //   return true
   // }else if(userInfo.position == schoolId || userInfo.position == collegeId){
-  //   //如果是院管理员/所管理员
+  //   //如果是校级管理员/院级管理员
   //   return true
   // }else if(userInfo.userId == subAdminId){
   //   //如果当前用户userId 与 管理员ID相等
@@ -51,7 +51,7 @@ export function itoOrVideoLimits(subAdminId) {
 		//如果是管理员(系统用户)
     return true
 	}else if(userInfo.position == schoolId || userInfo.position == collegeId){
-		//如果是院管理员/所管理员
+		//如果是校级管理员/院级管理员
     return true
   }else if(uni.getStorageSync('subAdmin') == 1){
     return true