From 480f4ff46043322dc625d87b2ea1f1bdc649914a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 30 Mar 2023 17:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=20=E4=BF=AE=E6=94=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9icon=20=E5=90=8E=E7=82=B9=E5=87=BB=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86=E5=BC=B9=E5=87=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/GPS/car/index.vue      | 41 -----------------------
 ruoyi-ui/src/views/dashboard/PieChart.vue | 23 ++++++++-----
 ruoyi-ui/src/views/dashboard/Temp.vue     |  2 --
 ruoyi-ui/src/views/index.vue              |  4 ++-
 ruoyi-ui/src/views/system/menu/index.vue  |  4 ++-
 5 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/ruoyi-ui/src/views/GPS/car/index.vue b/ruoyi-ui/src/views/GPS/car/index.vue
index cb4d852..07d1264 100644
--- a/ruoyi-ui/src/views/GPS/car/index.vue
+++ b/ruoyi-ui/src/views/GPS/car/index.vue
@@ -48,28 +48,6 @@
         >{{ t('option.add') }}
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-            v-hasPermi="['test:test:edit']"
-            :disabled="single"
-            icon="Edit"
-            plain
-            type="success"
-            @click="handleUpdate"
-        >{{ t('option.edit') }}
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-            v-hasPermi="['test:test:remove']"
-            :disabled="multiple"
-            icon="Delete"
-            plain
-            type="danger"
-            @click="handleDelete"
-        >{{ t('option.remove') }}
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
             v-hasPermi="['test:test:export']"
@@ -129,25 +107,6 @@
                        width="150"/>
       <el-table-column label="终端主电源掉电" align="center" prop="mainpowerloss"
                        width="150"/>
-      <el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
-                       width="160">
-        <template #default="scope">
-          <el-button
-              v-hasPermi="['test:test:edit']"
-              icon="Edit"
-              type="text"
-              @click="handleUpdate(scope.row)"
-          >{{ t('option.edit') }}
-          </el-button>
-          <el-button
-              v-hasPermi="['test:test:remove']"
-              icon="Delete"
-              type="text"
-              @click="handleDelete(scope.row)"
-          >{{ t('option.remove') }}
-          </el-button>
-        </template>
-      </el-table-column>
     </el-table>
 
     <!--    分页-->
diff --git a/ruoyi-ui/src/views/dashboard/PieChart.vue b/ruoyi-ui/src/views/dashboard/PieChart.vue
index b3b32a2..45fe281 100644
--- a/ruoyi-ui/src/views/dashboard/PieChart.vue
+++ b/ruoyi-ui/src/views/dashboard/PieChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width}"/>
 </template>
 
 <script>
@@ -7,9 +7,11 @@ import * as echarts from 'echarts';
 // require('echarts/theme/macarons') // echarts theme
 const echart = inject('echart')
 import resize from './mixins/resize'
+import {toRefs} from "vue";
 
 export default {
   mixins: [resize],
+  expose: ['setData'],
   props: {
     className: {
       type: String,
@@ -26,7 +28,13 @@ export default {
   },
   data() {
     return {
-      chart: null
+      chart: null,
+      chartData:[
+        {value: 320, name: '低压报警'},
+        {value: 149, name: '高温报警'},
+        {value: 100, name: '位置报警'},
+        {value: 59, name: '电池电量报警'}
+      ]
     }
   },
   mounted() {
@@ -42,6 +50,10 @@ export default {
     this.chart = null
   },
   methods: {
+    setData(e) {
+      console.log(e)
+      this.initChart()
+    },
     initChart() {
       this.chart = echarts.init(this.$el, 'macarons')
 
@@ -62,12 +74,7 @@ export default {
             roseType: 'radius',
             radius: [15, 95],
             center: ['50%', '38%'],
-            data: [
-              { value: 320, name: '低压报警' },
-              { value: 149, name: '高温报警' },
-              { value: 100, name: '位置报警' },
-              { value: 59, name: '电池电量报警' }
-            ],
+            data: this.chartData,
             animationEasing: 'cubicInOut',
             animationDuration: 2600
           }
diff --git a/ruoyi-ui/src/views/dashboard/Temp.vue b/ruoyi-ui/src/views/dashboard/Temp.vue
index 5f53424..f8a739a 100644
--- a/ruoyi-ui/src/views/dashboard/Temp.vue
+++ b/ruoyi-ui/src/views/dashboard/Temp.vue
@@ -186,8 +186,6 @@ export default defineComponent({
       X.forEach(res => {
         Y1.push(e.SpeedList.find(v => v.time === res)?.speed || 0)
       })
-      console.log(X)
-      console.log(Y1)
       option.value.xAxis.data = X
       option.value.series[0].data = Y1
       option.value.series[1].data = Y2
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 5d18e1a..03fd418 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -42,7 +42,7 @@
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
-          <pie-chart />
+          <pie-chart ref="pieRef"/>
         </div>
       </el-col>
       <el-col :xs="24" :sm="24" :lg="8">
@@ -71,6 +71,7 @@
   const showSearch = ref(true);
   const dateRange = ref([]);
   const tempRef = ref();
+  const pieRef = ref();
 
   // 搜索参数
   const queryParams = ref({
@@ -96,6 +97,7 @@
   function handleQuery() {
     getTempdata(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
       tempRef.value.setData(response.data);
+      pieRef.value.setData(response.data);
     }).finally(() => {
      //loading.value = false;
     });
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 1c01b44..2d6dcac 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -119,7 +119,7 @@
                         @show="showSelectIcon"
                      >
                         <template #reference>
-                           <el-input v-model="form.icon" placeholder="点击选择图标" @blur="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
+                           <el-input ref="iconRef" v-model="form.icon" placeholder="点击选择图标" @input="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
                               <template #prefix>
                                  <svg-icon
                                     v-if="form.icon"
@@ -297,6 +297,7 @@ const isExpandAll = ref(false);
 const refreshTable = ref(true);
 const showChooseIcon = ref(false);
 const iconSelectRef = ref(null);
+const iconRef = ref()
 
 const data = reactive({
   form: {},
@@ -353,6 +354,7 @@ function reset() {
 }
 /** 展示下拉图标 */
 function showSelectIcon() {
+  console.log('blue')
   iconSelectRef.value.reset();
   showChooseIcon.value = true;
 }