图标修正

.env.development

 NODE_ENV = "development"
 Mock: true
-VUE_APP_API_URL = "http://qjwl.ythplan.com/"
+VUE_APP_API_URL = "http://192.168.0.123:8002/"

.env.production

 NODE_ENV = "production"
 Mock: false
-VUE_APP_API_URL = "http://qjwl.ythplan.com/"
\ No newline at end of file
+# VUE_APP_API_URL = "http://qjwl.ythplan.com/"
+VUE_APP_API_URL = "http://192.168.0.123:8002/"
\ No newline at end of file

src/assets/iconfont/iconfont.css

 @font-face {
   font-family: "iconfont";
   /* Project id 4100703 */
-  src: url('iconfont.woff2?t=1685676784641') format('woff2'),
-    url('iconfont.woff?t=1685676784641') format('woff'),
-    url('iconfont.ttf?t=1685676784641') format('truetype');
+  src: url('iconfont.woff2?t=1686809530756') format('woff2'),
+    url('iconfont.woff?t=1686809530756') format('woff'),
+    url('iconfont.ttf?t=1686809530756') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +14,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-report-fill-03:before {
+  content: "\e9cf";
+}
+
+.icon-report-fill-01:before {
+  content: "\e9d3";
+}
+
+.icon-report-fill-02:before {
+  content: "\e9d4";
+}
+
+.icon-report-fill-03-2:before {
+  content: "\e9d5";
+}
+
+.icon-you:before {
+  content: "\e600";
+}
+
+.icon-you1:before {
+  content: "\e706";
+}
+
+.icon-fl-renyuan:before {
+  content: "\e625";
+}
+
 .icon-anquanmao:before {
   content: "\e9cb";
 }

src/assets/iconfont/iconfont.json

@@ -5,6 +5,55 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "35871490",
+      "name": "icon_san",
+      "font_class": "report-fill-03",
+      "unicode": "e9cf",
+      "unicode_decimal": 59855
+    },
+    {
+      "icon_id": "35871509",
+      "name": "icon_yi",
+      "font_class": "report-fill-01",
+      "unicode": "e9d3",
+      "unicode_decimal": 59859
+    },
+    {
+      "icon_id": "35871531",
+      "name": "icon_er",
+      "font_class": "report-fill-02",
+      "unicode": "e9d4",
+      "unicode_decimal": 59860
+    },
+    {
+      "icon_id": "36013877",
+      "name": "report-fill-03-2",
+      "font_class": "report-fill-03-2",
+      "unicode": "e9d5",
+      "unicode_decimal": 59861
+    },
+    {
+      "icon_id": "14456894",
+      "name": "左",
+      "font_class": "you",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "16588070",
+      "name": "右",
+      "font_class": "you1",
+      "unicode": "e706",
+      "unicode_decimal": 59142
+    },
+    {
+      "icon_id": "2439690",
+      "name": "人员",
+      "font_class": "fl-renyuan",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
     {
       "icon_id": "35798422",
       "name": "安全帽",

src/components/earlywarning/Index.vue

@@ -57,6 +57,7 @@
               class="person-check"
               v-for="(warns, index) in warningList"
               :key="index"
+              @click="showWarning(warns._id)"
             >
               <div class="portrait">
                 <img
@@ -204,6 +205,11 @@
         </ShadowContainer>
       </div>
     </div>
+    <warning-dialog
+      :data="warningData"
+      :visible="warningDialogVisible"
+      @changeVisible="(val) => (warningDialogVisible = val)"
+    ></warning-dialog>
   </div>
 </template>
 <script>
@@ -212,9 +218,13 @@ import {
   getWarningList,
   getMonthWarningStatis,
   getStatis,
+  getWarningLogDetail,
 } from "@/api/index";
+import WarningDialog from "./WarningDialog";
+
 export default {
   name: "EarlyWarning",
+  components: { WarningDialog },
   data() {
     return {
       warningList: [],
@@ -229,6 +239,8 @@ export default {
       todayTotal: 0,
       historyTotal: 0,
       srcList: [],
+      warningDialogVisible: false,
+      warningData: {},
     };
   },
   methods: {
@@ -523,6 +535,12 @@ export default {
         this.autoScroll(1, 50, 1500, element);
       });
     },
+    showWarning(id) {
+      getWarningLogDetail(id).then((res) => {
+        this.warningData = res.data;
+        this.warningDialogVisible = true;
+      });
+    },
   },
 
   mounted() {
@@ -535,6 +553,7 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+@import "@/assets/common/element.less";
 #earlywarning {
   padding: 12px 20px;
   padding-bottom: 0;

src/components/earlywarning/WarningDialog.vue

@@ -8,11 +8,7 @@
   >
     <div id="scroll-dialog">
       <div class="step-area">
-        <el-steps
-          :active="warningDetail.step"
-          align-center
-          finish-status="success"
-        >
+        <el-steps :active="warningDetail.step" align-center>
           <el-step
             v-for="(step, index) in warningDetail.process_list"
             :key="index"
@@ -21,6 +17,20 @@
             }`"
             :class="[step.status == 3 ? 'warning' : 'success']"
           >
+            <template #icon>
+              <i
+                :class="[
+                  'iconfont',
+                  step.type == 'log'
+                    ? 'icon-report-fill-01'
+                    : step.type == 'check'
+                    ? 'icon-report-fill-02'
+                    : step.type == 'handle'
+                    ? 'icon-report-fill-03-2'
+                    : 'icon-report-fill-03',
+                ]"
+              ></i>
+            </template>
             <template #title>
               <span> {{ step.title }} </span
               ><span v-if="step.status_text"> / </span
@@ -324,4 +334,18 @@ export default {
 ::v-deep .el-step__head {
   height: 16px;
 }
+
+::v-deep .el-step__icon.is-text {
+  border: none !important;
+  i {
+    font-size: 24px;
+  }
+}
+::v-deep .el-step__head.is-finish {
+  color: #24f0b8;
+  border-color: #24f0b8;
+}
+::v-deep .el-step__head.is-process {
+  color: #c6def9;
+}
 </style>
\ No newline at end of file

src/components/projectcheck/CorrectDialog.vue

@@ -14,16 +14,20 @@
             :key="index"
             :title="step.title"
             :description="`${step.person} / ${step.time}`"
-            :status="
-              step.status == 1
-                ? 'process'
-                : step.status == 3
-                ? 'error'
-                : step.status == 2
-                ? 'success'
-                : 'wait'
-            "
-          ></el-step>
+          >
+            <template #icon>
+              <i
+                :class="[
+                  'iconfont',
+                  step.type == 'check'
+                    ? 'icon-report-fill-01'
+                    : step.type == 'rectify'
+                    ? 'icon-report-fill-02'
+                    : 'icon-report-fill-03',
+                ]"
+              ></i>
+            </template>
+          </el-step>
         </el-steps>
       </div>
       <div
@@ -301,4 +305,18 @@ export default {
 ::v-deep .el-step__head {
   height: 16px;
 }
+
+::v-deep .el-step__icon.is-text {
+  border: none !important;
+  i {
+    font-size: 24px;
+  }
+}
+::v-deep .el-step__head.is-finish {
+  color: #24f0b8;
+  border-color: #24f0b8;
+}
+::v-deep .el-step__head.is-process {
+  color: #c6def9;
+}
 </style>
\ No newline at end of file