From 31980b06d50d530feb2c0f1db9daf24bd3b8797a Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期日, 15 六月 2025 22:50:16 +0800
Subject: [PATCH] 2025.6.15

---
 src/components/inspection/TaskItem.vue |  143 +++++++++++++++++++++++++++--------------------
 1 files changed, 82 insertions(+), 61 deletions(-)

diff --git a/src/components/inspection/TaskItem.vue b/src/components/inspection/TaskItem.vue
index ca54f28..9a32527 100644
--- a/src/components/inspection/TaskItem.vue
+++ b/src/components/inspection/TaskItem.vue
@@ -1,49 +1,56 @@
 <template>
-  <!-- <div class="demo-progress border-r-small"> -->
-  <el-row justify="space-evenly">
-    <el-col span="12">
-      <div class="v-center">
-        <el-text>鎬婚噺</el-text>
-        <el-progress
-          :width="100"
-          type="circle"
-          status="warning"
-          :percentage="(finish / total) * 100"
-        >
-          <template #default="{ percentage }">
-            <span class="percentage-value">{{ percentage }}%</span>
-            <!-- <span class="percentage-label">{{ finish + '/' + total }}</span> -->
-          </template>
-        </el-progress>
-        <el-text size="small">{{ finish + '/' + total }}</el-text>
-      </div>
-    </el-col>
-    <el-col span="12" class="flex-bottom">
-      <!-- <div>{{ name }}</div> -->
-      <!-- <div>{{ planTime }}</div> -->
-      <!-- <div>{{ userName }}</div> -->
-      <el-row style="gap: 40px" justify="space-between">
-        <div class="v-center" v-for="item in count" :key="item.sceneType">
-          <el-text size="small">{{ item.sceneType }}</el-text>
-          <el-progress
-            :width="50"
-            :stroke-width="3"
-            type="circle"
-            status="warning"
-            :percentage="(item.finish / item.total) * 100"
-          >
-            <template #default="{ percentage }">
-              <span class="percentage-value-small">{{ percentage }}%</span>
-            </template>
-          </el-progress>
-          <el-text size="small">{{ item.finish + '/' + item.total }}</el-text>
-          <!-- <div class="percentage-label-small">{{ item.sceneType }}</div> -->
-          <!-- <span class="percentage-label-small">{{ item.finish + '/' + item.total }} </span> -->
-        </div>
-      </el-row>
-    </el-col>
+  <el-row justify="start">
+    <el-text>{{ name }}</el-text>
   </el-row>
-  <!-- </div> -->
+  <div>
+    <el-text>鎬婚噺</el-text>
+    <el-text size="default">{{ completetask + '/' + totaltask }}</el-text>
+    <el-progress
+      style="width: 300px"
+      type="line"
+      status="warning"
+      :text-inside="true"
+      :stroke-width="18"
+      :striped="percentFormat(completetask, totaltask) < 100"
+      striped-flow
+      :percentage="percentFormat(completetask, totaltask)"
+    >
+      <template #default="{ percentage }">
+        <span class="percentage-value">{{ percentage }}%</span>
+      </template>
+    </el-progress>
+  </div>
+  <!-- </el-col> -->
+  <!-- <el-col span="12" class="flex-bottom"> -->
+  <!-- <div>{{ name }}</div> -->
+  <!-- <div>{{ planTime }}</div> -->
+  <!-- <div>{{ userName }}</div> -->
+  <el-row class="m-t-8">
+    <div
+      align="center"
+      :style="'width: ' + 300 / count.length + 'px'"
+      v-for="item in count"
+      :key="item.sceneType"
+    >
+      <el-progress
+        :stroke-width="18"
+        status="exception"
+        :text-inside="true"
+        :striped="percentFormat(item.finish, item.total) < 100"
+        striped-flow
+        :percentage="percentFormat(item.finish, item.total)"
+      >
+        <template #default="{ percentage }">
+          <span class="percentage-value-small">{{ percentage }}%</span>
+        </template>
+      </el-progress>
+      <el-text size="small" truncated>{{ item.sceneType }}</el-text>
+      <!-- <el-text size="small">{{ item.finish + '/' + item.total }}</el-text> -->
+      <!-- <span class="percentage-value-small">{{ percentFormat(item.finish, item.total) }}%</span> -->
+      <!-- <div class="percentage-label-small">{{ item.sceneType }}</div> -->
+      <!-- <span class="percentage-label-small">{{ item.finish + '/' + item.total }} </span> -->
+    </div>
+  </el-row>
 </template>
 
 <script>
@@ -53,12 +60,15 @@
 export default {
   props: {
     name: String,
+    province: String,
     district: String,
     planTime: String,
     startTime: String,
     endTime: String,
     userName: String,
     status: String,
+    totaltask: Number,
+    completetask: Number,
 
     count: Array
   },
@@ -67,22 +77,34 @@
   },
   watch: {},
   computed: {
-    total() {
-      let t = 0
-      this.count.forEach((c) => {
-        t += c.total
-      })
-      return t
-    },
-    finish() {
-      let t = 0
-      this.count.forEach((c) => {
-        t += c.finish
-      })
-      return t
-    }
+    // total() {
+    //   let t = 0
+    //   this.count.forEach((c) => {
+    //     t += c.total
+    //   })
+    //   return t
+    // },
+    // finish() {
+    //   let t = 0
+    //   this.count.forEach((c) => {
+    //     t += c.finish
+    //   })
+    //   return t
+    // }
   },
-  methods: {}
+  methods: {
+    percentFormat(finish, total) {
+      if (total == 0) {
+        return 0
+      } else {
+        const per = finish / total > 1 ? 1 : finish / total
+        return Math.round(per * 100)
+      }
+    },
+    format(percentage) {
+      percentage === 100 ? 'Full' : `${percentage}%`
+    }
+  }
 }
 </script>
 
@@ -100,8 +122,7 @@
 
 .percentage-value {
   display: block;
-  margin-top: 10px;
-  font-size: var(--el-font-size-base);
+  font-size: var(--el-font-size-small);
 }
 .percentage-value-small {
   display: block;

--
Gitblit v1.9.3