ホーム エクスプローラ ヘルプ
サインイン
CocoRoboLabs
/
pbl-teacher-table
3
0
フォーク 0
ファイル 課題 0 プルリクエスト 0 Wiki
ソースを参照

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

zengyicheng 1 年間 前
親
3877c8da49 147dea8030
コミット
8a52b38b76
12 ファイル変更、86 行追加、62 行削除
分割表示 差分情報を表示
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.c04754490d1b81c6c0757a2b67ec85b0.css
  3. 0 0
      dist/static/css/app.c04754490d1b81c6c0757a2b67ec85b0.css.map
  4. 0 0
      dist/static/js/app.dac999cd38590a3d21d3.js
  5. 0 0
      dist/static/js/app.dac999cd38590a3d21d3.js.map
  6. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  7. 1 1
      src/components/pages/EnglishVoice/component/check.vue
  8. 16 3
      src/components/pages/EnglishVoice/component/component/gptImg.vue
  9. 5 1
      src/components/pages/EnglishVoice/component/component/qa2.vue
  10. 52 46
      src/components/pages/EnglishVoice/component/component/sentence.vue
  11. 5 1
      src/components/pages/EnglishVoice/component/component/word.vue
  12. 6 9
      src/components/pages/dataBoardNew/school/index.vue

+ 1 - 1
dist/index.html
ファイルの表示 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.66c0b3f921579887606f4a515a48eb06.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.2e57b4d93b90d6b9e84a.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.c04754490d1b81c6c0757a2b67ec85b0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.dac999cd38590a3d21d3.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/css/app.c04754490d1b81c6c0757a2b67ec85b0.css


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/css/app.c04754490d1b81c6c0757a2b67ec85b0.css.map


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/app.dac999cd38590a3d21d3.js


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/app.dac999cd38590a3d21d3.js.map


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 1 - 1
src/components/pages/EnglishVoice/component/check.vue
ファイルの表示 

@@ -137,7 +137,7 @@ export default {
 
                 this.checkArray = this.depthCopy(newVal);
 
             },
 
             deep: true,
 
-        },
 
+        }
 
     },
 
     mounted(){
 
         this.checkArray = this.depthCopy(this.checkJson);

+ 16 - 3
src/components/pages/EnglishVoice/component/component/gptImg.vue
ファイルの表示 

@@ -29,7 +29,8 @@ export default {
 
             type: Boolean,
 
         },
 
         value: {
 
-            type: String
 
+            type: String,
 
+            default: '' 
         }
 
     },
 
     data() {
 
@@ -75,13 +76,25 @@ export default {
 
                 console.log(error);
 
             });
 
         },
 
+        chooseSysPic2(url){
 
+            this.$emit("setImg", url);
 
+            this.close();
 
+        }
 
     },
 
     watch: {
 
-        sysPicVisible2(newValue, oldValue) {
 
+        sysPicVisible(newValue, oldValue) {
 
             if (newValue) {
 
                 this.searchImageValue = JSON.parse(JSON.stringify(this.value));
 
+                this.ppage = 1
 
+                this.searchImage()
 
             }
 
-        }
 
+        },
 
+        value: {
 
+            handler: function (newVal, oldVal) {
 
+                this.searchImageValue = JSON.parse(JSON.stringify(newVal));
 
+            },
 
+            deep: true,
 
+        },
 
     },
 
     mounted() {
 
         this.searchImageValue = JSON.parse(JSON.stringify(this.value));

+ 5 - 1
src/components/pages/EnglishVoice/component/component/qa2.vue
ファイルの表示 

@@ -40,7 +40,7 @@
 
           " style="width: 80%"></el-progress>
 
       </div>
 
     </div>
 
-    <gpt-img :sysPicVisible.sync="sysPicVisible" :value="checkJson.content"></gpt-img>
 
+    <gpt-img :sysPicVisible.sync="sysPicVisible" :value="checkJson.content" @setImg="setImg"></gpt-img>
 
   </div>
 
 </template>
 
 
@@ -61,6 +61,10 @@ export default {
 
   methods: {
 
     setJson() {
 
       this.$emit('setJson', this.checkJson)
 
+    },
 
+    setImg(url) {
 
+      this.checkJson.img = url
 
+      this.$emit('setJson', this.checkJson)
 
     }
 
   },
 
   watch: {

+ 52 - 46
src/components/pages/EnglishVoice/component/component/sentence.vue
ファイルの表示 

@@ -1,6 +1,6 @@
 
 <template>
 
-  <div class="o_box">
 
-    <div class="o_content">
 
+    <div class="o_box">
 
+        <div class="o_content">
 
             <span>输入内容</span>
 
             <textarea v-autoHeight="38" rows="1" class="binfo_input binfo_textarea" cols v-model="checkJson.content"
 
                 placeholder="句子/短文" @change="setJson"></textarea>
 
@@ -8,11 +8,11 @@
 
         <div class="o_content">
 
             <span>添加图片</span>
 
             <div class="o_uploadbox_img" v-if="checkJson.img">
 
-              <div class="pic_mask">
 
-                <span @click="checkImg(checkJson.img)">查看</span>
 
-                <span @click="deleteImg()">删除</span>
 
-              </div>
 
-              <img :src="checkJson.img" alt="">
 
+                <div class="pic_mask">
 
+                    <span @click="checkImg(checkJson.img)">查看</span>
 
+                    <span @click="deleteImg()">删除</span>
 
+                </div>
 
+                <img :src="checkJson.img" alt="">
 
             </div>
 
             <div class="o_uploadbox" v-if="!checkJson.img" @click="getImg()">智能获取</div>
 
             <div class="o_uploadbox" style="padding: 0 6px;" @click="addImg($event)" v-if="!checkJson.img">
 
@@ -40,8 +40,8 @@
 
                     " style="width: 80%"></el-progress>
 
             </div>
 
         </div>
 
-        <gpt-img :sysPicVisible.sync="sysPicVisible" :value="checkJson.content"></gpt-img>
 
-  </div>
 
+        <gpt-img :sysPicVisible.sync="sysPicVisible" :value="checkJson.content" @setImg="setImg"></gpt-img>
 
+    </div>
 
 </template>
 
 
 <script>
 
@@ -55,13 +55,17 @@ export default {
 
     },
 
     data() {
 
         return {
 
-          checkJson:{}
 
+            checkJson: {}
 
         }
 
     },
 
     methods: {
 
-      setJson(){
 
-        this.$emit('setJson',this.checkJson)
 
-      }
 
+        setJson() {
 
+            this.$emit('setJson', this.checkJson)
 
+        },
 
+        setImg(url) {
 
+            this.checkJson.img = url
 
+            this.$emit('setJson', this.checkJson)
 
+        }
 
     },
 
     watch: {
 
         cjson: {
 
@@ -74,12 +78,12 @@ export default {
 
             handler: function (newVal, oldVal) {
 
                 this.checkJson.img = newVal
 
                 this.$forceUpdate()
 
-                this.$emit('setJson',this.checkJson)
 
+                this.$emit('setJson', this.checkJson)
 
             },
 
             deep: true,
 
         },
 
     },
 
-    mounted(){
 
+    mounted() {
 
         this.checkJson = this.depthCopy(this.cjson);
 
     }
 
 }
 
@@ -228,42 +232,44 @@ export default {
 
 
 
 .o_uploadbox_img {
 
-  width:100px;
 
-  height: 100px;
 
-  border-radius: 5px;
 
-  position: relative;
 
-  overflow: hidden;
 
+    width: 100px;
 
+    height: 100px;
 
+    border-radius: 5px;
 
+    position: relative;
 
+    overflow: hidden;
 
 }
 
-.o_uploadbox_img > img{
 
-  width:100%;
 
-  height: 100%;
 
-  object-fit: cover;
 
+
 
+.o_uploadbox_img>img {
 
+    width: 100%;
 
+    height: 100%;
 
+    object-fit: cover;
 
 }
 
-.o_uploadbox_img:hover .pic_mask{
 
-  display: flex;
 
+
 
+.o_uploadbox_img:hover .pic_mask {
 
+    display: flex;
 
 }
 
+
 
 .pic_mask {
 
-  position: absolute;
 
-  width: 100%;
 
-  height: 100%;
 
-  background: rgba(0, 0, 0, .3);
 
-  flex-direction: column;
 
-  justify-content: center;
 
-  align-items: center;
 
-  top: 0;
 
-  left: 0;
 
-  color: #458dff;
 
-  display: none;
 
-  border-radius: 5px;
 
+    position: absolute;
 
+    width: 100%;
 
+    height: 100%;
 
+    background: rgba(0, 0, 0, .3);
 
+    flex-direction: column;
 
+    justify-content: center;
 
+    align-items: center;
 
+    top: 0;
 
+    left: 0;
 
+    color: #458dff;
 
+    display: none;
 
+    border-radius: 5px;
 
 }
 
 
-.pic_mask > span{
 
-  cursor: pointer;
 
-  font-size: 14px;
 
-  color: #fff;
 
+.pic_mask>span {
 
+    cursor: pointer;
 
+    font-size: 14px;
 
+    color: #fff;
 
 }
 
 
-.pic_mask > span + span{
 
-  margin-top: 10px;
 
-}
 
-</style>
 
+.pic_mask>span+span {
 
+    margin-top: 10px;
 
+}</style>

+ 5 - 1
src/components/pages/EnglishVoice/component/component/word.vue
ファイルの表示 

@@ -40,7 +40,7 @@
 
                     " style="width: 80%"></el-progress>
 
             </div>
 
         </div>
 
-        <gpt-img :sysPicVisible.sync="sysPicVisible" :value="checkJson.content"></gpt-img>
 
+        <gpt-img :sysPicVisible.sync="sysPicVisible" :value="checkJson.content" @setImg="setImg"></gpt-img>
 
     </div>
 
 </template>
 
 
@@ -61,6 +61,10 @@ export default {
 
     methods: {
 
         setJson() {
 
             this.$emit('setJson', this.checkJson)
 
+        },
 
+        setImg(url){
 
+            this.checkJson.img = url
 
+            this.$emit('setJson', this.checkJson)
 
         }
 
     },
 
     watch: {

+ 6 - 9
src/components/pages/dataBoardNew/school/index.vue
ファイルの表示 

@@ -571,14 +571,14 @@ export default {
 
           }
 
           loginCountYearArray = loginCountYearArray.reverse()
 
           for (var i = 0; i < loginCountYear.length; i++) {
 
-            let _date = new Date(loginCountYear[i].create_at)
 
+            let _date = new Date(loginCountYear[i].time)
 
             var _month = _date.getMonth() + 1
 
             var _year = _date.getFullYear()
 
             var _day = _date.getDay()
 
             let dayArray = ['sun', 'mon', 'tue', 'wed', 'thur', 'fri', 'sat']
 
             for (var j = 0; j < loginCountYearArray.length; j++) {
 
               if (_month == loginCountYearArray[j].Month && _year == loginCountYearArray[j].Year) {
 
-                loginCountYearArray[j][dayArray[_day]]++
 
+                loginCountYearArray[j][dayArray[_day]]+=loginCountYear[i].usernum
 
                 break;
 
               }
 
             }
 
@@ -650,7 +650,6 @@ export default {
 
 
           let _workCourse = res.data[11]; //带作业的课程
 
           let _taskCount = 0 //任务数量
 
-
 
           var wList = [];
 
           for (var i = 0; i < _workCourse.length; i++) {
 
             if (!wList[_workCourse[i].courseId]) {
 
@@ -755,13 +754,12 @@ export default {
 
           this.lightJson.upSCourseTeachers = res.data[17][0].count; //上传项目老师数量
 
           this.lightJson.toolTeachers = res.data[18][0].count; //使用工具老师数量
 
           this.lightJson.gCourseTeachers = res.data[19][0].count; //协同课程老师数量
 
-          this.lightJson.commentTeachers = res.data[20][0].count; //协同交流老师数量
 
+          this.lightJson.commentTeachers = res.data[20][0].count; //互动交流老师数量
 
           this.lightJson.courseStudents = res.data[21][0].count; //参与课程学生数量
 
           this.lightJson.scourseStudents = res.data[22][0].count; //参与项目学生数量
 
           this.lightJson.toolStudents = res.data[23][0].count; //使用工具数量
 
           this.lightJson.gsCourseStudents = res.data[24][0].count; //获取协同项目数量
 
           this.lightJson.commentStudents = res.data[25][0].count; //互动交流学生数量
 
-
 
           var today = new Date();
 
           var lastDayOfWeek = new Date(today.setDate(today.getDate() - today.getDay() + 7));;//本周周日
 
 
@@ -851,9 +849,8 @@ export default {
 
           this.weekCourse2 = weekCourse2
 
 
           let allTimeYear = res.data[26]; //累计时长热力图
 
-          this.teacherLoginCount = res.data[27].length; //教师登录频次柱状图
 
-          this.studentLoginCount = res.data[28].length; //学生登录频次柱状图
 
-
 
+          this.teacherLoginCount = res.data[27][0].count; //教师登录频次柱状图
 
+          this.studentLoginCount = res.data[28][0].count; //学生登录频次柱状图
 
           let allTimeYearArray = []
 
           for (var i = Month; i > Month - 12; i--) {
 
             if (i <= 0) {
 
@@ -891,7 +888,7 @@ export default {
 
             let dayArray = ['sun', 'mon', 'tue', 'wed', 'thur', 'fri', 'sat']
 
             for (var j = 0; j < allTimeYearArray.length; j++) {
 
               if (_month == allTimeYearArray[j].Month && _year == allTimeYearArray[j].Year) {
 
-                allTimeYearArray[j][dayArray[_day]] += parseInt((parseInt(allTimeYear[i].text) / 3600).toFixed(0));
 
+                allTimeYearArray[j][dayArray[_day]] += parseInt((parseInt(allTimeYear[i].time) / 3600).toFixed(0));
 
                 break;
 
               }
 
             }

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません