فهرست منبع

修改文字可以选择

eraser 4 سال پیش
والد
کامیت
13bb329fc2

+ 1 - 1
components/home/teacher/msg.vue

@@ -8,7 +8,7 @@
 				{{title}}
 			</view>
 			<view :class="btnArr.length>1?'m_btn':'m_btn_sing'">
-				<text class="m_btn_option" :class="'m_btn_'+index" v-for="(item,index) in btnArr" @click="determine(index)" :key="index">{{item}}</text>
+				<text selectable="true"class="m_btn_option" :class="'m_btn_'+index" v-for="(item,index) in btnArr" @click="determine(index)" :key="index">{{item}}</text>
 			</view>
 		</view>
 	</view>

+ 8 - 8
components/home/teacher/project.vue

@@ -217,13 +217,13 @@
 					<view class="edit_title">修改</view>
 				
 					<view class="edit_row">
-						<text class="edit_text">名称</text>
+						<text selectable="true"class="edit_text">名称</text>
 						<view class="input_frame">
 							<input class="edit_input" type="string" v-model="projectName" placeholder="" @input="onInputProjectName"/>
 						</view>
 					</view>
 					<view class="edit_row">
-						<text class="edit_text">类型</text>
+						<text selectable="true"class="edit_text">类型</text>
 						<view class="input_frame">
 							<!-- <input class="edit_input"  type="string" v-model="projectType" placeholder="" @input="onInputProjectType"/> -->
 							
@@ -238,7 +238,7 @@
 						</view>
 					</view>
 					<view class="edit_row">
-						<text class="edit_text">描述</text>
+						<text selectable="true"class="edit_text">描述</text>
 						<view class="input_frame">
 							<input class="edit_input"  type="string" v-model="projectDescribe" placeholder="" @input="onInputProjectDescribe"/>
 						</view>
@@ -257,13 +257,13 @@
 				<view class="edit_BG">
 					<view class="edit_title">上传文件</view>
 					<view class="edit_row">
-						<text class="edit_text">名称</text>
+						<text selectable="true"class="edit_text">名称</text>
 						<view class="input_frame">
 							<input class="edit_input" type="string" placeholder="文件名" @input="onSelectFileName"/>
 						</view>
 					</view>
 					<view class="edit_row">
-						<text class="edit_text">类型</text>
+						<text selectable="true"class="edit_text">类型</text>
 						<view class="input_frame">
 							<picker class="form-input" @change="onSelectFileType" :value="fileType" :range="addFileType">
 							 	<view class=" df fdr aic jcsb">
@@ -288,13 +288,13 @@
 				<view class="edit_BG">
 					<view class="edit_title">添加学生</view>
 					<view class="edit_row">
-						<text class="edit_text">姓名</text>
+						<text selectable="true"class="edit_text">姓名</text>
 						<view class="input_frame">
 							<input class="edit_input" type="string" placeholder="姓名" @input="onInputStuName"/>
 						</view>
 					</view>
 					<view class="edit_row">
-						<text class="edit_text">类型</text>
+						<text selectable="true"class="edit_text">类型</text>
 						<view class="input_frame">
 							<picker class="form-input" @change="onSelectStuType" :value="stuType" :range="addproType">
 							 	<view class=" df fdr aic jcsb">
@@ -671,7 +671,7 @@
 					method: "POST",
 					dataType: "json",
 					success: res => {
-						// console.log("请求学生", res);
+						console.log("请求学生", res);
 						if (res.data.Code == 100) {
 							this.projectMembers = res.data.Users;
 							// console.log();

+ 3 - 3
components/home/teacher/table.vue

@@ -23,11 +23,11 @@
 				</tbody>
 			</table>
 			<!-- <view class="m_paging" style="margin-top: 80rpx;">
-				<text class="m_paging_item m_paging_upper">上一页</text>
-				<text class="m_paging_item" v-for="i in 8" @click="paging(i)" :key="i" :class="i==index?'p_act':''">
+				<text selectable="true"class="m_paging_item m_paging_upper">上一页</text>
+				<text selectable="true"class="m_paging_item" v-for="i in 8" @click="paging(i)" :key="i" :class="i==index?'p_act':''">
 					{{i}}
 				</text>
-				<text class="m_paging_item m_paging_lower">下一页</text>
+				<text selectable="true"class="m_paging_item m_paging_lower">下一页</text>
 			</view> -->
 		</view>
 

+ 2 - 2
components/introductionToTheExperiment/syjj_second.vue

@@ -17,11 +17,11 @@
 				<view class="syjj-content" v-for="(content,contentI) in data_SYJJ[checkedIndex_second].page[checkedIndex_bodyTitle].content" :key="contentI">
 					<!-- 文字 -->
 					<view v-show="content.type=='text'">
-						<text v-for="(text,textI) in content.textList" :key="textI" :class="'syjj-text-'+text.textType" v-show="text.textType!='link'">
+						<text selectable="true"v-for="(text,textI) in content.textList" :key="textI" :class="'syjj-text-'+text.textType" v-show="text.textType!='link'">
 							{{text.text}}
 						</text>
 						<!-- link -->
-						<text v-for="(link,index) in content.textList" v-show="link.textType=='link'">
+						<text selectable="true"v-for="(link,index) in content.textList" v-show="link.textType=='link'">
 							<a :href="url" style="text-decoration:underline;color:blue">{{link.text}}</a>
 						</text>
 					</view>

+ 1 - 1
components/learningProcess/learningProcess.vue

@@ -26,7 +26,7 @@
 						<view class="xxlc-content-box3" v-for="(content,contentI) in data" :key="contentI">
 							<!-- 文字 -->
 							<view v-show="content.type=='text'">
-								<text v-for="(text,textI) in content.textList" :key="textI" :class="'xxlc-text-'+text.textType">
+								<text selectable="true"v-for="(text,textI) in content.textList" :key="textI" :class="'xxlc-text-'+text.textType">
 									{{text.text}}
 								</text>
 							</view>

+ 1 - 1
components/learningProcess/xxgy.vue

@@ -17,7 +17,7 @@
 				<view class="syjj-content" v-for="(content,contentI) in data_SYJJ[checkedIndex_second].page[checkedIndex_bodyTitle].content" :key="contentI">
 					<!-- 文字 -->
 					<view v-show="content.type=='text'">
-						<text v-for="(text,textI) in content.textList" :key="textI" :class="'syjj-text-'+text.textType">
+						<text selectable="true"v-for="(text,textI) in content.textList" :key="textI" :class="'syjj-text-'+text.textType">
 							{{text.text}}
 						</text>
 					</view>

+ 2 - 2
components/learningProcess/xxzlxz.vue

@@ -18,11 +18,11 @@
 				 :key="contentI">
 					<!-- 文字 -->
 					<view v-show="content.type=='text'">
-						<text v-for="(text,textI) in content.textList" :key="textI" :class="'syjj-text-'+text.textType" v-show="text.textType!='link'">
+						<text selectable="true" v-for="(text,textI) in content.textList" :key="textI" :class="'syjj-text-'+text.textType" v-show="text.textType!='link'">
 							{{text.text}}
 						</text>
 						<!-- link -->
-						<text v-for="(link,index) in content.textList" v-show="link.textType=='link'">
+						<text selectable="true" v-for="(link,index) in content.textList" v-show="link.textType=='link'">
 							<a :href="link.url" style="text-decoration:underline;color:blue">{{link.text}}</a>
 						</text>
 					</view>

+ 1 - 1
components/login/loginByPWD.vue

@@ -125,7 +125,7 @@
 							}
 							userController.updateScore();
 							userController.updateUserInfo();
-							MyRequest.SetUserType(mydata_userInfo.role, null, null);
+							// MyRequest.SetUserType(mydata_userInfo.role, null, null);
 
 							this.$emit("onLogin");
 						}

+ 3 - 3
components/manager/Index.vue

@@ -123,11 +123,11 @@
 			</view>
 			<view class="m_right_footer">
 				<view class="m_paging">
-					<text class="m_paging_item m_paging_upper">上一页</text>
-					<text class="m_paging_item" v-for="i in 8" @click="paging(i)" :class="i==index?'p_act':''">
+					<text selectable="true"class="m_paging_item m_paging_upper">上一页</text>
+					<text selectable="true"class="m_paging_item" v-for="i in 8" @click="paging(i)" :class="i==index?'p_act':''">
 						{{i}}
 					</text>
-					<text class="m_paging_item m_paging_lower">下一页</text>
+					<text selectable="true"class="m_paging_item m_paging_lower">下一页</text>
 				</view>
 			</view>
 

+ 1 - 1
components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -170,7 +170,7 @@
 						"text": '学习知识点',
 						"icon_btn1_checked": require('../../../../assets/learning/icon_ylrz_menu_02.png'),
 						"icon_btn1_unchecked": require('../../../../assets/learning/icon_ylrz_menu_01.png'),
-						"list": ['课程地图及知识点位置', '知识点:虚拟制片流程', '知识点:虚拟引擎', '知识点:影视现场实时特效']
+						"list": ['课程地图及知识点位置', '知识点:虚拟制片流程', '知识点:虚拟引擎', '知识点:影视现场实时特效']
 					},
 					{
 						"text": '测验(完成获得10分)',

+ 1 - 1
components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -7,7 +7,7 @@
 			 :key="i">
 				<!-- 不换行文字 -->
 				<view class="contentText">
-					<text v-for="(text,m) in paragraph" :key="m" :style="{color:text.color,fontWeight:text.fontWeight}">
+					<text selectable="true"v-for="(text,m) in paragraph" :key="m" :style="{color:text.color,fontWeight:text.fontWeight}">
 						{{text.text}}
 					</text>
 				</view>

+ 1 - 1
components/startLearning/preludePreparation/preludePreparation.vue

@@ -16,7 +16,7 @@
 			<view class="df fdc ">
 				<!-- 文字 -->
 				<view class="contentText">
-					<text v-for="(item,i) in data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.text" :key="i+1" :style="{color:item.color}">
+					<text selectable="true"v-for="(item,i) in data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.text" :key="i+1" :style="{color:item.color}">
 						{{item.text}}
 					</text>
 				</view>

+ 3 - 3
components/student/table.vue

@@ -23,11 +23,11 @@
 				</tbody>
 			</table>
 			<!-- <view class="m_paging" style="margin-top: 80rpx;">
-				<text class="m_paging_item m_paging_upper">上一页</text>
-				<text class="m_paging_item" v-for="i in 8" @click="paging(i)" :key="i" :class="i==index?'p_act':''">
+				<text selectable="true"class="m_paging_item m_paging_upper">上一页</text>
+				<text selectable="true"class="m_paging_item" v-for="i in 8" @click="paging(i)" :key="i" :class="i==index?'p_act':''">
 					{{i}}
 				</text>
-				<text class="m_paging_item m_paging_lower">下一页</text>
+				<text selectable="true"class="m_paging_item m_paging_lower">下一页</text>
 			</view> -->
 		</view>
 

+ 6 - 0
components/user/personalLearning.vue

@@ -121,6 +121,12 @@
 									<th>{{model.Score_xnyscz>=10?'是':'否'}}</th>
 									<th>{{model.Score_xnyscz>0?model.Score_xnyscz:'0'}}</th>
 								</tr>
+								<tr>
+									<th>总成绩</th>
+									<th></th>
+									<th></th>
+									<th>{{model.Score_ylrz+model.Score_sjkc+model.Score_xnjsdj+model.Score_xnyscz}}</th>
+								</tr>
 							</tbody>
 						</table>
 					</view>

+ 12 - 4
components/user/stuManage.vue

@@ -32,11 +32,11 @@
 			</view>
 			<view class="m_right_footer">
 				<view class="m_paging">
-					<text class="m_paging_item m_paging_upper" @click="onClick_last" v-show="pageCount>1">上一页</text>
-					<text class="m_paging_item" :key="i" v-for="i in pageCount" @click="paging(i)" :class="i==index?'p_act':''">
+					<text selectable="true"class="m_paging_item m_paging_upper" @click="onClick_last" v-show="pageCount>1">上一页</text>
+					<text selectable="true"class="m_paging_item" :key="i" v-for="i in pageCount" @click="paging(i)" :class="i==index?'p_act':''">
 						{{i}}
 					</text>
-					<text class="m_paging_item m_paging_lower" @click="onClick_next" v-show="pageCount>1">下一页</text>
+					<text selectable="true"class="m_paging_item m_paging_lower" @click="onClick_next" v-show="pageCount>1">下一页</text>
 				</view>
 			</view>
 		</view>
@@ -145,7 +145,15 @@
 
 
 				MyRequest.AddUsers([this.addStudentData], function(res) {
-					// console.log("请求添加成功,返回值", res);
+					console.log("请求添加成功,返回值", res);
+					
+					if(res.data.Users[0].State == 2)
+					{
+						alert("该学生不存在");
+						
+						return;
+					}
+					
 					// self.updateInfo();
 					self.isShowAdd = false;
 					self.addStudentData = {};

+ 2 - 1
components/user/stuTestDetails.vue

@@ -121,7 +121,8 @@
 									<th>{{model.Score_xnyscz>0?model.Score_xnyscz:'0'}}</th>
 								</tr>
 								<tr>
-									<th>教师评分</th>
+									<!-- <th>教师评分</th> -->
+									<th>总成绩</th>
 									<th></th>
 									<th></th>
 									<!-- <th v-show="isShow_jspf">{{model.Score_jspf>0?model.Score_jspf:'0'}}</th> -->

+ 1 - 1
components/user/user.vue

@@ -189,7 +189,7 @@
 						let data = res.data;
 						//100成功
 						if (data.Code == 100) {
-							// console.log("请求成功", res);
+							console.log("请求成功", res);
 							this.$refs.GRXX.updateInfo(data.User);
 							mydata_userInfo.email = data.User.Email;
 							// console.log('00000000000=',mydata_userInfo.role)

+ 2 - 1
main.js

@@ -10,7 +10,8 @@ Vue.config.productionTip = false
 
 App.mpType = 'app'
 
-Vue.prototype.$Api="http://39.105.166.141:8085"
+Vue.prototype.$Api="http://8.140.128.1:8085"
+// Vue.prototype.$Api="http://39.105.166.141:8085"
 Vue.prototype.$UserId="1e9c969f-8990-40f2-8a8c-ecbafc5720b2"
 
 const app = new Vue({

+ 3 - 1
myData.js

@@ -26,4 +26,6 @@ mydata_userInfo = {
 	"email":'',
 	"Position":''
 }
-mydata_api='http://39.105.166.141:8085'
+// mydata_api='http://39.105.166.141:8085'
+mydata_api='http://8.140.128.1:8085'
+

+ 1 - 1
pages/home.vue

@@ -175,7 +175,7 @@
 							}
 							userController.updateScore();
 							userController.updateUserInfo();
-							MyRequest.SetUserType(mydata_userInfo.role,null,null);
+							// MyRequest.SetUserType(mydata_userInfo.role,null,null);
 							
 							getApp().globalData.bLogin = true;
 							this.onLogin();

+ 1 - 1
pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<image class="logo" src="/static/logo.png"></image>
 		<view class="text-area">
-			<text class="title">{{title}}</text>
+			<text selectable="true"class="title">{{title}}</text>
 		</view>
 		<view>
 			<input id="myInput" type="text" v-model="funName" placeholder="请输入方法名" />

+ 9 - 8
request.js

@@ -9,6 +9,7 @@ MyRequest = {
 	},
 	uniRquest: function(myurl, mydata, suc100, fail) {
 		// console.log("请求url", mydata_api + myurl);
+		// console.log("mydata", mydata);
 		uni.request({
 			header: {
 				'Content-Type': 'application/json;charset=UTF-8'
@@ -70,14 +71,14 @@ MyRequest = {
 		// console.log("添加用户", data);
 		this.uniRquest('/user/addusers', data, suc, fail);
 	},
-	SetUserType(type, suc, fail) {
-		let data = {
-			"UserID": mydata_userInfo.UserID,
-			"Type": type
-		};
-		// console.log("设置身份", data);
-		this.uniRquest('/user/setusertype', data, suc, fail);
-	},
+	// SetUserType(type, suc, fail) {
+	// 	let data = {
+	// 		"UserID": mydata_userInfo.UserID,
+	// 		"Type": type
+	// 	};
+	// 	// console.log("设置身份", data);
+	// 	this.uniRquest('/user/setusertype', data, suc, fail);
+	// },
 	CreateProjectNew(data, suc, fail) {
 		this.uniRquest('/project/createprojectnew', data, suc, fail);
 	},

+ 1 - 1
uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.vue

@@ -6,7 +6,7 @@
         backgroundColor: index === currentIndex && styleType === 'button' ? activeColor : '',borderColor: index === currentIndex&&styleType === 'text'||styleType === 'button'?activeColor:'transparent'
       }"
 		 class="segmented-control__item" @click="_onClick(index)">
-			<text :style="{color:
+			<text selectable="true":style="{color:
           index === currentIndex
             ? styleType === 'text'
               ? activeColor