lsc 2 years ago
parent
commit
4d0720eb42

+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.61e05f4bd0263c135afff1b5192cc436.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.22ce41e1fce64bc5d1cf.js></script><script type=text/javascript src=./static/js/app.0ae9eebde047cc09717e.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.e8cff7d4b599ccebfb554d97540a3c19.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.22ce41e1fce64bc5d1cf.js></script><script type=text/javascript src=./static/js/app.08ecd42bd49fca52143e.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


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


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


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


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


+ 57 - 63
src/components/components/askStatic.vue

@@ -4,20 +4,12 @@
       <div style="font-size: 25px">{{ askJSONC.askJson.askTitle }}</div>
     </div>
     <div class="a_addBox">
-      <div
-        class="a_add_box"
-        v-for="(item, index) in askJSONC.askJson.askJson"
-        :key="index"
-      >
+      <div class="a_add_box" v-for="(item, index) in askJSONC.askJson.askJson" :key="index">
         <div class="a_add_head">
           <div>
             <span>{{ index + 1 + "、" + item.askstitle }}</span>
           </div>
-          <el-button
-            type="primary"
-            @click="getA(checkJson[index].checkPerson, item.checkList)"
-            >查看答题学生</el-button
-          >
+          <el-button type="primary" @click="getA(checkJson[index].checkPerson, item.checkList)">查看答题学生</el-button>
         </div>
         <div class="a_add_body">
           <div class="a_add_input width100">
@@ -25,29 +17,19 @@
               <span>选项</span><span>小计</span><span>比例</span>
             </div>
             <div class="a_add_persent">
-              <div
-                class="a_add_persent_div"
-                v-for="(item1, checkIndex) in item.askItem"
-                :key="checkIndex"
-              >
-                <span
-                  :class="{ right: item.answer == checkIndex }"
-                  v-html="item.checkList[checkIndex]"
-                ></span>
+              <div class="a_add_persent_div" v-for="(item1, checkIndex) in item.askItem" :key="checkIndex">
+                <span :class="{ right: item.answer == checkIndex }" v-html="item.checkList[checkIndex]"></span>
                 <span>{{
-                  checkJson[index].checkCount[checkIndex]
-                    ? checkJson[index].checkCount[checkIndex]
-                    : 0
+                checkJson[index].checkCount[checkIndex]
+                ? checkJson[index].checkCount[checkIndex]
+                : 0
                 }}</span>
                 <span>
-                  <el-progress
-                    :percentage="
-                      checkJson[index].checkPerent[checkIndex]
-                        ? checkJson[index].checkPerent[checkIndex]
-                        : 0
-                    "
-                    :show-text="false"
-                  ></el-progress>
+                  <el-progress :percentage="
+                    checkJson[index].checkPerent[checkIndex]
+                      ? checkJson[index].checkPerent[checkIndex]
+                      : 0
+                  " :show-text="false"></el-progress>
                 </span>
               </div>
             </div>
@@ -55,14 +37,8 @@
         </div>
       </div>
     </div>
-    <el-dialog
-      title="查看"
-      :visible.sync="dialogVisible"
-      :append-to-body="true"
-      width="900px"
-      :before-close="handleClose"
-      class="dialog_diy"
-    >
+    <el-dialog title="查看" :visible.sync="dialogVisible" :append-to-body="true" width="900px" :before-close="handleClose"
+      class="dialog_diy">
       <div>
         <div v-for="(item, index) in timu" :key="index" class="borderB">
           <div v-html="item" class="s_title"></div>
@@ -70,21 +46,14 @@
             <div style="margin: 0 0 10px 0; min-width: 70px; color: #adadad">
               选择同学:
             </div>
-            <div
-              v-for="(pe, pi) in person[index]"
-              :key="index + '-' + pi"
-              class="stuBox"
-              style="flex-wrap: wrap"
-            >
-              <span class="studentClass">{{ pe }}</span>
+            <div class="stuBox" style="flex-wrap: wrap">
+              <span class="studentClass" v-for="(pe, pi) in person[index]" :key="index + '-' + pi">{{ pe }}</span>
             </div>
           </div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-          >关 闭</el-button
-        >
+        <el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
       </span>
     </el-dialog>
   </div>
@@ -128,10 +97,12 @@ export default {
   /* max-height: 420px; */
   overflow: auto;
 }
+
 .a_addBox {
   margin: 20px 0;
   background: #fff;
 }
+
 .a_add_box {
   border-bottom: 2px solid #eee;
   padding-bottom: 10px;
@@ -144,25 +115,31 @@ export default {
   margin: 10px 0;
   font-size: 18px;
 }
+
 .a_add_head .a_add_head_input {
   width: 300px;
 }
+
 .a_add_head .a_add_head_div {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
+
 .a_add_head_div img {
   cursor: pointer;
   width: 23px;
 }
-.a_add_head_div img + img {
+
+.a_add_head_div img+img {
   margin-left: 10px;
 }
+
 .a_add_body {
   display: flex;
   align-items: center;
 }
+
 .a_add_input {
   display: flex;
   align-items: center;
@@ -170,28 +147,35 @@ export default {
   /* flex-direction: column; */
   /* width: 100%; */
 }
+
 .width100 {
   width: 100%;
 }
+
 .a_add_input .a_add_persent {
   /* display: flex; */
   /* flex-direction: column; */
   width: 100%;
 }
+
 .a_add_persent_div {
   width: 100%;
   display: flex;
   align-items: center;
 }
+
 .a_add_persent_div span {
   margin: 5px 0;
 }
+
 .a_add_persent_div span:nth-child(1) {
   width: 30%;
 }
+
 .a_add_persent_div span:nth-child(2) {
   width: 7%;
 }
+
 .a_add_persent_div span:nth-child(3) {
   width: 40%;
 }
@@ -220,6 +204,7 @@ export default {
   color: rgb(0 123 255);
   position: relative;
 }
+
 .right::after {
   content: "";
   position: absolute;
@@ -232,35 +217,42 @@ export default {
   transform: translateY(-50%);
 }
 
-.dialog_diy >>> .el-dialog__header,
-.dialog_diy1 >>> .el-dialog__header {
+.dialog_diy>>>.el-dialog__header,
+.dialog_diy1>>>.el-dialog__header {
   background: #002e81 !important;
   padding: 15px 20px;
 }
-.dialog_diy >>> .el-dialog__title,
-.dialog_diy1 >>> .el-dialog__title {
+
+.dialog_diy>>>.el-dialog__title,
+.dialog_diy1>>>.el-dialog__title {
   color: #fff;
 }
-.dialog_diy >>> .el-dialog__headerbtn,
-.dialog_diy1 >>> .el-dialog__headerbtn {
+
+.dialog_diy>>>.el-dialog__headerbtn,
+.dialog_diy1>>>.el-dialog__headerbtn {
   top: 19px;
 }
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close,
-.dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close {
+
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close,
+.dialog_diy1>>>.el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover,
-.dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close:hover {
+
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close:hover,
+.dialog_diy1>>>.el-dialog__headerbtn .el-dialog__close:hover {
   color: #fff;
 }
-.dialog_diy1 >>> .el-dialog__body {
+
+.dialog_diy1>>>.el-dialog__body {
   padding: 0;
 }
-.dialog_diy >>> .el-dialog__body,
-.dialog_diy >>> .el-dialog__footer,
-.dialog_diy1 >>> .el-dialog__footer {
+
+.dialog_diy>>>.el-dialog__body,
+.dialog_diy>>>.el-dialog__footer,
+.dialog_diy1>>>.el-dialog__footer {
   background: #fafafa;
 }
+
 .s_title {
   /* margin-top: 10px; */
   font-size: 18px;
@@ -268,11 +260,13 @@ export default {
   word-break: break-word;
   /* min-width: calc(100% / 2 - 200px); */
 }
+
 .stuBox {
   display: flex;
   /* flex-wrap: wrap; */
   align-items: center;
 }
+
 .studentClass {
   background: #46a1eb;
   color: #fff;

+ 17 - 10
src/components/study.vue

@@ -1527,7 +1527,7 @@
       <img width="100%" :src="dialogImageUrl" alt />
     </el-dialog>
     <el-dialog :title="noteName != '' ? noteName : '查看选择题'" :visible.sync="dialogVisible5" :append-to-body="true"
-      width="1000px" :before-close="handleClose" class="dialog_diy">
+      width="1000px" :before-close="handleClose" class="dialog_diy dialog_diy3">
       <div>
         <div class="a_add_title" style="
             display: flex;
@@ -1735,7 +1735,7 @@
       </div>
       <div class="commentBox">
         <div class="pl">评论:</div>
-        <div style="height: 200px; overflow: auto">
+        <div style="max-height: 200px; overflow: auto">
           <div v-if="commentDetail.commentJson" style="padding: 10px 0 0 0">
             <div class="studentDetail" style="padding-top: 10px" v-for="(co, coIndex) in commentDetail.commentJson"
               :key="coIndex">
@@ -1829,7 +1829,7 @@
       </div>
       <div slot="footer">
         <el-button @click="studentEvalDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addBzWorks">确 定</el-button>
+        <el-button type="primary" @click="addBzWorks" v-if="isStar">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="选择填空" :visible.sync="dialogVisibleSelect" :append-to-body="true"
@@ -1853,7 +1853,7 @@
                   根据题目选择对应答案
                 </div>
                 <div class="select_box2_answer_box" v-for="(item2, checkIndex) in selectJson.select" :key="checkIndex">
-                  <span>{{ checkIndex + 1 }}、</span>
+                  <span style="min-width: 30px;">{{ checkIndex + 1 }}、</span>
                   <el-select :disabled="isSelect" v-model="selectAnswer.answer[checkIndex]" placeholder="请选择正确答案">
                     <el-option v-for="(e, eIndex) in selectJson.select" :key="eIndex" :label="e" :value="eIndex">
                     </el-option>
@@ -1878,11 +1878,10 @@
                   </div>
                 </div>
               </div>
-
-              <div class="upAnswerCss">
-                <el-button type="primary" @click="addSelectAnswer">提交答案</el-button>
-              </div>
             </div>
+            <div class="upAnswerCss">
+                <el-button type="primary" @click="addSelectAnswer" v-if="!isSelect">提交答案</el-button>
+              </div>
           </div>
         </div>
       </div>
@@ -2224,7 +2223,7 @@ export default {
     selectWorksStudent() {
       let params = {
         oid: this.oid,
-        cid: this.classId,
+        cid: this.courseDetail.juri,
       };
       this.ajax
         .get(this.$store.state.api + "selectWorksStudent", params)
@@ -4308,6 +4307,10 @@ export default {
     width: 50px !important;
   }
 
+  .dialog_diy3 >>> .el-dialog{
+    width: 95% !important;
+  }
+
   /* .pb_left{
     position: unset !important;
     height: auto !important;
@@ -4323,6 +4326,9 @@ export default {
     width: 550px !important;
   }
 }
+.dialog_diy>>>.el-dialog {
+  margin-top: 10vh !important;
+}
 
 .body_student {
   width: 77%;
@@ -6098,6 +6104,7 @@ export default {
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
+  align-items: flex-start;
 }
 
 .tx {
@@ -6240,7 +6247,7 @@ export default {
   border-radius: 5px;
   width: 300px;
   overflow: auto;
-  height: 100%;
+  height: 90%;
   display: flex;
   flex-direction: column;
   align-items: flex-start;

+ 21 - 11
src/components/studyStudent.vue

@@ -1713,7 +1713,7 @@
       <img width="100%" :src="dialogImageUrl" alt />
     </el-dialog>
     <el-dialog :title="noteName != '' ? noteName : '查看选择题'" :visible.sync="dialogVisible5" :append-to-body="true"
-      width="1000px" :before-close="handleClose" class="dialog_diy">
+      width="1000px" :before-close="handleClose" class="dialog_diy dialog_diy3">
       <div>
         <div class="a_add_title" style="
             display: flex;
@@ -1920,11 +1920,11 @@
       </div>
       <div class="commentBox">
         <div class="pl">评论:</div>
-        <div style="height: 200px; overflow: auto">
+        <div style="max-height: 200px; overflow: auto">
           <div v-if="commentDetail.commentJson" style="padding: 10px 0 0 0">
             <div class="studentDetail" style="padding-top: 10px" v-for="(co, coIndex) in commentDetail.commentJson"
               :key="coIndex">
-              <div class="tx" style="width: 40px">
+              <div class="tx" style="min-width: 40px">
                 <img src="../assets/avatar.png" alt="" />
               </div>
               <div class="plPerson">
@@ -2026,7 +2026,7 @@
       </div>
       <div slot="footer">
         <el-button @click="studentEvalDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addBzWorks">确 定</el-button>
+        <el-button type="primary" @click="addBzWorks" v-if="!isStar">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="选择填空" :visible.sync="dialogVisibleSelect" :append-to-body="true"
@@ -2050,7 +2050,7 @@
                   根据题目选择对应答案
                 </div>
                 <div class="select_box2_answer_box" v-for="(item2, checkIndex) in selectJson.select" :key="checkIndex">
-                  <span>{{ checkIndex + 1 }}、</span>
+                  <span style="min-width: 30px;">{{ checkIndex + 1 }}、</span>
                   <el-select :disabled="isSelect" v-model="selectAnswer.answer[checkIndex]" placeholder="请选择正确答案">
                     <el-option v-for="(e, eIndex) in selectJson.select" :key="eIndex" :label="e" :value="eIndex">
                     </el-option>
@@ -2075,10 +2075,10 @@
                   </div>
                 </div>
               </div>
+            </div>
 
-              <div class="upAnswerCss">
-                <el-button type="primary" @click="addSelectAnswer">提交答案</el-button>
-              </div>
+            <div class="upAnswerCss">
+              <el-button type="primary" @click="addSelectAnswer" v-if="!isSelect">提交答案</el-button>
             </div>
           </div>
         </div>
@@ -2451,7 +2451,7 @@ export default {
     selectWorksStudent() {
       let params = {
         oid: this.oid,
-        cid: this.classId,
+        cid: this.courseDetail.juri,
       };
       this.ajax
         .get(this.$store.state.api + "selectWorksStudent", params)
@@ -4518,11 +4518,20 @@ export default {
     width: 100% !important;
   }
 
+
+  .dialog_diy3>>>.el-dialog {
+    width: 95% !important;
+  }
+
   /* .textTitle >>> .el-form-item__label {
     width: 150px !important;
   } */
 }
 
+.dialog_diy>>>.el-dialog {
+  margin-top: 10vh !important;
+}
+
 .body_student {
   width: 77%;
   height: 100%;
@@ -6290,7 +6299,8 @@ export default {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
-  align-items: center;
+  /* align-items: center; */
+  align-items: flex-start;
 }
 
 .tx {
@@ -6433,7 +6443,7 @@ export default {
   border-radius: 5px;
   width: 300px;
   overflow: auto;
-  height: 100%;
+  height: 90%;
   display: flex;
   flex-direction: column;
   align-items: flex-start;

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