Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

zengyicheng 3 years ago
parent
7849c31d17 fab716f490
commit
c750244569
12 changed files with 46 additions and 14 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.2ad8719b7cb9289477d56ceea87c942d.css.map
  3. 0 0
      dist/static/css/app.6b8f6a5746aabc5aed0aaad6de326acc.css
  4. 0 0
      dist/static/css/app.6b8f6a5746aabc5aed0aaad6de326acc.css.map
  5. 0 0
      dist/static/js/app.124edf7c46759fd6f89d.js
  6. 0 0
      dist/static/js/app.124edf7c46759fd6f89d.js.map
  7. 0 0
      dist/static/js/app.f4abef3a9a4420712061.js
  8. 0 0
      dist/static/js/app.f4abef3a9a4420712061.js.map
  9. 0 0
      dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
  10. 2 1
      src/components/pages/addCourse.vue
  11. 15 6
      src/components/pages/components/worksDetail2.vue
  12. 28 6
      src/components/pages/data.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,4 +25,4 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.2ad8719b7cb9289477d56ceea87c942d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.2acf8ad908015a64b66a.js></script><script type=text/javascript src=./static/js/app.f4abef3a9a4420712061.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
 
+    }</style><link href=./static/css/app.6b8f6a5746aabc5aed0aaad6de326acc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.2acf8ad908015a64b66a.js></script><script type=text/javascript src=./static/js/app.124edf7c46759fd6f89d.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.2ad8719b7cb9289477d56ceea87c942d.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.6b8f6a5746aabc5aed0aaad6de326acc.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.6b8f6a5746aabc5aed0aaad6de326acc.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.124edf7c46759fd6f89d.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.124edf7c46759fd6f89d.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f4abef3a9a4420712061.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f4abef3a9a4420712061.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.85f48b0184f614b2b8d9.js.map


+ 2 - 1
src/components/pages/addCourse.vue
View File 

@@ -510,7 +510,7 @@
 
               </div>
 
             </div>
 
           </div>
 
-          <div class="rightBox" v-if="this.steps == 3">
 
+          <div class="rightBox" v-if="this.steps == 3" ref="rightboxR">
 
             <div class="basic_box">
 
               <div
 
                 style="
 
@@ -3092,6 +3092,7 @@ export default {
 
     },
 
     unitSet(i) {
 
       this.unitIndex = i;
 
+      this.$refs.rightboxR.scrollTop = 0;
 
     },
 
     time() {
 
       if (!this.now) {

+ 15 - 6
src/components/pages/components/worksDetail2.vue
View File 

@@ -2279,6 +2279,7 @@ export default {
 
   justify-content: center;
 
   padding: 20px 0px;
 
   flex-direction: column;
 
+  height: calc(100% - 50px);
 
 }
 
 
 .zyBox {
 
@@ -2361,6 +2362,10 @@ export default {
 
 .max_diy >>> .el-dialog {
 
   /* max-width: 1200px; */
 
   max-width: 1300px;
 
+  /* height:800px */
 
+}
 
+.max_diy >>> .el-dialog__body {
 
+  height: 800px;
 
 }
 
 
 .dialog_diy2 >>> .el-dialog__header {
 
@@ -2372,7 +2377,7 @@ export default {
 
   font-size: 15px;
 
 }
 
 .dialog_diy2 >>> .el-dialog__headerbtn {
 
-  top: 14px;
 
+  top: 12px;
 
 }
 
 .dialog_diy2 >>> .el-dialog__headerbtn .el-dialog__close {
 
   color: #fff;
 
@@ -2584,6 +2589,8 @@ export default {
 
   flex-wrap: nowrap;
 
   align-items: flex-start;
 
   width: 100%;
 
+  height: calc(100% - 60px);
 
+  overflow: auto;
 
 }
 
 .right_score {
 
   min-width: 370px;
 
@@ -2596,7 +2603,8 @@ export default {
 
   margin-right: 10px;
 
   background: rgb(255, 255, 255);
 
   /* padding-right: 10px; */
 
-  height: 500px;
 
+  /* height: 500px; */
 
+  height: 100%;
 
 }
 
 .cTitle {
 
   background: #205cc6;
 
@@ -2626,7 +2634,7 @@ export default {
 
   width: 100%;
 
   margin: 0 auto;
 
   overflow: auto;
 
-  height: 400px;
 
+  height: calc(100% - 90px);
 
   overflow-x: hidden;
 
 }
 
 .cru_selectBox::-webkit-scrollbar {
 
@@ -2762,7 +2770,8 @@ export default {
 
   width: 100%;
 
   flex-wrap: nowrap;
 
   overflow: auto;
 
-  height: 500px;
 
+  /* height: 500px; */
 
+  height: 100%;
 
 }
 
 .answerbox {
 
   display: flex;
 
@@ -2834,8 +2843,8 @@ export default {
 
   align-items: baseline;
 
 }
 
 .fullBox {
 
-  overflow: unset !important;
 
-  height: auto !important;
 
+  /* overflow: unset !important;
 
+  height: auto !important; */
 
 }
 
 .fullZyBox {
 
   width: 60% !important;

+ 28 - 6
src/components/pages/data.vue
View File 

@@ -80,16 +80,22 @@
 
               placeholder="请输入手机号码"
 
             ></el-input>
 
           </el-form-item> -->
 
-          <!-- <el-form-item label="组织" prop="sBySchool">
 
+          <el-form-item label="组织" prop="org">
 
             <el-select
 
-              v-model="ruleForm.sBySchool"
 
+              v-model="ruleForm.org"
 
               clearable
 
-              placeholder="请选择组织"
 
+              placeholder="暂无组织"
 
               disabled
 
             >
 
-              <el-option :value="ruleForm.sBySchool"> </el-option>
 
+              <el-option
 
+                v-for="item in orgJuri"
 
+                :key="item.id"
 
+                :label="item.name"
 
+                :value="item.id"
 
+              >
 
+              </el-option>
 
             </el-select>
 
-          </el-form-item> -->
 
+          </el-form-item>
 
           <el-form-item label="学校" prop="sBySchool">
 
             <el-select
 
               v-model="ruleForm.sBySchool"
 
@@ -171,11 +177,13 @@ export default {
 
         // mail: "",
 
         phone: "",
 
         sBySchool: "",
 
+        org: "",
 
         headportrait: "",
 
       },
 
       tx: require("../../assets/avatar.png"),
 
       userinfo: "",
 
       schoolJuri: [],
 
+      orgJuri: [],
 
       userid: this.$route.query.userid,
 
       rules: {
 
         pass: [{ validator: validatePass, trigger: "blur" }],
 
@@ -215,7 +223,19 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
-
 
+    getOrg() {
 
+      this.isLoading = true;
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectorg2", "")
 
+        .then((res) => {
 
+          this.isLoading = false;
 
+          this.orgJuri = res.data[0];
 
+        })
 
+        .catch((err) => {
 
+          this.isLoading = false;
 
+          console.error(err);
 
+        });
 
+    },
 
     submitForm(formName) {
 
       this.$refs[formName];
 
       let params = [
 
@@ -267,6 +287,7 @@ export default {
 
           if (res.data[0][0]) {
 
             res.data[0][0].sex = res.data[0][0].sex ? "女" : "男";
 
             this.ruleForm = res.data[0][0];
 
+            this.ruleForm.org = res.data[0][0].org.split(",")[0];
 
             this.ruleForm.type = res.data[0][0].type == 1 ? "老师" : "学生";
 
             console.log(res.data[0][0]);
 
           }
 
@@ -278,6 +299,7 @@ export default {
 
   },
 
   created() {
 
     this.getSchool();
 
+    this.getOrg();
 
     this.getDetail();
 
   },
 
 };

Some files were not shown because too many files changed in this diff