Página inicial Explorar Ajuda
Entrar
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

Merge branch 'beta' into HK

lsc 6 meses atrás
pai
fdb3c05d9b 6b9049c64e
commit
e84ea494ad
17 arquivos alterados com 2114 adições e 1054 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 4 0
      dist/index.html
  2. 0 0
      dist/static/css/app.20c235f0a8b5700ecf61e0ee4dd2abdd.css
  3. 0 0
      dist/static/css/app.20c235f0a8b5700ecf61e0ee4dd2abdd.css.map
  4. 1 0
      dist/static/js/app.a312832d3b854e161a92.js
  5. 0 0
      dist/static/js/app.a312832d3b854e161a92.js.map
  6. 1 0
      dist/static/js/app.a72561d94243ca37a7e5.js
  7. 1 0
      dist/static/js/app.a72561d94243ca37a7e5.js.map
  8. 0 0
      dist/static/js/manifest.0ad6c5648a38a6d1fa8f.js.map
  9. 7 274
      src/components/pages/aiAddCourse/addCourse.vue
  10. 532 0
      src/components/pages/aiAddCourse/evaList.vue
  11. 3 3
      src/components/pages/classroomObservation/components/analysisItem.vue
  12. 705 597
      src/components/pages/classroomObservation/components/analysisSpecialItem.vue
  13. 334 54
      src/components/pages/classroomObservation/index.vue
  14. 449 110
      src/components/pages/components/exportDataDialog.vue
  15. 29 5
      src/components/pages/components/studentWorksDetail.vue
  16. 1 1
      src/components/pages/components/workData.vue
  17. 47 10
      src/components/pages/works.vue

+ 4 - 0
dist/index.html
Ver arquivo 

@@ -32,7 +32,11 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.046fa3af48096fdbe193099843fff947.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.0ad6c5648a38a6d1fa8f.js></script><script type=text/javascript src=./static/js/vendor.a82b79982b082928b294.js></script><script type=text/javascript src=./static/js/app.a312832d3b854e161a92.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.20c235f0a8b5700ecf61e0ee4dd2abdd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.00bfcafc8431113801f1.js></script><script type=text/javascript src=./static/js/vendor.a54a39a7efbf3fedeee2.js></script><script type=text/javascript src=./static/js/app.a72561d94243ca37a7e5.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.20c235f0a8b5700ecf61e0ee4dd2abdd.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.20c235f0a8b5700ecf61e0ee4dd2abdd.css.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
dist/static/js/app.a312832d3b854e161a92.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.a312832d3b854e161a92.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
dist/static/js/app.a72561d94243ca37a7e5.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
dist/static/js/app.a72561d94243ca37a7e5.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/manifest.0ad6c5648a38a6d1fa8f.js.map


+ 7 - 274
src/components/pages/aiAddCourse/addCourse.vue
Ver arquivo 

@@ -3492,7 +3492,7 @@
 
                           background: #fff;
 
                           border-radius: 5px;
 
                           margin-top: 15px;
 
-                        ">
 
+                        " :style="{paddingBottom:pjTemplateArray.indexOf(templateid) == -1?'':'75px'}">
 
                         <div v-if="
 
                           unitJson[unitIndex].easy == 6 ||
 
                           !unitJson[unitIndex].easy
 
@@ -4851,13 +4851,8 @@
 
                                   </div>
 
                                 </div>
 
                               </div>
 
+                              <evaList v-if="pjTemplateArray.indexOf(templateid) != -1"></evaList>
 
                             </div>
 
-                            <!-- <div class="addToolFun2" @click="addToolFun(itemTaskIndex)">
 
-                              <div class="addToolImg">
 
-                                <img src="../../../assets/icon/add.png" alt />
 
-                              </div>
 
-                              <div>添加工具</div>
 
-                            </div> -->
 
                             <button class="c_pub_button_add pub_btn_tool_img" @click="addToolFun(itemTaskIndex)" style="
 
                                 margin: 0 auto;
 
                                 padding: 0 30px;
 
@@ -4867,273 +4862,7 @@
 
                             </button>
 
                           </div>
 
                         </div>
 
-                        <div v-else-if="
 
-                          unitJson[unitIndex].easy == 2 ||
 
-                          unitJson[unitIndex].easy == 4
 
-                        " class="toolChoose" style="padding: 0 0 40px">
 
-                          <div class="tools">
 
-                            <div class="leftTools" style="width: 100%" v-for="(
 
-                                itemTool, toolIndex
 
-                              ) in itemTask.toolChoose" :key="toolIndex">
 
-                              <div>
 
-                                <textarea rows="3" type="text" placeholder="添加工具描述" class="binfo_input" style="
 
-                                    margin: 0 0 20px 0;
 
-                                    width: 100% !important;
 
-                                  " v-model="itemTool.toolDetail"></textarea>
 
-                              </div>
 
-                              <div style="
 
-                                  display: flex;
 
-                                  flex-direction: row;
 
-                                  align-items: baseline;
 
-                                  flex-wrap: nowrap;
 
-                                  justify-content: flex-start;
 
-                                  position: relative;
 
-                                ">
 
-                                <div style="margin-right: 20px; font-weight: bold"
 
-                                  :id="'gj' + itemTaskIndex + '' + toolIndex">
 
-                                  工具 {{ toolIndex + 1 }} ：
 
-                                </div>
 
-                                <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
-                                  v-if="itemTask.toolChoose.length > 1" style="right: 0"></div>
 
-                              </div>
 
-                              <div style="min-height: 163px">
 
-                                <div class="toolSort">
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 1, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/secondToolList/whiteBoard.png" alt />
 
-                                      <div style="margin: 5px 0">电子白板</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(1, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(1) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 52, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/fourthToolList/text.png" alt />
 
-                                      <div style="margin: 5px 0">文档</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(52, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(52) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 3, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/secondToolList/mindMapping.png" alt />
 
-                                      <div style="margin: 5px 0">思维导图</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(3, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(3) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 4, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/thirdToolList/ask.png" alt />
 
-                                      <div style="margin: 5px 0">问卷调查</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(4, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(4) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 45, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/thirdToolList/choose.png" alt />
 
-                                      <div style="margin: 5px 0">选择题</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(45, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(45) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 15, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/thirdToolList/answer.png" alt />
 
-                                      <div style="margin: 5px 0">问答</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(15, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(15) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      addTools(16, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/thirdToolList/work.png" alt />
 
-                                      <div style="margin: 5px 0">作业提交</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(16, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(16) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 50, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/thirdToolList/plwork.png" alt />
 
-                                      <div style="margin: 5px 0">批量上传</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(50, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(50) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 41, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/thirdToolList/select.png" alt />
 
-                                      <div style="margin: 5px 0">选择匹配</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(41, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(41) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 47, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/fourthToolList/conSentences.png" alt />
 
-                                      <div style="margin: 5px 0">排序</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(47, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(47) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 48, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/fourthToolList/table.png" alt />
 
-                                      <div style="margin: 5px 0">表格</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(48, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(48) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                </div>
 
-                              </div>
 
-                            </div>
 
-                            <!-- <div class="addToolFun" style="margin-bottom: 20px" @click="addToolFun(itemTaskIndex)">
 
-                              <div class="addToolImg">
 
-                                <img src="../../../assets/icon/add.png" alt />
 
-                              </div>
 
-                              <div>添加工具</div>
 
-                            </div> -->
 
-                            <button class="c_pub_button_add pub_btn_tool_img" @click="addToolFun(itemTaskIndex)"
 
-                              style="margin: 35px auto 20px">
 
-                              添加工具
 
-                            </button>
 
-                          </div>
 
-                        </div>
 
-                        <div v-else-if="
 
-                          unitJson[unitIndex].easy == 1 ||
 
-                          (unitJson[unitIndex].easy == 5 &&
 
-                            itemTask.taskType == 2)
 
-                        " class="toolChoose" style="padding: 0 0 40px">
 
-                          <div class="tools">
 
-                            <div class="leftTools" style="width: 100%; padding: 0 0 15px 0" v-for="(
 
-                                itemTool, toolIndex
 
-                              ) in itemTask.toolChoose" :key="toolIndex">
 
-                              <div style="min-height: 163px">
 
-                                <div class="toolSort">
 
-                                  <div class="tool">
 
-                                    <div class="whiteBIcon" @click="
 
-                                      openTools(itemTaskIndex, 50, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/thirdToolList/plwork.png" alt />
 
-                                      <div style="margin: 5px 0">批量上传</div>
 
-                                    </div>
 
-                                    <div class="check" @click="
 
-                                      addTools(50, itemTaskIndex, toolIndex)
 
-                                      ">
 
-                                      <img src="../../../assets/icon/checkNo.png" alt
 
-                                        v-if="itemTool.tool.indexOf(50) == -1" />
 
-                                      <div class="checkDiv" v-else>
 
-                                        <img src="../../../assets/icon/checkedIs.png" alt /><span>已选择</span>
 
-                                      </div>
 
-                                    </div>
 
-                                  </div>
 
-                                </div>
 
-                              </div>
 
-                            </div>
 
-                          </div>
 
-                        </div>
 
-                        <div class="elist_css" v-if="!(unitJson[unitJson.length - 1].easy == 4)"
 
+                        <div class="elist_css" v-if="!(unitJson[unitJson.length - 1].easy == 4) && pjTemplateArray.indexOf(templateid) == -1"
 
                           v-loading="(taskDetailLoading4.indexOf('task-' + itemTaskIndex) !== -1) || (taskGLoading[itemTaskIndex] && taskGLoading[itemTaskIndex][2])" element-loading-text="小可正在努力生成中，请稍等...">
 
                           <div class="elist_title">
 
                             <div style="
 
@@ -7173,6 +6902,7 @@ import wOffice from "../test/file/wOffice.vue";
 
 import htmlDocx from "html-docx-js/dist/html-docx";
 
 import TurndownService from 'turndown';
 
 import JSZip from "jszip";
 
+import evaList from "./evaList.vue";
 
 
 var OpenCC = require("opencc-js");
 
 let converter = OpenCC.Converter({
 
@@ -7207,6 +6937,7 @@ export default {
 
     aiCreateVideoDialog,
 
     wpdf,
 
     wOffice,
 
+    evaList
 
   },
 
   data() {
 
     return {
 
@@ -7648,6 +7379,7 @@ export default {
 
       knowinfoisAllSize: 0,
 
       knowinfoprogress: 0,
 
       knowFileids: [],
 
+      pjTemplateArray: [ 'cf5722a4-401b-11ef-b873-005056b86cp5' ],
 
     };
 
   },
 
   directives: {
 
@@ -15974,6 +15706,7 @@ export default {
 
       }
 
       console.log(courseInfo)
 
       window.course_info = courseInfo
 
+      window.course_lang = this.languageSetting
 
     },
 
     setCover() {
 
       var _this = this;

+ 532 - 0
src/components/pages/aiAddCourse/evaList.vue
Ver arquivo 

@@ -0,0 +1,532 @@
 
+<template>
 
+    <div>
 
+        <div class="elist_title">
 
+            <div style=" display: flex; flex-direction: row;align-items: center; margin: 20px 0; ">
 
+                <div class="lineTitle clineTitle">评价设置</div>
 
+                <div style="margin-left:auto;display: flex;">
 
+                    <div class="r_pub_button_op" style="margin-left:10px;"
 
+                        @contextmenu.prevent="openAiDialog(1)"
 
+                        @click="openAiDialog(2)">{{ (eList && eList.length) ? '重新生成评价' : '生成评价' }}</div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="mbCss">
 
+            <div class="pjCss" :style="{ width: isEvaFold ? 'calc(100% - 55%)' : 'calc(100% - 120px)', }">
 
+                <div v-if="eList && eList.length" class="elist_input">
 
+                    <div v-for="(eItem, eIndex) in eList" :key="eIndex" class="elist_input_box">
 
+                        <div class="elist_inptu_text">
 
+                            <span>素养：</span>
 
+                            <input type="input" v-model="eItem.target" placeholder="填写目标"
 
+                                style="width: calc(100% - 280px);" />
 
+                            <el-switch @change="forceUpdate" class="rateSwitch" style="margin-left: auto;"
 
+                                v-model="eItem.isai" active-color="#0061FF" active-text="AI评分"
 
+                                inactive-text="" active-value="1" inactive-value="2">
 
+                            </el-switch>
 
+                        </div>
 
+                        <div class="elist_inptu_text">
 
+                            <span>评价标准：</span>
 
+                            <input type="input" v-model="eItem.detail" placeholder="填写评价标准" />
 
+                            <div class="remove" @click="
 
+                                deletEList(
 
+                                    eIndex
 
+                                )
 
+                                "></div>
 
+                        </div>
 
+                        <div class="elist_inptu_text" style="align-items: flex-start;"
 
+                            v-loading="ruleLoading[itemTaskIndex] && ruleLoading[itemTaskIndex][eIndex]"
 
+                            element-loading-text="小可正在努力生成中，请稍等...">
 
+                            <span>评价细则：</span>
 
+                            <div style="width: calc(100%);">
 
+                                <div @click="openRule(itemTaskIndex, eIndex)" class="ruleBtn">{{ eItem.isrule ? '收起细则' : '展开细则' }}</div>
 
+                                <div style="width: calc(100%);" class='op_task_box' v-if="eItem.isrule">
 
+                                    <textarea v-autoHeight="68" rows="2" class="binfo_input binfo_textarea" cols v-model="eItem.rule" placeholder="请输入评价细则"></textarea>
 
+                                </div>
 
+                            </div>
 
+
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+                <!-- <div class="eva_btn_box">
 
+                    <div class="eva_btn_left_box">
 
+                        <button class="c_pub_button_add pub_btn_eval_img" @click="addEList()">
 
+                            添加
 
+                        </button>
 
+                    </div>
 
+                </div> -->
 
+            </div>
 
+        </div>
 
+    </div>
 
+
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    data() {
 
+        return {
 
+            eList:[],
 
+            isEvaFold: true
 
+        }
 
+    },
 
+    methods: {
 
+        openAiDialog() {
 
+            
+        },
 
+        addEList(){
 
+
 
+        },
 
+        deletEList(){
 
+            
+        }
 
+    },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+/* 评价样式 */
 
+.elist_css {
 
+  padding-bottom: 75px !important;
 
+}
 
+
 
+.elist_title {
 
+  margin-bottom: 10px;
 
+}
 
+
 
+.elist_input {
 
+  width: 100%;
 
+}
 
+
 
+.elist_input_box {
 
+  display: flex;
 
+  align-items: center;
 
+  flex-wrap: wrap;
 
+}
 
+
 
+.elist_input_box+.elist_input_box {
 
+  margin-top: 30px;
 
+}
 
+
 
+.elist_input .elist_input_box input {
 
+  font: inherit;
 
+  color: currentColor;
 
+  width: 100%;
 
+  /* max-width: calc(100% - 385px); */
 
+  max-width: calc(100% - 150px);
 
+  padding: 8px 14px;
 
+  display: block;
 
+  min-width: 0;
 
+  outline: none;
 
+  border: 1px solid rgba(0, 0, 0, 0.23);
 
+  border-radius: 4px;
 
+  box-sizing: border-box;
 
+  background: #fff;
 
+  margin: 0 20px 0 0;
 
+}
 
+
 
+.elist_input .elist_input_box span {
 
+  height: 36px;
 
+  line-height: 36px;
 
+  color: rgb(82, 82, 82);
 
+  min-width: 80px;
 
+}
 
+
 
+.elist_input .elist_input_box .remove {
 
+  height: 20px;
 
+  width: 20px;
 
+  min-height: 20px;
 
+  min-width: 20px;
 
+  background-size: 100% 100%;
 
+  background-position: unset;
 
+  margin-left: 5px;
 
+}
 
+
 
+.elist_input_box>>>.el-rate {
 
+  display: flex;
 
+  height: 36px;
 
+  align-items: center;
 
+}
 
+
 
+.elist_input_box .elist_inptu_text {
 
+  width: 100%;
 
+  display: flex;
 
+  align-items: center;
 
+  margin-top: 10px;
 
+}
 
+
 
+.elist_input_box .elist_inptu_text input {
 
+  /* width: 500px; */
 
+  width: 100%;
 
+  max-width: unset;
 
+}
 
+
 
+.elist_input_box>>>.el-rate__icon {
 
+  font-size: 24px;
 
+}
 
+
 
+.elist_btn {
 
+  margin-top: 10px;
 
+}
 
+
 
+.lineTitle {
 
+  /* margin-top: 15px; */
 
+  width: 110px;
 
+  font-size: 16px;
 
+  display: flex;
 
+  align-items: center;
 
+  line-height: 20px;
 
+}
 
+
 
+.lineTitle::before {
 
+  content: "";
 
+  display: block;
 
+  width: 3px;
 
+  height: 20px;
 
+  background: #0061ff;
 
+  border-radius: 3px;
 
+  margin: 0 5px 0 0;
 
+}
 
+
 
+.clineTitle::before {
 
+  content: "";
 
+  display: block;
 
+  min-width: 10px;
 
+  width: 10px;
 
+  height: 10px;
 
+  background: #0061ff;
 
+  border-radius: 50%;
 
+  margin: 0 5px 0 0;
 
+}
 
+
 
+.courseTop {
 
+  display: flex;
 
+  flex-direction: row;
 
+  justify-content: space-between;
 
+  align-items: center;
 
+  width: calc(100% - 40px);
 
+  margin: 0 auto;
 
+  padding: 10px 0;
 
+}
 
+
 
+.stepsNav {
 
+  display: flex;
 
+  flex-direction: row;
 
+  justify-content: flex-start;
 
+  align-items: center;
 
+}
 
+
 
+.stepsWord {
 
+  font-size: 18px;
 
+  color: #fff;
 
+  font-weight: bold;
 
+  margin-left: auto;
 
+  background: rgb(15, 126, 255);
 
+  border-radius: 5px;
 
+  padding: 3px 25px;
 
+  box-sizing: border-box;
 
+}
 
+
 
+.stepBox {
 
+  width: calc(100% - 40px);
 
+  height: calc(100% - 50px);
 
+  overflow: hidden;
 
+  border-radius: 5px;
 
+  margin: 0 auto;
 
+}
 
+
 
+.rightBox {
 
+  width: calc(100%);
 
+  background: #f0f2f5;
 
+  /* border-radius: 10px; */
 
+  overflow: auto;
 
+  height: calc(100% - 150px);
 
+  margin: 0 auto;
 
+  position: relative;
 
+  box-sizing: border-box;
 
+}
 
+
 
+.e_add_top {
 
+  display: flex;
 
+  justify-content: space-between;
 
+  background: #fff;
 
+  position: absolute;
 
+  right: 20px;
 
+  height: 50px;
 
+  align-items: center;
 
+}
 
+
 
+.e_add_title2 {
 
+  display: flex;
 
+  align-items: center;
 
+}
 
+
 
+.e_add_title2 span {
 
+  width: 40px;
 
+}
 
+
 
+.e_add_title {
 
+  display: flex;
 
+  align-items: center;
 
+  color: #b8b8b8;
 
+  font-size: 18px;
 
+  position: relative;
 
+  height: 40px;
 
+}
 
+
 
+.e_add_title span {
 
+  margin-right: 10px;
 
+}
 
+
 
+.e_add_title .el_input {
 
+  width: 300px;
 
+}
 
+
 
+.e_add_title>>>.el-input__inner {
 
+  width: 400px;
 
+}
 
+
 
+.e_add_btn {}
 
+
 
+.e_add_content {
 
+  display: flex;
 
+  width: 100%;
 
+}
 
+
 
+.e_add_list {
 
+  background: #fff;
 
+  height: 500px;
 
+  width: 210px;
 
+  position: relative;
 
+  margin: 15px 5px 0 0;
 
+  flex-shrink: 0;
 
+  display: flex;
 
+  flex-direction: column;
 
+}
 
+
 
+.e_add_list_title {
 
+  font-size: 20px;
 
+  width: 100%;
 
+  box-sizing: border-box;
 
+  padding: 15px 40px;
 
+  text-align: center;
 
+  border-bottom: 1px solid #eaeaea;
 
+  position: relative;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  height: 57px;
 
+  background: #f6f6f6;
 
+}
 
+
 
+.e_add_list_title span {
 
+  overflow: hidden;
 
+  white-space: nowrap;
 
+  text-overflow: ellipsis;
 
+}
 
+
 
+.e_add_list_title img {
 
+  position: absolute;
 
+  right: 15px;
 
+  width: 25px;
 
+  cursor: pointer;
 
+  top: 50%;
 
+  transform: translateY(-50%);
 
+}
 
+
 
+.e_add_list_body {
 
+  height: calc(100% - 187px);
 
+  overflow: auto;
 
+}
 
+
 
+.e_add_list_child {
 
+  width: 100%;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  position: relative;
 
+  box-sizing: border-box;
 
+  padding: 15px 40px;
 
+  text-align: center;
 
+}
 
+
 
+.e_add_list_child span {
 
+  overflow: hidden;
 
+  white-space: nowrap;
 
+  text-overflow: ellipsis;
 
+  cursor: pointer;
 
+}
 
+
 
+.e_add_list_child img {
 
+  position: absolute;
 
+  right: 10px;
 
+  width: 21px;
 
+  cursor: pointer;
 
+  top: 50%;
 
+  transform: translateY(-50%);
 
+}
 
+
 
+.e_add_list_child+.e_add_list_child {
 
+  border-top: 1px solid #eaeaea;
 
+}
 
+
 
+.e_add_list_child .active {
 
+  color: #409eff;
 
+}
 
+
 
+.e_add_list_btn {
 
+  position: absolute;
 
+  bottom: 0;
 
+  height: 50px;
 
+  background: rgb(120, 120, 254);
 
+  width: 100%;
 
+  color: #fff;
 
+  font-size: 16px;
 
+  text-align: center;
 
+  line-height: 50px;
 
+  cursor: pointer;
 
+}
 
+
 
+.e_add_list_detail {
 
+  position: absolute;
 
+  bottom: 0;
 
+  height: 130px;
 
+  background: rgb(120, 120, 254);
 
+  width: 100%;
 
+  color: #fff;
 
+  font-size: 16px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+}
 
+
 
+.e_add_list_detail textarea {
 
+  height: 90%;
 
+  width: 95%;
 
+  border: none;
 
+  resize: none;
 
+  outline: none;
 
+  padding: 5px;
 
+  box-sizing: border-box;
 
+}
 
+
 
+.e_add_list_pbox {
 
+  width: 100%;
 
+}
 
+
 
+.e_add_list_pbox_title {
 
+  height: 50px;
 
+  background: #fff;
 
+  display: flex;
 
+  align-items: center;
 
+  width: 100%;
 
+  box-sizing: border-box;
 
+  padding: 0 20px;
 
+  flex-direction: row;
 
+  flex-wrap: wrap;
 
+}
 
+
 
+.mbCss {
 
+  width: 100%;
 
+  display: flex;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-content: center;
 
+  align-items: flex-start;
 
+  justify-content: flex-start;
 
+}
 
+
 
+.pjCss {
 
+  /* width: 42%; */
 
+  width: calc(100% - 55%);
 
+  display: flex;
 
+  flex-direction: column;
 
+  flex-wrap: nowrap;
 
+  align-items: flex-start;
 
+}
 
+
 
+.e_box {
 
+  /* display: flex; */
 
+  flex-wrap: wrap;
 
+  max-height: 500px;
 
+  align-items: flex-start;
 
+  overflow: auto;
 
+  width: 100%;
 
+}
 
+
 
+.e_card {
 
+  border: 1px solid #ccc;
 
+  background: #fff;
 
+  margin-right: 20px;
 
+  width: 270px;
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  border-radius: 5px;
 
+  margin-top: 10px;
 
+  text-align: center;
 
+}
 
+
 
+.e_card_picture {
 
+  margin: 10px 0;
 
+}
 
+
 
+.e_card_picture>img {
 
+  width: 50px;
 
+}
 
+
 
+.e_card_name {
 
+  width: 100%;
 
+  padding: 0 10px;
 
+  box-sizing: border-box;
 
+  margin-bottom: 10px;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  white-space: nowrap;
 
+}
 
+
 
+.e_card_time {
 
+  width: 100%;
 
+  padding: 0 10px;
 
+  box-sizing: border-box;
 
+  font-size: 15px;
 
+  color: #c3c3c3;
 
+  margin-bottom: 10px;
 
+}
 
+
 
+.e_card_btn {
 
+  height: 40px;
 
+  display: flex;
 
+  align-items: center;
 
+  width: 100%;
 
+  background: rgb(244, 244, 244);
 
+}
 
+
 
+.e_card_btn:hover {
 
+  background: rgb(221 221 221);
 
+}
 
+
 
+.e_card_btn span {
 
+  flex: 1 1 auto;
 
+  text-align: center;
 
+  cursor: pointer;
 
+}
 
+
 
+.addEva {
 
+  border: 1px solid #ccc;
 
+  background: #fff;
 
+  margin-right: 20px;
 
+  width: 270px;
 
+  height: 149px;
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  border-radius: 5px;
 
+  margin-top: 10px;
 
+  text-align: center;
 
+  cursor: pointer;
 
+  justify-content: center;
 
+}
 
+
 
+.addEva>img {
 
+  width: 50px;
 
+  object-fit: cover;
 
+}
 
+</style>

+ 3 - 3
src/components/pages/classroomObservation/components/analysisItem.vue
Ver arquivo 

@@ -302,10 +302,10 @@ export default {
 
 					return this.$message.error("未找到对应的AI助手");
 
 				}
 
 
-				if (assistant.agentid) {
 
-					type = 0
 
-				}else if(assistant.tips){
 
+				if (assistant.tips) {
 
 					type = 1
 
+				}else if(assistant.agentid){
 
+					type = 0
 
 				}else{
 
 					this.loading = false;
 
 					this.loadNum = 2;

Diferenças do arquivo suprimidas por serem muito extensas
+ 705 - 597
src/components/pages/classroomObservation/components/analysisSpecialItem.vue


+ 334 - 54
src/components/pages/classroomObservation/index.vue
Ver arquivo 

@@ -169,11 +169,7 @@
 
         />
 
       </div>
 
     </div>
 
-    <sharePdf
 
-      :dialogVisibleShare="dialogVisibleShare"
 
-      :tid="tid"
 
-      @shareBtn="shareBtn"
 
-    ></sharePdf>
 
+    <sharePdf :tid="tid" ref="sharePdfRef" @shareBtn="shareBtn"></sharePdf>
 
     <changeCourseNameDialog
 
       :tid="tid"
 
       ref="changeCourseNameDialogRef"
 
@@ -202,11 +198,13 @@ import { v4 as uuidv4 } from "uuid";
 
 //修改课程名称弹窗
 
 import changeCourseNameDialog from "./components/changeCourseNameDialog";
 
 //保存模板弹窗
 
-
 
+import QRCode from "qrcodejs2";
 
+import * as echarts from "echarts";
 
+import "echarts-wordcloud";
 
 // word
 
 import htmlDocx from "html-docx-js/dist/html-docx";
 
 import saveAs from "file-saver";
 
-
 
+import MarkdownIt from "markdown-it";
 
 export default {
 
   components: {
 
     chatArea,
 
@@ -218,13 +216,17 @@ export default {
 
   data() {
 
     return {
 
       loading: false,
 
-      dialogVisibleShare: false,
 
       createTime: new Date().toLocaleString().replaceAll("/", "-"),
 
       tid: "",
 
       fileId: "",
 
       fileIdId: "",
 
       optionData: [],
 
-      userId: this.$route.query["userid"]
 
+      userId: this.$route.query["userid"],
 
+      tag: {
 
+        0: "一",
 
+        1: "二",
 
+        2: "三"
 
+      }
 
     };
 
   },
 
   methods: {
 
@@ -465,55 +467,333 @@ export default {
 
         "*"
 
       );
 
     },
 
-    derive() {
 
-      if(!this.tid)return this.$message.error("请先选择课堂")
 
-			this.$message.info("还在开发中...")
 
-    //   let content = `
 
-    //     <!DOCTYPE html>
 
-    //     <html>
 
-    //     <head>
 
-    //       <meta charset="UTF-8">
 
-    //       <style>
 
-    //         .page{
 
-		// 					width:100%;
 
-		// 					height: 100%;
 
-    //           display: flex;
 
-    //           justify-content: center;
 
-    //           align-items: center;
 
-    //           text-align: center;
 
-    //           page-break-after: always;
 
-		// 					writing-mode: vertical-rl;
 
-		// 				}
 
-    //       </style>
 
-    //     </head>
 
-    //     <body>
 
-    //       <div class="page first_page">
 
-		// 	<h1>日期:xxxx</h1>
 
-		// 	<h1>测试：xxxx</h1>
 
-		// </div>
 
-		// <hr style="page-break-after: always;">
 
-		// <div class="page">
 
-		// 	<h1>村上春树</h1>
 
-		// </div>
 
-		// <hr style="page-break-after: always;">
 
-		// <div class="page">
 
-		// 	<h2>村上春树</h2>
 
-		// </div>
 
-		// 		</body>
 
-    //     </html>
 
-    //   `;
 
-
 
-    //   // 将文档转换为 DOCX 文件
 
-    //   // const docx = htmlToDocx(doc);
 
-
 
-    //   let _file = htmlDocx.asBlob(content);
 
-
 
-    //   saveAs(_file, "测试.docx");
 
+    async derive() {
 
+      if (!this.tid) return this.$message.error("请先选择课堂");
 
+
 
+      try {
 
+        this.loading = true;
 
+        let bmData = this.$refs.messageAreaRef.bmData
 
+          ? this.$refs.messageAreaRef.bmData.jsonData
 
+          : "";
 
+        const md = new MarkdownIt();
 
+        let dataList = this.$refs.messageAreaRef.dataList;
 
+        let tagList = this.$refs.messageAreaRef.dialogTagList;
 
+        let showBrief = this.$refs.messageAreaRef.showBrief;
 
+        tagList.forEach(i => (i.dataList = []));
 
+        let url = `https://beta.cloud.cocorobo.cn/aigpt/#/classroom_observation_board?tid=${this.tid}`;
 
+        const qRCodeSrc = await this.getQrCodeImageSrc(url);
 
+        dataList.forEach(i1 => {
 
+          tagList.forEach(i2 => {
 
+            if (i2.value == i1.Type) {
 
+              i2.dataList.push(i1);
 
+            }
 
+          });
 
+        });
 
+
 
+        let directoryHtml = `<div style="margin-bottom:1in"><div style="text-align:center;font-size:20pt;margin-bottom:0.5in">目录</div>`;
 
+
 
+        let analysisHtml = ``;
 
+
 
+        // tagList.forEach(i => {
 
+        //   let dire = `<div>`;
 
+        //   let tagHtml = `<div style="margin-bottom:100px">`;
 
+        //   if (i.value == 0) {
 
+        //     i.dataList = i.dataList.filter(i2 => i2.tIndex != 2);
 
+        //   }
 
+        //   i.dataList.sort((a, b) => a.tIndex - b.tIndex);
 
+
 
+        //   tagHtml += `<h1 style="font-size:16pt;margin-bottom:30px">${
 
+        //     this.tag[i.value]
 
+        //   }、${i.name}</h1>`;
 
+        //   dire += `<div style="font-size:14pt;margin:15px 0">${
 
+        //     this.tag[i.value]
 
+        //   }、${i.name}</div>`;
 
+        //   i.dataList.forEach(async (i2, i2Index) => {
 
+        //     tagHtml += `<h2 style="font-size:14pt;margin-bottom:20px">${i2Index +
 
+        //       1}、${
 
+        //       i2.jsonData.anotherName
 
+        //         ? i2.jsonData.anotherName
 
+        //         : i2.jsonData.name
 
+        //     }</h2>`;
 
+        //     dire += `<div style="font-size:11pt;margin:10px 0;margin-left:50px">${i2Index +
 
+        //       1}、${
 
+        //       i2.jsonData.anotherName
 
+        //         ? i2.jsonData.anotherName
 
+        //         : i2.jsonData.name
 
+        //     }</div>`;
 
+        //     if (showBrief) {
 
+        //       tagHtml += `<div style="font-size:10.5pt;font-style:italic;margin-bottom:10px;color:#6b798e">${i2.jsonData.result}</div>`;
 
+        //     }
 
+        //     if (i2.jsonData.eChartData) {
 
+        //       console.log(
 
+        //         await this.getEChartsImageSrc(i2.jsonData.eChartData)
 
+        //       );
 
+        //       // tagHtml += `<div>${await this.getEChartsImageSrc(
 
+        //       //   i2.jsonData.eChartData
 
+        //       // )}</div>`;
 
+        //       // tagHtml+=`<img src="${await this.getEChartsImageSrc(i2.jsonData.eChartData)}" style="width:400px;height:400px;"/>`
 
+        //     }
 
+        //     let _content = md.render(i2.jsonData.content);
 
+
 
+        //     tagHtml += `<div style="font-size:10.5pt;margin-bottom:10px">${_content}</div>`;
 
+        //   });
 
+
 
+        //   tagHtml += "</div>";
 
+        //   dire += "</div>";
 
+        //   analysisHtml += tagHtml;
 
+        //   directoryHtml += dire;
 
+        // });
 
+
 
+        for (let c = 0; c < tagList.length; c++) {
 
+          let i = tagList[c];
 
+          let dire = `<div>`;
 
+          let tagHtml = `<div style="margin-bottom:0.5in">`;
 
+          if (i.value == 0) {
 
+            i.dataList = i.dataList.filter(i2 => i2.tIndex != 2);
 
+          }
 
+          i.dataList.sort((a, b) => a.tIndex - b.tIndex);
 
+          tagHtml += `<h1 style="font-size:16pt;margin-bottom:-1in">${
 
+            this.tag[i.value]
 
+          }、${i.name}</h1>`;
 
+          dire += `<p style="font-size:14pt;margin-bottom:-0.8in">${
 
+            this.tag[i.value]
 
+          }、${i.name}</p>`;
 
+
 
+          for (let d = 0; d < i.dataList.length; d++) {
 
+            let i2 = i.dataList[d];
 
+            let i2Index = d;
 
+            tagHtml += `<h2 style="font-size:14pt;margin-bottom:-1in">${i2Index +
 
+              1}、${
 
+              i2.jsonData.anotherName
 
+                ? i2.jsonData.anotherName
 
+                : i2.jsonData.name
 
+            }</h2>`;
 
+            dire += `<p style="font-size:11pt;margin-bottom:-0.8in;margin-left:0.1in">${i2Index +
 
+              1}、${
 
+              i2.jsonData.anotherName
 
+                ? i2.jsonData.anotherName
 
+                : i2.jsonData.name
 
+            }</p>`;
 
+            if (showBrief) {
 
+              tagHtml += `<p style="font-size:10.5pt;font-style:italic;margin-bottom:-0.7in;color:#6b798e">${i2.jsonData.result}</p>`;
 
+            }
 
+            if (i2.jsonData.eChartData) {
 
+              tagHtml += `<img src="${await this.getEChartsImageSrc(
 
+                i2.jsonData.eChartData
 
+              )}"/>`;
 
+            }
 
+
 
+            if (i2.jsonData.CH && i2.jsonData.RT) {
 
+              tagHtml += `<div>
 
+								<img src=''>
 
+								</div>`;
 
+            }
 
+
 
+            let _content = md.render(i2.jsonData.content);
 
+
 
+            tagHtml += `<p style="font-size:10.5pt;margin-bottom:-0.5in">${_content}</p>`;
 
+          }
 
+          tagHtml += "</div>";
 
+          dire += "</div>";
 
+          analysisHtml += tagHtml;
 
+          directoryHtml += dire;
 
+        }
 
+        directoryHtml += "</div>";
 
+        // this.loading = false;
 
+        // return console.log(analysisHtml);
 
+        // return console.log(analysisHtml);
 
+        let _html = `
 
+			<div>
 
+				<p style="width:100vw;margin-bottom:1.5in">*分析结果仅供参考</p> 
+				<p style="font-size:28pt;width:100vw;text-align:center;">课堂观察报告</p>
 
+				<p style="font-size:10pt;width:100vw;text-align:center;margin-bottom:0.6in">报告生成时间：${new Date().toLocaleString()}</p>
 
+				<div style="font-size:16pt;width:100vw;text-align:center;margin-bottom:1in">
 
+					<p style="font-size:20pt;margin-bottom:0.7in">《${bmData.courseName}》</p>
 
+					<p style="margin-bottom:-1in">授课老师：${bmData.teacherName ? bmData.teacherName : "未填写"}</p>
 
+					<p style="margin-bottom:-1in">授课年级：${bmData.grade ? bmData.grade : "未填写"}</p>
 
+					<p style="margin-bottom:-1in">授课科目：${bmData.subject ? bmData.subject : "未填写"}</p>
 
+					<p style="margin-bottom:-1in">授课时间：${bmData.time ? bmData.time : "未填写"}</p>
 
+				</div>
 
+				<div style="font-size:16pt;width:100vw;text-align:center;margin-bottom:0.5in">
 
+					<img src="${qRCodeSrc}" style="width:150px;height:150px;margin:auto;"/>
 
+					<p>扫码查看网页版</p>
 
+				</div>
 
+			</div>
 
+			${directoryHtml}
 
+
 
+			<div>
 
+				${analysisHtml}
 
+			</div>
 
+			`;
 
+        this.generateDocx(`《${bmData.courseName}》课堂观察报告`, _html);
 
+        this.loading = false;
 
+      } catch (e) {
 
+        console.log(e);
 
+        this.$message.error("导出失败");
 
+        this.loading = false;
 
+      }
 
+    },
 
+    getQrCodeImageSrc(url) {
 
+      return new Promise((resolve, reject) => {
 
+        let qrcode = new QRCode(document.createElement("div"), {
 
+          text: url, // 需要转换为二维码的内容
 
+          width: 150,
 
+          height: 150,
 
+          colorDark: "#000000",
 
+          colorLight: "#ffffff",
 
+          correctLevel: QRCode.CorrectLevel.H
 
+        });
 
+        let img = qrcode._el.getElementsByTagName("img")[0];
 
+        img.onload = () => {
 
+          resolve(img.src);
 
+        };
 
+      });
 
+    },
 
+    getEChartsImageSrc(option) {
 
+      return new Promise(resolve => {
 
+        let hiddenDiv = document.createElement("div");
 
+        hiddenDiv.style.width = "600px";
 
+        hiddenDiv.style.height = "500px";
 
+        hiddenDiv.style.position = "absolute";
 
+        hiddenDiv.style.left = "-9999px"; // 隐藏div
 
+        document.body.appendChild(hiddenDiv);
 
+
 
+        // 初始化图表
 
+        let myChart = echarts.init(hiddenDiv);
 
+
 
+        // 设置图标配置
 
+        myChart.setOption(option);
 
+
 
+        myChart.on("finished", () => {
 
+          // 获取图表的图片
 
+          let base64Image = myChart.getDataURL({
 
+            type: "png", // 图片格式
 
+            pixelRatio: 1, // 图像清晰度
 
+            backgroundColor: "#fff" // 背景颜色
 
+          });
 
+
 
+          resolve(base64Image);
 
+          // 清除隐藏的div和图表实例
 
+          document.body.removeChild(hiddenDiv);
 
+          myChart.dispose();
 
+        });
 
+      });
 
+    },
 
+    // 导出docx
 
+    async generateDocx(name, html) {
 
+      // 将html文件中需要用到的数据挂载到store上
 
+      const content = `<!DOCTYPE html>
 
+      <html xmlns:v='urn:schemas-microsoft-com
 
+      :vml'xmlns:o='urn:schemas-microsoft-com:office
 
+      :office'xmlns:w='urn:schemas-microsoft-com:office
 
+      :word'xmlns:m='http://schemas.microsoft.com/office/2004/12/omml'
 
+      xmlns='http://www.w3.org/TR/REC-html40' 
+      xmlns='http://www.w3.org/1999/xhtml'>
 
+      <head>
 
+          <meta charset="UTF-8">
 
+          <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+          <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+          <title>${name}</title>
 
+          <style>
 
+						*{
 
+							font-family: '宋体';
 
+							margin:0;
 
+							padding:0;
 
+							line-height:1;
 
+						}
 
+            table {
 
+              border-collapse: collapse; /* 折叠边框 */
 
+              width: 100%;
 
+							font-size:10.5pt;
 
+            }
 
+            th, td {
 
+              border: 1px solid black; /* 线条样式 */
 
+              padding: 8px;
 
+              text-align: left;
 
+							font-size:10.5pt;
 
+            }
 
+						ol,ul{
 
+							margin:0;
 
+							padding:0;
 
+							margin-right:-1in;
 
+						}
 
+						li{
 
+							margin-bottom:0.1in
 
+							margin-right:-1in;
 
+						}
 
+						p{
 
+							line-height:1;
 
+							margin:0;
 
+							padding:0
 
+						}
 
+          </style>
 
+      </head>
 
+      <body>
 
+      ${html}
 
+      </body>
 
+      </html>`;
 
+      // console.log(content)
 
+      // return console.log(content)
 
+      // debugger
 
+      let blob = htmlDocx.asBlob(content);
 
+
 
+      // const uploadFile = new File([blob], `${name}.docx`, {
 
+      //   type:
 
+      //     "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
 
+      // });
 
+      saveAs(blob, `${name}.docx`);
 
+      return true;
 
+      // this.beforeUploadHtml(uploadFile);
 
+    },
 
+    beforeUploadHtml(event) {
 
+      var file = event;
 
+      var credentials = {
 
+        accessKeyId: "AKIATLPEDU37QV5CHLMH",
 
+        secretAccessKey: "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"
 
+      }; //秘钥形式的登录上传
 
+      window.AWS.config.update(credentials);
 
+      window.AWS.config.region = "cn-northwest-1"; //设置区域
 
+
 
+      var bucket = new window.AWS.S3({ params: { Bucket: "ccrb" } }); //选择桶
 
+      var _this = this;
 
+
 
+      if (file) {
 
+        var params = {
 
+          Key:
 
+            file.name.split(".")[0] +
 
+            new Date().getTime() +
 
+            "." +
 
+            file.name.split(".")[file.name.split(".").length - 1],
 
+          ContentType: file.type,
 
+          Body: file,
 
+          "Access-Control-Allow-Credentials": "*",
 
+          ACL: "public-read"
 
+        }; //key可以设置为桶的相抵路径，Body为文件， ACL最好要设置
 
+        var options = {
 
+          partSize: 2048 * 1024 * 1024,
 
+          queueSize: 2,
 
+          leavePartsOnError: true
 
+        };
 
+        bucket
 
+          .upload(params, options)
 
+          .on("httpUploadProgress", function(evt) {
 
+            //这里可以写进度条
 
+            // console.log("Uploaded : " + parseInt((evt.loaded * 80) / evt.total) + '%');
 
+          })
 
+          .send(function(err, data) {
 
+            if (err) {
 
+              _this.$message.error("上传失败");
 
+            } else {
 
+              console.log(data.Location);
 
+            }
 
+          });
 
+      }
 
     },
 
     // 分享
 
     shareBtn() {
 
       // if(!this.fileId)return;
 
-      this.dialogVisibleShare = !this.dialogVisibleShare;
 
+      // this.dialogVisibleShare = !this.dialogVisibleShare;
 
+      this.$refs.sharePdfRef.open();
 
     },
 
     // 审核
 
     examine() {

+ 449 - 110
src/components/pages/components/exportDataDialog.vue
Ver arquivo 

@@ -80,31 +80,31 @@
 
         <div style="display: flex; justify-content: space-between">
 
           <div class="zhBlock">
 
             <div class="zhBlockTit">
 
-              <span style="margin-right: 5px">登录时长</span
 
-              ><img
 
+              <span style="margin-right: 5px;font-weight: 600;">登录时长</span>
 
+              <!-- <img
 
                 src="../../../assets/icon/exportPdfworks/infocircle.svg"
 
                 alt=""
 
-              />
 
+              /> -->
 
             </div>
 
             <div class="zhBlockCon">{{ loginTime }}</div>
 
           </div>
 
           <div class="zhBlock">
 
             <div class="zhBlockTit">
 
-              <span style="margin-right: 5px">学习时长</span
 
-              ><img
 
+              <span style="margin-right: 5px;font-weight: 600;">学习时长</span>
 
+              <!-- <img
 
                 src="../../../assets/icon/exportPdfworks/infocircle.svg"
 
                 alt=""
 
-              />
 
+              /> -->
 
             </div>
 
             <div class="zhBlockCon">{{ studyTime }}</div>
 
           </div>
 
           <div class="zhBlock">
 
             <div class="zhBlockTit">
 
-              <span style="margin-right: 5px">学习成绩</span
 
-              ><img
 
+              <span style="margin-right: 5px;font-weight: 600;">学习成绩</span>
 
+              <!-- <img
 
                 src="../../../assets/icon/exportPdfworks/infocircle.svg"
 
                 alt=""
 
-              />
 
+              /> -->
 
             </div>
 
             <div class="zhBlockCon">
 
               <div class="zhBlockCon">{{ star }} / 5.0</div>
 
@@ -112,15 +112,15 @@
 
           </div>
 
           <div class="zhBlock">
 
             <div class="zhBlockTit">
 
-              <span style="margin-right: 5px">包含学科</span
 
-              ><img
 
+              <span style="margin-right: 5px;font-weight: 600;">包含学科</span>
 
+              <!-- <img
 
                 src="../../../assets/icon/exportPdfworks/infocircle.svg"
 
                 alt=""
 
-              />
 
+              /> -->
 
             </div>
 
             <div class="zhBlockCon2">
 
               <div>
 
-               <span v-for="(i,index) in subject" :key="index">{{ i }}</span>
 
+                <span v-for="(i, index) in subject" :key="index">{{ i }}</span>
 
               </div>
 
             </div>
 
           </div>
 
@@ -169,6 +169,16 @@
 
         <div class="zxt">
 
           <div style="height: 350px; width: 100%" ref="cScoEcharts"></div>
 
         </div>
 
+        <div class="pdfAnalysis">
 
+          <div
 
+            style="font-weight: 600; font-size: 16px; color: rgba(0, 0, 0, 0.9);margin: 10px 0;"
 
+          >
 
+            <li>学习分析报告</li>
 
+          </div>
 
+          <div class="pdfAnalysisCon">
 
+            <div v-html="AiAnalysisCon"></div>
 
+          </div>
 
+        </div>
 
         <div style="display: flex;justify-content: flex-end;">
 
           <img :src="schoolImg.bjLogo ? schoolImg.bjLogo : ''" alt="" />
 
         </div>
 
@@ -184,6 +194,8 @@ import html2canvas from "html2canvas";
 
 import jspdf from "jspdf";
 
 import JSZip from "jszip";
 
 import * as echarts from "echarts";
 
+import { v4 as uuidv4 } from "uuid";
 
+import MarkdownIt from "markdown-it";
 
 
 export default {
 
   props: [
 
@@ -205,6 +217,7 @@ export default {
 
       studyTime: "",
 
       // 登录时长
 
       loginTime: "",
 
+      userid: this.$route.query.userid,
 
 
       // 五边形图开始
 
       chartData: [
 
@@ -227,6 +240,8 @@ export default {
 
       ],
 
       // 环形图数据结束
 
 
+      classStageListPer: [], //班级数据
 
+      classSco: [], //分数
 
       // 作业提交率折线图开始
 
       stageList: [], // 阶段
 
       stageListPer: [], // 阶段所占百分比
 
@@ -239,7 +254,10 @@ export default {
 
       // 作业得分折线图结束
 
 
       // 分数工具柱状图开始
 
-      columnData: [],
 
+      columnData: [
 
+        { name: "分组工具", data: [] },
 
+        { name: "其他", data: [] }
 
+      ],
 
       // 分数工具柱状图结束
 
 
       // 师生在线互动次数开始
 
@@ -271,8 +289,8 @@ export default {
 
       // 处理过的分组
 
       TeaStuInt2: [1, 3, 5, 4, 10, 13, 15],
 
 
-      subject:[],
 
-
 
+      subject: [], //课程分类
 
+      AiAnalysisCon: "", //ai数据分析
 
       data3: [],
 
       data4: [],
 
       data5: [],
 
@@ -280,13 +298,14 @@ export default {
 
       data7: [],
 
       data8: [],
 
       data9: [],
 
+      data10: [],
 
+
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
       uid2: "",
 
       worksDialogCon2: "",
 
 
       loading: false,
 
-      userInfo: "",
 
       tableData: [],
 
       courseName: "",
 
       imgList: [
 
@@ -304,13 +323,138 @@ export default {
 
   mounted() {
 
     if (this.digNum == 0) {
 
       this.downPdf();
 
-    } else {
 
+    } else if (this.digNum == 1) {
 
       this.getWorks1();
 
+    } else {
 
+      this.lookPage();
 
     }
 
     // this.getCourseDetail();
 
   },
 
 
   methods: {
 
+    // ai评价分析
 
+    async getAiAnalysisCon() {
 
+      let messages = `NOTICE
 
+      Role:你是一个学生学习行为分析专家，你要根据线上学习平台的数据分析，在学习状态、学习效果、学习动力、学习积极性等方面评估学生，评估后生成学生学习画像和学习建议。你可以自行扩充评估的角度，实现相对全面的评估。
 
+      Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 
+      ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
 
+      Instruction: Based on the context, follow "Format example", write content.
 
+
 
+      #Context
 
+      ##要求
 
+      学生进行了线上平台和线下授课相结合的混合式学习，线上平台会记录学生的学习行为，并对数据进行简单的分析
 
+      只输出分析结果不要输出无关内容
 
+      
+      ##风格
 
+      专业的
 
+
 
+      ##语气
 
+      陈述
 
+
 
+      ##受众
 
+      教师和教育管理者
 
+
 
+      ##分析数据
 
+      学习成绩满分为5分
 
+
 
+      登录时长:${this.loginTime}
 
+      课程学习时长：${this.studyTime}
 
+      课程学习成绩：${this.star}
 
+
 
+      学生作业提交率：${this.stageListPer}
 
+      班级作业平均提交率：${this.classStageListPer}
 
+
 
+      师生互动次数：${this.interactWork}
 
+      班级师生互动平均次数：${this.classSco}
 
+
 
+      学生主动互动次数：${this.stuInterAllLike}
 
+      班级学生主动互动平均次数：${this.classSco}
 
+
 
+      学生主动被动次数：${this.bdStuInterAllLike}
 
+      班级学生主动被动平均次数：${this.classSco}
 
+
 
+      个人成绩：${this.scoFoldLineData}
 
+      班级平均成绩：${this.classSco}
 
+
 
+      #输出要求#
 
+      根据分析数据中的数据，对学生在本次课程中的每个${
 
+        this.cState == 1 ? "阶段" : "任务"
 
+      }进行学生与班级平均数据进行对比分析
 
+
 
+
 
+      # Format example
 
+      该课程学习过程中，学生登录时长共1天2小时（班级前25%），学习时长共6小时（班级前25%），使用平台工具22次（班级前25%）。学生进行了科学、数学、美术学科的学习与实践。学生课程得分为4.4/5.0，高于班级平均得分。在课程的每个阶段，学生使用工具次数大多数高于或等于班级平均值，大多数任务能准时提交，有1次未交和2次迟交，师生在线互动次数全部高于或等于班级平均值，生生在线互动次数全部高于或等于班级平均值，协作完成的任务占总任务数量的36.6%，独立完成的任务占63.3%，学生阶段任务得分大多数高于或等于班级平均值。
 
+      `;
 
+      // this.aiGet2(msg)
 
+      let params = {
 
+        assistant_id: "b19f1a1a-7586-11ef-8ce0-12e77c4cb76b",
 
+        message: [
 
+          {
 
+            type: "text",
 
+            text: messages.replaceAll("\n", " ").replaceAll("*", "")
 
+          }
 
+        ],
 
+        session_name: uuidv4(),
 
+        userId: this.userid,
 
+        file_ids: "",
 
+        model: "gpt-4o-2024-08-06"
 
+      };
 
+      return new Promise((resolve, reject) => {
 
+        this.ajax
 
+          .post("https://gpt4.cocorobo.cn/ai_agent_park_chat", params)
 
+          .then(response => {
 
+            let data = response.data.FunctionResponse;
 
+            let md = new MarkdownIt();
 
+            this.AiAnalysisCon = md.render(data.message);
 
+            console.log("data", data);
 
+            this.uploadData();
 
+
 
+            return resolve();
 
+          })
 
+          .catch(error => {
 
+            console.log(error);
 
+            return resolve();
 
+          });
 
+      });
 
+    },
 
+    //   // ai打分
 
+    // aiGet2(messages) {
 
+    //   let _this = this;
 
+
 
+    // },
 
+    async uploadData() {
 
+      let conData = { comprehensive: this.AiAnalysisCon };
 
+      let params = [
 
+        {
 
+          cid: this.cid,
 
+          uid: this.worksDialogCon2.userid,
 
+          con: JSON.stringify(conData)
 
+        }
 
+      ];
 
+      return new Promise((resolve, reject) => {
 
+        this.ajax
 
+          .post(this.$store.state.api + "upDateAnalysis", params) //getCourseWorksReport
 
+          .then(res => {
 
+            return resolve();
 
+          })
 
+          .catch(err => {
 
+            console.error(err);
 
+          });
 
+      });
 
+    },
 
+    // 查看pdf报告
 
+    async lookPage() {
 
+      this.loading = true;
 
+      this.worksDialogCon2 = this.worksDialogCon;
 
+      await this.getData();
 
+      if (this.data10 && this.data10.length) {
 
+        let Asd = this.data10[0].jsonTxt;
 
+        this.AiAnalysisCon = JSON.parse(Asd).comprehensive;
 
+      } else {
 
+        await this.getAiAnalysisCon();
 
+      }
 
+      this.loading = false;
 
+    },
 
     // 下载单个文件
 
     async downPdf() {
 
       this.loading = true;
 
@@ -323,6 +467,15 @@ export default {
 
         this.uid2 = this.tableData[0].userid;
 
         this.worksDialogCon2 = this.tableData[0];
 
         await this.getData();
 
+        if (this.data10 && this.data10.length) {
 
+          // console.log('res.data[10]',res.data[10]);
 
+          let Asd = this.data10[0].jsonTxt;
 
+          this.AiAnalysisCon = JSON.parse(Asd).comprehensive;
 
+        } else {
 
+          await this.getAiAnalysisCon();
 
+        }
 
+        this.loading = false;
 
+
 
         await this.getPdf();
 
       } else {
 
         this.circulatePdf();
 
@@ -353,7 +506,7 @@ export default {
 
 
             pdf.save(
 
               this.worksDialogCon2.course +
 
-                "-作业集-" +
 
+                "-学生成长报告-" +
 
                 this.worksDialogCon2.sName +
 
                 ".pdf"
 
             );
 
@@ -414,6 +567,7 @@ export default {
 
         this.uid2 = this.tableData[i].userid;
 
         this.worksDialogCon2 = this.tableData[i];
 
         await this.getData();
 
+        this.loading = false;
 
         let a = await this.getPdf2();
 
         pdfList.push(a);
 
       }
 
@@ -472,7 +626,7 @@ export default {
 
       });
 
     },
 
     async getData() {
 
-      this.subject=[]
 
+      this.subject = [];
 
       let params = {
 
         cid: this.cid,
 
         uid: this.worksDialogCon2.userid,
 
@@ -485,8 +639,10 @@ export default {
 
             this.cState = res.data[0][0].state;
 
             this.courseTit = res.data[0][0].title;
 
 
-            let sub = res.data[9][0].subject
 
-            this.subject = sub.split(',')
 
+            let sub = res.data[9][0].subject;
 
+            if (res.data[9][0].subject) {
 
+              this.subject = sub.split(",");
 
+            }
 
 
             this.imgList.forEach(e => {
 
               if (e.schoolId == this.oid) {
 
@@ -522,10 +678,10 @@ export default {
 
             this.data7 = res.data[7];
 
             this.data8 = res.data[8];
 
             this.data9 = res.data[9];
 
+            this.data10 = res.data[10];
 
 
             // 处理这个课程下的工具分类
 
             let data = JSON.parse(res.data[0][0].chapters);
 
-            
 
             if (this.cState == 1) {
 
               this.getDataStageMode(data);
 
@@ -535,7 +691,6 @@ export default {
 
 
             // 将课程的所有工具进行分类，然后装在变量里 , 获取所有折线图阶段
 
             // console.log("data", data);
 
-            this.loading = false;
 
 
             setTimeout(() => {
 
               return resolve();
 
@@ -559,12 +714,20 @@ export default {
 
       this.bdStuInterAllLike = [];
 
       this.stageList = [];
 
       this.stageListPer = [];
 
+      this.classStageListPer = [];
 
+      this.classSco = [];
 
+
 
       data.forEach((e, eInd) => {
 
         let toolList = e.chapterInfo[0].taskJson;
 
         toolList.forEach((i, iInd) => {
 
           this.stageList.push("任务" + (iInd * 1 + 1));
 
           this.toolPercentage[iInd] = []; // 每个任务有的工具
 
           this.stageListPer.push(0); // 作业提交率基础数据折线图
 
+          let randomNumber = Math.random().toFixed(2);
 
+          this.classStageListPer.push(0.6);
 
+
 
+          const randomInt = Math.floor(Math.random() * 6);
 
+          this.classSco.push(3);
 
           // 课程阶段下互动数据工具
 
           this.interact[iInd] = [];
 
 
@@ -672,6 +835,8 @@ export default {
 
       this.bdStuInterAllLike = [];
 
       this.stageList = [];
 
       this.stageListPer = [];
 
+      this.classStageListPer = [];
 
+      this.classSco = [];
 
 
       data.forEach((e, eInd) => {
 
         let toolList = e.chapterInfo[0].taskJson;
 
@@ -680,7 +845,10 @@ export default {
 
         this.stageList.push("阶段" + (eInd * 1 + 1));
 
         // 作业提交率基础数据
 
         this.stageListPer.push(0);
 
-
 
+        let randomNumber = Math.random().toFixed(2);
 
+        this.classStageListPer.push(0.6);
 
+        const randomInt = Math.floor(Math.random() * 6);
 
+        this.classSco.push(3);
 
         // 课程阶段下互动数据工具
 
         this.interact[eInd] = [];
 
         //每个工具下提交的作业
 
@@ -869,7 +1037,7 @@ export default {
 
         zSco += e * 1;
 
       });
 
 
-      this.star = (zSco / this.scoFoldLineData.length).toFixed(1) * 1;
 
+      this.star = (zSco / this.scoFoldLineData.length).toFixed(1);
 
     },
 
 
     getFoldLineData(repeatWork) {
 
@@ -970,7 +1138,7 @@ export default {
 
         zSco += e * 1;
 
       });
 
 
-      this.star = (zSco / this.scoFoldLineData.length).toFixed(1) * 1;
 
+      this.star = (zSco / this.scoFoldLineData.length).toFixed(1);
 
     },
 
     // 师生互动数据
 
     getTeaStuHdAi(TeaStuHdData) {
 
@@ -1069,7 +1237,7 @@ export default {
 
         },
 
         legend: {
 
           orient: "vertical",
 
-          right: 0,
 
+          right: "2%",
 
           itemWidth: 10, // 控制图例项的宽度
 
           itemHeight: 10, // 控制图例项的高度
 
           data: this.toolRatio.map(item => item.name)
 
@@ -1104,48 +1272,8 @@ export default {
 
 
       chartObj2.setOption(option);
 
     },
 
-    // 工具提交折线图
 
-    initChart() {
 
-      const chart = echarts.init(this.$refs.toolSubEcharts);
 
 
-      const option = {
 
-        title: {
 
-          text: "作业提交率",
 
-          left: "left",
 
-          textStyle: {
 
-            color: "rgba(140, 140, 140, 1)", // 标题颜色
 
-            fontSize: 10 // 标题字体大小
 
-          }
 
-        },
 
-        tooltip: {
 
-          trigger: "axis",
 
-          formatter: "{b} : {c}%"
 
-        },
 
-        xAxis: {
 
-          type: "category",
 
-          data: this.stageList.map(item => item),
 
-          axisTick: {
 
-            alignWithLabel: true // 使刻度线和标签对齐
 
-        }
 
-        },
 
-        yAxis: {
 
-          type: "value",
 
-          axisLabel: {
 
-            formatter: "{value}%"
 
-          },
 
-          max: 100
 
-        },
 
-        series: [
 
-          {
 
-            data: this.stageListPer.map(item => item * 100),
 
-            type: "line"
 
-          }
 
-        ]
 
-      };
 
-
 
-      chart.setOption(option);
 
-    },
 
-    // 课程得分
 
+    // 阶段成绩 任务成绩
 
     initChart2() {
 
       const chart = echarts.init(this.$refs.cScoEcharts);
 
       const option = {
 
@@ -1154,19 +1282,26 @@ export default {
 
           left: "left",
 
           textStyle: {
 
             color: "rgba(140, 140, 140, 1)", // 标题颜色
 
-            fontSize: 10 // 标题字体大小
 
+            fontSize: 10, // 标题字体大小
 
+            fontWeight: "bold" // 加粗样式
 
           }
 
         },
 
         tooltip: {
 
-          trigger: "axis",
 
-          formatter: "{b} : {c}"
 
+          trigger: "axis"
 
+          // formatter: "{b} : {c}"
 
+        },
 
+        legend: {
 
+          data: ["个人数据", "班级平均值"],
 
+          // align: "right",
 
+          orient: "vertical", // 设置为垂直排列
 
+          right: 10
 
         },
 
         xAxis: {
 
           type: "category",
 
           data: this.stageList.map(item => item),
 
           axisTick: {
 
             alignWithLabel: true // 使刻度线和标签对齐
 
-        }
 
+          }
 
         },
 
         yAxis: {
 
           type: "value",
 
@@ -1177,9 +1312,29 @@ export default {
 
         },
 
         series: [
 
           {
 
+            name: "个人数据",
 
             data: this.scoFoldLineData.map(item => item),
 
-            type: "line"
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5,
 
+            lineStyle: {
 
+              opacity: 1 // 设置透明度为1，即不透明
 
+            }
 
+          },
 
+          {
 
+            name: "班级平均值",
 
+            data: this.classSco.map(item => item),
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5,
 
+            lineStyle: {
 
+              opacity: 1 // 设置透明度为1，即不透明
 
+            }
 
           }
 
+          // {
 
+          //   data: this.scoFoldLineData.map(item => item),
 
+          //   type: "line"
 
+          // }
 
         ]
 
       };
 
 
@@ -1195,15 +1350,21 @@ export default {
 
           left: "left",
 
           textStyle: {
 
             color: "rgba(140, 140, 140, 1)", // 标题颜色
 
-            fontSize: 10 // 标题字体大小
 
+            fontSize: 10, // 标题字体大小
 
+            fontWeight: "bold" // 加粗样式
 
           }
 
         },
 
+        legend: {
 
+            data: this.columnData.map(item => item.name),  // 设置图例的数据为系列的名称
 
+            orient: "vertical", // 设置为垂直排列
 
+            right: 10
 
+        },
 
         tooltip: {
 
-          trigger: "axis",
 
-          axisPointer: {
 
-            type: "shadow"
 
-          },
 
-          formatter: "{b} : {c}%"
 
+          trigger: "axis"
 
+          // axisPointer: {
 
+          //   type: "shadow"
 
+          // },
 
+          // formatter: "{b} : {c}%"
 
         },
 
         xAxis: {
 
           type: "category",
 
@@ -1211,17 +1372,33 @@ export default {
 
         },
 
         yAxis: {
 
           type: "value",
 
-          axisLabel: {
 
-            formatter: "{value}%"
 
-          },
 
-          max: 100
 
+          // axisLabel: {
 
+          //   formatter: "{value}%"
 
+          // },
 
         },
 
-        series: [
 
-          {
 
-            data: this.columnData.map(item => item * 100),
 
-            type: "bar"
 
-          }
 
-        ]
 
+        series: this.columnData.map(item => ({
 
+          name: item.name,
 
+          type: "bar",
 
+          stack: "total",
 
+          barWidth: "60%",
 
+          label: {
 
+            show: true,
 
+            formatter: params => Math.round(params.value * 1000) / 10 + "%"
 
+          },
 
+          data: item.data
 
+        }))
 
+        // series: [
 
+        //   {
 
+        //     name: "个人数据",
 
+        //     data: this.columnData.map(item => item * 100),
 
+        //     type: "bar"
 
+        //   }
 
+
 
+        //   // {
 
+        //   //   data: this.columnData.map(item => item * 100),
 
+        //   //   type: "bar"
 
+        //   // }
 
+        // ]
 
       };
 
 
       chart.setOption(option);
 
@@ -1236,19 +1413,26 @@ export default {
 
           left: "left",
 
           textStyle: {
 
             color: "rgba(140, 140, 140, 1)", // 标题颜色
 
-            fontSize: 10 // 标题字体大小
 
+            fontSize: 10, // 标题字体大小
 
+            fontWeight: "bold" // 加粗样式
 
           }
 
         },
 
         tooltip: {
 
-          trigger: "axis",
 
-          formatter: "{b} : {c}"
 
+          trigger: "axis"
 
+          // formatter: "{b} : {c}"
 
+        },
 
+        legend: {
 
+          data: ["个人数据", "班级平均值"],
 
+          // align: "right",
 
+          orient: "vertical", // 设置为垂直排列
 
+          right: 10
 
         },
 
         xAxis: {
 
           type: "category",
 
           data: this.stageList.map(item => item),
 
           axisTick: {
 
             alignWithLabel: true // 使刻度线和标签对齐
 
-        }
 
+          }
 
         },
 
         yAxis: {
 
           type: "value",
 
@@ -1258,9 +1442,23 @@ export default {
 
         },
 
         series: [
 
           {
 
+            name: "个人数据",
 
             data: this.interactWork.map(item => item.length),
 
-            type: "line"
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5
 
+          },
 
+          {
 
+            name: "班级平均值",
 
+            data: this.classSco.map(item => item),
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5
 
           }
 
+          // {
 
+          //   data: this.interactWork.map(item => item.length),
 
+          //   type: "line"
 
+          // }
 
         ]
 
       };
 
 
@@ -1276,19 +1474,26 @@ export default {
 
           left: "left",
 
           textStyle: {
 
             color: "rgba(140, 140, 140, 1)", // 标题颜色
 
-            fontSize: 10 // 标题字体大小
 
+            fontSize: 10, // 标题字体大小
 
+            fontWeight: "bold" // 加粗样式
 
           }
 
         },
 
+        legend: {
 
+          data: ["个人数据", "班级平均值"],
 
+          // align: "right",
 
+          orient: "vertical", // 设置为垂直排列
 
+          right: 10
 
+        },
 
         tooltip: {
 
-          trigger: "axis",
 
-          formatter: "{b} : {c}"
 
+          trigger: "axis"
 
+          // formatter: "{b} : {c}"
 
         },
 
         xAxis: {
 
           type: "category",
 
           data: this.stageList.map(item => item),
 
           axisTick: {
 
             alignWithLabel: true // 使刻度线和标签对齐
 
-        }
 
+          }
 
         },
 
         yAxis: {
 
           type: "value",
 
@@ -1298,9 +1503,26 @@ export default {
 
         },
 
         series: [
 
           {
 
+            name: "个人数据",
 
             data: this.stuInterAllLike.map(item => item.length),
 
-            type: "line"
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5,
 
+            lineStyle: {
 
+              opacity: 1 // 设置透明度为1，即不透明
 
+            }
 
+          },
 
+          {
 
+            name: "班级平均值",
 
+            data: this.classSco.map(item => item),
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5
 
           }
 
+          // {
 
+          //   data: this.stuInterAllLike.map(item => item.length),
 
+          //   type: "line"
 
+          // }
 
         ]
 
       };
 
 
@@ -1316,19 +1538,26 @@ export default {
 
           left: "left",
 
           textStyle: {
 
             color: "rgba(140, 140, 140, 1)", // 标题颜色
 
-            fontSize: 10 // 标题字体大小
 
+            fontSize: 10, // 标题字体大小
 
+            fontWeight: "bold" // 加粗样式
 
           }
 
         },
 
         tooltip: {
 
-          trigger: "axis",
 
-          formatter: "{b} : {c}"
 
+          trigger: "axis"
 
+          // formatter: "{b} : {c}"
 
+        },
 
+        legend: {
 
+          data: ["个人数据", "班级平均值"],
 
+          // align: "right",
 
+          orient: "vertical", // 设置为垂直排列
 
+          right: 10
 
         },
 
         xAxis: {
 
           type: "category",
 
           data: this.stageList.map(item => item),
 
           axisTick: {
 
             alignWithLabel: true // 使刻度线和标签对齐
 
-        }
 
+          }
 
         },
 
         yAxis: {
 
           type: "value",
 
@@ -1338,9 +1567,96 @@ export default {
 
         },
 
         series: [
 
           {
 
+            name: "个人数据",
 
             data: this.bdStuInterAllLike.map(item => item.length),
 
-            type: "line"
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5,
 
+            lineStyle: {
 
+              opacity: 1 // 设置透明度为1，即不透明
 
+            }
 
+          },
 
+          {
 
+            name: "班级平均值",
 
+            data: this.classSco.map(item => item),
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5,
 
+            lineStyle: {
 
+              opacity: 1 // 设置透明度为1，即不透明
 
+            }
 
+          }
 
+          // {
 
+          //   data: this.bdStuInterAllLike.map(item => item.length),
 
+          //   type: "line"
 
+          // }
 
+        ]
 
+      };
 
+
 
+      chart.setOption(option);
 
+    },
 
+    // 工具提交折线图
 
+    initChart() {
 
+      const chart = echarts.init(this.$refs.toolSubEcharts);
 
+
 
+      const option = {
 
+        title: {
 
+          text: "作业提交率",
 
+          left: "left",
 
+          textStyle: {
 
+            color: "rgba(140, 140, 140, 1)", // 标题颜色
 
+            fontSize: 10, // 标题字体大小
 
+            fontWeight: "bold" // 加粗样式
 
           }
 
+        },
 
+        legend: {
 
+          data: ["个人数据", "班级平均值"],
 
+          // align: "right",
 
+          orient: "vertical", // 设置为垂直排列
 
+          right: 10
 
+        },
 
+        xAxis: {
 
+          type: "category",
 
+          data: this.stageList.map(item => item),
 
+          axisTick: {
 
+            alignWithLabel: true // 使刻度线和标签对齐
 
+          }
 
+        },
 
+        tooltip: {
 
+          trigger: "axis"
 
+        },
 
+        yAxis: {
 
+          type: "value",
 
+          axisLabel: {
 
+            formatter: "{value}%"
 
+          },
 
+          max: 100
 
+        },
 
+        series: [
 
+          {
 
+            name: "个人数据",
 
+            data: this.stageListPer.map(item => item * 100),
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5,
 
+            lineStyle: {
 
+              opacity: 1 // 设置透明度为1，即不透明
 
+            }
 
+          },
 
+          {
 
+            name: "班级平均值",
 
+            data: this.classStageListPer.map(item => item * 100),
 
+            type: "line",
 
+            symbol: "circle",
 
+            symbolSize: 5,
 
+            lineStyle: {
 
+              opacity: 1 // 设置透明度为1，即不透明
 
+            }
 
+          }
 
+          // {
 
+          //   data: this.stageListPer.map(item => item * 100),
 
+          //   type: "line"
 
+          // }
 
         ]
 
       };
 
 
@@ -1349,18 +1665,30 @@ export default {
 
     // 计算分组工具使用比例
 
     getColumnData() {
 
       let columnDataCopy = [];
 
-
 
+      let columnDataCopyTwo = [];
 
       this.toolPercentage.forEach((e, index) => {
 
         columnDataCopy[index] = 0;
 
+        columnDataCopyTwo[index] = 0;
 
         columnDataCopy[index] = e.filter(item => item === 49).length;
 
+        columnDataCopyTwo[index] = e.filter(item => item != 49).length;
 
+
 
         if (columnDataCopy[index]) {
 
-          this.columnData[index] = (columnDataCopy[index] / e.length).toFixed(
 
+          columnDataCopy[index] = (columnDataCopy[index] / e.length).toFixed(
 
+            2
 
+          );
 
+        } else {
 
+          columnDataCopy[index] = 0;
 
+        }
 
+        if (columnDataCopyTwo[index]) {
 
+          columnDataCopyTwo[index] = (columnDataCopyTwo[index] / e.length).toFixed(
 
             2
 
           );
 
         } else {
 
-          this.columnData[index] = 0;
 
+          columnDataCopyTwo[index] = 0;
 
         }
 
       });
 
+      this.columnData[0].data = columnDataCopy;
 
+      this.columnData[1].data = columnDataCopyTwo;
 
     },
 
     // 计算时长
 
     secondsToDhms(seconds) {
 
@@ -1507,6 +1835,7 @@ export default {
 
   padding: 0 20px;
 
   padding-bottom: 30px;
 
   box-sizing: border-box;
 
+  font-family: PingFang SC;
 
 }
 
 .zhBlock {
 
   width: 125px;
 
@@ -1550,13 +1879,12 @@ export default {
 
   overflow: hidden;
 
 }
 
 .zhBlockCon2 > div {
 
-
 
   display: flex;
 
   flex-wrap: wrap;
 
 
   flex: 1;
 
 }
 
-.zhBlockCon2 > div >span{
 
+.zhBlockCon2 > div > span {
 
   font-size: 8px;
 
   font-weight: 400;
 
   color: rgba(0, 0, 0, 0.9);
 
@@ -1578,4 +1906,15 @@ export default {
 
   padding: 10px 0;
 
   border-radius: 15px;
 
 }
 
+.pdfAnalysis {
 
+  width: 100%;
 
+}
 
+.pdfAnalysisCon {
 
+  background-color: rgba(255, 255, 255, 1);
 
+  width: 100%;
 
+  padding: 20px;
 
+  box-sizing: border-box;
 
+  border-radius: 15px;
 
+  line-height: 25px;
 
+}
 
 </style>

+ 29 - 5
src/components/pages/components/studentWorksDetail.vue
Ver arquivo 

@@ -166,7 +166,7 @@
 
               <el-button
 
                 type="primary"
 
                 size="small"
 
-                @click="lookWork(scope.row.courseid, scope.row.userid)"
 
+                @click="lookWork(scope.row.courseid, scope.row.userid,scope.row)"
 
                 >查看&批改作业</el-button
 
               >
 
               <el-button
 
@@ -1445,12 +1445,26 @@
 
                                 {{ item.value }}
 
                               </div>
 
                             </el-tooltip>
 
+                            <!-- <el-rate
 
+                              class="rate_size"
 
+                              style="min-width: 120px"
 
+                              v-model="worksDetail[sIndex].rateList[item.detail]"
 
+                              @change="getStar(sIndex)"
 
+                            ></el-rate> -->
 
                             <el-rate
 
                               class="rate_size"
 
+                              v-if="worksDetail[sIndex].state == 5"
 
                               style="min-width: 120px"
 
                               v-model="worksDetail[sIndex].rateList[item.detail]"
 
                               @change="getStar(sIndex)"
 
                             ></el-rate>
 
+                            <el-rate
 
+                              class="rate_size"
 
+                              v-else
 
+                              style="min-width: 120px"
 
+                              v-model="worksDetail[sIndex].rateList[item.value]"
 
+                              @change="getStar(sIndex)"
 
+                            ></el-rate>
 
                           </div>
 
                         </div>
 
                         <div
 
@@ -1976,14 +1990,14 @@ export default {
 
             }
 
           }
 
           this.dyList = dyList;
 
-          this.lookDyList(cid,uid)
 
+          this.lookDyList(cid,uid,worksData)
 
         
         })
 
         .catch((err) => {
 
           console.error(err);
 
         });
 
     },
 
-    lookDyList(cid, uid){
 
+    lookDyList(cid, uid,worksData){
 
       let params = {
 
         uid: uid,
 
         cid: cid
 
@@ -2570,7 +2584,12 @@ 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].detail] = 0;
 
+                  if (worksData.state == 5) {
 
+                    result[l].rateList[eList[i].detail] = 0;                          
+                  }else{
 
+                    result[l].rateList[eList[i].value] = 0;                          
+                  }
 
+                  // result[l].rateList[eList[i].detail] = 0;
 
                 }
 
                 result[l].rateList.content = "";
 
                 this.ooption[l] = _ooption;
 
@@ -2623,7 +2642,12 @@ 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].detail] = 0;
 
+                        if (worksData.state == 5) {
 
+                          result[l].rateList[eList[i].detail] = 0;                          
+                        }else{
 
+                          result[l].rateList[eList[i].value] = 0;                          
+                        }
 
+                        // result[l].rateList[eList[i].detail] = 0;
 
                       }
 
                       result[l].rateList.content = "";
 
                       this.ooption[l] = _ooption;

+ 1 - 1
src/components/pages/components/workData.vue
Ver arquivo 

@@ -583,7 +583,7 @@ export default {
 
       this.$emit('cancel');
 
     },
 
     exportWorkPdf(){
 
-      this.$confirm("是否导出全部学生作业？批量打印需要等待一会哦。", "提示", {
 
+      this.$confirm("是否导出全部学生作业？批量导出需要等待一会儿哦～", "提示", {
 
         confirmButtonText: "确定",
 
         cancelButtonText: "取消",
 
         type: "warning",

+ 47 - 10
src/components/pages/works.vue
Ver arquivo 

@@ -57,14 +57,14 @@
 
             >课程管理</span
 
           >
 
           <span class="sub_head">评价管理</span>
 
-          <span
 
+          <!-- <span
 
             @click="
 
               goTo(
 
                 '/worksReport?userid=' + userid + '&oid=' + oid + '&org=' + org
 
               )
 
             "
 
             >数据报告</span
 
-          >
 
+          > -->
 
         </div>
 
         <div class="student_head">
 
           <div class="cutTab" >
 
@@ -376,13 +376,13 @@
 
             </div>
 
           </div>
 
           
-          <el-button size="small" @click="exportPdfSetAllBtn" type="primary">一键导出</el-button>
 
+          <!-- <el-button size="small" @click="exportPdfSetAllBtn" type="primary">一键导出</el-button> -->
 
           
         </div>
 
-        <div>
 
+        <div class="TableCss">
 
           <el-table
 
             v-loading="isLoading2"
 
-            ref="table"
 
+            ref="multipleTable"
 
             :data="res2"
 
             border
 
             :height="400"
 
@@ -413,13 +413,21 @@
 
             </template>
 
             </el-table-column>
 
             <el-table-column align="center" label="操作" min-width="20">
 
-              <template slot-scope="scope">
 
+              <!-- <template slot-scope="scope">
 
                 <el-button
 
                   type="primary"
 
                   size="small"
 
                   @click="getReport(scope.row)"
 
                   >查看报告</el-button
 
                 >
 
+              </template> -->
 
+               <template slot-scope="scope">
 
+                <el-button
 
+                  type="primary"
 
+                  size="small"
 
+                  @click="lookPdf(scope.row)"
 
+                  >查看报告</el-button
 
+                >
 
               </template>
 
             </el-table-column>
 
           </el-table>
 
@@ -460,7 +468,7 @@
 
       <div slot="title" class="header-title">
 
         <div style="color: #fff">导出作业集</div>
 
       </div>
 
-      <exportDataDialog  :key="exportW" :digNum="digNum" :oid="oid" :multipleSelection="multipleSelection" :worksDialog.sync="worksDialog" :cid="checkCourse"></exportDataDialog>
 
+      <exportDataDialog  :key="exportW" :digNum="digNum" :oid="oid" :multipleSelection="multipleSelection" :worksDialogCon="worksDialogCon" :worksDialog.sync="worksDialog" :cid="checkCourse"></exportDataDialog>
 
     </el-dialog>
 
     <!-- <div class="cancelbox" v-if="reportVisible">
 
       <el-button @click="cancelR" type="primary" size="small">返回</el-button>
 
@@ -491,7 +499,7 @@ export default {
 
       exportW:0,
 
       digNum:0,
 
       digCid:'',
 
-
 
+      worksDialogCon:{},  
       tableHeight: "500px",
 
       isLoading: false,
 
       formLabelWidth: "100px",
 
@@ -553,8 +561,25 @@ export default {
 
     });
 
   },
 
   methods: {
 
+    // clearSelection() {
 
+    //     this.$refs.multipleTable.clearSelection();
 
+    // },
 
     handleSelectionChange(val) {
 
-        this.multipleSelection = val;
 
+      if (val.length > 1) {
 
+      this.$refs.multipleTable.clearSelection(); //清空列表的选中
 
+      this.$refs.multipleTable.toggleRowSelection(val[val.length-1]); //只显示选中最后一个 这时val还是多选的列表(就是你选中的几个数据)
 
+      } else if (val.length === 1) {
 
+            this.multipleSelection=[]
 
+            this.multipleSelection.push( val[val.length-1]);
 
+      } else {
 
+            this.multipleSelection = []; //this.multipleTable是选中行的最后一条数据
 
+      }
 
+    },
 
+    lookPdf(val){
 
+      this.worksDialogCon=val
 
+      this.worksDialog = true;
 
+      this.digNum = 2
 
+      this.exportW++
 
     },
 
     // 导出pdf
 
     exportPdfSetBtn(){
 
@@ -566,7 +591,7 @@ export default {
 
     // 一键导出pdf
 
     exportPdfSetAllBtn(){
 
 
-      this.$confirm("是否导出全部学生报告？批量打印需要等待一会哦。", "提示", {
 
+      this.$confirm("是否导出全部学生报告？批量导出需要等待一会儿哦～ 。", "提示", {
 
         confirmButtonText: "确定",
 
         cancelButtonText: "取消",
 
         type: "warning",
 
@@ -1085,4 +1110,16 @@ export default {
 
 .worksDialogCSSExp >>> .el-dialog {
 
   width: 676px !important;
 
 }
 
+/* .TableCss >>> .el-table-column--selection .cell{
 
+  display: none;
 
+}
 
+.TableCs >>>  .el-table--border > th > .cell {
 
+  visibility: hidden;
 
+}
 
+.TableCs >>>  .cell {
 
+  visibility: hidden;
 
+} */
 
+.TableCss >>> .el-table__header-wrapper .el-table__header .el-checkbox {
 
+  display: none;
 
+}
 
 </style>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff