1

Signed-off-by: lcw <1324309909@qq.com>

src/App.vue

@@ -15,9 +15,9 @@
         <span class="user_name">{{
           this.$store.state.userInfo ? this.$store.state.userInfo.name : "用户"
         }}</span>
-        <div>
+        <div @click="exit">
           <i class="exitI"></i>
-          <el-button type="text" style="color: white" @click="exit"
+          <el-button type="text" style="color: white" 
             >退出</el-button
           >
         </div>

src/components/login.vue

@@ -47,7 +47,7 @@
           <el-button type="text" @click="islogin = false">立即注册</el-button>
         </div>
         <div class="login_button">
-          <button @click="login()">登录</button>
+          <button @click="findPhone()">登录</button>
         </div>
       </div>
     </div>
@@ -98,21 +98,16 @@
               style="width: 100%"
             ></el-input>
           </el-form-item>
-          <el-form-item label="角色" prop="school">
-            <el-select
-              v-model="registerForm.school"
-              style="width: 80%"
-              placeholder="请选择角色"
-            >
-              <!-- <el-option
-                v-for="item in schoolArray"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option> -->
-              <el-option value="1">老师</el-option>
-              <el-option value="2">学生</el-option>
-            </el-select>
+          <el-form-item label="学校" prop="school">
+            <el-select v-model="registerForm.school" placeholder="请选择学校">
+								<el-option
+									v-for="(item, index) in schoolArray"
+									:key="index"
+									:label="item.name"
+									:value="item.id"
+								>
+								</el-option>
+							</el-select>
           </el-form-item>
         </el-form>
         <div style="display: flex; justify-content: flex-end">
@@ -217,6 +212,7 @@ export default {
   },
   created() {
     // this.getOrg();
+    this.getSchool();
   },
   methods: {
     time() {
@@ -241,7 +237,7 @@ export default {
               {
                 username: this.registerForm.rphoneNum,
                 userpassword: this.registerForm.repassword,
-                type: this.registerForm.school,
+                oid: this.registerForm.school,
               },
             ];
             this.ajax
@@ -300,7 +296,6 @@ export default {
       if (this.time()) {
         var _this = this;
         var isU = _this.isU;
-        this.findPhone();
         if (isU == 1) {
           let params = [
             {
@@ -359,6 +354,16 @@ export default {
     //       console.error(err);
     //     });
     // },
+    getSchool() {
+				this.ajax
+					.get(this.$store.state.api + "selectOrg", "")
+					.then((res) => {
+						this.schoolArray = res.data[0];
+					})
+					.catch((err) => {
+						console.error(err);
+					});
+			},
   },
 };
 </script>

src/components/pages/class.vue

@@ -162,6 +162,8 @@
 			insertClass() {
 				let params = {
 					name: this.className,
+					oid: this.$store.state.userInfo.organizeid,
+					uid: this.$store.state.userInfo.userid,
 				};
 				this.ajax
 					.get(this.$store.state.api + "insertClass", params)

src/components/pages/course.vue

@@ -30,11 +30,16 @@
 			</div>
 			<div class="student_table">
 				<div class="course_box">
-					<div class="out_box">
-						<div class="tup"><img src="../../assets/kc1.png" alt="" /></div>
+					<div class="out_box" v-for="(item, index) in course" :key="index">
+						<div class="tup">
+							<img
+								:src="item.cover != null && item.cover != '' ? JSON.parse(item.cover).length > 0 ? JSON.parse(item.cover)[0].url : mr : mr"
+								alt=""
+							/>
+						</div>
 						<div class="bottom_box">
-							<div>制作一台太阳能路灯</div>
-							<div class="kc_time">2021-09-02 10:42:57</div>
+							<div>{{ item.title }}</div>
+							<div class="kc_time">{{ item.time }}</div>
 						</div>
 						<div class="three_bottom">
 							<div @click="jump">开始教学</div>
@@ -42,7 +47,7 @@
 							<div>作业</div>
 						</div>
 					</div>
-					<div class="out_box">
+					<!-- <div class="out_box">
 						<div class="tup"><img src="../../assets/kc1.png" alt="" /></div>
 						<div class="bottom_box">
 							<div>制作一台太阳能路灯</div>
@@ -77,7 +82,7 @@
 							<div>修改文档模板</div>
 							<div>作业</div>
 						</div>
-					</div>
+					</div> -->
 				</div>
 				<!-- <div class="course_empty" >暂无数据</div> -->
 			</div>
@@ -109,6 +114,7 @@
 				itemCount: 1,
 				courseTitle: "",
 				courseText: "",
+				courseTime: "",
 				isLoading: false,
 				fileList: [],
 				fileList1: [],
@@ -129,6 +135,8 @@
 				addCourse: {},
 				groupA: "",
 				classX: "",
+				course: [],
+				mr: require("../../assets/icon/kc1.png"),
 			};
 		},
 		methods: {
@@ -154,7 +162,7 @@
 					return "";
 				}
 			},
-			jump(){
+			jump() {
 				window.open("");
 			},
 			handle_remove(file, fileList) {
@@ -180,7 +188,6 @@
 			handleCurrentChange(val) {
 				// console.log(`当前页: ${val}`);
 				this.page = val;
-				this.getCourse();
 			},
 			init() {
 				this.itemCount = 1;
@@ -261,14 +268,25 @@
 					}
 				}
 			},
+			getCourse() {
+				this.ajax
+					.get(this.$store.state.api + "selectCourse", "")
+					.then((res) => {
+						this.course = res.data[0];
+						console.log(res.data);
+					})
+					.catch((err) => {
+						console.error(err);
+					});
+			},
 			search() {
 				this.page = 1;
 				this.isLoading = true;
-				this.getCourse();
 			},
 		},
 		created() {
 			this.page = 1;
+			this.getCourse();
 		},
 	};
 </script>
@@ -465,9 +483,16 @@
 		border-right: 1px solid #ccc;
 		box-sizing: border-box;
 	}
+	.bottom_box > div:nth-child(1) {
+		width: 230px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 
 	.tup {
 		width: 100%;
+		height: 141.06px;
 		margin: 0 auto;
 	}
 
@@ -495,7 +520,7 @@
 		border-right: 1px solid #ccc;
 		font-size: 14px;
 	}
-	.three_bottom>div:nth-child(1){
+	.three_bottom > div:nth-child(1) {
 		cursor: pointer;
 	}
 </style>

src/components/pages/data.vue

@@ -12,7 +12,7 @@
 					label-width="100px"
 					class="demo-ruleForm"
 				>
-					<el-form-item label="姓名" prop="name">
+					<el-form-item label="姓名" prop="teacherName">
 						<el-input
 							v-model="ruleForm.name"
 							style="width: 250px"
@@ -39,20 +39,16 @@
 							placeholder="请输入手机号码"
 						></el-input>
 					</el-form-item>
-					<el-form-item label="学校选择" prop="school">
-						<el-select v-model="ruleForm.sBySchool" placeholder="请选择学校">
-							<el-option
-								v-for="(item, index) in schoolJuri"
-								:key="index"
-								:label="item.name"
-								:value="item.id"
-							>
-							</el-option>
-						</el-select>
+					<el-form-item label="学校" prop="sBySchool">
+						<el-input
+							disabled
+							v-model="ruleForm.sBySchool"
+							style="width: 300px"
+						></el-input>
 					</el-form-item>
-					<el-form-item label="个人简介" prop="desc">
+					<el-form-item label="个人简介" prop="intro">
 						<el-input
-							v-model="ruleForm.desc"
+							v-model="ruleForm.intro"
 							type="textarea"
 							:rows="5"
 							resize="none"
@@ -98,11 +94,12 @@
 					name: "",
 					type: [],
 					sex: "男",
-					desc: "",
+					intro: "",
 					mail: "",
 					phone: "",
 					sBySchool: "",
 				},
+				userinfo:"",
 				schoolJuri: [],
 				rules: {
 					pass: [{ validator: validatePass, trigger: "blur" }],
@@ -124,32 +121,7 @@
 				},
 			};
 		},
-		mounted() {
-			this.$nextTick(function () {
-				this.tableHeight =
-					window.innerHeight - this.$refs.table.$el.offsetTop - 200;
-				if (this.tableHeight <= 530) {
-					this.tableHeight = 530;
-				}
-				// 监听窗口大小变化
-				let self = this;
-				window.onresize = function () {
-					self.tableHeight =
-						window.innerHeight - self.$refs.table.$el.offsetTop - 200;
-					if (self.tableHeight <= 530) {
-						self.tableHeight = 530;
-					}
-				};
-			});
-		},
 		methods: {
-			tableRowClassName({ row, rowIndex }) {
-				if ((rowIndex + 1) % 2 === 0) {
-					return "even_row";
-				} else {
-					return "";
-				}
-			},
 			getSchool() {
 				this.isLoading = true;
 				let params = {
@@ -175,8 +147,7 @@
 						ph: this.ruleForm.phone,
 						sex: this.ruleForm.sex == "男" ? "0" : "1",
 						email: this.ruleForm.mail,
-						oid: this.ruleForm.sBySchool,
-						js: this.ruleForm.desc,
+						js: this.ruleForm.intro,
 					},
 				];
 				this.ajax
@@ -186,23 +157,38 @@
 							message: "修改成功",
 							type: "success",
 						});
-						this.getDetail();
+						this.getUser();
 					})
 					.catch((err) => {
 						this.$message.error("修改失败");
 						console.error(err);
 					});
 			},
+			getUser() {
+				let params = { uid: this.$store.state.userInfo.userid };
+				this.ajax
+					.get(this.$store.state.api + "getUser", params)
+					.then((res) => {
+						this.userinfo = res.data[0][0];
+						// this.$cookies.set("userInfo", this.userinfo, -1);
+               			 this.$cookies.set("teacherInfo", res.data[0][0], -1);
+						this.$store.commit("update", ["userInfo", this.userinfo]);
+						console.log(res.data[0][0]);
+					})
+					.catch((err) => {
+						console.error(err);
+					});
+			},
 			getDetail() {
 				let params = { uid: this.$store.state.userInfo.userid };
 				this.ajax
-					.get(this.$store.state.api + "findTeacherDeail", params)
+					.get(this.$store.state.api + "getUser", params)
 					.then((res) => {
 						res.data[0][0].sex = res.data[0][0].sex ? "女" : "男";
 						this.ruleForm = res.data[0][0];
+						console.log(res.data[0][0]);
 					})
 					.catch((err) => {
-						// this.$message.error("删除失败");
 						console.error(err);
 					});
 			},

src/components/pages/notice.vue

@@ -23,6 +23,9 @@
 						align="center"
 						:show-overflow-tooltip="true"
 					>
+						<template slot-scope="scope"
+							><div v-html="snippet(scope.row.content)"></div
+						></template>
 					</el-table-column>
 					<el-table-column
 						prop="creater"
@@ -75,7 +78,7 @@
 				<div class="logoImg">
 					<img src="../../assets/logo.png" alt="" />
 				</div>
-				<div class="title_add_student">查看作业</div>
+				<div class="title_add_student">查看通知</div>
 			</div>
 			<div>
 				<div class="pb_head">
@@ -84,7 +87,7 @@
 						res.creater ? res.creater : "未知"
 					}}</span>
 				</div>
-				<div class="notice_content" v-html="res.newscontent"></div>
+				<div class="notice_content cont" v-html="res.newscontent"></div>
 			</div>
 			<span slot="footer" class="dialog-footer">
 				<el-button class="close" @click="dialogVisible = false" type="primary"
@@ -105,11 +108,7 @@
 				isLoading: false,
 				formLabelWidth: "100px",
 				dialogVisible: false,
-				title: "国学经典之《汉书》",
-				newscontent:
-					"《汉书》，又称《前汉书》，由我国东汉时期的历史学家班固编撰，是中国第一部纪传体断代史，“二十四史之一”。" +
-					"《汉书》是继《史记》之后我国古代又一部重要史书，与《史记》、《后汉书》、《三国志》并称为“前四史”。《汉书》全书主要记述了上起西汉的汉高祖元年（公元前206年），下至新朝的王莽地皇四年，共230年的史事。" +
-					"《汉书》包括纪十二篇，表八篇，志十篇，传七十篇，共一百篇，后人划分一百二十卷，共八十万字。",
+				title: "",
 				tableData: [],
 				res: [],
 			};
@@ -270,4 +269,47 @@
 		background: #0e72e6;
 		padding: 0 !important;
 	}
+	/* table 样式 */
+	.cont >>> table {
+		border-top: 1px solid #ccc;
+		border-left: 1px solid #ccc;
+	}
+	.cont >>> table td,
+	.cont >>> table th {
+		border-bottom: 1px solid #ccc;
+		border-right: 1px solid #ccc;
+		padding: 3px 5px;
+	}
+	.cont >>> table th {
+		border-bottom: 2px solid #ccc;
+		text-align: center;
+	}
+	/* blockquote 样式 */
+	.cont >>> blockquote {
+		display: block;
+		border-left: 8px solid #d0e5f2;
+		padding: 5px 10px;
+		margin: 10px 0;
+		line-height: 1.4;
+		font-size: 100%;
+		background-color: #f1f1f1;
+	}
+	/* code 样式 */
+	.cont >>> code {
+		display: inline-block;
+		*display: inline;
+		*zoom: 1;
+		background-color: #f1f1f1;
+		border-radius: 3px;
+		padding: 3px 5px;
+		margin: 0 3px;
+	}
+	.cont >>> pre code {
+		display: block;
+	}
+	/* ul ol 样式 */
+	.cont >>> ul,
+	ol {
+		margin: 10px 0 10px 20px;
+	}
 </style>

src/components/pages/student.vue

@@ -87,7 +87,7 @@
 								class="de_button"
 								type="primary"
 								size="small"
-								@click="deleteStudent(scope.row.id)"
+								@click="deleteStudent(scope.row.userid, scope.row.state)"
 								>删除</el-button
 							>
 						</template>
@@ -128,15 +128,11 @@
 							</span>
 						</el-form-item>
 						<el-form-item label="所属学校" :label-width="formLabelWidth">
-							<el-select v-model="sBySchool" placeholder="请选择学校">
-								<el-option
-									v-for="(item, index) in schoolJuri"
-									:key="index"
-									:label="item.name"
-									:value="item.id"
-								>
-								</el-option>
-							</el-select>
+							<el-input
+								disabled
+								style="width: 300px"
+								:value="this.$store.state.userInfo.schoolName"
+							></el-input>
 						</el-form-item>
 						<el-form-item label="班级" :label-width="formLabelWidth">
 							<el-select v-model="sByClass" placeholder="请选择班级">
@@ -149,6 +145,9 @@
 								</el-option>
 							</el-select>
 						</el-form-item>
+						<div style="text-align: center; color: #adb3b7">
+							注：添加学生的账号密码为123456
+						</div>
 					</el-form>
 					<span slot="footer" class="dialog-footer flex">
 						<el-button class="right" @click="insertStudent">确认</el-button>
@@ -181,7 +180,8 @@
 				dialogVisible: false,
 				sName: "",
 				sPhone: "",
-				sBySchool: "",
+				// sBySchool: [],
+				// sBySchoolName:"",
 				sByClass: "",
 				schoolJuri: [],
 				classJuri: [],
@@ -223,12 +223,9 @@
 			},
 			addStudent() {
 				this.dialogVisible = true;
-				(this.sName = ""),
-					(this.sPhone = ""),
-					(this.sBySchool = ""),
-					(this.sByClass = "");
+				(this.sName = ""), (this.sPhone = ""), (this.sByClass = "");
 				this.getClass();
-				this.getSchool();
+				// this.getSchool();
 			},
 			handleClose(done) {
 				done();
@@ -280,9 +277,6 @@
 				} else if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)) {
 					this.$message.error("手机号格式不正确");
 					return;
-				} else if (this.sBySchool === "") {
-					this.$message.error("请为学生选择班级");
-					return;
 				}
 				if (this.time()) {
 					let params = { un: this.sPhone };
@@ -304,8 +298,9 @@
 				let params = {
 					ph: this.sPhone,
 					username: this.sName,
+					userpassword: 123456,
 					type: 2,
-					oid: this.sBySchool,
+					oid: this.$store.state.userInfo.organizeid,
 					tid: this.$store.state.userInfo.userid,
 					cid: this.sByClass,
 				};
@@ -320,7 +315,7 @@
 						this.dialogVisible = false;
 						this.sPhone = "";
 						this.sName = "";
-						this.sBySchool = [];
+						// this.sBySchool = [];
 						this.sByClass = [];
 						this.getStudent();
 					})
@@ -353,22 +348,22 @@
 						console.error(err);
 					});
 			},
-			getSchool() {
-				this.isLoading = true;
-				let params = {
-					page: this.page,
-				};
-				this.ajax
-					.get(this.$store.state.api + "selectOrg", params)
-					.then((res) => {
-						this.isLoading = false;
-						this.schoolJuri = res.data[0];
-					})
-					.catch((err) => {
-						this.isLoading = false;
-						console.error(err);
-					});
-			},
+			// getSchool() {
+			// 	this.isLoading = true;
+			// 	let params = {
+			// 		page: this.page,
+			// 	};
+			// 	this.ajax
+			// 		.get(this.$store.state.api + "selectOrg", params)
+			// 		.then((res) => {
+			// 			this.isLoading = false;
+			// 			this.schoolJuri = res.data[0];
+			// 		})
+			// 		.catch((err) => {
+			// 			this.isLoading = false;
+			// 			console.error(err);
+			// 		});
+			// },
 			getStudent() {
 				this.isLoading = true;
 				let params = {
@@ -637,10 +632,50 @@
 					reader.readAsBinaryString(f);
 				}
 			},
+			// getSchoolName() {
+			// 	let params = {
+			// 		oid: this.$store.state.userInfo.organizeid,
+			// 	};
+			// 	this.ajax
+			// 		.get(this.$store.state.api + "selectSchoolName", params)
+			// 		.then((res) => {
+			// 			this.sBySchool = res.data[0];
+			// 			this.sBySchoolName = this.sBySchool[0].name;
+			// 		})
+			// 		.catch((err) => {
+			// 			console.error(err);
+			// 		});
+			// },
+			deleteStudent(id, state) {
+				state = 0;
+				let params = [{ uid: id, state: state}];
+				this.$confirm("确定" + "删除" + "此学生吗?", "提示", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				})
+					.then(() => {
+						this.ajax
+							.post(this.$store.state.api + "deleteStudent", params)
+							.then((res) => {
+								this.$message({
+									message: "操作成功",
+									type: "success",
+								});
+								this.getStudent();
+							})
+							.catch((err) => {
+								this.$message.error("操作失败");
+								console.error(err);
+							});
+					})
+					.catch(() => {});
+			},
 		},
 		created() {
 			this.page = 1;
 			this.getStudent();
+			// this.getSchoolName();
 		},
 	};
 </script>

src/components/pages/works.vue

@@ -2,14 +2,14 @@
 	<div class="pb_content">
 		<div class="pb_head">
 			<span>评价管理</span>
-			<span>备注：教师可以根据课程、班级条件筛选学生并查看该学生信息</span>
+			<!-- <span>备注：教师可以根据课程、班级条件筛选学生并查看该学生信息</span> -->
 		</div>
 		<div class="pb_content_body">
 			<div class="student_head">
 				<div class="student_search" v-if="this.choose == 0">
 					<div>项目筛选</div>
 					<el-select
-						v-model="project"
+						v-model="projectchoose"
 						placeholder="请选择课程"
 						@change="searchProject"
 					>
@@ -365,6 +365,7 @@
 				subjectJuri: [],
 				projectJuri: [],
 				grade: [],
+				projectchoose:"",
 				rateList: {
 					ca: 0,
 					sia: 0,
@@ -495,7 +496,7 @@
 				this.isLoading = true;
 				let params = {
 					cu: "",
-					cn: "",
+					cn: this.projectchoose,
 					page: this.page,
 				};
 				this.ajax

src/config/config.js

@@ -9,8 +9,8 @@ const store = new Vuex.Store({
         luyou:1,
         userInfo: {},
         nCount:0,
-        api: 'https://pbl.cocorobo.cn/api/pbl/',
-        // api: 'http://localhost:7003/pbl/',
+        // api: 'https://pbl.cocorobo.cn/api/pbl/',
+        api: 'http://localhost:7003/pbl/',
     },
 
     mutations: {