Merge branch 'master' of http://81.70.224.233:10080/yichael/ZhongChuang_front_2

components/home/teacher/project.vue

@@ -44,7 +44,7 @@
 							
 							<th>{{item.ProjectName}}</th>
 							<th>{{item.Type}}</th>
-							<th>{{item.Type}}</th>
+							<th>{{item.Describe}}</th>
 							<th>{{item.CreateUserName}}</th>
 							<th style="position: relative;"><button type="default" size="mini" @click="editProject(index)" class="m_edit">修改</button></th>
 							<th style="position: relative;"><button type="default" size="mini" @click="deleteProject(index)" class="m_delete">删除</button></th>
@@ -128,12 +128,12 @@
 						<button type="default" class="m_btn_download" size="mini" @click="addMember">添加学生</button>
 					</view>
 				</view>
-				<view class="df fdr aic addMember_box showboder" v-show="isShowAddMember">
-					<view class="addMember_input_box">
-						<input class="addMember_input" type="string" v-model="addedMemberModel.IlabAccount" />
-					</view>
-					<view class="addMember_btn df aic jcc">添加</view>
-				</view>
+				<!--<view class="df fdr aic addMember_box showboder" v-show="isShowAddMember">-->
+					<!--<view class="addMember_input_box">-->
+						<!--<input class="addMember_input" type="string" v-model="addedMemberModel.IlabAccount" />-->
+					<!--</view>-->
+					<!--<view class="addMember_btn df aic jcc" @click="addMemberData">添加</view>-->
+				<!--</view>-->
 				<table style="width: 100%;border: 1px solid #DDDDDD;border-collapse: collapse">
 					<thead class="m-table-hander">
 						<tr>
@@ -159,7 +159,7 @@
 								</div>
 							</th>
 							<th>{{item.User.PhoneNum}}</th>
-							<th style="position: relative;"><button type="default" size="mini" class="m_delete" @click="delete1(item)">删除</button></th>
+							<th style="position: relative;"><button type="default" size="mini" class="m_delete" @click="deleteMember(item)"  v-show="item.User.Id != projectData[0].CreateUserID">删除</button></th>
 						</tr>
 
 					</tbody>
@@ -169,6 +169,131 @@
 		</view>
 		<msg ref="msg" :title="title" @determine="determine" :btnArr="arr" v-show="show"></msg>
 		<audit ref="audit" v-show="auditshow" @determine="determine"></audit>
+		<!--修改对话框-->
+		<view class="m_msg" v-show="editDialogshow">
+			<table style="width: 100%;border: 1px solid #DDDDDD;border-collapse: collapse">
+				<thead class="m-table-hander">
+				<tr>
+					<th>名称</th>
+					<th>类型</th>
+					<th>介绍</th>
+				</tr>
+				</thead>
+				<!-- <tbody class='table'> -->
+				<tbody>
+				<tr>
+					<!-- 	<t-table @change="change">
+                        <t-tr> </t-tr>
+                        <t-tr>{{item.ProjectName}}</t-tr>
+                        <t-tr>{{item.Type}}</t-tr>
+                        <t-tr>{{item.Describe}}</t-tr>
+                        <t-tr>{{item.CreateUserName}}</t-tr>
+                        <t-tr style="position: relative;"><button type="default" size="mini" @click="edit(index)" class="m_edit">修改</button></t-tr>
+                        <t-tr style="position: relative;"><button type="default" size="mini" @click="delete1(index)" class="m_delete">删除</button></t-tr>
+                        </t-table> -->
+					<th>
+						<input class="uni-input" placeholder-style="color:#F76260" placeholder="名称"  v-model="editDialogData.name"/>
+
+					</th>
+					<!--<th>-->
+						<!--<input class="uni-input" placeholder-style="color:#F76260" placeholder="类型"  v-model="editDialogData.type"/>-->
+					<!--</th>-->
+					<th>
+						<picker class="form-input" @change="bindPickerChange_proType" :value="index_proType" :range="proType">
+							<view class=" df fdr aic jcsb">
+								<view>{{proType[index_proType]}}</view>
+								<view>
+									<img src="../../../assets/user/pic_user_03.png" />
+								</view>
+							</view>
+						</picker>
+					</th>
+					<th>
+						<input class="uni-input" placeholder-style="color:#F76260" placeholder="介绍"  v-model="editDialogData.Introduction"/>
+					</th>
+
+					<!-- <th class='blank'><input type="text" :value='item.ProjectName' class='input-item'/></th>
+                    <th class='blank'><input type="text" :value='item.Type' class='input-item'/></th>
+                    <th class='blank'><input type="text" :value='item.Type' class='input-item'/></th>
+                    <th class='blank'><input type="text" :value='item.CreateUserName' class='input-item'/></th>
+                    <th style="position:relative;" class='blank'><button type="default" size="mini" @click="editProject(index)" class="m_edit">修改</button></th>
+                    <th style="position:relative;" class='blank'><button type="default" size="mini" @click="deleteProject(index)" class="m_delete">删除</button></th>
+                 -->
+				</tr>
+				</tbody>
+			</table>
+			<view class="layout">
+				<button type="default" size="mini" @click="editDialogDetermine(index)" class="m_edit">修改</button>
+				<button type="default" size="mini" @click="editDialogCancel(index)" class="m_delete">取消</button>
+			</view>
+
+		</view>
+
+		<!--添加用户对话框-->
+		<view class="m_msg" v-show="isShowAddMember">
+			<table style="width: 100%;border: 1px solid #DDDDDD;border-collapse: collapse">
+				<thead class="m-table-hander">
+				<tr>
+					<th>名称</th>
+					<th>类型</th>
+					<!--<th>介绍</th>-->
+				</tr>
+				</thead>
+				<!-- <tbody class='table'> -->
+				<tbody>
+				<tr>
+					<!-- 	<t-table @change="change">
+                        <t-tr> </t-tr>
+                        <t-tr>{{item.ProjectName}}</t-tr>
+                        <t-tr>{{item.Type}}</t-tr>
+                        <t-tr>{{item.Describe}}</t-tr>
+                        <t-tr>{{item.CreateUserName}}</t-tr>
+                        <t-tr style="position: relative;"><button type="default" size="mini" @click="edit(index)" class="m_edit">修改</button></t-tr>
+                        <t-tr style="position: relative;"><button type="default" size="mini" @click="delete1(index)" class="m_delete">删除</button></t-tr>
+                        </t-table> -->
+					<th>
+						<!--<input class="uni-input" placeholder-style="color:#F76260" placeholder="名称"  v-model="editDialogData.name"/>-->
+						<view class="addMember_input_box">
+							<input class="addMember_input" type="string" v-model="addedMemberModel.IlabAccount" placeholder="学员id" />
+						</view>
+
+					</th>
+					<!--<th>-->
+					<!--<input class="uni-input" placeholder-style="color:#F76260" placeholder="类型"  v-model="editDialogData.type"/>-->
+					<!--</th>-->
+					<th>
+						<picker class="form-input" @change="bindPickerChange_proTypeadd" :value="index_addproType" :range="addproType">
+							<view class=" df fdr aic jcsb">
+								<view>{{addproType[index_addproType]}}</view>
+								<view>
+									<img src="../../../assets/user/pic_user_03.png" />
+								</view>
+							</view>
+						</picker>
+					</th>
+					<!--<th>-->
+						<!--<input class="uni-input" placeholder-style="color:#F76260" placeholder="介绍"  v-model="editDialogData.Introduction"/>-->
+					<!--</th>-->
+
+					<!-- <th class='blank'><input type="text" :value='item.ProjectName' class='input-item'/></th>
+                    <th class='blank'><input type="text" :value='item.Type' class='input-item'/></th>
+                    <th class='blank'><input type="text" :value='item.Type' class='input-item'/></th>
+                    <th class='blank'><input type="text" :value='item.CreateUserName' class='input-item'/></th>
+                    <th style="position:relative;" class='blank'><button type="default" size="mini" @click="editProject(index)" class="m_edit">修改</button></th>
+                    <th style="position:relative;" class='blank'><button type="default" size="mini" @click="deleteProject(index)" class="m_delete">删除</button></th>
+                 -->
+				</tr>
+				</tbody>
+			</table>
+			<view class="layout">
+				<!--<view class="addMember_btn df aic jcc" @click="addMemberData">添加</view>-->
+				<button type="default" size="mini" @click="addMemberData(index)" class="m_edit">添加</button>
+				<button type="default" size="mini" @click="addMemberDataCancel(index)" class="m_delete">取消</button>
+			</view>
+
+		</view>
+
+
 		<!-- <locationtemp ref="location_temp"></locationtemp> -->
 	</view>
 </template>
@@ -196,10 +321,17 @@
 				isShowAddMember: false,
 				addedMemberModel: {
 					"IlabAccount": '',
-					"AddUserID": ''
+					"type": ''
 				},
 				currentSelect:{section:-1,buttonType:'',index:-1},
-				Type:'asd'
+				Type:'asd',
+				editDialogshow : false,
+
+				editDialogData : {name : "", type :"", Introduction : ""},
+				proType: ['科幻', '现实', '剧情', '历史', '爱情', '惊悚', '公路', '动画'],
+				addproType: ['编剧', '摄影师' ,'录音师', '灯光师', '创建人'],
+				index_addproType : 0,
+				index_proType : 0,
 			}
 		},
 		components: {
@@ -212,9 +344,11 @@
 				this.index = obj;
 			},
 			editProject(index) {
-				this.title = "是否删除信息?";
-				this.arr = ["删除", "取消"]
+				this.title = "是否修改信息?";
+				this.arr = ["修改", "取消"]
 				this.show = true;
+				this.currentSelect = {section:0,buttonType:'edit',index:index};
+				console.log("修改什么", this.currentSelect);
 			},
 			deleteProject(index) {
 				this.title = "是否删除信息?";
@@ -245,6 +379,114 @@
 				this.callback = "audit"
 				// this.auditshow = true;
 			},
+			editSave() {
+				if (this.editDialogData.name == "") {
+					alert("请输入项目名称~");
+					return false;
+				}
+				if (this.editDialogData.type == "") {
+					alert("请输入项目类型~");
+					return false;
+				}
+				if (this.editDialogData.Introduction == "") {
+					alert("请输入项目介绍~");
+					return false;
+				}
+				// let data = {
+				// 	"CreateUserID":mydata_userInfo.UserID,
+				// 	"ProjectName":this.model.projectName,
+				// 	"Describe":this.model.describe,
+				// 	"Type":this.model.type
+				// }
+				// console.log("请求创建项目",data);
+				// MyRequest.CreateProjectNew(data,function(res){
+				// 	console.log("创建项目成功",res);
+				// },null);
+
+				console.log("创建项目自己ID",mydata_userInfo.UserID);
+
+
+				uni.request({
+					url: this.$Api + "/project/changeprojectinfo",
+					data: {
+						"UserID":this.projectData[0].CreateUserID,
+						"ProjectID" : this.projectData[0].Id,
+						"ProjectName":this.editDialogData.name,
+						"Describe":this.editDialogData.Introduction,              // 项目描述
+						"Type":this.editDialogData.type
+					},
+					method: "POST",
+					dataType: "json",
+					success: res => {
+						console.log('是否成功',res)
+						if (res.data.Code == 100) {
+							// this.projectMembers = res.data.Users;
+							// console.log();
+							// this.$refs.table.getList();
+							this.getlist()
+							this.editDialogshow = false
+							// this.editProject(0)
+							// this.show = false;
+							return true;
+						}
+						// this.tabledata = res.data.Projects
+						// console.log('res=',this.tabledata)
+					}
+				})
+
+
+				// uni.chooseImage({
+				// 	success: (chooseImageRes) => {
+				// 		const tempFilePaths = chooseImageRes.tempFilePaths;
+				// 		uni.uploadFile({
+				// 			url: this.$Api+'/project/uploadprojectfile', //仅为示例，非真实的接口地址
+				// 			filePath: tempFilePaths[0],
+				// 			name: 'file',
+				// 			formData: {
+				// 				// UserID:         //上传用户 id
+				// 				// Name:           //文件名
+				// 				// Type:           //规范文件 剧本 拍摄脚本 分镜头脚本 气氛图 项目简介 项目报告 场景图
+				// 				// ProjectID:      //项目ID
+				//
+				// 				"UserID": this.projectData[0].CreateUserID,
+				// 				"Name": this.editDialogData.name,
+				// 				"Type": this.editDialogData.type,
+				// 				"ProjectID": this.projectData[0].Id,
+				// 			},
+				// 			success: (uploadFileRes) => {
+				// 				console.log('upload ok=', uploadFileRes.data);
+				// 				alert("创建成功");
+				// 				this.model.projectName='';
+				// 				this.model.describe='';
+				// 				this.model.type='科幻';
+				//
+				// 				this.$emit('onBackCreateInfo');
+				// 			}
+				// 		});
+				// 	}
+				// });
+			},
+
+
+			editDialogDetermine(){
+				this.editSave()
+
+
+			},
+			editDialogCancel(){
+				this.editDialogshow = false
+				this.editDialogData = {name : "", type :"", Introduction : ""}
+
+			},
+			// editDialogName(event){
+			// 	this.editDialogData.name = event.target.value
+			// },
+			// editDialogType(event){
+			// 	this.editDialogData.type = event.target.value
+			// },
+			// editDialogIntroduction(event){
+			// 	this.editDialogData.Introduction = event.target.value
+			// },
 			determine(obj) {
 				this.show = false;
 				this.auditshow = false;
@@ -260,12 +502,43 @@
 				// 		break;
 				// }
 				// this.currentSelect = {section:0,buttonType:'delete',index:index};
+
+				console.log("点了 对话框", obj);
 				switch (this.currentSelect.section) {
 					case 0: //項目管理
 						switch (this.currentSelect.buttonType) {
-							case 'delete': 
-								
-								
+							case 'delete':
+								console.log("点了 删除", this.currentSelect);
+								if (obj == 0) {
+									console.log("点了 确定删除", this.currentSelect);
+									this.deleteItemProject()
+								}else if(obj == 1){
+									console.log("点了 取消删除", this.currentSelect);
+								}
+
+
+								break;
+							case 'edit':
+								console.log("点了 修改", this.currentSelect);
+								if (obj == 0) {
+									console.log("点了 确定修改", this.currentSelect,this.projectData[0]);
+
+									// CreateTime: "2021-04-17 11:04:09"
+									// CreateUserID: "1e9c969f-8990-40f2-8a8c-ecbafc5720b2"
+									// CreateUserName: "李力新"
+									// Describe: "999"
+									// Id: 28
+									// ProjectName: "999"
+									// ProjectReviewImage: "http://communication-org-simulation.oss-cn-beijing.aliyuncs.com/project_28_timg.jpeg?Expires=1618634575&OSSAccessKeyId=LTAI4G4obJx7AiUgWThKBL47&Signature=az3xXUG%2F6lmxEBTmRtwZ%2FankjK8%3D"
+									// ReviewImageOss: "project_28_timg.jpeg"
+									// Type: "科幻"
+									this.editDialogData = {name : this.projectData[0].ProjectName, type :this.projectData[0].Type, Introduction : this.projectData[0].Describe}
+									this.editDialogshow = true
+									console.log("修改数据", this.editDialogData);
+								}else if(obj == 1){
+									this.editDialogData = {name : "", type :"", Introduction : ""}
+									console.log("点了 取消修改", this.currentSelect);
+								}
 								break;
 							default:
 								break;
@@ -275,7 +548,7 @@
 					default:
 						break;
 				}
-				
+				this.currentSelect = {section:-1,buttonType:'',index:-1}
 				// console.log(obj)
 			},
 			auditPost(obj) {
@@ -296,12 +569,19 @@
 				uni.request({
 					url: this.$Api + "/project/getprojectcontent",
 					data: {
-						"UserID": this.$UserId
+						"UserID": this.$UserId,
+						"ProjectID": this.projectData[0].Id
 					},
 					method: "POST",
 					dataType: "json",
 					success: res => {
-						this.projectData = res.data.Projects;
+						if (res.data.Code == 100) {
+							this.projectData[0] = null
+							this.projectData[0] = res.data.Project;
+							// ++this.projectData
+							this.$forceUpdate()
+						}
+						console.log("获取了什么样子的信息", this.projectData[0]);
 					}
 				})
 			},
@@ -319,11 +599,12 @@
 					dataType: "json",
 					success: res => {
 						this.fileData = res.data.ProjectItem;
-						// console.log('this.fileData=',this.fileData)
+						console.log('this.fileData=',this.fileData)
 					}
 				})
 			},
 			viewProject(obj) {
+				console.log('进来的什么信息',obj)
 				this.projectData = [obj];
 				this.getFileList();
 				this.getMemberList();
@@ -349,6 +630,60 @@
 			addMember() {
 				this.isShowAddMember = true;
 			},
+			addMemberData(){
+				console.log("添加学生", this.addedMemberModel,this.projectData[0]);
+				// "userID" : "12eqwed12"，
+				// "ProjectID":1,
+				// "DeleteUserID":"12eqwe12"
+				// userID User.Id
+				// ProjectID this.projectData[0].Id,
+
+				// "UserID" : "12eqwed12",    //项目创建人ID
+				// "ProjectID": 10001,        //项目ID
+				// "AddUserID":"12eqwe12"     //添加人员ID 支持ilabID UserID
+				// "Type":"美术师"             //编剧 摄影师 录音师 灯光师 创建人
+				if (this.addedMemberModel.IlabAccount == "") {
+					alert("学员id不能为空")
+					return
+				}
+
+
+				console.log('删掉成员 ')
+
+				let url = this.$Api + "/project/addmember"
+
+
+				let data = {
+					"UserID" : this.projectData[0].CreateUserID,
+					"ProjectID":this.projectData[0].Id,
+					"AddUserID":this.addedMemberModel.IlabAccount,
+					"Type":this.addedMemberModel.type,
+				}
+				console.log('添加成员 发送数据 '," 地址 ",url," 数据 ",data,"项目数据",this.projectData)
+
+				uni.request({
+					url: url,
+					data: data,
+					method: "POST",
+					dataType: "json",
+					success: res => {
+						console.log('添加成员 返回',res)
+						if (res.data.Code == 100) {
+							// this.$refs.table.getList();
+							this.$forceUpdate()
+							this.isShowAddMember = false
+						}
+						this.getMemberList();
+						this.$forceUpdate()
+						this.isShowAddMember = false
+						// this.projectData.splice(index,index);
+					}
+				})
+
+			},
+			addMemberDataCancel(){
+				this.isShowAddMember = false;
+			},
 			onClick_addMember_ok() {
 				console.log("添加学生", this.addedMemberModel);
 				var temp = {
@@ -372,15 +707,17 @@
 				})
 			},
 			onClick_addFile(){
-				
+				console.log("项目 点了添加文件")
 			},
-			deleteProject(){
+			//删除条目
+			deleteItemProject(){
 				console.log('UserID=',this.$UserId)
 				console.log('ProjectID=',this.projectData[0].Id)
 				var temp = {
-					"UserID": this.$UserId, //项目创建人ID
-					"ProjectID": this.projectData[0].Id, //项目ID
+					"UserID":this.projectData[0].CreateUserID,
+					"ProjectID" : this.projectData[0].Id,
 				}
+				console.log("要删除过去的数据为",temp)
 				uni.request({
 					url: this.$Api + "/backstage/deleteproject",
 					data: temp,
@@ -389,6 +726,52 @@
 					success: res => {
 						console.log("delete project ok", res);
 						this.$emit('onBackToProjectList');
+						this.getlist()
+						this.$forceUpdate();//强制刷新页面
+					}
+				})
+			},
+			bindPickerChange_proType: function(e) {
+				this.index_proType = e.target.value;
+				this.editDialogData.type = this.proType[this.index_proType];
+				// console.log(this.model)
+			},
+			bindPickerChange_proTypeadd: function(e) {
+				this.index_addproType = e.target.value;
+				this.addedMemberModel.type = this.addproType[this.index_addproType];
+				// console.log(this.model)
+			},
+			deleteMember(item){
+				// "userID" : "12eqwed12"，
+  				// "ProjectID":1,
+				// "DeleteUserID":"12eqwe12"
+				// userID User.Id
+				// ProjectID this.projectData[0].Id,
+				console.log('删掉成员 ',item)
+
+				let url = this.$Api + "/project/deletemember"
+
+
+				let data = {
+					"userID" : this.projectData[0].CreateUserID,
+					"DeleteUserID":item.User.Id,
+					"ProjectID":this.projectData[0].Id,
+				}
+				console.log('删掉成员 发送数据 '," 地址 ",url," 数据 ",data)
+
+				uni.request({
+					url: url,
+					data: data,
+					method: "POST",
+					dataType: "json",
+					success: res => {
+						console.log('删掉成员 返回',res)
+						if (res.data.Code == 100) {
+							// this.$refs.table.getList();
+							this.getMemberList();
+							this.$forceUpdate();//强制刷新页面
+						}
+						// this.projectData.splice(index,index);
 					}
 				})
 			}
@@ -462,7 +845,15 @@
 		background: #FDEBEC;
 		// opacity: 0.08;
 	}
+	.form-input {
+		width: 100%;
+		border: 1px solid #ece8e8;
+		line-height: 50rpx;
+		font-size: 30rpx;
+		border-radius: 6rpx;
+		padding: 10rpx 40rpx;
 
+	}
 	.m-table-hander {
 		background-color: #FFF8F7;
 		height: 140rpx;
@@ -638,4 +1029,39 @@
 		// justify-content:center;
 		border:1px solid black;
 	}
+	.m_msg {
+		width: 1500rpx;
+		 height: 900rpx;
+		padding: 0rpx 0 40rpx 0;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		border-radius: 10rpx;
+		transform: translate(-50%, -50%);
+		z-index: 100;
+		background-color: #fff;
+		opacity: 1;
+		.layout{
+			position: absolute;
+			left: 50%;
+			bottom: 2%;
+		}
+		.m_edit {
+			position: relative;
+			left: 20%;
+
+			transform: translate(-50%, -50%);
+			background: rgb(67, 127, 250);
+			color: rgb(255, 255, 255);
+			min-width: 130rpx;
+		}
+		.m_delete {
+			position: relative;
+			left: 50%;
+			min-width: 130rpx;
+			transform: translate(-50%, -50%);
+			background: rgb(234, 37, 44);
+			color: rgb(255, 255, 255);
+		}
+	}
 </style>

components/home/teacher/table.vue

@@ -67,7 +67,7 @@
 					success: res => {
 						this.tabledata = res.data.Projects
 						// console.log("table页面请求所有项目",res);
-						// this.$forceUpdate();//强制刷新页面
+						this.$forceUpdate();//强制刷新页面
 					}
 				})
 			},

components/home/teacherCreation.vue

@@ -92,10 +92,13 @@
 			project,
 			location
 		},
+		onLoad(){
+			// uni.$on('add', this.add)
+		},
 		methods: {
 		
 			checkMenu(obj, i) {
-					// console.log('index=',obj.id)
+					console.log('index=',obj.id)
 				this.index = obj.id;
 				if (i == 0) {
 					this.index = obj.id;

components/login/login.vue

@@ -10,7 +10,7 @@
 			</view>
 			<!-- 中间竖线 -->
 			<view class="login-middleline"></view>
-			<ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole>
+			<!-- <ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole> -->
 			<LoginByPWD class="showborder" v-show="visibleLoginByPWD" v-on:onLogin="onLogin" v-on:onForget="onForget"></LoginByPWD>
 			<ResetPWD v-show="visibleResetPWD" v-on:onLogin="onLogin"></ResetPWD>
 		</view>
@@ -18,18 +18,18 @@
 </template>
 
 <script>
-	import ChooseRole from './chooseRole.vue'
+	// import ChooseRole from './chooseRole.vue'
 	import LoginByPWD from './loginByPWD.vue'
 	import ResetPWD from './resetPWD.vue'
 	export default {
 		components: {
-			ChooseRole,
+			// ChooseRole,
 			LoginByPWD,
 			ResetPWD
 		},
 		data() {
 			return {
-				visibleChooseRole: true,
+				// visibleChooseRole: true,
 				visibleLoginByPWD: false,
 				visibleResetPWD: false,
 				//当前登录类型T教师S学生
@@ -38,22 +38,22 @@
 		},
 		methods: {
 			initData() {
-				this.visibleChooseRole = true;
-				this.visibleLoginByPWD = false;
+				// this.visibleChooseRole = true;
+				this.visibleLoginByPWD = true;
 				this.visibleResetPWD = false;
 			},
 			onLogin: function() {
 				// console.log("登录成功login");
 				getApp().globalData.bLogin = true;
 				this.$emit("onLogin");
-				this.visibleChooseRole = false;
+				// this.visibleChooseRole = false;
 				this.visibleLoginByPWD = false;
 				this.visibleResetPWD = false;
 			},
 			onChoose(type) {
 				// console.log("onChoose", type)
 				this.roleType = type;
-				this.visibleChooseRole = false;
+				// this.visibleChooseRole = false;
 				this.visibleLoginByPWD = true;
 				mydata_userInfo.role = type;
 			},

components/login/loginByPWD.vue

@@ -95,9 +95,11 @@
 							if (data.Image != '') {
 								mydata_userInfo.avatarSrc = data.Image;
 							}
+							console.log("登陆成功data=",data);
 							mydata_userInfo.Name = data.Name;
 							mydata_userInfo.UserID = data.UserID;
 							mydata_userInfo.Position = data.Position;
+							mydata_userInfo.role = data.Type;
 							// console.log("登陆成功，个人信息", mydata_userInfo);
 							if (mydata_userInfo.role == '老师') {
 								userController.updateStudentList(null,null);

components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -252,8 +252,28 @@
 				this.resetCurCheckedAnswer();
 			},
 			onClick_test_next() {
-				this.curQIndex++;
-				this.resetCurCheckedAnswer();
+				if (this.checkedAnswer() == true) {
+					this.curQIndex++;
+					this.resetCurCheckedAnswer();
+				}else{
+					alert("必须选择一个答案");
+				}
+			},
+
+			checkedAnswer(){
+				let count = 0
+				let countMax = this.curCheckedAnswer.length
+				for (let i = 0; i <this.curCheckedAnswer.length ; i++) {
+
+					if (this.curCheckedAnswer[i] == 0) {
+						count++
+					}
+				}
+				if (count == countMax ) {
+					return false
+				}else{
+					return true
+				}
 			},
 			onClick_test_finish() {
 				console.log("所有答案", this.allCheckedAnswer);

components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -264,9 +264,33 @@
 				this.resetCurCheckedAnswer();
 			},
 			onClick_test_next() {
-				this.curQIndex++;
-				this.resetCurCheckedAnswer();
+				console.log("这道题选了什么", this.curCheckedAnswer);
+				if (this.checkedAnswer() == true) {
+					this.curQIndex++;
+					this.resetCurCheckedAnswer();
+				}else{
+					alert("必须选择一个答案");
+				}
+
 			},
+
+
+			checkedAnswer(){
+				let count = 0
+				let countMax = this.curCheckedAnswer.length
+				for (let i = 0; i <this.curCheckedAnswer.length ; i++) {
+
+					if (this.curCheckedAnswer[i] == 0) {
+						count++
+					}
+				}
+				if (count == countMax ) {
+					return false
+				}else{
+					return true
+				}
+			},
+
 			onClick_test_finish() {
 				console.log("所有答案", this.allCheckedAnswer);
 				//检验一下答案

components/student/survey.vue

@@ -246,8 +246,30 @@
 				this.resetCurCheckedAnswer();
 			},
 			onClick_test_next() {
-				this.curQIndex++;
-				this.resetCurCheckedAnswer();
+
+				// console.log("这道题选了什么", this.curCheckedAnswer);
+				if (this.checkedAnswer() == true) {
+					this.curQIndex++;
+					this.resetCurCheckedAnswer();
+				}else{
+					alert("必须选择一个答案");
+				}
+			},
+
+			checkedAnswer(){
+				let count = 0
+				let countMax = this.curCheckedAnswer.length
+				for (let i = 0; i <this.curCheckedAnswer.length ; i++) {
+
+					if (this.curCheckedAnswer[i] == 0) {
+						count++
+					}
+				}
+				if (count == countMax ) {
+					return false
+				}else{
+					return true
+				}
 			},
 			onClick_test_finish() {
 				console.log("所有答案", this.allCheckedAnswer);

components/student/table.vue

@@ -67,6 +67,7 @@
 					
 						this.tabledata = res.data.Projects
 						// console.log('res=',this.tabledata)
+						this.$forceUpdate();//强制刷新页面
 					}
 				})
 			},

components/user/selfInfo.vue

@@ -11,12 +11,12 @@
 			</view>
 		</view>
 		<view class="user-full" v-show="showIndex_userInfo==1">
-			<view class="box1 df fdr aic">
-				<view class="self-avatar df">
-					<img :src="userInfo.avatarSrc"></img>
-				</view>
-				<view class="self-btn02 df jcc aic" @click="onUploadAvatar">上传头像</view>
-			</view>
+			<!--<view class="box1 df fdr aic">-->
+				<!--<view class="self-avatar df">-->
+					<!--<img :src="userInfo.avatarSrc"></img>-->
+				<!--</view>-->
+				<!--<view class="self-btn02 df jcc aic" @click="onUploadAvatar">上传头像</view>-->
+			<!--</view>-->
 			<view class="box2 df ">
 				<view class="box2-content">
 					<view class="title df fdr aic">
@@ -312,6 +312,7 @@
 			}
 		},
 		onUploadAvatar(){
+			console.log("点我了吗")
 			uni.chooseFile({
 			    success: (chooseFileRes) => {
 			        const tempFilePaths = chooseFileRes.tempFilePaths;
@@ -332,7 +333,7 @@
 							    url: this.$Api + "/user/getuserinfo", //仅为示例，非真实的接口地址
 								method: 'POST',
 								data: {
-									'UserID':this.$UserId, 
+									'UserID':this.$UserId,
 								},
 								dataType: 'json',
 								success: (res) => {