huliu il y a 1 an
Parent
commit
3e7d5f58a1

BIN
dist.zip


+ 3 - 3
src/assets/css/home.scss

@@ -31,12 +31,12 @@
31 31
     padding: 10px;
32 32
     padding-left: 20px;
33 33
     border-radius: 10px;
34
-    background: rgb(255, 255, 255);
34
+    background: rgba(255, 255, 255, 0.17);
35 35
     width: 206px;
36 36
     height: 165px;
37 37
     display: none;
38
-
39
-    z-index: 999;
38
+    backdrop-filter: blur(30.5px);
39
+    z-index: 888;
40 40
 
41 41
     .model-detail {
42 42
         position: absolute;

+ 6 - 6
src/components/CircleProgress.vue

@@ -28,7 +28,7 @@
28 28
     </div>
29 29
 </template>
30 30
 <script setup lang="ts">
31
-import { ref, computed, toRefs, watch, onMounted, nextTick } from 'vue';
31
+import { ref, computed, toRefs, watch, onMounted } from 'vue';
32 32
 import ScrollNum from './roll.vue'
33 33
 
34 34
 const props = defineProps({
@@ -57,7 +57,7 @@ const props = defineProps({
57 57
 });
58 58
 const { height, width, color, targetValue, textPosition } = toRefs(props);
59 59
 
60
-let showProgress = ref<number>(0);
60
+// let showProgress = ref<number>(0);
61 61
 const numArr = computed(() => {
62 62
     const str = String(targetValue.value)
63 63
     let arr = <any>[]
@@ -78,16 +78,16 @@ const circleValue = () => {
78 78
             return
79 79
         }
80 80
         (timer as any) = setInterval(() => {
81
-            progressValue.value += 10
82
-        }, 2000)
81
+            progressValue.value += 5
82
+        }, 3000)
83 83
     } else {
84 84
         if (progressValue.value = 120) {
85 85
             timer.value = null
86 86
             return
87 87
         }
88 88
         (timer as any) = setInterval(() => {
89
-            progressValue.value += 10
90
-        }, 2000)
89
+            progressValue.value += 5
90
+        }, 3000)
91 91
     }
92 92
 }
93 93
 

+ 2 - 2
src/components/home.vue

@@ -160,7 +160,7 @@ export default ({
160 160
             console.log("当前鼠标点击的坐标", e, e.clientX, e.clientY);
161 161
         }
162 162
         const handleResponseFunction = (data) => {
163
-            // console.log("从UE返回过来的值", data)
163
+            console.log("从UE返回过来的值", data)
164 164
             let json = eval("(" + data + ")");//转对象
165 165
 
166 166
             console.log("clickData---点击的数据", json)
@@ -237,7 +237,7 @@ export default ({
237 237
         }
238 238
         const windowSize = function () {
239 239
             // console.log("监听一下窗口是不是改了--click", lineContainer);
240
-            callUIInteraction("windowSizeChange")
240
+            callUIInteraction("windowSize")
241 241
         }
242 242
 
243 243
 

+ 22 - 34
src/components/left.vue

@@ -23,16 +23,13 @@
23 23
             <div class="title">
24 24
                 <div class="text">本周课程统计</div>
25 25
             </div>
26
-            <!-- <Number numm="1234" :numLen="4" /> -->
27 26
             <div class="content">
28 27
                 <div class="count" v-for="(item, index) in classCount" :key="index">
29 28
                     <CircleProgress :target-value="item.number" :color="item.color" text-position="bottom">
30 29
                         <img :src="leftimg + item.imgnumber + '.png'" alt="">
31
-                        <!-- <img :src="'src/assets/img/' + item.imgnumber + '.png'" alt=""> -->
32 30
                     </CircleProgress>
33 31
                     <div class="text">{{ item.text }}</div>
34 32
 
35
-                    <!-- <Number :numm="item.text" :numLen="4" /> -->
36 33
                 </div>
37 34
             </div>
38 35
         </div>
@@ -103,19 +100,9 @@ export default ({
103 100
     name: 'Histogram',
104 101
     components: { ElScrollbar, ElPagination, ElDialog, ElCarousel, ElCarouselItem, CircleProgress },
105 102
     setup() {
103
+        // 教室分类统计
104
+        const classRoomCount = ref([])
106 105
 
107
-        const pieData = reactive([{
108
-            value: 1048,
109
-            name: '基础型'
110
-        },
111
-        {
112
-            value: 735,
113
-            name: '扩展型'
114
-        },
115
-        {
116
-            value: 580,
117
-            name: '其他'
118
-        }])
119 106
         const classPie = reactive({
120 107
             option: {
121 108
                 color: ['#4ED2E4', '#5E91F6', '#67F0A8'],
@@ -135,28 +122,28 @@ export default ({
135 122
                         formatter: () => { // 格式化要展示的文本
136 123
                             return `总计\n\n1430间`
137 124
                         },
125
+
138 126
                         // formatter: '{total|' + 200 + '}' + '\n\r' + '{active|共发布活动}',
139 127
                         // 等着获取了数据在给样式
140
-                        rich: {
141
-                            total: {
142
-                                fontSize: 35,
143
-                                fontFamily: "微软雅黑",
144
-                                color: '#454c5c'
145
-                            },
146
-                            active: {
147
-                                fontFamily: "微软雅黑",
148
-                                fontSize: 16,
149
-                                color: '#6c7a89',
150
-                                lineHeight: 30,
151
-                            },
152
-                        }
153
-
128
+                        // rich: {
129
+                        //     total: {
130
+                        //         fontSize: 35,
131
+                        //         fontFamily: "微软雅黑",
132
+                        //         color: '#454c5c'
133
+                        //     },
134
+                        //     active: {
135
+                        //         fontFamily: "微软雅黑",
136
+                        //         fontSize: 16,
137
+                        //         color: '#6c7a89',
138
+                        //         lineHeight: 30,
139
+                        //     },
140
+                        // }
154 141
 
155 142
                     },
156 143
                     labelLine: {
157 144
                         show: false
158 145
                     },
159
-                    data: pieData
146
+                    data: classRoomCount
160 147
 
161 148
                 }]
162 149
             },
@@ -210,8 +197,7 @@ export default ({
210 197
 
211 198
 
212 199
 
213
-        // 教室分类统计
214
-        const classRoomCount = ref([])
200
+
215 201
         // 本周课程统计数据
216 202
         const classCount = ref([])
217 203
         // 智慧教室使用数据
@@ -224,7 +210,9 @@ export default ({
224 210
             let { course, classroomDetail, category } = res.data;
225 211
             classRoomCount.value = category;
226 212
 
227
-
213
+            if (classRoomCount.value) {
214
+                initeCharts()
215
+            }
228 216
             classCount.value = course;
229 217
             console.log("看一下颜色", classCount.value)
230 218
             classRoom.value = classroomDetail
@@ -234,7 +222,7 @@ export default ({
234 222
         let timer = ref(null)
235 223
         let testMain = ref(null)
236 224
         onMounted(() => {
237
-            initeCharts()
225
+
238 226
             getClassData()
239 227
             start()
240 228
         })

+ 3 - 2
src/components/roll.vue

@@ -86,8 +86,9 @@ export default {
86 86
 }
87 87
 
88 88
 .animate {
89
-    animation: move .3s linear infinite,
90
-        bounce-in-down 1s calc(var(--delay) * 1s) forwards;
89
+    animation: move 1s linear forwards
90
+        /* animation: move .3s linear infinite, */
91
+        /* bounce-in-down 1s calc(var(--delay) * 1s) forwards; */
91 92
 
92 93
 }
93 94