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

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

SanHQin 7 months ago
parent
216bbfb853 be71077ccb
commit
b7cc14df27
24 changed files with 2535 additions and 537 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.22f1680fc730d77db17b9fb994d02bff.css
  3. 0 0
      dist/static/css/app.22f1680fc730d77db17b9fb994d02bff.css.map
  4. 0 0
      dist/static/css/app.433863ab3c18a76b5c517d53d6b1e9df.css
  5. 0 0
      dist/static/css/app.433863ab3c18a76b5c517d53d6b1e9df.css.map
  6. 0 0
      dist/static/js/app.c947dbf06879bd3aaaca.js
  7. 0 0
      dist/static/js/app.c947dbf06879bd3aaaca.js.map
  8. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  9. 17 16
      src/components/pages/aiAddCourse/addCourse.vue
  10. 1 1
      src/components/pages/aiAddCourse/templateDialog.vue
  11. 29 30
      src/components/pages/components/report.vue
  12. 145 95
      src/components/pages/components/studentWorksDetail.vue
  13. 1035 263
      src/components/pages/components/worksDetail2.vue
  14. 41 5
      src/components/pages/components/worksDetail3.vue
  15. 59 19
      src/components/pages/test/add/addTest.vue
  16. 97 27
      src/components/pages/test/add/addTestJ.vue
  17. 3 3
      src/components/pages/test/add/edit/check/index.vue
  18. 72 5
      src/components/pages/test/add/edit/edit/index.vue
  19. 151 8
      src/components/pages/test/add/edit/edit/indexJ.vue
  20. 19 9
      src/components/pages/test/add/edit/index.vue
  21. 7 6
      src/components/pages/test/add/edit/indexJ.vue
  22. 21 47
      src/components/pages/test/add/setInfo/index.vue
  23. 835 0
      src/components/pages/test/add/setInfo/indexJ.vue
  24. 2 2
      src/components/pages/works.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.22f1680fc730d77db17b9fb994d02bff.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.c4ab183d8fe1f910d2d8.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.433863ab3c18a76b5c517d53d6b1e9df.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.c947dbf06879bd3aaaca.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


+ 17 - 16
src/components/pages/aiAddCourse/addCourse.vue
View File 

@@ -104,9 +104,9 @@
 
                   ? istemplate == 1 ? 'auto' : 'calc(100% - 20px)'
 
                   : istemplate == 1 ? 'auto' : 'calc(100% - 100px)',
 
             }">
 
-            <div class="updateMask" :style="{
 
+            <!-- <div class="updateMask" :style="{
 
               height: rightBoxHeight ? rightBoxHeight + 'px' : '100%',
 
-            }" v-if="cid && userid != courseUserid && role != '1'"></div>
 
+            }" v-if="cid && userid != courseUserid && role != '1'"></div> -->
 
             <div class="whiteBg" style="background: unset; padding: 0">
 
               <div>
 
                 <div class="basic_box" style="padding: 0">
 
@@ -577,17 +577,17 @@
 
                       placeholder="请输入课程目标" v-if="targetCourseTextB"></textarea>
 
                     <div class="markBox vditor-reset" style="white-space:pre-wrap;" v-text="targetCourseText" v-else-if="targetTextLoading"></div>
 
                     <div class="markBox vditor-reset" v-html="MarkdownT(targetCourseText)" v-else></div>
 
-                      <div class="op_box">
 
-                        <div class="op_remark">*可以将需要优化的建议添加在任务描述后，点击“智能优化”，自动进行修改</div>
 
-                        <div style="display: flex;">
 
-                          <el-tooltip effect="light" content="右键单击可配置提示词" placement="bottom">
 
-                            <div class="r_pub_button_op"
 
-                              @contextmenu.prevent="openAiDialog(1, 'aitargetTextDetail', 2)"
 
-                              @click="openAiDialog(2, 'aitargetTextDetail', 2)">智能优化</div>
 
-                          </el-tooltip>
 
-                          <div class="r_pub_button_edit" style="margin-left:10px" @click="targetCourseTextB = !targetCourseTextB">{{ targetCourseTextB ? '确定' : '编辑'}}</div>
 
-                        </div>
 
+                    <div class="op_box">
 
+                      <div class="op_remark">*可以将需要优化的建议添加在任务描述后，点击“智能优化”，自动进行修改</div>
 
+                      <div style="display: flex;">
 
+                        <el-tooltip effect="light" content="右键单击可配置提示词" placement="bottom">
 
+                          <div class="r_pub_button_op"
 
+                            @contextmenu.prevent="openAiDialog(1, 'aitargetTextDetail', 2)"
 
+                            @click="openAiDialog(2, 'aitargetTextDetail', 2)">智能优化</div>
 
+                        </el-tooltip>
 
+                        <div class="r_pub_button_edit" style="margin-left:10px" @click="targetCourseTextB = !targetCourseTextB">{{ targetCourseTextB ? '确定' : '编辑'}}</div>
 
                       </div>
 
+                    </div>
 
                   </div>
 
                 </div>
 
               </div>
 
@@ -20574,10 +20574,10 @@ ${msg}
 
 ## 补充描述
 
 课程简要描述：${_this.courseText}
 
 任务名：${_this.unitJson[0].chapterInfo[0].taskJson[_tindex2].task}
 
-其他大纲的任务名：${taskN.join(",")}
 
+${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? '' : `其他大纲的任务名：${taskN.join(",")}`}
 
 ${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? 'index:'+(_tindex2+1) : ''}
 
 ${_this.unitJson[0].chapterInfo[0].taskJson[_tindex2].taskDetail2 ? '任务描述：' + _this.unitJson[0].chapterInfo[0].taskJson[_tindex2].taskDetail2.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
 
-其他大纲的任务描述：${taskD.join("\n")}
 
+${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? '' : `其他大纲的任务描述：${taskD.join("\n")}`}
 
 ${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? '#目标层：'+_this.cpote.cpote3.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
 
 ${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? '#任务簇：'+_this.cpote.cpote4.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
 
 `
 
@@ -22066,9 +22066,10 @@ ${msg}
 
                   let match = data.message.match(regex);
 
                   dArray = JSON.parse(match[0]);
 
               } catch (error) {
 
-                callback ? callback() : ''
 
-                _this.$message.error("生成的json格式错误，请重新点击获取")
 
+                // callback ? callback() : ''
 
+                _this.$message.error("返回的数据格式错误，小可正在为您重新获取...")
 
                 console.log("error_________________" + error);
 
+                _this.aiSearchFile(messages, callback)
 
               }
 
             }
 
             for(let i = 0; i < dArray.length; i++){

+ 1 - 1
src/components/pages/aiAddCourse/templateDialog.vue
View File 

@@ -100,7 +100,7 @@ export default {
 
                 { id: '2', name: "社区模板" },
 
                 { id: '1', name: "我的模板" },
 
             ],
 
-            tagIndex: '1',
 
+            tagIndex: '2',
 
             searchDataList: [],
 
             input2: '',
 
             loading: false

+ 29 - 30
src/components/pages/components/report.vue
View File 

@@ -302,16 +302,16 @@ export default {
 
                     _workjson.bgInfo.push(element.content);
 
                   }
 
                 }
 
-                for (let d = 0; d < cocopiInfo.length; d++) {
 
-                  if (
 
-                    cocopiInfo[d].stage == chapI &&
 
-                    cocopiInfo[d].task == _tI[1] &&
 
-                    cocopiInfo[d].userid == _uname[i].userid
 
-                  ) {
 
-                    const element = cocopiInfo[d];
 
-                    _workjson.cocopiInfo.push(element.content);
 
-                  }
 
-                }
 
+                // for (let d = 0; d < cocopiInfo.length; d++) {
 
+                //   if (
 
+                //     cocopiInfo[d].stage == chapI &&
 
+                //     cocopiInfo[d].task == _tI[1] &&
 
+                //     cocopiInfo[d].userid == _uname[i].userid
 
+                //   ) {
 
+                //     const element = cocopiInfo[d];
 
+                //     _workjson.cocopiInfo.push(element.content);
 
+                //   }
 
+                // }
 
                 for (let d = 0; d < wordInfo.length; d++) {
 
                   if (
 
                     wordInfo[d].stage == chapI &&
 
@@ -456,16 +456,16 @@ export default {
 
                     _workjson.bgInfo.push(element.content);
 
                   }
 
                 }
 
-                for (let d = 0; d < cocopiInfo.length; d++) {
 
-                  if (
 
-                    cocopiInfo[d].stage == chapI &&
 
-                    cocopiInfo[d].task == _tI[1] &&
 
-                    cocopiInfo[d].userid == _uname[i].userid
 
-                  ) {
 
-                    const element = cocopiInfo[d];
 
-                    _workjson.cocopiInfo.push(element.content);
 
-                  }
 
-                }
 
+                // for (let d = 0; d < cocopiInfo.length; d++) {
 
+                //   if (
 
+                //     cocopiInfo[d].stage == chapI &&
 
+                //     cocopiInfo[d].task == _tI[1] &&
 
+                //     cocopiInfo[d].userid == _uname[i].userid
 
+                //   ) {
 
+                //     const element = cocopiInfo[d];
 
+                //     _workjson.cocopiInfo.push(element.content);
 
+                //   }
 
+                // }
 
                 for (let d = 0; d < wordInfo.length; d++) {
 
                   if (
 
                     wordInfo[d].stage == chapI &&
 
@@ -573,7 +573,7 @@ export default {
 
 
             chooseData.testJson.testJson.forEach((e,eIndex)=>{
 
                 var _div2 = document.createElement("div");
 
-                _div2.innerHTML = `<h5>第${eIndex + 1}题:${
 
+                _div2.innerHTML = `<h5>第${eIndex}题:${
 
                     e.teststitle
 
                 }  选择:${
 
                   chooseData.anwer[eIndex].length > 1? chooseData.anwer[eIndex].join(',') : chooseData.anwer[eIndex]
 
@@ -650,15 +650,15 @@ export default {
 
         }
 
       }
 
       
-      var _cocopi = "";
 
+      // var _cocopi = "";
 
 
-      if (workJson.cocopiInfo.length > 0) {
 
+      // if (workJson.cocopiInfo.length > 0) {
 
 
-        var _cocopi = "<h4>cocopi<h3>";
 
-        for (var i = 0; i < workJson.cocopiInfo.length; i++) {
 
-          _cocopi += `<h6>不支持查看</h6>`;
 
-        }
 
-      }
 
+      //   var _cocopi = "<h4>cocopi<h3>";
 
+      //   for (var i = 0; i < workJson.cocopiInfo.length; i++) {
 
+      //     _cocopi += `<h6>不支持查看</h6>`;
 
+      //   }
 
+      // }
 
 
       var _word = "";
 
       if (workJson.wordInfo.length > 0) {
 
@@ -683,7 +683,6 @@ export default {
 
         !workJson.pjInfo.length &&
 
         !workJson.xztkInfo.length &&
 
         !workJson.chooseInfo.length &&
 
-        !workJson.cocopiInfo.length &&
 
         !workJson.bgInfo.length 
 
 
@@ -692,7 +691,7 @@ export default {
 
         return "";
 
       }
 
       
-      return _title + _subtitle + _img + _ask + _pjInfo + _answer + _xztkInfo + _link + _choose + _lccjInfo + _bg + _cocopi + _word;
 
+      return _title + _subtitle + _img + _ask + _pjInfo + _answer + _xztkInfo + _link + _choose + _lccjInfo + _bg  + _word;
 
     },
 
     async generate(a) {
 
       // 将html文件中需要用到的数据挂载到store上

+ 145 - 95
src/components/pages/components/studentWorksDetail.vue
View File 

@@ -1411,13 +1411,31 @@
 
                             v-for="(item, index) in worksDetail[sIndex].eList"
 
                             :key="index"
 
                           >
 
+                          <el-tooltip
 
+                              class="item"
 
+                              effect="dark"
 
+                              v-if="worksDetail[sIndex].state == 5"
 
+                              :content="item.detail"
 
+                              placement="top-start"
 
+                            >
 
+                              <div class="RootImgBlock">
 
+                                <img
 
+                                  v-if="item.isai == 1"
 
+                                  class="RootImg"
 
+                                  src="../../../assets/icon/conSentences/Brootper.svg"
 
+                                  alt=""
 
+                                />
 
+                                {{ item.detail }}
 
+                              </div>
 
+                            </el-tooltip>
 
                             <el-tooltip
 
                               class="item"
 
                               effect="dark"
 
+                              v-else
 
                               :content="item.value"
 
                               placement="top-start"
 
                             >
 
-                            <div class="RootImgBlock">
 
+                              <div class="RootImgBlock">
 
                                 <img
 
                                   v-if="item.isai == 1"
 
                                   class="RootImg"
 
@@ -1430,7 +1448,7 @@
 
                             <el-rate
 
                               class="rate_size"
 
                               style="min-width: 120px"
 
-                              v-model="worksDetail[sIndex].rateList[item.value]"
 
+                              v-model="worksDetail[sIndex].rateList[item.detail]"
 
                               @change="getStar(sIndex)"
 
                             ></el-rate>
 
                           </div>
 
@@ -1453,7 +1471,8 @@
 
                               .eList"
 
                             :key="tarIndex"
 
                           >
 
-                            <span v-if="item.target"> {{ item.target }}</span>
 
+                          <span v-if="worksDetail[sIndex].state == 5"> {{ item.target }}</span>
 
+                          <span v-else> {{ item.target[item.target.length-1] }}</span>
 
                           </div>
 
                         </div>
 
                       </div>
 
@@ -1859,13 +1878,16 @@ export default {
 
       return function(val) {
 
         let sco = 0;
 
         let num = 0;
 
-
 
+        
         for (const key in val) {
 
-          if (val[key] || key != 'content') {
 
+          if (val[key] && key != 'content') {
 
             sco += val[key] * 1;
 
           }
 
           num += 1;
 
         }
 
+        
+        if(sco == 0) return '0.0'
 
+        
         return (sco / (num - 1)).toFixed(1);
 
       };
 
     },
 
@@ -2068,6 +2090,7 @@ export default {
 
                 wordInfo: [],
 
                 scopeId: res.data[0][k].id,
 
                 stagetask: stagetask,
 
+                state: res.data[0][k].state,
 
                 time: "",
 
               };
 
               checkJson[stagetask] = {
 
@@ -2547,7 +2570,7 @@ export default {
 
                 result[l].eList = eList;
 
                 for (var i = 0; i < eList.length; i++) {
 
                   _ooption.push({ value: 0, name: eList[i].value });
 
-                  result[l].rateList[eList[i].value] = 0;
 
+                  result[l].rateList[eList[i].detail] = 0;
 
                 }
 
                 result[l].rateList.content = "";
 
                 this.ooption[l] = _ooption;
 
@@ -2600,7 +2623,7 @@ export default {
 
                       result[l].eList = eList;
 
                       for (var i = 0; i < eList.length; i++) {
 
                         _ooption.push({ value: 0, name: eList[i].value });
 
-                        result[l].rateList[eList[i].value] = 0;
 
+                        result[l].rateList[eList[i].detail] = 0;
 
                       }
 
                       result[l].rateList.content = "";
 
                       this.ooption[l] = _ooption;
 
@@ -2744,91 +2767,91 @@ export default {
 
             wordInfo: []
 
           };
 
           var eList = [];
 
-          if (workEvaList.length > 0) {
 
-            for (var qi = 0; qi < workEvaList.length; qi++) {
 
-              var eListOld =
 
-                chapters[workEvaList[qi].stage].chapterInfo[0].taskJson[
 
-                  workEvaList[qi].task
 
-                ].eList;
 
-              var _ooption = [];
 
-              if (eListOld && eListOld.length) {
 
-                var eListNew = Object.keys(eListOld).map(function(key) {
 
-                  return {
 
-                    detail: eListOld[key].detail,
 
-                    score: eListOld[key].score,
 
-                    value: eListOld[key].value
 
-                  };
 
-                });
 
-                eList = eListNew;
 
-                if (eList && eList.length) {
 
-                  workJson.eList = eList;
 
-                  for (var i = 0; i < eList.length; i++) {
 
-                    _ooption.push({ value: 0, name: eList[i].value });
 
-                    workJson.rateList[eList[i].value] = 0;
 
-                  }
 
-                  workJson.rateList.content = "";
 
-                  this.ooption = _ooption;
 
-                } else {
 
-                  workJson.eList = [
 
-                    { value: "意识能力", detail: "", score: 5 },
 
-                    { value: "科学探究能力", detail: "", score: 5 },
 
-                    { value: "实践创新能力", detail: "", score: 5 },
 
-                    { value: "学习反思能力", detail: "", score: 5 },
 
-                    { value: "工程思维能力", detail: "", score: 5 }
 
-                  ];
 
-                  for (var i = 0; i < workJson.eList.length; i++) {
 
-                    _ooption.push({ value: 0, name: workJson.eList[i].value });
 
-                    workJson.rateList[workJson.eList[i].value] = 0;
 
-                  }
 
-                  workJson.rateList.content = "";
 
-                  this.ooption = [
 
-                    { value: 0, name: "意识能力" },
 
-                    { value: 0, name: "科学探究能力" },
 
-                    { value: 0, name: "实践创新能力" },
 
-                    { value: 0, name: "学习反思能力" },
 
-                    { value: 0, name: "工程思维能力" }
 
-                  ];
 
-                }
 
-              }
 
-            }
 
-          }
 
-          var _rate = [],
 
-            _rateList = [];
 
-          if (workEvaList.length > 0) {
 
-            for (var p = 0; p < workEvaList.length; p++) {
 
-              if (workEvaList[p].rate && eList && eList.length) {
 
-                _rate[p] = JSON.parse(workEvaList[p].rate);
 
-              }
 
-              _rateList[p] = Object.keys(JSON.parse(workEvaList[p].rate));
 
-              for (var i = 0; i < _rateList[p].length; i++) {
 
-                var _c = Object.keys(workJson.rateList);
 
-                if (_c.indexOf(_rateList[p][i]) != -1) {
 
-                  workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
 
-                }
 
-              }
 
-              for (var i = 0; i < this.ooption[p].length; i++) {
 
-                if (_rateList[p].indexOf(this.ooption[p][i].name) != -1) {
 
-                  this.ooption[p][i].value = _rate[p][this.ooption[p][i].name];
 
-                }
 
-              }
 
-            }
 
-          } else {
 
-            if (this.sInfo.rate) {
 
-              _rate = JSON.parse(this.sInfo.rate);
 
-              _rateList = Object.keys(JSON.parse(this.sInfo.rate));
 
-              for (var i = 0; i < _rateList.length; i++) {
 
-                var _c = Object.keys(workJson.rateList);
 
-                if (_c.indexOf(_rateList[i]) != -1) {
 
-                  workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
 
-                }
 
-              }
 
-              for (var i = 0; i < this.ooption.length; i++) {
 
-                if (_rateList.indexOf(this.ooption[i].name) != -1) {
 
-                  this.ooption[i].value = _rate[this.ooption[i].name];
 
-                }
 
-              }
 
-            }
 
-          }
 
+          // if (workEvaList.length > 0) {
 
+          //   for (var qi = 0; qi < workEvaList.length; qi++) {
 
+          //     var eListOld =
 
+          //       chapters[workEvaList[qi].stage].chapterInfo[0].taskJson[
 
+          //         workEvaList[qi].task
 
+          //       ].eList;
 
+          //     var _ooption = [];
 
+          //     if (eListOld && eListOld.length) {
 
+          //       var eListNew = Object.keys(eListOld).map(function(key) {
 
+          //         return {
 
+          //           detail: eListOld[key].detail,
 
+          //           score: eListOld[key].score,
 
+          //           value: eListOld[key].value
 
+          //         };
 
+          //       });
 
+          //       eList = eListNew;
 
+          //       if (eList && eList.length) {
 
+          //         workJson.eList = eList;
 
+          //         for (var i = 0; i < eList.length; i++) {
 
+          //           _ooption.push({ value: 0, name: eList[i].value });
 
+          //           workJson.rateList[eList[i].value] = 0;
 
+          //         }
 
+          //         workJson.rateList.content = "";
 
+          //         this.ooption = _ooption;
 
+          //       } else {
 
+          //         workJson.eList = [
 
+          //           { value: "意识能力", detail: "", score: 5 },
 
+          //           { value: "科学探究能力", detail: "", score: 5 },
 
+          //           { value: "实践创新能力", detail: "", score: 5 },
 
+          //           { value: "学习反思能力", detail: "", score: 5 },
 
+          //           { value: "工程思维能力", detail: "", score: 5 }
 
+          //         ];
 
+          //         for (var i = 0; i < workJson.eList.length; i++) {
 
+          //           _ooption.push({ value: 0, name: workJson.eList[i].value });
 
+          //           workJson.rateList[workJson.eList[i].value] = 0;
 
+          //         }
 
+          //         workJson.rateList.content = "";
 
+          //         this.ooption = [
 
+          //           { value: 0, name: "意识能力" },
 
+          //           { value: 0, name: "科学探究能力" },
 
+          //           { value: 0, name: "实践创新能力" },
 
+          //           { value: 0, name: "学习反思能力" },
 
+          //           { value: 0, name: "工程思维能力" }
 
+          //         ];
 
+          //       }
 
+          //     }
 
+          //   }
 
+          // }
 
+          // var _rate = [],
 
+          //   _rateList = [];
 
+          // if (workEvaList.length > 0) {
 
+          //   for (var p = 0; p < workEvaList.length; p++) {
 
+          //     if (workEvaList[p].rate && eList && eList.length) {
 
+          //       _rate[p] = JSON.parse(workEvaList[p].rate);
 
+          //     }
 
+          //     _rateList[p] = Object.keys(JSON.parse(workEvaList[p].rate));
 
+          //     for (var i = 0; i < _rateList[p].length; i++) {
 
+          //       var _c = Object.keys(workJson.rateList);
 
+          //       if (_c.indexOf(_rateList[p][i]) != -1) {
 
+          //         workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
 
+          //       }
 
+          //     }
 
+          //     for (var i = 0; i < this.ooption[p].length; i++) {
 
+          //       if (_rateList[p].indexOf(this.ooption[p][i].name) != -1) {
 
+          //         this.ooption[p][i].value = _rate[p][this.ooption[p][i].name];
 
+          //       }
 
+          //     }
 
+          //   }
 
+          // } else {
 
+          //   if (this.sInfo.rate) {
 
+          //     _rate = JSON.parse(this.sInfo.rate);
 
+          //     _rateList = Object.keys(JSON.parse(this.sInfo.rate));
 
+          //     for (var i = 0; i < _rateList.length; i++) {
 
+          //       var _c = Object.keys(workJson.rateList);
 
+          //       if (_c.indexOf(_rateList[i]) != -1) {
 
+          //         workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
 
+          //       }
 
+          //     }
 
+          //     for (var i = 0; i < this.ooption.length; i++) {
 
+          //       if (_rateList.indexOf(this.ooption[i].name) != -1) {
 
+          //         this.ooption[i].value = _rate[this.ooption[i].name];
 
+          //       }
 
+          //     }
 
+          //   }
 
+          // }
 
 
           for (var i = 0; i < worksDetail.length; i++) {
 
             workJson.img.push({
 
@@ -3566,9 +3589,36 @@ export default {
 
       } else {
 
         const element = document.getElementById(`${s}+${i}`);
 
         if (element) {
 
-          element.scrollIntoView({
 
-            behavior: 'smooth'
 
-          });
 
+          element.scrollIntoView();
 
+          setTimeout(()=>{
 
+            let scrollBody = document.querySelector(".zyBoxC").parentElement
 
+            scrollBody.scrollTop = scrollBody.scrollTop - 70
 
+          }, 100);
 
+          // function scrollToElement(elementA) {
 
+          //   return new Promise((resolve) => {
 
+          //     const observer = new IntersectionObserver((entries) => {
 
+          //       if (entries[0].isIntersecting) {
 
+          //         observer.disconnect(); // 停止观察
 
+          //         setTimeout(() => {
 
+          //           resolve(); // 延迟以确保滚动完成
 
+          //         }, 300); // 可以调整延迟时间
 
+          //       }
 
+          //     }, { threshold: [1] }); // 阈值设为 1 确保完全可见
 
+
 
+          //     elementA.scrollIntoView({ behavior: 'smooth', block: "start" });
 
+          //     // elementA.scrollIntoView();
 
+          //     observer.observe(elementA);
 
+          //   });
 
+          // }
 
+
 
+
 
+          // // 使用示例
 
+          // scrollToElement(element).then(()=>{
 
+          //   let scrollBody = document.querySelector(".zyBoxC").parentElement
 
+          //   setTimeout(() => {
 
+          //     scrollBody.scrollTop = scrollBody.scrollTop - 70;
 
+          //   }, 100); // 调整时间确保足够长
 
+          // });
 
         }
 
         var a = s + "-" + i;
 
         // var b = document.getElementById(a);

File diff suppressed because it is too large
+ 1035 - 263
src/components/pages/components/worksDetail2.vue


+ 41 - 5
src/components/pages/components/worksDetail3.vue
View File 

@@ -1060,18 +1060,44 @@
 
                             v-for="(item, index) in worksDetail[sIndex].eList"
 
                             :key="index"
 
                           >
 
+                          <el-tooltip
 
+                              class="item"
 
+                              effect="dark"
 
+                              v-if="worksDetail[sIndex].state == 5"
 
+                              :content="item.detail"
 
+                              placement="top-start"
 
+                            >
 
+                              <div class="RootImgBlock">
 
+                                <img
 
+                                  v-if="item.isai == 1"
 
+                                  class="RootImg"
 
+                                  src="../../../assets/icon/conSentences/Brootper.svg"
 
+                                  alt=""
 
+                                />
 
+                                {{ item.detail }}
 
+                              </div>
 
+                            </el-tooltip>
 
                             <el-tooltip
 
                               class="item"
 
                               effect="dark"
 
+                              v-else
 
                               :content="item.value"
 
                               placement="top-start"
 
                             >
 
-                              <span>{{ item.value }}</span>
 
+                              <div class="RootImgBlock">
 
+                                <img
 
+                                  v-if="item.isai == 1"
 
+                                  class="RootImg"
 
+                                  src="../../../assets/icon/conSentences/Brootper.svg"
 
+                                  alt=""
 
+                                />
 
+                                {{ item.value }}
 
+                              </div>
 
                             </el-tooltip>
 
                             <el-rate
 
                               class="rate_size"
 
                               style="min-width: 120px"
 
-                              v-model="worksDetail[sIndex].rateList[item.value]"
 
+                              v-model="worksDetail[sIndex].rateList[item.detail]"
 
                               @change="getStar(sIndex)"
 
                             ></el-rate>
 
                           </div>
 
@@ -1081,7 +1107,8 @@
 
                         <div class="worksTarget" v-if="isShow(worksDetail[sIndex].eList)"><span>目标</span></div>
 
                         <div class="worksTargetCon" v-if="isShow(worksDetail[sIndex].eList)">
 
                             <div v-for="(item,tarIndex) in worksDetail[sIndex].eList" :key="tarIndex">
 
-                              <span v-if="item.target"> {{ item.target }}</span>
 
+                              <span v-if="worksDetail[sIndex].state == 5"> {{ item.target }}</span>
 
+                              <span v-else> {{ item.target[item.target.length-1] }}</span>
 
                             </div>
 
                         </div>
 
                       </div>
 
@@ -1580,6 +1607,7 @@ export default {
 
                 wordInfo: [],
 
                 scopeId: res.data[0][k].id,
 
                 stagetask: stagetask,
 
+                state: res.data[0][k].state,
 
                 time: "",
 
               };
 
               checkJson[stagetask] = {
 
@@ -2434,11 +2462,13 @@ export default {
 
         let num = 0
 
 
         for (const key in val) {
 
-          if (val[key]  || val[key] == 0) {
 
-            sco+= val[key] * 1
 
+          if (val[key] && key != 'content') {
 
+            sco += val[key] * 1
 
           }
 
           num+=1
 
         }
 
+        if (sco == 0) return '0.0'
 
+        
         return (sco / (num - 1)).toFixed(1)
 
       }
 
     },
 
@@ -4120,4 +4150,10 @@ ol {
 
   object-fit: contain;
 
   cursor: pointer;
 
 }
 
+.RootImgBlock{
 
+    width: 50%;
 
+    white-space: nowrap;
 
+    overflow: hidden;
 
+    text-overflow: ellipsis;
 
+}
 
 </style>

+ 59 - 19
src/components/pages/test/add/addTest.vue
View File 

@@ -24,15 +24,24 @@
 
                     <div class="r_pub_button_retrun" @click="retrunCourse">返回</div>
 
                 </div>
 
                 <div class="step_box" :style="{ width: steps == 2 && '100%' }">
 
-                    <setInfo v-if="steps == 1 && !loading" :oid="oid" :org="org" :steps.sync="steps" :title.sync="title"
 
-                        :testType.sync="testType" :see.sync="see" :cJson.sync="cJson" :typeid.sync="typeid"
 
-                        :brief.sync="brief" :juri.sync="juri" :overDate.sync="overDate" :juriList.sync="juriList" :typeInfo.sync="typeInfo">
 
-                    </setInfo>
 
                     <editInfo v-if="steps == 2 && !loading" :oid="oid" :org="org" :steps.sync="steps"
 
-                        :title.sync="title" :cJson.sync="cJson" @save="save" @publish="publish"></editInfo>
 
+                        :title.sync="title" :brief.sync="brief" :cJson.sync="cJson" @save="save" @publish="publish">
 
+                    </editInfo>
 
                 </div>
 
             </div>
 
         </div>
 
+        <el-dialog title="发布表单" :visible.sync="dialogVisible" width="550px" @close="dialogVisible = false" class="eld">
 
+            <setInfo :oid="oid" :org="org" :steps.sync="steps" :title.sync="title" :testType.sync="testType"
 
+                :see.sync="see" :cJson.sync="cJson" :typeid.sync="typeid" :brief.sync="brief" :juri.sync="juri"
 
+                :overDate.sync="overDate" :juriList.sync="juriList" :typeInfo.sync="typeInfo">
 
+            </setInfo>
 
+            <span slot="footer" class="dialog-footer">
 
+                <el-button type="primary" @click="updateWork(3)">发 布 </el-button>
 
+            </span>
 
+        </el-dialog>
 
+
 
+
 
+
 
     </div>
 
 </template>
 
 
@@ -50,7 +59,7 @@ export default {
 
             org: this.$route.query.org,
 
             role: this.$route.query.role,
 
             cid: this.$route.query.cid,
 
-            steps: 1,
 
+            steps: 2,
 
             title: "",
 
             testType: [],
 
             see: false,
 
@@ -63,6 +72,7 @@ export default {
 
             overDate: "",
 
             juriList: [],
 
             typeInfo: [],
 
+            dialogVisible: false
 
         }
 
     },
 
     watch: {
 
@@ -137,9 +147,9 @@ export default {
 
         goTo(path) {
 
             this.$router.push(path);
 
         },
 
-        addWork(look) {
 
+        addWork(look, callback) {
 
             let j3 = []
 
-            if(this.typeInfo.length){
 
+            if (this.typeInfo.length) {
 
                 this.typeInfo.forEach(e => {
 
                     j3.push(e.value)
 
                 })
 
@@ -181,9 +191,10 @@ export default {
 
                             this.role
 
                         );
 
                     }
 
-                    setTimeout(() => {
 
-                        this.getData(2);
 
-                    }, 1000);
 
+                    // setTimeout(() => {
 
+                    //     this.getData(2);
 
+                    // }, 1000);
 
+                    callback ? callback() : ''
 
                 })
 
                 .catch((err) => {
 
                     this.$message.error("网络不佳");
 
@@ -200,7 +211,7 @@ export default {
 
         },
 
         updateWork(look) {
 
             let j3 = []
 
-            if(this.typeInfo.length){
 
+            if (this.typeInfo.length) {
 
                 this.typeInfo.forEach(e => {
 
                     j3.push(e.value)
 
                 })
 
@@ -286,8 +297,8 @@ export default {
 
                         this.overDate = res.data[0][0].overTime ? res.data[0][0].overTime : '';
 
                         this.juriList = res.data[0][0].juri2 ? res.data[0][0].juri2.split(',') : [];
 
                         let juri3 = res.data[0][0].juri3 ? res.data[0][0].juri3.split(',') : [];
 
-                        if(juri3.length > 0){
 
-                            this.typeInfo.forEach(e =>{
 
+                        if (juri3.length > 0) {
 
+                            this.typeInfo.forEach(e => {
 
                                 let array2 = []
 
                                 for (var i = 0; i < e.child.length; i++) {
 
                                     array2.push(e.child[i].id)
 
@@ -316,10 +327,30 @@ export default {
 
             }
 
         },
 
         save(look) {
 
-            this.updateWork(look == 4 ? look : this.look)
 
+            if (!this.title) {
 
+                this.$message.error("请补充填写课程名称");
 
+                return;
 
+            }
 
+            if (this.cid) {
 
+                this.updateWork(look == 4 ? look : this.look)
 
+            } else {
 
+                this.addWork();
 
+            }
 
+            // this.updateWork(5)
 
         },
 
         publish() {
 
-            this.updateWork(3)
 
+            if (!this.title) {
 
+                this.$message.error("请补充填写课程名称");
 
+                return;
 
+            }
 
+            if (this.cid) {
 
+                this.dialogVisible = true
 
+            } else {
 
+                this.addWork(this.look, ()=>{
 
+                    this.dialogVisible = true
 
+                });
 
+            }
 
+            // this.updateWork(3)
 
         },
 
         //获取分类类名
 
         getTypeInfo() {
 
@@ -357,9 +388,9 @@ export default {
 
 
             for (let i = 0; i < array1.length; i++) {
 
                 for (let j = 0; j < array2.length; j++) {
 
-                if (array1[i] === array2[j]) {
 
-                    commonElements.push(array1[i]);
 
-                }
 
+                    if (array1[i] === array2[j]) {
 
+                        commonElements.push(array1[i]);
 
+                    }
 
                 }
 
             }
 
             return commonElements;
 
@@ -418,4 +449,13 @@ export default {
 
     margin: 0 auto;
 
     height: calc(100% - 38px);
 
 }
 
+
 
+.eld >>> .el-dialog__header{
 
+    border-bottom: 1px solid #E7E7E7;
 
+}
 
+
 
+.eld >>> .el-dialog__body {
 
+    padding: 0 20px;
 
+    color: unset;
 
+}
 
 </style>

+ 97 - 27
src/components/pages/test/add/addTestXin.vue → src/components/pages/test/add/addTestJ.vue
View File 

@@ -25,9 +25,11 @@
 
                 </div>
 
                 <div class="step_box" :style="{ width: steps == 2 && '100%' }">
 
                     <setInfo v-if="steps == 1 && !loading" :oid="oid" :org="org" :steps.sync="steps" :title.sync="title"
 
-                        :testType.sync="testType" :see.sync="see" :cJson.sync="cJson" :typeid.sync="typeid" :brief.sync="brief" :juri.sync="juri" :overDate.sync="overDate" :juriList.sync="juriList"></setInfo>
 
-                    <editInfo v-if="steps == 2 && !loading" :oid="oid" :org="org" :steps.sync="steps" :title.sync="title"
 
-                        :cJson.sync="cJson" @save="save" @publish="publish"></editInfo>
 
+                        :testType.sync="testType" :see.sync="see" :cJson.sync="cJson" :typeid.sync="typeid"
 
+                        :brief.sync="brief" :juri.sync="juri" :overDate.sync="overDate" :juriList.sync="juriList" :typeInfo.sync="typeInfo">
 
+                    </setInfo>
 
+                    <editInfo v-if="steps == 2 && !loading" :oid="oid" :org="org" :steps.sync="steps"
 
+                        :title.sync="title" :cJson.sync="cJson" @save="save" @publish="publish"></editInfo>
 
                 </div>
 
             </div>
 
         </div>
 
@@ -48,18 +50,19 @@ export default {
 
             org: this.$route.query.org,
 
             role: this.$route.query.role,
 
             cid: this.$route.query.cid,
 
-            steps: 2,
 
+            steps: 1,
 
             title: "",
 
             testType: [],
 
             see: false,
 
             cJson: [],
 
-            loading:false,
 
-            look:"",
 
-            typeid:"",
 
-            brief:"",
 
-            juri:'0',
 
-            overDate:"",
 
-            juriList:"",
 
+            loading: false,
 
+            look: "",
 
+            typeid: "",
 
+            brief: "",
 
+            juri: '0',
 
+            overDate: "",
 
+            juriList: [],
 
+            typeInfo: [],
 
         }
 
     },
 
     watch: {
 
@@ -95,7 +98,7 @@ export default {
 
                         if (this.title == "") {
 
                             this.$message.error("请补充填写课程名称");
 
                             return;
 
-                        }else {
 
+                        } else {
 
                             this.addWork(5);
 
                         }
 
                         // else if(!this.juriList.length){
 
@@ -106,7 +109,7 @@ export default {
 
                         if (this.title == "") {
 
                             this.$message.error("请补充填写课程名称");
 
                             return;
 
-                        }else {
 
+                        } else {
 
                             this.updateWork(5);
 
                         }
 
                         // else if(!this.juriList.length){
 
@@ -135,6 +138,12 @@ export default {
 
             this.$router.push(path);
 
         },
 
         addWork(look) {
 
+            let j3 = []
 
+            if(this.typeInfo.length){
 
+                this.typeInfo.forEach(e => {
 
+                    j3.push(e.value)
 
+                })
 
+            }
 
             let params = [
 
                 {
 
                     uid: this.userid,
 
@@ -151,14 +160,15 @@ export default {
 
                     inviteCode: "",
 
                     typeid: this.typeid ? this.typeid : '',
 
                     overtime: this.overDate ? this.formatTime(this.overDate) : '',
 
-                    j2: this.juriList.length ? this.juriList.join(",") : ''
 
+                    j2: this.juriList.length ? this.juriList.join(",") : '',
 
+                    j3: j3.length ? j3.join(",") : '',
 
                 },
 
             ];
 
             this.ajax
 
-                .post(this.$store.state.api + "addTestCourse", params)
 
+                .post(this.$store.state.api + "addTestCourse3", params)
 
                 .then((res) => {
 
                     this.cid = res.data.courseId;
 
-                    if(look == 5){
 
+                    if (look == 5) {
 
                         this.$message.success("保存成功")
 
                         this.goTo(
 
                             "/test?userid=" +
 
@@ -185,10 +195,16 @@ export default {
 
             const year = date.getFullYear();
 
             const month = String(date.getMonth() + 1).padStart(2, '0');
 
             const day = String(date.getDate()).padStart(2, '0');
 
-            
+
 
             return `${year}-${month}-${day}`;
 
         },
 
         updateWork(look) {
 
+            let j3 = []
 
+            if(this.typeInfo.length){
 
+                this.typeInfo.forEach(e => {
 
+                    j3.push(e.value)
 
+                })
 
+            }
 
             let params = [
 
                 {
 
                     cid: this.cid,
 
@@ -206,13 +222,14 @@ export default {
 
                     look: look == 3 ? 2 : look == 4 ? this.look : look == 5 ? this.look : look,
 
                     typeid: this.typeid ? this.typeid : '',
 
                     overtime: this.overDate ? this.formatTime(this.overDate) : '',
 
-                    j2: this.juriList.length ? this.juriList.join(",") : ''
 
+                    j2: this.juriList.length ? this.juriList.join(",") : '',
 
+                    j3: j3.length ? j3.join(",") : '',
 
                 },
 
             ];
 
             this.ajax
 
-                .post(this.$store.state.api + "updateTestCourse", params)
 
+                .post(this.$store.state.api + "updateTestCourse3", params)
 
                 .then((res) => {
 
-                    if(look == 3){
 
+                    if (look == 3) {
 
                         this.$message.success("发布成功")
 
                         this.goTo(
 
                             "/test?userid=" +
 
@@ -224,11 +241,11 @@ export default {
 
                             "&role=" +
 
                             this.role
 
                         );
 
-                    }else if(look == 4){
 
+                    } else if (look == 4) {
 
                         this.$message.success("保存成功")
 
-                    }else if( look == 1 || look == 2){
 
+                    } else if (look == 1 || look == 2) {
 
                         // this.$message.success("保存成功")
 
-                    }else if(look == 5){
 
+                    } else if (look == 5) {
 
                         this.$message.success("保存成功")
 
                         this.goTo(
 
                             "/test?userid=" +
 
@@ -254,7 +271,7 @@ export default {
 
             if (this.cid == "" || this.cid == undefined) {
 
                 console.log("这是新增课程");
 
             } else {
 
-                if(type != 2){
 
+                if (type != 2) {
 
                     this.loading = true
 
                 }
 
                 let params = {
 
@@ -268,6 +285,16 @@ export default {
 
                         this.juri = res.data[0][0].juri ? res.data[0][0].juri : '0';
 
                         this.overDate = res.data[0][0].overTime ? res.data[0][0].overTime : '';
 
                         this.juriList = res.data[0][0].juri2 ? res.data[0][0].juri2.split(',') : [];
 
+                        let juri3 = res.data[0][0].juri3 ? res.data[0][0].juri3.split(',') : [];
 
+                        if(juri3.length > 0){
 
+                            this.typeInfo.forEach(e =>{
 
+                                let array2 = []
 
+                                for (var i = 0; i < e.child.length; i++) {
 
+                                    array2.push(e.child[i].id)
 
+                                }
 
+                                e.value = this.arrayToArray(juri3, array2)[0]
 
+                            })
 
+                        }
 
                         this.see = res.data[0][0].open == 1 ? true : false;
 
 
                         this.typeid = res.data[0][0].typeid;
 
@@ -279,7 +306,7 @@ export default {
 
                         console.log(this.testType);
 
                         this.look = res.data[0][0].look
 
                         this.$forceUpdate()
 
-                        if(type != 2){
 
+                        if (type != 2) {
 
                             this.loading = false
 
                         }
 
                     })
 
@@ -294,9 +321,52 @@ export default {
 
         publish() {
 
             this.updateWork(3)
 
         },
 
+        //获取分类类名
 
+        getTypeInfo() {
 
+            this.loading = true
 
+            let params = {
 
+                oid: this.oid
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectPerInfoAllTea", params)
 
+                .then((res) => {
 
+                    this.typeInfo = res.data[0];
 
+                    let typeInfo = res.data[1];
 
+                    this.typeInfo.forEach((e) => {
 
+                        e.child = [];
 
+                        e.value = '';
 
+                        typeInfo.forEach((i) => {
 
+                            if (e.id == i.parentid) {
 
+                                e.child.push({ id: i.id, name: i.name })
 
+                            }
 
+                        })
 
+                    })
 
+                    this.loading = false
 
+                    console.log(this.typeInfo, "typeInfo");
 
+                    this.getData();
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        arrayToArray(arrayo, arrayt) {
 
+            let array1 = arrayo;
 
+            let array2 = arrayt;
 
+
 
+            let commonElements = [];
 
+
 
+            for (let i = 0; i < array1.length; i++) {
 
+                for (let j = 0; j < array2.length; j++) {
 
+                if (array1[i] === array2[j]) {
 
+                    commonElements.push(array1[i]);
 
+                }
 
+                }
 
+            }
 
+            return commonElements;
 
+        },
 
     },
 
-    mounted () {
 
-        this.getData();
 
+    mounted() {
 
+        this.getTypeInfo();
 
     },
 
 }
 
 </script>

+ 3 - 3
src/components/pages/test/add/edit/check/index.vue
View File 

@@ -238,10 +238,10 @@ export default {
 
 .c_box {
 
   padding: 10px 0;
 
   box-sizing: border-box;
 
-  width: 95%;
 
-  margin: 10px auto 0;
 
+  width: 100%;
 
+  margin: 0 auto 0;
 
   background: #fff;
 
-  height: calc(100% - 10px);
 
+  height: calc(100% - 0px);
 
   overflow: auto;
 
 }

+ 72 - 5
src/components/pages/test/add/edit/edit/index.vue
View File 

@@ -27,7 +27,7 @@
 
                   pub_test_btn_choose2: item.value == 9,
 
                 }"
 
               >
 
-                {{ item.label }} 
+                {{ item.label }}
 
               </button>
 
             </div>
 
           </div>
 
@@ -82,7 +82,10 @@
 
       </div>
 
     </div>
 
     <div class="e_content">
 
-      <div class="title">{{ title }}</div>
 
+      <div v-if="!isEditing" class="title" @click="editTitle">{{ title ? title : '请填写表单标题' }}</div>
 
+      <input v-if="isEditing" class="titleInput" ref="title" v-model="titleValue" @blur="save" @keyup.enter="save" placeholder="请填写表单标题"/>
 
+      <div v-if="!isEditing2" class="detail" @click="editBref">{{ brief ? brief : '请填写表单说明' }}</div>
 
+      <input v-if="isEditing2" class="briefInput" ref="detail" v-model="briefValue" @blur="save2" @keyup.enter="save2" placeholder="请填写表单说明"/>
 
       <div class="e_order_box">
 
         <checkOrder
 
           :checkC.sync="checkC"
 
@@ -128,12 +131,19 @@ export default {
 
     title: {
 
       type: String,
 
     },
 
+    brief: {
 
+      type: String,
 
+    },
 
   },
 
   data() {
 
     return {
 
       manualJson: [],
 
       checkC: "",
 
       cJson: {},
 
+      isEditing: false,
 
+      titleValue: "",
 
+      isEditing2: false,
 
+      briefValue: "",
 
     };
 
   },
 
   watch: {
 
@@ -168,6 +178,30 @@ export default {
 
     },
 
   },
 
   methods: {
 
+    editTitle(){
 
+      this.isEditing = true;
 
+      this.titleValue = this.title ? JSON.parse(JSON.stringify(this.title)) : ''
 
+      this.$nextTick(() => {
 
+        // 聚焦到输入框
 
+        this.$refs['title'].focus();
 
+      });
 
+    },
 
+    save(){
 
+      this.isEditing = false;
 
+      this.$emit("updateTitle", this.titleValue);
 
+    },
 
+    editBref(){
 
+      this.isEditing2 = true;
 
+      this.briefValue = this.brief ? JSON.parse(JSON.stringify(this.brief)) : ''
 
+      this.$nextTick(() => {
 
+        // 聚焦到输入框
 
+        this.$refs['brief'].focus();
 
+      });
 
+    },
 
+    save2(){
 
+      this.isEditing2 = false;
 
+      this.$emit("updateBrief", this.briefValue);
 
+    },
 
     changeJson(json) {
 
       this.manualJson = json;
 
       this.$emit("changeJson", json);
 
@@ -539,16 +573,18 @@ export default {
 
   overflow: auto;
 
   padding: 20px 10px;
 
   box-sizing: border-box;
 
-  border-right: 1px solid #e5e5e5;
 
+  /* border-right: 1px solid #e5e5e5; */
 
+  border-radius: 5px;
 
 }
 
 
 .e_content {
 
   height: 100%;
 
-  width: calc(100% - 600px);
 
+  width: calc(100% - 640px);
 
   background: #fff;
 
   overflow: auto;
 
-  padding: 20px 0;
 
+  padding: 20px;
 
   box-sizing: border-box;
 
+  border-radius: 5px;
 
 }
 
 
 .e_content > .title {
 
@@ -560,6 +596,36 @@ export default {
 
   word-break: break-all;
 
 }
 
 
+.titleInput {
 
+  font-size: 24px;
 
+  font-weight: bold;
 
+  text-align: center;
 
+  width: 100%;
 
+  margin-bottom: 10px;
 
+  border: none;
 
+  outline: none;
 
+}
 
+
 
+.briefInput{
 
+  font-size: 14px;
 
+  text-align: center;
 
+  width: 100%;
 
+  margin-bottom: 10px;
 
+  border: none;
 
+  outline: none;
 
+  width: 100%;
 
+}
 
+
 
+.e_content > .detail {
 
+  font-size: 14px;
 
+  text-align: center;
 
+  width: 100%;
 
+  margin-bottom: 10px;
 
+  word-break: break-all;
 
+  color:#00000066;
 
+}
 
+
 
+
 
 .e_order {
 
   height: 100%;
 
   width: 300px;
 
@@ -567,6 +633,7 @@ export default {
 
   overflow: auto;
 
   padding: 20px 10px;
 
   box-sizing: border-box;
 
+  border-radius: 5px;
 
 }
 
 
 .e_add > .title,

+ 151 - 8
src/components/pages/test/add/edit/edit/indexXin.vue → src/components/pages/test/add/edit/edit/indexJ.vue
View File 

@@ -19,8 +19,34 @@
 
                 class="pub_test_btn"
 
                 :class="{
 
                   pub_test_btn_text: item.value == 3,
 
-                  pub_test_btn_choose: item.value == 1,
 
+                  pub_test_btn_choose: item.value == 1 || item.value == 10,
 
                   pub_test_btn_file: item.value == 5,
 
+                  pub_test_btn_course: item.value == 6,
 
+                  pub_test_btn_eva: item.value == 7,
 
+                  pub_test_btn_time: item.value == 8,
 
+                  pub_test_btn_choose2: item.value == 9,
 
+                }"
 
+              >
 
+                {{ item.label }} 
+              </button>
 
+            </div>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      <div class="e_add_box">
 
+        <div class="title">平台组件</div>
 
+        <div class="e_add_ci">
 
+          <div class="box">
 
+            <div
 
+              class="btn"
 
+              v-for="item in optionsPin"
 
+              :key="item.label"
 
+              @click="addCheck(item.value)"
 
+            >
 
+              <button
 
+                class="pub_test_btn"
 
+                :class="{
 
+                  pub_test_btn_course: item.value == 6 || item.value == 11,
 
                 }"
 
               >
 
                 {{ item.label }}
 
@@ -148,6 +174,27 @@ export default {
 
     },
 
     addCheck(topicType) {
 
       let type = 1;
 
+			// if(this.manualJson.filter(i=>i.type==6).length>=1){
 
+			// 	return this.$message.error("一个表单只能添加一个课程组件");
 
+			// }
 
+			function checkType(obj){
 
+				if(obj.filter(i=>i.array).length>0){
 
+					let bol = false;
 
+					obj.forEach(i=>{
 
+						console.log(i.array)
 
+						if(bol)return;
 
+						bol = checkType(i.array);
 
+					})
 
+					return bol;
 
+				}else if(obj.filter(i=>i.type==6).length>=1){
 
+					return true;
 
+				}else{
 
+					return false;
 
+				}
 
+			}
 
+			if(topicType == 6 && checkType(this.manualJson)){
 
+				return this.$message.error("一个表单只能添加一个课程组件");
 
+			}
 
       if (this.manualJson.length > 0) {
 
         for (var i = 0; i < this.manualJson.length; i++) {
 
           if (this.manualJson[i].ttype == 2) {
 
@@ -157,12 +204,19 @@ export default {
 
           }
 
         }
 
       }
 
+
 
       if (this.checkC) {
 
         let _check = this.checkC.replace("x", "").split("-");
 
         let _json = this.manualJson[_check[0]];
 
+        let _topicType = ''
 
+        if(topicType == 9 || topicType == 10){
 
+          _topicType = 1 
+        }else {
 
+          _topicType = topicType
 
+        }
 
         let json = {
 
           ttype: 1,
 
-          type: topicType,
 
+          type: _topicType,
 
         };
 
         if (topicType == 1) {
 
           json.json = {
 
@@ -186,6 +240,49 @@ export default {
 
             type: 1,
 
             detail: "",
 
           };
 
+        } else if (topicType == 6) {
 
+          json.json = {
 
+            title: "标题",
 
+            detail: "",
 
+            courses:[]
 
+          };
 
+        } else if (topicType == 7) {
 
+          json.json = {
 
+            title: "标题",
 
+            detail: "",
 
+            small: 0,
 
+            big: 10,
 
+          };
 
+        } else if (topicType == 8) {
 
+          json.json = {
 
+            title: "标题",
 
+            detail: "",
 
+          };
 
+        }else if (topicType == 9) {
 
+          json.json = {
 
+            title: "标题",
 
+            type: 1,
 
+            array: [
 
+              { option: "选项1", img: "" },
 
+              { option: "选项2", img: "" },
 
+            ],
 
+            answer: "",
 
+          };
 
+        }else if (topicType == 10) {
 
+          json.json = {
 
+            title: "标题",
 
+            type: 2,
 
+            array: [
 
+              { option: "选项1", img: "" },
 
+              { option: "选项2", img: "" },
 
+            ],
 
+            answer: "",
 
+          };
 
+        } else if (topicType == 11) {
 
+          json.json = {
 
+            title: "标题",
 
+            detail: ""
 
+          };
 
         }
 
         if (_json.array) {
 
           if (type == 3 && _check.length == 2) {
 
@@ -227,9 +324,15 @@ export default {
 
         }
 
       } else {
 
         if (type == 1) {
 
+          let _topicType = ''
 
+          if(topicType == 9 || topicType == 10){
 
+            _topicType = 1 
+          }else {
 
+            _topicType = topicType
 
+          }
 
           let json1 = {
 
             ttype: 1,
 
-            type: topicType,
 
+            type: _topicType,
 
           };
 
 
           if (topicType == 1) {
 
@@ -254,6 +357,49 @@ export default {
 
               type: 1,
 
               detail: "",
 
             };
 
+          } else if (topicType == 6) {
 
+            json1.json = {
 
+              title: "标题",
 
+              detail: "",
 
+              courses:[]
 
+            };
 
+          } else if (topicType == 7) {
 
+            json1.json = {
 
+              title: "标题",
 
+              detail: "",
 
+              small: 0,
 
+              big: 10,
 
+            };
 
+          } else if (topicType == 8) {
 
+            json1.json = {
 
+              title: "标题",
 
+              detail: "",
 
+            };
 
+          } else if (topicType == 9) {
 
+            json1.json = {
 
+              title: "标题",
 
+              type: 1,
 
+              array: [
 
+                { option: "选项1", img: "" },
 
+                { option: "选项2", img: "" },
 
+              ],
 
+              answer: "",
 
+            };
 
+          } else if (topicType == 10) {
 
+            json1.json = {
 
+              title: "标题",
 
+              type: 2,
 
+              array: [
 
+                { option: "选项1", img: "" },
 
+                { option: "选项2", img: "" },
 
+              ],
 
+              answer: "",
 
+            };
 
+          } else if (topicType == 11) {
 
+            json1.json = {
 
+              title: "标题",
 
+              detail: ""
 
+            };
 
           }
 
           this.manualJson.push(json1);
 
           this.$forceUpdate()
 
@@ -393,18 +539,16 @@ export default {
 
   overflow: auto;
 
   padding: 20px 10px;
 
   box-sizing: border-box;
 
-  /* border-right: 1px solid #e5e5e5; */
 
-  border-radius: 5px;
 
+  border-right: 1px solid #e5e5e5;
 
 }
 
 
 .e_content {
 
   height: 100%;
 
-  width: calc(100% - 640px);
 
+  width: calc(100% - 600px);
 
   background: #fff;
 
   overflow: auto;
 
   padding: 20px 0;
 
   box-sizing: border-box;
 
-  border-radius: 5px;
 
 }
 
 
 .e_content > .title {
 
@@ -423,7 +567,6 @@ export default {
 
   overflow: auto;
 
   padding: 20px 10px;
 
   box-sizing: border-box;
 
-  border-radius: 5px;
 
 }
 
 
 .e_add > .title,

+ 19 - 9
src/components/pages/test/add/edit/index.vue
View File 

@@ -1,8 +1,8 @@
 
 <template>
 
   <div class="rightBox">
 
-    <div class="title">
 
+    <!-- <div class="title">
 
       <div class="c_info_title">创建表单内容</div>
 
-    </div>
 
+    </div> -->
 
     <div class="edit_top">
 
       <div class="edit_btn">
 
         <span class="edit" :class="{ active: type == 1 }" @click="type = 1">编辑</span>
 
@@ -11,14 +11,14 @@
 
         <span :class="{ active: type == 4 }" @click="type = 4">统计</span> -->
 
       </div>
 
       <div class="op_btn">
 
-        <el-button type="primary" size="small" @click="lastSteps">上一步</el-button>
 
+        <!-- <el-button type="primary" size="small" @click="lastSteps">上一步</el-button> -->
 
         <el-button type="primary" size="small" @click="save">保存</el-button>
 
         <el-button type="primary" size="small" @click="publish">发布</el-button>
 
 
       </div>
 
     </div>
 
     <div class="e_box">
 
-      <editBox v-if="type == 1" :checkJson="checkJson" @changeJson="changeJson" :title="title"></editBox>
 
+      <editBox v-if="type == 1" :checkJson="checkJson" @changeJson="changeJson" :title="title" :brief="brief" @updateTitle="updateTitle" @updateBrief="updateBrief"></editBox>
 
       <checkBox v-if="type == 2" :cJson="checkJson" :title="title"></checkBox>
 
     </div>
 
   </div>
 
@@ -37,6 +37,9 @@ export default {
 
     title: {
 
       type: String
 
     },
 
+    brief: {
 
+      type: String
 
+    },
 
     testType: {
 
       type: Array
 
     },
 
@@ -65,6 +68,13 @@ export default {
 
     },
 
   },
 
   methods: {
 
+    updateTitle(value){
 
+      console.log(value);
 
+      this.$emit('update:title', value)
 
+    },
 
+    updateBrief(value){
 
+      this.$emit('update:brief', value)
 
+    },
 
     lastSteps() {
 
       this.$emit('update:steps', this.steps - 1)
 
     },
 
@@ -113,7 +123,7 @@ export default {
 
 .rightBox {
 
   width: calc(100%);
 
   /* background: #F0F2F5; */
 
-  background: #fff;
 
+  /* background: #fff; */
 
   overflow: auto;
 
   height: calc(100%);
 
   margin: 0 auto;
 
@@ -207,14 +217,14 @@ export default {
 
 }
 
 
 .e_box {
 
-  height: calc(100% - 135px);
 
+  height: calc(100% - 90px);
 
   width: calc(100% - 40px);
 
   overflow: hidden;
 
   /* background: rgb(196, 226, 241); */
 
-  background: #fff;
 
-  border: 1px solid #E5E5E5;
 
+  /* background: #fff; */
 
+  /* border: 1px solid #E5E5E5; */
 
   -webkit-box-sizing: border-box;
 
   box-sizing: border-box;
 
-  margin: 15px auto 0;
 
+  margin: 20px auto 0;
 
   border-radius: 5px;
 
 }</style>

+ 7 - 6
src/components/pages/test/add/edit/indexXin.vue → src/components/pages/test/add/edit/indexJ.vue
View File 

@@ -1,8 +1,8 @@
 
 <template>
 
   <div class="rightBox">
 
-    <!-- <div class="title">
 
+    <div class="title">
 
       <div class="c_info_title">创建表单内容</div>
 
-    </div> -->
 
+    </div>
 
     <div class="edit_top">
 
       <div class="edit_btn">
 
         <span class="edit" :class="{ active: type == 1 }" @click="type = 1">编辑</span>
 
@@ -78,6 +78,7 @@ export default {
 
       return s ? JSON.parse(JSON.stringify(s)) : ''
 
     },
 
     changeJson(json) {
 
+      console.log(json);
 
       this.$emit("update:cJson", json);
 
     }
 
   },
 
@@ -112,7 +113,7 @@ export default {
 
 .rightBox {
 
   width: calc(100%);
 
   /* background: #F0F2F5; */
 
-  /* background: #fff; */
 
+  background: #fff;
 
   overflow: auto;
 
   height: calc(100%);
 
   margin: 0 auto;
 
@@ -206,12 +207,12 @@ export default {
 
 }
 
 
 .e_box {
 
-  height: calc(100% - 90px);
 
+  height: calc(100% - 135px);
 
   width: calc(100% - 40px);
 
   overflow: hidden;
 
   /* background: rgb(196, 226, 241); */
 
-  /* background: #fff; */
 
-  /* border: 1px solid #E5E5E5; */
 
+  background: #fff;
 
+  border: 1px solid #E5E5E5;
 
   -webkit-box-sizing: border-box;
 
   box-sizing: border-box;
 
   margin: 15px auto 0;

+ 21 - 47
src/components/pages/test/add/setInfo/index.vue
View File 

@@ -5,8 +5,8 @@
 
                 <div class="basic_box" style="padding: 0;">
 
                     <div class="big_box">
 
                         <div class="left_first">
 
-                            <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">设置基础信息</div>
 
-                            <div>
 
+                            <!-- <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">设置基础信息</div> -->
 
+                            <!-- <div>
 
                                 <div style="width: 100%;">
 
                                     <div class="course_input_box">
 
                                         <div class="bb_courseIcon"><img
 
@@ -19,7 +19,7 @@
 
                                             style="justify-content: center;" @change="seeChange"></el-switch>
 
                                     </div>
 
                                 </div>
 
-                            </div>
 
+                            </div> -->
 
                             <!-- <div class="typeBox">
 
                                 <span>权限：</span>
 
                                 <el-select v-model="sJuri" placeholder="权限" @change="juriChange">
 
@@ -28,26 +28,26 @@
 
                                     <el-option label="学生" value="2"></el-option>
 
                                 </el-select>
 
                             </div> -->
 
-                            <div class="typeBox" style="display: flex;align-items: center;">
 
+                            <!-- <div class="typeBox" style="display: flex;align-items: center;">
 
                                 <span>教研室权限：</span>
 
                                 <div class="checkJuri" @click="checkJuri">
 
                                     <span v-if="!getCName(checkList)" style="color: #c0c4d6;">所有人</span>
 
                                     <span>{{ getCName(checkList) }}</span>
 
                                 </div>
 
-                            </div>
 
-                            <div class="typeBox">
 
-                                <span>截止日期：</span>
 
-                                <el-date-picker v-model="selectedDate" type="date" :picker-options="pickerOptions"
 
-                                    @change="DateChange" format="yyyy-MM-dd" clearable=""
 
-                                    placeholder="选择截止日期"></el-date-picker>
 
-                            </div>
 
-                            <div class="typeBox" v-if="typeArray.length">
 
-                                <span>类型：</span>
 
+                            </div> -->
 
+                            <div class="typeBox" v-if="typeArray.length" style="display: flex;flex-direction: column;">
 
+                                <span style="margin-bottom: 10px;">表单类型：</span>
 
                                 <el-select v-model="typeCheck" placeholder="选择类型" clearable @change="typeChange2">
 
                                     <el-option v-for="(item, index) in typeArray" :key="index" :label="item.name"
 
                                         :value="item.id"></el-option>
 
                                 </el-select>
 
                             </div>
 
+                            <div class="typeBox" style="display: flex;flex-direction: column;">
 
+                                <span style="margin-bottom: 10px;">截止日期：</span>
 
+                                <el-date-picker v-model="selectedDate" type="date" :picker-options="pickerOptions"
 
+                                    @change="DateChange" format="yyyy-MM-dd" clearable=""
 
+                                    placeholder="选择截止日期" style="width: 100%;"></el-date-picker>
 
+                            </div>
 
                             <div class="both">
 
                                 <div class="choose">
 
                                     <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index"
 
@@ -65,7 +65,7 @@
 
                             <div class="whiteBg" style="border-radius: 0; margin-top: 0px;margin-bottom: 10px;" v-if="teaType.length">
 
                                 <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">设置填写范围
 
                                     <span style="font-weight: 500; color: #7F7979E5;">（符合以下所有条件的教师）</span>
 
-                                    <span style="font-weight: 500; margin-left: 10px; cursor: pointer;" @click="checkTeacher">已选：{{ teacherArray.length }}人</span>
 
+                                    <span style="margin-left: auto; cursor: pointer;" @click="checkTeacher">已选：{{ teacherArray.length }}人</span>
 
                                 </div>
 
                                 <div class="typeBox" v-for="item in teaType" :key="item.id" style="margin: 0 0 10px">
 
                                     <span>{{ item.name + "：" }}</span>
 
@@ -76,7 +76,7 @@
 
                                     </el-select>
 
                                 </div>
 
                             </div>
 
-                            <div class="whiteBg" style="border-radius: 0; margin-top: 0px">
 
+                            <!-- <div class="whiteBg" style="border-radius: 0; margin-top: 0px">
 
                                 <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">表单描述</div>
 
                                 <div style="width: 100%;box-sizing: border-box;">
 
                                     <div style="width: calc((100%))">
 
@@ -84,39 +84,12 @@
 
                                             v-model="courseText" placeholder="表单描述" @change="briefChange"></textarea>
 
                                     </div>
 
                                 </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
-            </div>
 
-        </div>
 
-        <div class="e_btn" style="display: flex;justify-content: center;margin-top: 10px;"
 
-            v-show="oid == 'd67940a5-510c-40ea-9c9a-2631ab03013a'">
 
-            <el-button type="primary" size="mini" @click="nextSteps()">下一步</el-button>
 
-        </div>
 
-        <div class="whiteBg" style="background:#fff;margin: 10px 0;min-height: 300px;"
 
-            v-show="oid != 'd67940a5-510c-40ea-9c9a-2631ab03013a'">
 
-            <div class="whiteBg" style="border-radius: 0">
 
-                <div class="c_info_title">创建表单内容</div>
 
-                <div class="c_info_box">
 
-                    <div class="c_info_tab">
 
-                        <!-- <span :class="{ active: type == 1 }" @click="type = 1">智能创建</span> -->
 
-                        <span :class="{ active: type == 2 }" @click="type = 2">手动创建</span>
 
-                        <!-- <span :class="{ active: type == 3 }" @click="type = 3">题库导入</span> -->
 
-                        <div class="skip_btn">
 
-                            <!-- <el-button type="primary" size="mini" @click="openAiCreate">智能创建</el-button> -->
 
-                            <!-- <el-button type="primary" size="mini" @click="nextSteps">跳过</el-button> -->
 
+                            </div> -->
 
                         </div>
 
-
 
-                    </div>
 
-                    <div class="c_info_tab_box">
 
-                        <manualCreate v-if="type == 2" :manualJson.sync="manualJson" @nextSteps="nextSteps">
 
-                        </manualCreate>
 
                     </div>
 
                 </div>
 
             </div>
 
         </div>
 
-        <aiCreate :aiJson.sync="manualJson" :aiDialogVisible.sync="aiDialogVisible" v-if="aiDialogVisible"></aiCreate>
 
         <el-dialog title="选择权限" :visible.sync="juriDialog" :append-to-body="true" :before-close="handleClose"
 
             class="dialog_diy" width="500px">
 
             <van-divider>
 
@@ -527,6 +500,7 @@ export default {
 
     margin: 0 auto;
 
     position: relative;
 
     box-sizing: border-box;
 
+    overflow: hidden;
 
 }
 
 
 .whiteBg {
 
@@ -552,7 +526,7 @@ export default {
 
     flex-direction: column;
 
     flex-wrap: nowrap;
 
     width: calc(100%);
 
-    padding: 20px;
 
+    padding: 0;
 
     box-sizing: border-box;
 
     background: #fff;
 
     border-radius: 5px;
 
@@ -687,7 +661,7 @@ export default {
 
 
 .c_info_title {
 
     padding: 15px 0 15px 0;
 
-    font-size: 16px;
 
+    font-size: 14px;
 
     font-weight: bold;
 
     margin: 0 0 0 20px;
 
     box-sizing: border-box;
 
@@ -696,7 +670,7 @@ export default {
 
     line-height: 20px;
 
 }
 
 
-.c_info_title::before {
 
+/* .c_info_title::before {
 
     content: '';
 
     display: block;
 
     width: 3px;
 
@@ -704,7 +678,7 @@ export default {
 
     background: #0061FF;
 
     border-radius: 3px;
 
     margin: 0 5px 0 0;
 
-}
 
+} */
 
 
 .c_info_box {
 
     width: 100%;

+ 835 - 0
src/components/pages/test/add/setInfo/indexJ.vue
View File 

@@ -0,0 +1,835 @@
 
+<template>
 
+    <div class="rightBox">
 
+        <div class="whiteBg" style="background:unset;padding: 0;">
 
+            <div>
 
+                <div class="basic_box" style="padding: 0;">
 
+                    <div class="big_box">
 
+                        <div class="left_first">
 
+                            <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">设置基础信息</div>
 
+                            <div>
 
+                                <div style="width: 100%;">
 
+                                    <div class="course_input_box">
 
+                                        <div class="bb_courseIcon"><img
 
+                                                src="../../../../../assets/icon/new/course.png" />
 
+                                        </div>
 
+                                        <input @input="titleChange" type="text" placeholder="请输入表单名称"
 
+                                            class="binfo_input" v-model="courseName"
 
+                                            style="border: 1.5px solid rgb(202, 209, 220);margin: 0px 10px 0px 0px;border-radius: 5px;font-weight: 600;padding: 12px 14px 12px 71px;" />
 
+                                        <el-switch v-model="isTeacherSee" active-text="允许回答后查看正确答案"
 
+                                            style="justify-content: center;" @change="seeChange"></el-switch>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                            <!-- <div class="typeBox">
 
+                                <span>权限：</span>
 
+                                <el-select v-model="sJuri" placeholder="权限" @change="juriChange">
 
+                                    <el-option label="所有人" value="0"></el-option>
 
+                                    <el-option label="老师" value="1"></el-option>
 
+                                    <el-option label="学生" value="2"></el-option>
 
+                                </el-select>
 
+                            </div> -->
 
+                            <div class="typeBox" style="display: flex;align-items: center;">
 
+                                <span>教研室权限：</span>
 
+                                <div class="checkJuri" @click="checkJuri">
 
+                                    <span v-if="!getCName(checkList)" style="color: #c0c4d6;">所有人</span>
 
+                                    <span>{{ getCName(checkList) }}</span>
 
+                                </div>
 
+                            </div>
 
+                            <div class="typeBox">
 
+                                <span>截止日期：</span>
 
+                                <el-date-picker v-model="selectedDate" type="date" :picker-options="pickerOptions"
 
+                                    @change="DateChange" format="yyyy-MM-dd" clearable=""
 
+                                    placeholder="选择截止日期"></el-date-picker>
 
+                            </div>
 
+                            <div class="typeBox" v-if="typeArray.length">
 
+                                <span>类型：</span>
 
+                                <el-select v-model="typeCheck" placeholder="选择类型" clearable @change="typeChange2">
 
+                                    <el-option v-for="(item, index) in typeArray" :key="index" :label="item.name"
 
+                                        :value="item.id"></el-option>
 
+                                </el-select>
 
+                            </div>
 
+                            <div class="both">
 
+                                <div class="choose">
 
+                                    <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index"
 
+                                        @change="typeChange">
 
+                                        <span v-if="CourseTypeJson[item.id].length > 0">{{ item.name }}:</span>
 
+                                        <el-checkbox-group v-model="courseTypeId"
 
+                                            v-if="CourseTypeJson[item.id].length > 0">
 
+                                            <el-checkbox v-for="item1 in CourseTypeJson[item.id]" :key="item1.id"
 
+                                                :label="item1.id">{{
 
+                                                    item1.name }}</el-checkbox>
 
+                                        </el-checkbox-group>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                            <div class="whiteBg" style="border-radius: 0; margin-top: 0px;margin-bottom: 10px;" v-if="teaType.length">
 
+                                <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">设置填写范围
 
+                                    <span style="font-weight: 500; color: #7F7979E5;">（符合以下所有条件的教师）</span>
 
+                                    <span style="font-weight: 500; margin-left: 10px; cursor: pointer;" @click="checkTeacher">已选：{{ teacherArray.length }}人</span>
 
+                                </div>
 
+                                <div class="typeBox" v-for="item in teaType" :key="item.id" style="margin: 0 0 10px">
 
+                                    <span>{{ item.name + "：" }}</span>
 
+                                    <el-select v-model="item.value" :placeholder="'请选择' + item.name"
 
+                                        @change="Ochange" clearable>
 
+                                        <el-option v-for="i in item.child" :key="i.id" :label="i.name" :value="i.id">
 
+                                        </el-option>
 
+                                    </el-select>
 
+                                </div>
 
+                            </div>
 
+                            <div class="whiteBg" style="border-radius: 0; margin-top: 0px">
 
+                                <div class="c_info_title" style="padding: 0 0 15px;margin: 0 auto 0 0;">表单描述</div>
 
+                                <div style="width: 100%;box-sizing: border-box;">
 
+                                    <div style="width: calc((100%))">
 
+                                        <textarea v-autoHeight="68" rows="2" class="binfo_input binfo_textarea" cols
 
+                                            v-model="courseText" placeholder="表单描述" @change="briefChange"></textarea>
 
+                                    </div>
 
+                                </div>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="e_btn" style="display: flex;justify-content: center;margin-top: 10px;"
 
+            v-show="oid == 'd67940a5-510c-40ea-9c9a-2631ab03013a'">
 
+            <el-button type="primary" size="mini" @click="nextSteps()">下一步</el-button>
 
+        </div>
 
+        <div class="whiteBg" style="background:#fff;margin: 10px 0;min-height: 300px;"
 
+            v-show="oid != 'd67940a5-510c-40ea-9c9a-2631ab03013a'">
 
+            <div class="whiteBg" style="border-radius: 0">
 
+                <div class="c_info_title">创建表单内容</div>
 
+                <div class="c_info_box">
 
+                    <div class="c_info_tab">
 
+                        <!-- <span :class="{ active: type == 1 }" @click="type = 1">智能创建</span> -->
 
+                        <span :class="{ active: type == 2 }" @click="type = 2">手动创建</span>
 
+                        <!-- <span :class="{ active: type == 3 }" @click="type = 3">题库导入</span> -->
 
+                        <div class="skip_btn">
 
+                            <!-- <el-button type="primary" size="mini" @click="openAiCreate">智能创建</el-button> -->
 
+                            <!-- <el-button type="primary" size="mini" @click="nextSteps">跳过</el-button> -->
 
+                        </div>
 
+
 
+                    </div>
 
+                    <div class="c_info_tab_box">
 
+                        <manualCreate v-if="type == 2" :manualJson.sync="manualJson" @nextSteps="nextSteps">
 
+                        </manualCreate>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <aiCreate :aiJson.sync="manualJson" :aiDialogVisible.sync="aiDialogVisible" v-if="aiDialogVisible"></aiCreate>
 
+        <el-dialog title="选择权限" :visible.sync="juriDialog" :append-to-body="true" :before-close="handleClose"
 
+            class="dialog_diy" width="500px">
 
+            <van-divider>
 
+                <div class="people_name">
 
+                    <el-checkbox v-model="checkAll" @change="checkAllChange">全选</el-checkbox>
 
+                    <el-checkbox v-model="ischeckAll" @change="ischeckAllChange">所有人</el-checkbox>
 
+                </div>
 
+                <div style="max-height: 300px;overflow: auto;">
 
+                    <el-checkbox-group v-model="checkList2" class="people_name" @change="pChange">
 
+                        <el-checkbox v-for="item in classJuri" :key="item.id" :label="item.id">
 
+                            {{ item.name }}
 
+                        </el-checkbox>
 
+                    </el-checkbox-group>
 
+                </div>
 
+            </van-divider>
 
+            <span slot="footer" class="dialog-footer">
 
+                <el-button @click="juriDialog = false">取 消</el-button>
 
+                <el-button type="primary" @click="confirmCheck">确 定
 
+                </el-button>
 
+            </span>
 
+        </el-dialog>
 
+        <el-dialog title="填写返回已选教师" :visible.sync="dialogTeacher" :append-to-body="true" :before-close="handleClose"
 
+            class="dialog_diy" width="500px">
 
+            <van-divider>
 
+                <div style="display: flex;flex-wrap: wrap;line-height: 20px;">
 
+                    <span style="color: #00000099;">已选教师名单：</span>
 
+                    <span style="word-break: break-word;" v-for="(item, index) in teacherArray" :key="item.userid">
 
+                        {{ item.username }}{{ index == teacherArray.length - 1 ? '' : '、' }}
 
+                    </span>
 
+                </div>
 
+            </van-divider>
 
+        </el-dialog>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+import manualCreate from './manualCreated.vue';
 
+import aiCreate from './aiCreate.vue';
 
+export default {
 
+    components: {
 
+        manualCreate,
 
+        aiCreate
 
+    },
 
+    props: {
 
+        oid: {
 
+            type: String
 
+        },
 
+        org: {
 
+            type: String
 
+        },
 
+        title: {
 
+            type: String
 
+        },
 
+        testType: {
 
+            type: Array
 
+        },
 
+        see: {
 
+            type: Boolean
 
+        },
 
+        steps: {
 
+            type: Number
 
+        },
 
+        cJson: {
 
+            type: Array
 
+        },
 
+        typeid: {
 
+            type: String
 
+        },
 
+        brief: {
 
+            type: String
 
+        },
 
+        juri: {
 
+            type: String
 
+        },
 
+        overDate: {
 
+            type: String
 
+        },
 
+        juriList: {
 
+            type: Array
 
+        },
 
+        typeInfo: {
 
+            type: Array
 
+        }
 
+    },
 
+    data() {
 
+        return {
 
+            CourseType: [],
 
+            courseTypeId: [],
 
+            CourseTypeJson: {},
 
+            courseName: "",
 
+            isTeacherSee: false,
 
+            type: 2,
 
+            manualJson: [],
 
+            aiDialogVisible: false,
 
+            typeArray: [],
 
+            typeCheck: '',
 
+            sJuri: '',
 
+            courseText: '',
 
+            selectedDate: '',
 
+            pickerOptions: {
 
+                disabledDate(time) {
 
+                    return time.getTime() < Date.now(); // 只能选择大于今天的日期
 
+                },
 
+            },
 
+            classJuri: [],
 
+            checkList: [],
 
+            checkList2: [],
 
+            juriDialog: false,
 
+            checkAll: false,
 
+            ischeckAll: false,
 
+            teaType: [],
 
+            teacherArray:[],
 
+            dialogTeacher: false,
 
+        }
 
+    },
 
+    computed: {
 
+        getCName() {
 
+            return function (clist) {
 
+                let _people = [];
 
+                let _people2 = [];
 
+                let _people3 = [];
 
+                if (this.classJuri.length) {
 
+                    for (var i = 0; i < this.classJuri.length; i++) {
 
+                        _people2.push(this.classJuri[i].id);
 
+                    }
 
+                    for (var i = 0; i < clist.length; i++) {
 
+                        if (_people2.indexOf(clist[i]) !== -1) {
 
+                            _people3.push(clist[i]);
 
+                        }
 
+                    }
 
+                    for (var i = 0; i < this.classJuri.length; i++) {
 
+                        if (_people3.indexOf(this.classJuri[i].id) !== -1) {
 
+                            _people.push(this.classJuri[i].name);
 
+                        }
 
+                    }
 
+                }
 
+                return this.classJuri.length ? _people.join(',') : "所有人";
 
+            };
 
+        },
 
+    },
 
+    directives: {
 
+        autoHeight: {
 
+            update(el, binding) {
 
+                const { value } = binding
 
+                if (value && typeof value === 'number') {
 
+                    el.style.height = `${value}px`
 
+                } else {
 
+                    el.style.height = 'auto'
 
+                }
 
+            },
 
+            componentUpdated(el) {
 
+                el.style.height = `${el.scrollHeight + 5}px`
 
+            },
 
+        },
 
+    },
 
+    watch: {
 
+        teaType: {
 
+            immediate: true,
 
+            deep: true,
 
+            handler(newValue, oldValue) {
 
+                this.getTestWorkTeacherCount()
 
+            },
 
+        },
 
+    },
 
+    methods: {
 
+        getTestWorkTeacherCount(){
 
+            let j3 = []
 
+            if(this.teaType.length){
 
+                this.teaType.forEach(e => {
 
+                    j3.push(e.value)
 
+                })
 
+            }
 
+            let params = [{
 
+                juri: j3.length ? j3.join(',') : "",
 
+                userid: this.$route.query.userid
 
+            }]
 
+            this.ajax
 
+                .post(this.$store.state.api + "getTestWorkTeacherCount", params)
 
+                .then((res) => {
 
+                    this.teacherArray = res.data[0]
 
+                })
 
+                .catch((err) => {
 
+                    this.$message.error("网络不佳");
 
+                    console.error(err);
 
+                });
 
+        },
 
+        Ochange() {
 
+            this.$forceUpdate()
 
+            this.$emit("update:typeInfo", this.teaType)
 
+        },
 
+        handleClose(done) {
 
+            done();
 
+        },
 
+        selectAllType() {
 
+            let params = {
 
+                org: this.org && this.org != "" ? this.org : "",
 
+                oid: this.oid && this.oid != "" ? this.oid : "",
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectAllTypeT", params)
 
+                .then((res) => {
 
+                    this.CourseType = res.data;
 
+                    for (var cti = 0; cti < res.data[0].length; cti++) {
 
+                        if (res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5") {
 
+                            res.data[0][cti].name = "年级";
 
+                        } else if (res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5") {
 
+                            res.data[0][cti].name = "学科";
 
+                        }
 
+                    }
 
+                    let _courseTypeId = [];
 
+                    for (var i = 0; i < res.data[0].length; i++) {
 
+                        if (!this.cid) {
 
+                            this.courseTypeId[res.data[0][i].id] = [];
 
+                        }
 
+                        // if (!this.CourseTypeJson[res.data[0][i].id]) {
 
+                        // }
 
+                        this.CourseTypeJson[res.data[0][i].id] = [];
 
+
 
+                        if (res.data[2].length == 0 && res.data[3].length == 0) {
 
+                            for (var j = 0; j < res.data[1].length; j++) {
 
+                                if (
 
+                                    this.courseTypeId.indexOf(res.data[1][j].id) != -1 &&
 
+                                    _courseTypeId.indexOf(res.data[1][j].id) == -1
 
+                                ) {
 
+                                    _courseTypeId.push(res.data[1][j].id);
 
+                                }
 
+                                if (res.data[0][i].id == res.data[1][j].pid) {
 
+                                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                                }
 
+                            }
 
+                        } else {
 
+                            if (res.data[2].length > 0) {
 
+                                for (var j = 0; j < res.data[2].length; j++) {
 
+                                    if (
 
+                                        this.courseTypeId.indexOf(res.data[2][j].id) != -1 &&
 
+                                        _courseTypeId.indexOf(res.data[2][j].id) == -1
 
+                                    ) {
 
+                                        _courseTypeId.push(res.data[2][j].id);
 
+                                    }
 
+                                    if (res.data[0][i].id == res.data[2][j].pid) {
 
+                                        this.CourseTypeJson[res.data[0][i].id].push(res.data[2][j]); // 去除公共分类
 
+                                    }
 
+                                }
 
+                            }
 
+                            if (res.data[3].length > 0) {
 
+                                for (var j = 0; j < res.data[3].length; j++) {
 
+                                    if (
 
+                                        this.courseTypeId.indexOf(res.data[3][j].id) != -1 &&
 
+                                        _courseTypeId.indexOf(res.data[3][j].id) == -1
 
+                                    ) {
 
+                                        _courseTypeId.push(res.data[3][j].id);
 
+                                    }
 
+                                    if (res.data[0][i].id == res.data[3][j].pid) {
 
+                                        this.CourseTypeJson[res.data[0][i].id].push(res.data[3][j]); // 去除公共分类
 
+                                    }
 
+                                }
 
+                            }
 
+                        }
 
+                    }
 
+                    this.courseTypeId = _courseTypeId;
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        titleChange() {
 
+            this.$emit("update:title", this.courseName)
 
+        },
 
+        typeChange() {
 
+            this.$emit("update:testType", this.courseTypeId)
 
+        },
 
+        seeChange() {
 
+            this.$emit("update:see", this.isTeacherSee)
 
+        },
 
+        typeChange2() {
 
+            this.$emit("update:typeid", this.typeCheck)
 
+        },
 
+        juriChange() {
 
+            this.$emit("update:juri", this.sJuri)
 
+        },
 
+        DateChange() {
 
+            this.$emit("update:overDate", this.selectedDate)
 
+        },
 
+        briefChange() {
 
+            this.$emit("update:brief", this.courseText)
 
+        },
 
+        depthCopy(s) {
 
+            return JSON.parse(JSON.stringify(s))
 
+        },
 
+        openAiCreate() {
 
+            this.aiDialogVisible = true
 
+        },
 
+        nextSteps() {
 
+            if (this.type == 2) {
 
+                this.$emit("update:cJson", this.manualJson)
 
+            }
 
+            this.$emit('update:steps', this.steps + 1)
 
+            console.log(this.cJson);
 
+            console.log(this.manualJson);
 
+        },
 
+        selectType() {
 
+            let params = {
 
+                oid: this.oid,
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectTestType", params)
 
+                .then((res) => {
 
+                    this.typeArray = res.data[0];
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        //获取教研室列表
 
+        getClass2() {
 
+            let params = {
 
+                oid: this.oid,
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectTeacherOfficeBySchool", params)
 
+                .then((res) => {
 
+                    this.classJuri = res.data[0].filter((item) => { return item.parentid == '6' });
 
+                })
 
+                .catch((err) => {
 
+                    this.isLoading = false;
 
+                    console.error(err);
 
+                });
 
+        },
 
+        checkJuri() {
 
+            let clist = []
 
+            let clist2 = []
 
+            for (var i = 0; i < this.classJuri.length; i++) {
 
+                clist2.push(this.classJuri[i].id)
 
+            }
 
+            for (var i = 0; i < this.checkList.length; i++) {
 
+                if (clist2.indexOf(this.checkList[i]) !== -1) {
 
+                    clist.push(this.checkList[i])
 
+                }
 
+            }
 
+            this.checkList2 = JSON.parse(JSON.stringify(clist));
 
+            this.checkAll = this.checkList2.length == this.classJuri.length;
 
+            this.ischeckAll = !this.checkList2.length;
 
+            this.juriDialog = true
 
+        },
 
+        checkAllChange() {
 
+            if (this.checkAll) {
 
+                this.checkList2 = []
 
+                for (var i = 0; i < this.classJuri.length; i++) {
 
+                    this.checkList2.push(this.classJuri[i].id)
 
+                }
 
+                this.ischeckAll = false
 
+            } else {
 
+                this.checkList2 = []
 
+                this.ischeckAll = true
 
+            }
 
+        },
 
+        ischeckAllChange() {
 
+            if (this.ischeckAll) {
 
+                this.checkAll = false
 
+                this.checkList2 = []
 
+            } else {
 
+            }
 
+            this.ischeckAll = !this.checkList2.length;
 
+
 
+        },
 
+        pChange(val) {
 
+            if (val.length == this.classJuri.length) {
 
+                this.checkAll = true
 
+            } else {
 
+                this.checkAll = false
 
+            }
 
+            this.ischeckAll = !this.checkList2.length;
 
+        },
 
+        confirmCheck() {
 
+            this.checkList = JSON.parse(JSON.stringify(this.checkList2));
 
+            this.$emit("update:juriList", this.checkList)
 
+            this.juriDialog = false
 
+        },
 
+        checkTeacher(){
 
+            this.dialogTeacher = true
 
+        }
 
+    },
 
+    mounted() {
 
+        this.courseTypeId = this.depthCopy(this.testType)
 
+        this.courseName = this.depthCopy(this.title)
 
+        this.isTeacherSee = this.depthCopy(this.see)
 
+        this.manualJson = this.depthCopy(this.cJson)
 
+        this.typeCheck = this.depthCopy(this.typeid)
 
+        this.courseText = this.depthCopy(this.brief)
 
+        this.sJuri = this.depthCopy(this.juri)
 
+        this.selectedDate = this.depthCopy(this.overDate)
 
+        this.checkList = this.depthCopy(this.juriList)
 
+        this.teaType = this.depthCopy(this.typeInfo)
 
+        this.$forceUpdate()
 
+        // this.selectAllType();
 
+        this.selectType();
 
+        this.getClass2();
 
+    }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.rightBox {
 
+    width: calc(100%);
 
+    background: #F0F2F5;
 
+    overflow: auto;
 
+    height: calc(100%);
 
+    margin: 0 auto;
 
+    position: relative;
 
+    box-sizing: border-box;
 
+}
 
+
 
+.whiteBg {
 
+    /* background: #fff; */
 
+    border-radius: 10px;
 
+}
 
+
 
+.basic_box {
 
+    margin: 0 auto;
 
+    position: relative;
 
+    padding: 0 20px 0 20px;
 
+}
 
+
 
+.big_box {
 
+    /* margin-top: 20px; */
 
+    display: flex;
 
+    justify-content: space-between;
 
+    /* border-bottom: 1px solid #E0E2ED; */
 
+}
 
+
 
+.left_first {
 
+    display: flex;
 
+    flex-direction: column;
 
+    flex-wrap: nowrap;
 
+    width: calc(100%);
 
+    padding: 20px;
 
+    box-sizing: border-box;
 
+    background: #fff;
 
+    border-radius: 5px;
 
+}
 
+
 
+.course_input_box {
 
+    display: flex;
 
+    margin-right: 20px;
 
+    width: 100%;
 
+    align-items: center;
 
+    position: relative;
 
+}
 
+
 
+.course_input_box>.binfo_input {
 
+    width: calc(100% - 290px);
 
+    margin: 0 10px;
 
+}
 
+
 
+.bb_courseIcon {
 
+    width: 57px;
 
+    height: 45px;
 
+    background: #F0F4FA;
 
+    border-radius: 5px 0px 0px 5px;
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+    border-right: 1.5px solid rgb(202, 209, 220);
 
+    box-sizing: border-box;
 
+    position: absolute;
 
+    left: 1.5px
 
+}
 
+
 
+.bb_courseIcon>img {
 
+    width: 25px;
 
+    height: auto
 
+}
 
+
 
+.all_choose {
 
+    display: flex;
 
+    flex-direction: row;
 
+    align-items: flex-start;
 
+    width: 100%;
 
+}
 
+
 
+.all_choose+.all_choose {
 
+    /* margin-top: 10px */
 
+}
 
+
 
+.all_choose>span {
 
+    min-width: fit-content;
 
+    display: block;
 
+    white-space: nowrap;
 
+    overflow: hidden;
 
+    text-overflow: ellipsis;
 
+    margin-right: 20px;
 
+    font-weight: bold;
 
+    font-size: 14px;
 
+}
 
+
 
+.all_choose>>>.el-checkbox-group {
 
+    display: flex;
 
+    flex-direction: row;
 
+    width: 100%;
 
+    flex-wrap: wrap;
 
+    align-content: center;
 
+    justify-content: flex-start;
 
+    align-items: center;
 
+    margin-top: 3px;
 
+}
 
+
 
+.all_choose>.el-checkbox-group>>>.el-checkbox {
 
+    margin-bottom: 10px;
 
+    display: flex;
 
+    flex-direction: row;
 
+    align-items: center;
 
+    margin-right: 10px;
 
+}
 
+
 
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {
 
+    min-width: 80px;
 
+    overflow: hidden;
 
+    width: 80px;
 
+    text-overflow: ellipsis;
 
+    white-space: nowrap;
 
+}
 
+
 
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label:hover {
 
+    width: auto;
 
+}
 
+
 
+.choose>div:nth-child(3)>span {
 
+    /* letter-spacing: 0 !important; */
 
+}
 
+
 
+.choose {
 
+    display: flex;
 
+    flex-direction: column;
 
+    flex-wrap: nowrap;
 
+    height: 100%;
 
+    justify-content: space-evenly;
 
+    align-items: flex-start;
 
+}
 
+
 
+.both {
 
+    display: flex;
 
+    flex-direction: row;
 
+    flex-wrap: wrap;
 
+    width: 100%;
 
+    align-items: center;
 
+    justify-content: flex-start;
 
+    margin: 15px 0;
 
+}
 
+
 
+.binfo_input {
 
+    width: 100%;
 
+    margin: 0;
 
+    padding: 12px 14px;
 
+    display: block;
 
+    min-width: 0;
 
+    outline: none;
 
+    box-sizing: border-box;
 
+    background: none;
 
+    border: none;
 
+    border-radius: 4px;
 
+    background: #fff;
 
+    font-size: 16px;
 
+    resize: none;
 
+    font-family: 'Microsoft YaHei';
 
+    min-height: 48px;
 
+    border: 1.5px solid #CAD1DC;
 
+}
 
+
 
+.c_info_title {
 
+    padding: 15px 0 15px 0;
 
+    font-size: 16px;
 
+    font-weight: bold;
 
+    margin: 0 0 0 20px;
 
+    box-sizing: border-box;
 
+    display: flex;
 
+    align-items: center;
 
+    line-height: 20px;
 
+}
 
+
 
+.c_info_title::before {
 
+    content: '';
 
+    display: block;
 
+    width: 3px;
 
+    height: 20px;
 
+    background: #0061FF;
 
+    border-radius: 3px;
 
+    margin: 0 5px 0 0;
 
+}
 
+
 
+.c_info_box {
 
+    width: 100%;
 
+}
 
+
 
+.c_info_tab {
 
+    display: flex;
 
+    align-items: center;
 
+    justify-content: center;
 
+}
 
+
 
+.c_info_tab>span {
 
+    cursor: pointer;
 
+    padding-bottom: 10px;
 
+    font-weight: bold;
 
+}
 
+
 
+.c_info_tab>span+span {
 
+    margin-left: 20px;
 
+}
 
+
 
+.c_info_tab>.active {
 
+    color: #3e88f4;
 
+    border-bottom: 2px solid #2f80f3;
 
+}
 
+
 
+
 
+.c_info_tab_box {
 
+    overflow: hidden;
 
+}
 
+
 
+.skip_btn {
 
+    position: absolute;
 
+    right: 20px;
 
+}
 
+
 
+.typeBox {
 
+    margin-top: 20px;
 
+}
 
+
 
+.typeBox>span {
 
+    font-weight: bold;
 
+    font-size: 14px;
 
+}
 
+
 
+.binfo_textarea {
 
+    border: 1.5px solid #CAD1DC;
 
+    font-size: 16px;
 
+    resize: none;
 
+    /* background: #f6f6f6; */
 
+    font-family: 'Microsoft YaHei';
 
+}
 
+
 
+
 
+.checkJuri {
 
+    width: 220px;
 
+    height: 40px;
 
+    border: 1px solid #DCDFE6;
 
+    padding: 0 15px;
 
+    display: flex;
 
+    align-items: center;
 
+    box-sizing: border-box;
 
+    margin-left: 5px;
 
+    border-radius: 4px;
 
+    overflow: hidden;
 
+    text-overflow: ellipsis;
 
+    white-space: nowrap;
 
+    cursor: pointer;
 
+    font-size: 14px;
 
+    color: #464646;
 
+}
 
+
 
+
 
+.dialog_diy>>>.el-dialog {
 
+    /* height: 100%; */
 
+    /* margin: 15vh auto !important; */
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__header {
 
+    background: #454545 !important;
 
+    padding: 15px 20px;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__body {
 
+    /* height: calc(100% - 54px); */
 
+    box-sizing: border-box;
 
+    /* padding: 0px; */
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__title {
 
+    color: #fff;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__headerbtn {
 
+    top: 19px;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close {
 
+    color: #fff;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close:hover {
 
+    color: #fff;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__body,
 
+.dialog_diy>>>.el-dialog__footer {
 
+    /* background: #e8ebf1; */
 
+    overflow: hidden;
 
+}
 
+
 
+.people_name>>>.el-checkbox {
 
+    width: 100%;
 
+    display: flex;
 
+    align-items: center;
 
+    margin-bottom: 10px;
 
+}
 
+
 
+.people_name>>>.el-checkbox__label {
 
+    text-overflow: ellipsis;
 
+    overflow: hidden;
 
+    width: calc(100%);
 
+}
 
+
 
+.people_name2>>>.el-checkbox__label {
 
+    width: calc(100% - 130px);
 
+}
 
+</style>

+ 2 - 2
src/components/pages/works.vue
View File 

@@ -909,7 +909,7 @@ export default {
 
   background: #fff;
 
   overflow: auto;
 
   z-index: 1;
 
-  width: 95%;
 
+  width: 100%;
 
   left: 50%;
 
   transform: translateX(-50%);
 
   padding: 20px;
 
@@ -985,7 +985,7 @@ export default {
 
   background: #fff;
 
   overflow: auto;
 
   z-index: 1;
 
-  width: 95%;
 
+  width: 100%;
 
   left: 50%;
 
   -webkit-transform: translateX(-50%);
 
   transform: translateX(-50%);

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