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

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

SanHQin 10 months ago
parent
ad84c6c5af fdbeb55a5f
commit
bc5edd3e54
17 changed files with 322 additions and 85 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.38e35e53118df8e75578b315d1569aa5.css.map
  3. 0 0
      dist/static/css/app.af3deefd5080c4de9dc362720587a627.css
  4. 0 0
      dist/static/css/app.af3deefd5080c4de9dc362720587a627.css.map
  5. 0 0
      dist/static/js/app.bb82efc79102816c18d3.js
  6. 0 0
      dist/static/js/app.bb82efc79102816c18d3.js.map
  7. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. BIN
      src/assets/icon/course/copyTxt.png
  9. BIN
      src/assets/icon/course/resImg.png
  10. BIN
      src/assets/icon/course/sImg.png
  11. BIN
      src/assets/icon/course/sRio.png
  12. 4 4
      src/components/classRoomHelper/component/dialogArea.vue
  13. 103 10
      src/components/classRoomHelper/component/searchArea.vue
  14. 4 4
      src/components/classRoomHelper/component/taskArea.vue
  15. 70 22
      src/components/easy2/studyStudent.vue
  16. 70 22
      src/components/easy3/studyStudent.vue
  17. 70 22
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.38e35e53118df8e75578b315d1569aa5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.733814fc48c2bd2222aa.js></script><script type=text/javascript src=./static/js/app.40d1a38886993524d639.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.af3deefd5080c4de9dc362720587a627.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.733814fc48c2bd2222aa.js></script><script type=text/javascript src=./static/js/app.bb82efc79102816c18d3.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.38e35e53118df8e75578b315d1569aa5.css.map


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


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


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


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


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


BIN
src/assets/icon/course/copyTxt.png
View File


BIN
src/assets/icon/course/resImg.png
View File


BIN
src/assets/icon/course/sImg.png
View File


BIN
src/assets/icon/course/sRio.png
View File


+ 4 - 4
src/components/classRoomHelper/component/dialogArea.vue
View File 

@@ -22,7 +22,7 @@
 
               <div
 
                 class="d_t_c_a_r_content"
 
                 style="display: flex;justify-content: space-between;flex-wrap: wrap;"
 
-                v-if="item.content.includes('图片')"
 
+                v-if="pan(item.aiContent).length"
 
               >
 
                 <div
 
                   v-if="!pan(item.aiContent).length"
 
@@ -33,7 +33,7 @@
 
 
                 <div v-else v-for="i in pan(item.aiContent)">
 
                   <img
 
-                    style="width: 130px;height: 130px;"
 
+                    style="width: 130px;height: 130px;object-fit: cover;"
 
                     :src="i.image"
 
                     alt=""
 
                     @click="previewImg(i.image)"
 
@@ -46,11 +46,11 @@
 
                 v-loading="item.loading"
 
                 v-html="htmlContent(item.aiContent)"
 
               ></div>
 
-              <div v-if="!item.content.includes('图片')" class="aiCopy">
 
+              <div v-if="!pan(item.aiContent).length" class="aiCopy">
 
                 <img
 
                   @click="onCopy(item.aiContent)"
 
                   style="width: 30px;"
 
-                  src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%A4%8D%E5%88%B6%E5%9B%BE%E6%A0%871715569581741.png"
 
+                  src="../../../assets/icon/course/copyTxt.png"
 
                   alt=""
 
                 />
 
               </div>

+ 103 - 10
src/components/classRoomHelper/component/searchArea.vue
View File 

@@ -1,6 +1,7 @@
 
 <template>
 
   <div class="search">
 
     <div class="s_top" ref="chatRef">
 
+      
       <!-- <div class="s_t_chat">
 
         <div class="s_t_c_ai">
 
           <div class="s_t_c_a_left">
 
@@ -56,7 +57,7 @@
 
           <div class="s_t_c_a_right">
 
             <div
 
               class="s_t_c_a_r_content"
 
-              v-if="item.content.includes('图片')"
 
+              v-if="pan(item.aiContent).length"
 
               style="display: flex;justify-content: space-between;flex-wrap: wrap;"
 
             >
 
               <div
 
@@ -71,12 +72,16 @@
 
                 :key="index"
 
               >
 
                 <img
 
-                  style="width: 130px;height: 130px;"
 
+                  style="width: 130px;height: 130px;object-fit: cover;"
 
                   :src="i.image"
 
                   alt=""
 
                   @click="previewImg(i.image)"
 
                 />
 
               </div>
 
+              <!-- {{ item }} -->
 
+              <div style="margin-top: 10px;width: 100%;display: flex;justify-content: end;" v-if="pan(item.aiContent).length > 0 && chatList.length-2 == index" >
 
+                <img style="cursor: pointer;" @click="resetImg(item.content)" src="../../../assets/icon/course/resImg.png" alt="">
 
+              </div>
 
             </div>
 
             <div
 
               v-else
 
@@ -84,11 +89,13 @@
 
               v-loading="item.loading"
 
               v-html="htmlContent(item.aiContent)"
 
             ></div>
 
-            <div v-if="!item.content.includes('图片')" class="aiCopy">
 
+            <!-- {{ Array.isArray(JSON.parse(item.aiContent)) }} -->
 
+            <!-- {{ JSON.parse(item) }} -->
 
+            <div v-if="!pan(item.aiContent).length" class="aiCopy">
 
               <img
 
                 @click="onCopy(item.aiContent)"
 
                 style="width: 30px;"
 
-                src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%A4%8D%E5%88%B6%E5%9B%BE%E6%A0%871715569581741.png"
 
+                src="../../../assets/icon/course/copyTxt.png"
 
                 alt=""
 
               />
 
             </div>
 
@@ -153,6 +160,30 @@
 
       <!-- <div class="s_b_ba-item" @click.stop="choiceRole()">选择角色</div> -->
 
 
       <div class="s_b_btnArea">
 
+        <!-- <div class="s_b_ba-item">
 
+          <el-checkbox
 
+            :disabled="loading"
 
+            style="display: flex;"
 
+            v-model="imageCheck"
 
+            >图片</el-checkbox
 
+          >
 
+        </div>
 
+        <div class="s_b_ba-item">
 
+          <el-checkbox
 
+            :disabled="loading"
 
+            style="display: flex;"
 
+            v-model="videoCheck"
 
+            >视频</el-checkbox
 
+          >
 
+        </div> -->
 
+
 
+        <div class="s_b_ba-item" @click="send(text, 1)">
 
+          <img src="../../../assets/icon/course/sImg.png" style="margin-right: 5px;" alt="">图片
 
+        </div>
 
+        <div class="s_b_ba-item" @click="send(text, 2)">
 
+          <img src="../../../assets/icon/course/sRio.png" style="margin-right: 5px;" alt="">视频
 
+        </div>
 
+
 
         <div class="s_b_ba-item" @click="clear()" v-if="!openAtBox">
 
           清空聊天记录
 
         </div>
 
@@ -457,6 +488,8 @@ export default {
 
   data() {
 
     return {
 
       text: "",
 
+      ppage: 1,
 
+      CheckConNnm: 0,
 
       loading: false,
 
       chatLoading: false,
 
       imageCheck: false,
 
@@ -620,6 +653,58 @@ export default {
 
     }
 
   },
 
   methods: {
 
+    resetImg(_text){
 
+        this.ppage++
 
+
 
+        let _uuid = uuidv4();
 
+        this.chatList.push({
 
+          role: "user",
 
+          content: `${_text}`,
 
+          uid: _uuid,
 
+          AI: "AI",
 
+          aiContent: "",
 
+          oldContent: "",
 
+          isShowSynchronization: false,
 
+          filename: "",
 
+          index: this.chatList.length,
 
+          is_mind_map: false,
 
+          loading: true
 
+        });
 
+        this.text = "";
 
+        let params = {
 
+          page: this.ppage,
 
+          pagesize: 6,
 
+          query: _text
 
+        };
 
+        // this.$message.info(_text);
 
+        this.chatList.push({
 
+          role: "user",
 
+          content: `getImage`,
 
+          uid: _uuid,
 
+          AI: "AI",
 
+          aiContent: "",
 
+          oldContent: "",
 
+          isShowSynchronization: false,
 
+          filename: "",
 
+          index: this.chatList.length,
 
+          is_mind_map: false,
 
+          loading: true
 
+        });
 
+        this.scrollBottom();
 
+
 
+        this.ajax
 
+          .post("https://gpt.cocorobo.cn/search_image", params)
 
+          .then(res => {
 
+            let data = res.data.FunctionResponse.result;
 
+            // console.log('res',res.data.FunctionResponse.result);
 
+            this.chatList.find(i => i.uid == _uuid).aiContent = JSON.stringify(
 
+              data
 
+            );
 
+            this.chatList.find(i => i.uid == _uuid).loading = false;
 
+            this.chatLoading = false;
 
+            this.insertChat(_uuid);
 
+          });
 
+    },
 
     stopSend() {
 
       if (this.source) {
 
         this.source.close();
 
@@ -681,7 +766,9 @@ export default {
 
     //   if (this.loading) return this.$message.info("请稍等");
 
     //   this.$message.info(`点击了语音`);
 
     // },
 
-    send(_text = this.text) {
 
+    send(_text = this.text,val = 0) {
 
+      this.ppage = 1
 
+      this.CheckConNnm = val
 
       if (this.loading || this.chatLoading) return this.$message.info("请稍等");
 
       if (_text.trim().length == 0) return this.$message.info("请输入内容");
 
       let _atRoleList = [];
 
@@ -718,7 +805,7 @@ export default {
 
         loading: true
 
       });
 
       this.scrollBottom();
 
-      if (_text.indexOf("视频") != -1) {
 
+      if (_text.indexOf("视频") != -1 || this.CheckConNnm == 2) {
 
         _msg = `
 
 NOTICE
 
 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.
 
@@ -746,12 +833,12 @@ Instruction: Based on the context, follow "Format example", write content.
 
 视频内容：介绍了一款AI教育软件
 
 视频链接https://www.ted.com/talks/sal_khan_how_ai_could_save_not_destroy_education
 
 				`;
 
-      } else if (_text.indexOf("图片") != -1) {
 
+      } else if (_text.indexOf("图片") != -1 || this.CheckConNnm == 1) {
 
         // console.log("图片");
 
         this.text = "";
 
         let params = {
 
-          page: 1,
 
-          pagesize: 4,
 
+          page: this.ppage,
 
+          pagesize: 6,
 
           query: _text
 
         };
 
         // this.$message.info(_text);
 
@@ -846,8 +933,9 @@ Instruction: Based on the context, follow "Format example", write content.
 
       // history.pop();
 
       if (_msg) {
 
         history.push({ role: "user", content: _msg });
 
+      }else{
 
+        history.push({ role: "user", content: _text });
 
       }
 
-      history.push({ role: "user", content: _text });
 
       // let params = {
 
       //   model: "gpt-3.5-turbo",
 
       //   temperature: 0,
 
@@ -871,6 +959,7 @@ Instruction: Based on the context, follow "Format example", write content.
 
         model: "Claude 3 Sonnet" // Claude 3 Sonnet或者Claude 3 Haiku
 
       };
 
       this.text = "";
 
+      // console.log('56465166541561616',params);
 
 
       this.ajax
 
         .post("https://claude3.cocorobo.cn/chat", params)
 
@@ -1948,6 +2037,10 @@ ${_wordData}
 
   height: 100%;
 
   box-sizing: border-box;
 
 }
 
+.checkboxCss{
 
+  color: #fff;
 
+  background-color: #76a7f5 !important;
 
+}
 
 .imgNumberBlock {
 
   width: 100%;
 
   height: 30px;

+ 4 - 4
src/components/classRoomHelper/component/taskArea.vue
View File 

@@ -78,7 +78,7 @@
 
             <div
 
               class="t_t_c_a_r_content"
 
               style="display: flex;justify-content: space-between;flex-wrap: wrap;"
 
-              v-if="item.content.includes('图片')"
 
+              v-if="pan(item.aiContent).length"
 
             >
 
               <div
 
                 v-if="!pan(item.aiContent).length"
 
@@ -88,7 +88,7 @@
 
               ></div>
 
               <div v-else v-for="i in pan(item.aiContent)">
 
                 <img
 
-                  style="width: 130px;height: 130px;"
 
+                  style="width: 130px;height: 130px;object-fit: cover;"
 
                   :src="i.image"
 
                   alt=""
 
                   @click="previewImg(i.image)"
 
@@ -101,11 +101,11 @@
 
               v-loading="item.loading"
 
               v-html="htmlContent(item.aiContent)"
 
             ></div>
 
-            <div v-if="!item.content.includes('图片')" class="aiCopy">
 
+            <div v-if="!pan(item.aiContent).length" class="aiCopy">
 
               <img
 
                 @click="onCopy(item.aiContent)"
 
                 style="width: 30px;"
 
-                src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%A4%8D%E5%88%B6%E5%9B%BE%E6%A0%871715569581741.png"
 
+                src="../../../assets/icon/course/copyTxt.png"
 
                 alt=""
 
               />
 
             </div>

+ 70 - 22
src/components/easy2/studyStudent.vue
View File 

@@ -1880,7 +1880,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -2998,7 +3000,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(16, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3098,7 +3102,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3306,7 +3312,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(32, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3474,7 +3482,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(57, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3722,7 +3732,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(50, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3908,7 +3920,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(4, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4075,7 +4089,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(45, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4181,7 +4197,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(69, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4477,7 +4495,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(15, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4759,7 +4779,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(1, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5041,7 +5063,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(3, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5322,7 +5346,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5604,7 +5630,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(7, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5711,7 +5739,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5843,7 +5873,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(40, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6015,7 +6047,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(41, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6248,7 +6282,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(47, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6406,7 +6442,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(48, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6635,7 +6673,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(52, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -12345,8 +12385,8 @@ export default {
 
 				isScoreList:[],	
 			},
 
 			classRoomHelperWidth: '85px',
 
-			orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'],
 
-      oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5']
 
+			orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9','0fec3a8a-ad04-11ed-b13d-005056b86db5'],
 
+      oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5','45facc0a-1211-11ec-80ad-005056b86db5']
 
     };
 
   },
 
   methods: {
 
@@ -21848,6 +21888,14 @@ export default {
 
   border: 1px solid #0061ff;
 
 }
 
 
+.noWorksName > span{
 
+  max-width: 100%;
 
+  display: block;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  white-space: nowrap;
 
+}
 
+
 
 .isWorksName2 {
 
   width: 100px;
 
   height: 40px;

+ 70 - 22
src/components/easy3/studyStudent.vue
View File 

@@ -1910,7 +1910,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3028,7 +3030,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(16, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3128,7 +3132,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3336,7 +3342,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(32, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3504,7 +3512,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(57, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3752,7 +3762,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(50, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3938,7 +3950,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(4, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4105,7 +4119,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(45, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4211,7 +4227,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(69, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4507,7 +4525,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(15, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4789,7 +4809,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(1, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5071,7 +5093,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(3, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5352,7 +5376,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5634,7 +5660,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(7, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5741,7 +5769,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5873,7 +5903,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(40, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6045,7 +6077,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(41, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6278,7 +6312,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(47, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6436,7 +6472,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(48, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6665,7 +6703,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(52, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -12381,8 +12421,8 @@ export default {
 
 				isScoreList:[],	
 			},
 
 			classRoomHelperWidth: '85px',
 
-			orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'],
 
-      oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5']
 
+			orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9','0fec3a8a-ad04-11ed-b13d-005056b86db5'],
 
+      oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5','45facc0a-1211-11ec-80ad-005056b86db5']
 
     };
 
   },
 
   methods: {
 
@@ -21900,6 +21940,14 @@ export default {
 
   border: 1px solid #0061ff;
 
 }
 
 
+.noWorksName > span{
 
+  max-width: 100%;
 
+  display: block;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  white-space: nowrap;
 
+}
 
+
 
 .isWorksName2 {
 
   width: 100px;
 
   height: 40px;

+ 70 - 22
src/components/studyStudent.vue
View File 

@@ -1878,7 +1878,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -2996,7 +2998,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(16, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3096,7 +3100,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3304,7 +3310,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(32, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3472,7 +3480,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(57, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3720,7 +3730,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(50, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -3906,7 +3918,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(4, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4073,7 +4087,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(45, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4179,7 +4195,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(69, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4475,7 +4493,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(15, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -4757,7 +4777,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(1, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5039,7 +5061,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(3, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5320,7 +5344,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5602,7 +5628,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(7, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5709,7 +5737,9 @@
 
                         :key="sIndex"
 
                         class="noWorksName"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -5841,7 +5871,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(40, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6013,7 +6045,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(41, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6246,7 +6280,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(47, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6404,7 +6440,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(48, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -6633,7 +6671,9 @@
 
                         class="noWorksName"
 
                         @click="teacherWorkSubmit(52, toolIndex, taskCount, s)"
 
                       >
 
-                        {{ s.student }}
 
+                        <el-tooltip effect="dark" :content="s.student" placement="top">
 
+                            <span>{{ s.student }}</span>
 
+                        </el-tooltip>
 
                       </div>
 
                     </div>
 
                   </div>
 
@@ -12318,8 +12358,8 @@ export default {
 
 				isScoreList:[],	
 			},
 
       classRoomHelperWidth: '85px',
 
-			orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'],
 
-      oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5']
 
+			orgArray:['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9','0fec3a8a-ad04-11ed-b13d-005056b86db5'],
 
+      oidArray:['f297fbdc-f0a0-11ee-b534-005056b86db5','45facc0a-1211-11ec-80ad-005056b86db5']
 
     };
 
   },
 
   methods: {
 
@@ -21819,6 +21859,14 @@ export default {
 
   border: 1px solid #0061ff;
 
 }
 
 
+.noWorksName > span{
 
+  max-width: 100%;
 
+  display: block;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  white-space: nowrap;
 
+}
 
+
 
 .isWorksName2 {
 
   width: 100px;
 
   height: 40px;

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