SanHQin 4 months ago
parent
commit
d095d8f2b5

+ 1 - 1
dist/index.html

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

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


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


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


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


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


+ 1 - 1
src/components/pages/aiAddCourse/addCourse.vue

@@ -3649,7 +3649,7 @@
                             class="c_pub_button_add pub_btn_add_img"
                             class="c_pub_button_add pub_btn_add_img"
                             @click="openAddApp(itemTaskIndex)"
                             @click="openAddApp(itemTaskIndex)"
                           >
                           >
-                            Ai应用
+                            智能应用
                           </button>
                           </button>
                           </div>
                           </div>
                           <div v-if="
                           <div v-if="

+ 2 - 2
src/components/pages/aiEasy/addCourse.vue

@@ -608,7 +608,7 @@
                             class="c_pub_button_add pub_btn_add_img"
                             class="c_pub_button_add pub_btn_add_img"
                             @click="openAddApp(0)"
                             @click="openAddApp(0)"
                           >
                           >
-                            Ai应用
+                            智能应用
                           </button>
                           </button>
                       </div>
                       </div>
                       <div v-if="
                       <div v-if="
@@ -3214,7 +3214,7 @@
                             class="c_pub_button_add pub_btn_add_img"
                             class="c_pub_button_add pub_btn_add_img"
                             @click="openAddApp(itemTaskIndex)"
                             @click="openAddApp(itemTaskIndex)"
                           >
                           >
-                            Ai应用
+                            智能应用
                           </button>
                           </button>
                           </div>
                           </div>
                           <div
                           <div

+ 18 - 5
src/components/pages/classroomObservation/components/analysisItem.vue

@@ -735,15 +735,27 @@ export default {
             });
             });
 
 
             let _option = {
             let _option = {
-              legend: {},
+              legend: {
+                textStyle: {
+                  color: '#000'
+                }
+              },
               radar: {
               radar: {
                 // shape: 'circle',
                 // shape: 'circle',
-                indicator: radarData
+                indicator: radarData,
+                name: {
+                  textStyle: {
+                    color: '#000'
+                  }
+                }
               },
               },
               series: [
               series: [
                 {
                 {
                   type: "radar",
                   type: "radar",
-                  data: [seriesData]
+                  data: [seriesData],
+                  label: {
+                    color: '#000'
+                  }
                 }
                 }
               ]
               ]
             };
             };
@@ -839,13 +851,14 @@ export default {
                   },
                   },
                   data: _data,
                   data: _data,
                   title: {
                   title: {
-                    fontSize: 14
+                    fontSize: 14,
+                    color: "#000"
                   },
                   },
                   detail: {
                   detail: {
                     width: 50,
                     width: 50,
                     height: 14,
                     height: 14,
                     fontSize: 14,
                     fontSize: 14,
-                    color: "inherit",
+                    color: "#000",
                     borderColor: "inherit",
                     borderColor: "inherit",
                     borderRadius: 20,
                     borderRadius: 20,
                     borderWidth: 1,
                     borderWidth: 1,

+ 30 - 22
src/components/pages/classroomObservation/components/analysisSpecialItem.vue

@@ -553,38 +553,35 @@ export default {
       }
       }
 
 
       const _option = {
       const _option = {
-        // title: {
-        //   text: "课堂时间分配",
-        //   left: "center"
-        // },
         tooltip: {
         tooltip: {
-          // text: "课堂时间分配",
           left: "center",
           left: "center",
           trigger: "item",
           trigger: "item",
-          formatter: "{a} <br/>{b}: {d}%" // {a}为系列名,{b}为数据名,{d}为百分比
+          formatter: "{a} <br/>{b}: {d}%",
+          textStyle: {
+            color: '#000000'
+          }
         },
         },
         legend: {
         legend: {
           top: "5%",
           top: "5%",
-          // orient: "vertical",
-          left: "center"
+          left: "center",
+          textStyle: {
+            color: '#000000'
+          }
         },
         },
         series: [
         series: [
           {
           {
             name: "课堂时间分配",
             name: "课堂时间分配",
             type: "pie",
             type: "pie",
             radius: ["40%", "70%"],
             radius: ["40%", "70%"],
-            // avoidLabelOverlap: false,
             label: {
             label: {
-              formatter: "{b}: {d}%"
-              // show: false,
-              // position: "center",
+              formatter: "{b}: {d}%",
+              color: '#000000'
             },
             },
             emphasis: {
             emphasis: {
               label: {
               label: {
                 show: true,
                 show: true,
-                // fontSize: 40,
-                // fontWeight: "bold",
-                formatter: "{b}: {d}%" // 显示百分比
+                formatter: "{b}: {d}%",
+                color: '#000000'
               },
               },
               itemStyle: {
               itemStyle: {
                 shadowBlur: 10,
                 shadowBlur: 10,
@@ -592,9 +589,6 @@ export default {
                 shadowColor: "rgba(0, 0, 0, 0.5)"
                 shadowColor: "rgba(0, 0, 0, 0.5)"
               }
               }
             },
             },
-            // labelLine: {
-            // 	show: false,
-            // },
             data: _data
             data: _data
           }
           }
         ]
         ]
@@ -648,14 +642,26 @@ ${JSON.stringify(_dataList)}
           nameLocation: "end", // 标题位置
           nameLocation: "end", // 标题位置
           scale: true,
           scale: true,
           min: 0,
           min: 0,
-          max: _maxValue
+          max: _maxValue,
+          axisLabel: {
+            color: "#000" // 设置字体颜色为#000
+          },
+          nameTextStyle: {
+            color: "#000" // 设置老师字体颜色为#000
+          }
         },
         },
         yAxis: {
         yAxis: {
           name: "学生", // Y轴标题
           name: "学生", // Y轴标题
           nameLocation: "end", // 标题位置
           nameLocation: "end", // 标题位置
           scale: true,
           scale: true,
           min: 0,
           min: 0,
-          max: _maxValue
+          max: _maxValue,
+          axisLabel: {
+            color: "#000" // 设置字体颜色为#000
+          },
+          nameTextStyle: {
+            color: "#000" // 设置学生字体颜色为#000
+          }
         },
         },
         grid: {
         grid: {
           containLabel: true
           containLabel: true
@@ -665,7 +671,9 @@ ${JSON.stringify(_dataList)}
             name: "数据",
             name: "数据",
             step: "start",
             step: "start",
             data: _result,
             data: _result,
-            type: "line"
+            type: "line",
+            lineStyle: {
+            }
           },
           },
           {
           {
             name: "对角线",
             name: "对角线",
@@ -675,7 +683,7 @@ ${JSON.stringify(_dataList)}
               [_maxValue, _maxValue]
               [_maxValue, _maxValue]
             ],
             ],
             lineStyle: {
             lineStyle: {
-              type: "dashed"
+              type: "dashed",
             },
             },
             markLine: {
             markLine: {
               symbol: ["none", "none"]
               symbol: ["none", "none"]

+ 1 - 1
src/components/pages/easy/addCourse.vue

@@ -741,7 +741,7 @@
                             class="c_pub_button_add pub_btn_add_img"
                             class="c_pub_button_add pub_btn_add_img"
                             @click="openAddApp(0)"
                             @click="openAddApp(0)"
                           >
                           >
-                            Ai应用
+                            智能应用
                           </button>
                           </button>
                           <!-- <button class="info_btn" @click="addImg($event)">
                           <!-- <button class="info_btn" @click="addImg($event)">
                               其他附件
                               其他附件

+ 1 - 1
src/components/pages/newCourse/addCourse.vue

@@ -1457,7 +1457,7 @@
                             class="c_pub_button_add pub_btn_add_img"
                             class="c_pub_button_add pub_btn_add_img"
                             @click="openAddApp(itemTaskIndex)"
                             @click="openAddApp(itemTaskIndex)"
                           >
                           >
-                            Ai应用
+                            智能应用
                           </button>
                           </button>
                           </div>
                           </div>
                           <div
                           <div

+ 12 - 0
src/components/pages/testPerson/portrait/index.vue

@@ -359,6 +359,8 @@ export default {
       teacherName: "",
       teacherName: "",
       aArray: [],
       aArray: [],
       bArray: [],
       bArray: [],
+      timeSort:[],
+      selectTime:"",
     };
     };
   },
   },
   methods: {
   methods: {
@@ -380,6 +382,10 @@ export default {
               this.changeAnnualAssessmentStatus(1)
               this.changeAnnualAssessmentStatus(1)
             }
             }
           }
           }
+          this.timeSort = res.data[0].map(item => {return {label:item.timeName,id:item.time,time:item.timeName.split('~')[0]}});
+          if(this.timeSort.length>0){
+            this.selectTime = this.timeSort[0].id;
+          }
         })
         })
         .catch(error => {
         .catch(error => {
           console.log(error);
           console.log(error);
@@ -406,6 +412,12 @@ export default {
         .then(res => {
         .then(res => {
           let data = res.data[0];
           let data = res.data[0];
 
 
+          if(this.selectTime){
+            data = data.filter(item => item.time == this.selectTime);
+          }
+
+          console.log("👉xxx",data)
+
           data.forEach(e => {
           data.forEach(e => {
             e.json = JSON.parse(e.json);
             e.json = JSON.parse(e.json);
           });
           });

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