zc

api/apiDemo/index.js

@@ -1535,7 +1535,7 @@ export const materialApply = (data) => {
         data: data
     })
 };
-//获取实验室查询导师
+//获取实验室查询领导
 export const teacherApply = (data) => {
     return apiResquestForm({
         url: '/system/user/selectUserListByName',

api/request/config.js

@@ -1,9 +1,9 @@
 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.8/api',//1.8服务器
 	// base_url: 'http://192.168.1.88/labSystem',//1.88服务器
 	// base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总

pages/api/index.js

@@ -506,7 +506,7 @@ export const laboratoryClassLevelGetList = (data) => {
 		data: { ...data }
 	})
 };
-//查询用户信息-(初始密码/手机号/导师/身份)
+//查询用户信息-(初始密码/手机号/领导/身份)
 export const systemUserPersonalData  = (data) => {
     return apiResquest({
         url: `/system/user/personalData`,

pages/views/home/home.vue

@@ -51,11 +51,11 @@
 				} = await systemUserPersonalData();
 				if (data.code == 200) {
 					// isInitPwd 初始密码 true 是
-					// isTutorExist 导师 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',
 						});

pages/views/information/notPassInfo.vue

@@ -26,7 +26,7 @@
 				<view>{{subjectData.sysUser.phonenumber}}</view>
 			</view>
 			<view class="user-info-box-min" >
-				<view>学号：</view>
+				<view>卡号：</view>
 				<view>{{subjectData.sysUser.userName}}</view>
 			</view>
 			<!-- <view class="user-info-box-min">
@@ -34,11 +34,11 @@
 				<view>{{subjectData.sysUser.cardNum}}</view>
 			</view> -->
 			<view class="user-info-box-min" >
-				<view>班级：</view>
+				<view>班组：</view>
 				<view>{{subjectData.sysUser.grade}}</view>
 			</view>
 			<view class="user-info-box-min" >
-				<view>导师：</view>
+				<view>领导：</view>
 				<view>{{subjectData.sysUser.tutorUserName}}</view>
 			</view>
 

pages/views/login/login.vue

@@ -66,7 +66,7 @@
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),
 				infoList: [], //模板消息Id
-				tabText: ['师生登录'],
+				tabText: ['登录'],
 				curTab: 0,
 				pageType: 0,
 				supplierType: false,
@@ -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) {

pages/views/login/patrolLogin.vue

@@ -61,7 +61,7 @@
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),
 				infoList: [], //模板消息Id
-				tabText: ['师生登录'],
+				tabText: ['登录'],
 				curTab: 0,
 				pageType: 0,
 				supplierType: false,
@@ -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) {

pages/views/login/ssoCertification.vue

@@ -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')));
 					//等待配置与字段获取到后跳转

pages/views/teacherPage/teacherHome.vue

@@ -1,4 +1,4 @@
-<!-- 教师首页 -->
+<!-- 职工首页 -->
 <template>
 	<view class="teacherHome">
 		<data-board v-if="pageType == 1" style="display: flex;flex-direction:column;flex:1;"></data-board>
@@ -33,10 +33,10 @@
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqjc@1x.png')">
 					<view class="button-name">安全检查</view>
 				</view>
-				<view class="button-min" @click="goPage('deviceManagement')">
+				<!-- <view class="button-min" @click="goPage('deviceManagement')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_sbgl@1x.png')">
 					<view class="button-name">设备管理</view>
-				</view>
+				</view> -->
 				<view class="button-min" @click="saoCode()">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqks@1x.png')">
 					<view class="button-name">设备登记</view>
@@ -666,6 +666,7 @@
 					width: 172rpx;
 					height: 123rpx;
 					margin-top: 23rpx;
+					margin-left:44rpx;
 
 					.button-img {
 						display: block;

pages_basics/api/index.js

@@ -211,7 +211,7 @@ export const authForgetPassword  = (data) => {
         data: {...data}
     })
 };
-//查询用户信息-(初始密码/手机号/导师/身份)
+//查询用户信息-(初始密码/手机号/领导/身份)
 export const systemUserPersonalData  = (data) => {
     return apiResquest({
         url: `/system/user/personalData`,
@@ -226,7 +226,7 @@ export const systemUserDetail  = (data) => {
 				data: { ...data }
     })
 };
-//查询导师列表
+//查询领导列表
 export const systemUserSelectByPage  = (data) => {
     return apiResquest({
         url: `/system/user/selectByPage`,

pages_basics/views/completeInformation/completeInformation.vue

@@ -15,7 +15,7 @@
 			<view class="text-max-box">
 				<view class="text-top-box">
 					<view>*</view>
-					<view>{{newData.userType==1?'工号':(newData.userType==2?'学号':'')}}</view>
+					<view>{{newData.userType==1?'卡号':(newData.userType==2?'卡号':'')}}</view>
 				</view>
 				<view class="text-bottom-p">{{newData.account}}</view>
 			</view>
@@ -64,16 +64,16 @@
 			<view class="button-max-box" v-if="newData.userType == 2 && !newData.tutorUserName">
 				<view class="button-top-box">
 					<view>*</view>
-					<view>导师</view>
+					<view>领导</view>
 				</view>
 				<input class="button-bottom-p" :always-embed="true" :cursor-spacing="10"
 				:disabled="true" v-model="form.supervisorName"
-				maxlength="30" focus placeholder="请选择导师" @click="userButton()">
+				maxlength="30" focus placeholder="请选择领导" @click="userButton()">
 			</view>
 			<view class="text-max-box" v-if="newData.userType == 2 && newData.tutorUserName">
 				<view class="text-top-box">
 					<view>*</view>
-					<view>导师</view>
+					<view>领导</view>
 				</view>
 				<view class="text-bottom-p">{{newData.tutorUserName}}</view>
 			</view>
@@ -87,7 +87,7 @@
 						<uni-icons type="search" class="icon-view-left" size="20" color="#999999"></uni-icons>
 						<input class="input-top-p" :always-embed="true" :cursor-spacing="10"
 						 @confirm="searchButton()"
-						v-model="getData.userName" maxlength="10" focus placeholder="请输入导师">
+						v-model="getData.userName" maxlength="10" focus placeholder="请输入领导">
 						<uni-icons v-if="getData.userName" @click="clearButton()"
 						type="clear" class="icon-view-right" size="20" color="#999999"></uni-icons>
 					</view>
@@ -141,7 +141,6 @@
 				},
 				getDataType: false,
 				total: 0,
-				//教师查询列表
 				dataList:[],
 				//定时器
 				codeType: false,
@@ -272,7 +271,7 @@
 							return
 						} else if(!this.checkUserUserId){
 							uni.showToast({
-								title: '请选择导师',
+								title: '请选择领导',
 								icon: "none",
 								duration: 3000
 							});
@@ -281,7 +280,7 @@
 					}else if(this.newData.mobile){
 						if(!this.checkUserUserId){
 							uni.showToast({
-								title: '请选择导师',
+								title: '请选择领导',
 								icon: "none",
 								duration: 3000
 							});
@@ -379,11 +378,9 @@
 				this.$set(this.getData, 'page', 1);
 				this.systemUserSelectByPage();
 			},
-			//教师弹窗开关啊
 			userButton(type){
 				this.$set(this,'userShowType',!this.userShowType);
 			},
-			//选中教师
 			checkUser(item){
 				this.$set(this.form,'supervisorName',item.userName);
 				this.$set(this.form,'supervisorId',item.account);

pages_manage/views/accessControl/authorizationRecord.vue

@@ -3,7 +3,7 @@
 		<view class="top-max-big-box">
 			<view class="search-box">
 				<img class="img-view" :src="imagesUrl('commonality/icon_aqjc_ss.png')">
-				<input type="text" v-model="searchValue" placeholder="姓名/学工号" maxlength="20">
+				<input type="text" v-model="searchValue" placeholder="姓名/卡号" maxlength="20">
 				<view class="button-view" @click="searchButton()">搜索</view>
 			</view>
 			<view class="check-button-max-box">

pages_manage/views/accessControl/empowerOpen.vue

@@ -120,7 +120,7 @@
 				successVisible: false,
 				timer: null,
 				count: '',
-				//展示用工号
+				//展示用卡号
 				account:false,
 			}
 		},

pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -32,7 +32,7 @@
 				<view>{{newData.sysUser.mobile}}</view>
 			</view>
 			<view class="user-info-box-min">
-				<view>学号：</view>
+				<view>卡号：</view>
 				<view>{{newData.sysUser.account}}</view>
 			</view>
 			<!-- <view class="user-info-box-min">
@@ -40,11 +40,11 @@
 				<view>{{newData.sysUser.cardNum}}</view>
 			</view> -->
 			<view class="user-info-box-min" v-if="newData.sysUser.gradeName">
-				<view>班级：</view>
+				<view>班组：</view>
 				<view>{{newData.sysUser.gradeName}}</view>
 			</view>
 			<view class="user-info-box-min" v-if="newData.sysUser.tutorUserName">
-				<view>导师：</view>
+				<view>领导：</view>
 				<view>{{newData.sysUser.tutorUserName}}</view>
 			</view>
 		</view>

pages_student/views/accessApplication/applicationDetails.vue

@@ -29,7 +29,7 @@
 				<view>{{subjectData.sysUser.mobile}}</view>
 			</view>
 			<view class="user-info-box-min">
-				<view>学号：</view>
+				<view>卡号：</view>
 				<view>{{subjectData.sysUser.account}}</view>
 			</view>
 			<!-- <view class="user-info-box-min">
@@ -37,11 +37,11 @@
 				<view>{{subjectData.sysUser.cardNum}}</view>
 			</view> -->
 			<view class="user-info-box-min" v-if="subjectData.sysUser.gradeName">
-				<view>班级：</view>
+				<view>班组：</view>
 				<view>{{subjectData.sysUser.gradeName}}</view>
 			</view>
 			<view class="user-info-box-min" v-if="subjectData.sysUser.tutorUserName">
-				<view>导师：</view>
+				<view>领导：</view>
 				<view>{{subjectData.sysUser.tutorUserName}}</view>
 			</view>