From 46944238b9707764eda263356b195ce21299b874 Mon Sep 17 00:00:00 2001
From: wangqiujuan0808 <578331299@qq.com>
Date: Wed, 13 Dec 2023 15:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Flow.vue    | 10 ++++++----
 src/components/Header.vue  |  2 +-
 src/components/Process.vue | 13 ++++++++++---
 src/components/Quality.vue |  4 +++-
 src/router/index.js        |  2 +-
 src/utils/index.js         | 20 ++++++++++----------
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/components/Flow.vue b/src/components/Flow.vue
index 8851b45..f7519e7 100644
--- a/src/components/Flow.vue
+++ b/src/components/Flow.vue
@@ -12,7 +12,9 @@
       <div v-for="(item, index) of dataList" :key="index" :class="'div' + index">
         <div>{{ item.title }}</div>
         <div v-for="(it, i) of item.data" :key="i">
-          <Process :itemData="it"></Process>
+          <!-- <Process :itemData="it"></Process> -->
+          <span>{{ it.label }}</span>
+          <span class="font26" :style="{ 'color': it.color }">{{ it.value }}</span>
         </div>
       </div>
     </div>
@@ -20,7 +22,7 @@
 </template>
 
 <script>
-import { onMounted, reactive, ref, toRefs,watch } from "vue";
+import { onMounted, reactive, ref, toRefs, watch } from "vue";
 import { ElMessage } from "element-plus";
 import myApi from "@/api/myApi.js";
 import BarEchart from "./BarEchart.vue";
@@ -168,9 +170,9 @@ export default {
     });
     watch(() => store.state.pclData, val => {
       if (val) {
-        console.log('flow',val);
+        console.log('flow', val);
         state.dataList.forEach(ele => {
-          ele.data[0].value = Number(val[ele.data[0].key]).toFixed(2)+'';
+          ele.data[0].value = Number(val[ele.data[0].key]).toFixed(2) + '';
         })
       }
     }, { deep: true, immediate: true });
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 90e969f..2ad2593 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -12,7 +12,7 @@
         {{ currentTime }}
       </p>
       <p class="mr10">登录名： admin</p>
-      <img src="../assets/index.png" alt="" class="mr10" @click="back"/>
+      <!-- <img src="../assets/index.png" alt="" class="mr10" @click="back"/> -->
       <el-icon size="32" class="mr10" @click="setting"><Setting /></el-icon>
       <el-icon size="32" class="mr10" @click="logout"><SwitchButton /></el-icon>
     </div>
diff --git a/src/components/Process.vue b/src/components/Process.vue
index c4713c6..8270ff7 100644
--- a/src/components/Process.vue
+++ b/src/components/Process.vue
@@ -3,12 +3,13 @@
     <span>{{ itemData.label }}</span>
     <!-- <div :id="'process' + itemData.id" class="process-echart"></div> -->
     <div class="process-echart">
-      <el-progress :text-inside="true" :stroke-width="20" :percentage="itemData.value" :color="itemData.color" />
+      <el-progress :text-inside="true" :stroke-width="20" :percentage="itemData.value" :color="itemData.color"
+        show-text format="format"/>
     </div>
   </div>
 </template>
 <script>
-import { nextTick, onMounted, reactive, ref, toRefs,watch } from "vue";
+import { nextTick, onMounted, reactive, ref, toRefs, watch } from "vue";
 import * as echarts from "echarts";
 export default {
   name: "Process",
@@ -23,6 +24,11 @@ export default {
     onMounted(() => {
       getEchart();
     });
+
+    // 只显示数字
+    const format = (percentage) => {
+      return percentage;
+    }
     // watch(() => props.itemData, val => {
     //   if (val) {
     //     console.log(123 ,val);
@@ -158,7 +164,8 @@ export default {
     return {
       ...toRefs(state),
       getEchart,
-      loadProcessChart
+      loadProcessChart,
+      format
     };
   },
 };
diff --git a/src/components/Quality.vue b/src/components/Quality.vue
index 26b776e..ba3ddc6 100644
--- a/src/components/Quality.vue
+++ b/src/components/Quality.vue
@@ -14,7 +14,9 @@
         <div v-for="(item, index) of dataList" :key="index" :class="'div' + index" class="process-content">
           <!-- <div>{{ item.title }}</div> -->
           <div v-for="(it, i) of item.data" :key="i">
-            <Process :itemData="it"></Process>
+            <!-- <Process :itemData="it"></Process> -->
+            <span>{{ it.label }}</span>
+            <span class="font26" :style="{'color': it.color}">{{ item.value}}</span>
           </div>
         </div>
       </div>
diff --git a/src/router/index.js b/src/router/index.js
index 865903d..0b421ce 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,7 +5,7 @@ const router = createRouter({
   routes: [
     {
       path: '/',
-      redirect: '/home'
+      redirect: '/page'
     },
     {
       path: '/home',
diff --git a/src/utils/index.js b/src/utils/index.js
index e19fab2..535f846 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -28,14 +28,14 @@ export const uploadImgServer = 'http://backend-api-02.newbee.ltd/manage-api/v1/u
 export const uploadImgsServer = 'http://backend-api-02.newbee.ltd/manage-api/v1/upload/files'
 
 export const pathMap = {
-  login: '登录',
-  home: '世博浦西区活水公园',
-  level: '世博浦西区活水公园',
-  page: '世博浦西区活水公园',
-  weather: '世博浦西区活水公园',
-  green: '世博浦西区活水公园',
-  biology: '世博浦西区活水公园',
-  shentou: '世博浦西区活水公园',
-  chuxu: '世博浦西区活水公园',
-  config: '世博浦西区活水公园'
+  login: '中水系统',
+  home: '中水系统',
+  level: '中水系统',
+  page: '中水系统',
+  weather: '中水系统',
+  green: '中水系统',
+  biology: '中水系统',
+  shentou: '中水系统',
+  chuxu: '中水系统',
+  config: '中水系统'
 }
\ No newline at end of file