feat: ui走查修改

index.html

@@ -18,10 +18,10 @@
     />
     <title>pure-admin-thin</title>
     <link rel="icon" href="/favicon.ico" />
-    <!-- update 2024-01-21 16:41 -->
+    <!-- update 2024-07-31 14:21 -->
     <link
       rel="stylesheet"
-      href="//at.alicdn.com/t/c/font_4412653_qjjikxo6f6p.css"
+      href="//at.alicdn.com/t/c/font_4412653_br1fznj5w1.css"
     />
 
     <script src="https://threejs.org/build/three.js"></script>

src/assets/login/login_lock.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1399_6578)">
+<path d="M7.50202 11.3802V12.3267C7.50202 12.4052 7.56631 12.4695 7.64488 12.4695H8.35917C8.43774 12.4695 8.50202 12.4052 8.50202 12.3267V11.3802C8.64943 11.2744 8.75945 11.1245 8.81626 10.9522C8.87306 10.7798 8.87372 10.5939 8.81813 10.4212C8.76254 10.2484 8.65358 10.0978 8.50692 9.99093C8.36027 9.88406 8.18349 9.82648 8.00202 9.82648C7.82056 9.82648 7.64378 9.88406 7.49713 9.99093C7.35047 10.0978 7.24151 10.2484 7.18592 10.4212C7.13033 10.5939 7.13099 10.7798 7.18779 10.9522C7.2446 11.1245 7.35462 11.2744 7.50202 11.3802Z" fill="#154DDD"/>
+<path d="M13.7163 7.14808H12.502V3.14808C12.502 1.88558 11.4788 0.862366 10.2163 0.862366H5.78774C4.52524 0.862366 3.50202 1.88558 3.50202 3.14808V7.14808H2.28774C1.97167 7.14808 1.71631 7.40344 1.71631 7.71951V14.5767C1.71631 14.8927 1.97167 15.1481 2.28774 15.1481H13.7163C14.0324 15.1481 14.2877 14.8927 14.2877 14.5767V7.71951C14.2877 7.40344 14.0324 7.14808 13.7163 7.14808ZM4.78774 3.14808C4.78774 2.59629 5.23595 2.14808 5.78774 2.14808H10.2163C10.7681 2.14808 11.2163 2.59629 11.2163 3.14808V7.14808H4.78774V3.14808ZM13.002 13.8624H3.00202V8.4338H13.002V13.8624Z" fill="#154DDD"/>
+</g>
+<defs>
+<clipPath id="clip0_1399_6578">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/assets/login/login_user.svg

@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#154ddd;}</style></defs><path class="cls-1" d="M8,.73A3.27,3.27,0,1,0,11.27,4,3.28,3.28,0,0,0,8,.73ZM5.93,4A2.07,2.07,0,1,1,8,6.07,2.07,2.07,0,0,1,5.93,4Z"/><path class="cls-1" d="M8,8.07a6.59,6.59,0,0,0-6.6,6.6.6.6,0,0,0,1.2,0,5.4,5.4,0,1,1,10.8,0,.6.6,0,0,0,1.2,0A6.59,6.59,0,0,0,8,8.07Z"/></svg>

src/assets/svg/deviceStatus/device_error.svg

@@ -0,0 +1,7 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="39" height="39" rx="1.5" fill="#F15D53" fill-opacity="0.1" stroke="#F15D53"/>
+<path d="M10.9995 21.0005V29.0005" stroke="#F15D53" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.9995 24.5005H14.4995L16.4995 21.5005" stroke="#F15D53" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4995 18.0005L24.7363 26.825C24.897 26.9321 25.1052 26.9371 25.2708 26.8377L29.9995 24.0005" stroke="#F15D53" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5386 14.3599C11.266 14.1782 11.2389 13.7878 11.4838 13.5701L15.2135 10.2548C15.3823 10.1047 15.6308 10.0865 15.8197 10.2103L29.3519 19.0762C29.6556 19.2752 29.6526 19.7213 29.3463 19.9162L24.7744 22.8257C24.6073 22.932 24.3933 22.9297 24.2286 22.8199L11.5386 14.3599Z" stroke="#F15D53" stroke-width="1.5"/>
+</svg>

src/assets/svg/deviceStatus/device_online.svg

@@ -0,0 +1,7 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="39" height="39" rx="1.5" fill="#52C41A" fill-opacity="0.1" stroke="#52C41A"/>
+<path d="M10.9995 21.0005V29.0005" stroke="#52C41A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.9995 24.5005H14.4995L16.4995 21.5005" stroke="#52C41A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4995 18.0005L24.7363 26.825C24.897 26.9321 25.1052 26.9371 25.2708 26.8377L29.9995 24.0005" stroke="#52C41A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5386 14.3599C11.266 14.1782 11.2389 13.7878 11.4838 13.5701L15.2135 10.2548C15.3823 10.1047 15.6308 10.0865 15.8197 10.2103L29.3519 19.0762C29.6556 19.2752 29.6526 19.7213 29.3463 19.9162L24.7744 22.8257C24.6073 22.932 24.3933 22.9297 24.2286 22.8199L11.5386 14.3599Z" stroke="#52C41A" stroke-width="1.5"/>
+</svg>

src/assets/svg/deviceStatus/device_outline.svg

@@ -0,0 +1,7 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="39" height="39" rx="1.5" fill="#F5F5F5" stroke="#CCCCCC"/>
+<path d="M10.9995 21.0005V29.0005" stroke="#CCCCCC" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.9995 24.5005H14.4995L16.4995 21.5005" stroke="#CCCCCC" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4995 18.0005L24.7363 26.825C24.897 26.9321 25.1052 26.9371 25.2708 26.8377L29.9995 24.0005" stroke="#CCCCCC" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5386 14.3599C11.266 14.1782 11.2389 13.7878 11.4838 13.5701L15.2135 10.2548C15.3823 10.1047 15.6308 10.0865 15.8197 10.2103L29.3519 19.0762C29.6556 19.2752 29.6526 19.7213 29.3463 19.9162L24.7744 22.8257C24.6073 22.932 24.3933 22.9297 24.2286 22.8199L11.5386 14.3599Z" stroke="#CCCCCC" stroke-width="1.5"/>
+</svg>

src/assets/svg/deviceStatus/device_process.svg

@@ -0,0 +1,7 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="39" height="39" rx="1.5" fill="#FF8413" fill-opacity="0.1" stroke="#FF8413"/>
+<path d="M10.9995 21.0005V29.0005" stroke="#FF8413" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.9995 24.5005H14.4995L16.4995 21.5005" stroke="#FF8413" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.4995 18.0005L24.7363 26.825C24.897 26.9321 25.1052 26.9371 25.2708 26.8377L29.9995 24.0005" stroke="#FF8413" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5386 14.3599C11.266 14.1782 11.2389 13.7878 11.4838 13.5701L15.2135 10.2548C15.3823 10.1047 15.6308 10.0865 15.8197 10.2103L29.3519 19.0762C29.6556 19.2752 29.6526 19.7213 29.3463 19.9162L24.7744 22.8257C24.6073 22.932 24.3933 22.9297 24.2286 22.8199L11.5386 14.3599Z" stroke="#FF8413" stroke-width="1.5"/>
+</svg>

src/layout/components/sidebar/vertical.vue

@@ -70,7 +70,36 @@ function changeRoute(routes) {
   router.push({ path: routes.path });
   activeName.value = routes.name;
 }
-
+// 函数：根据路由名称获取图标类名
+function getIconClass(name: string, iconName: string) {
+  if (name === "Workbench") {
+    return activeName.value === name ? `icon-shouye-xuanzhong` : `${iconName}`;
+  } else if (name === "DeviceList") {
+    return activeName.value === name
+      ? `icon-shebeixianchang-xuanzhong1`
+      : `${iconName}`;
+  } else if (name === "ServerList") {
+    return activeName.value === name ? `icon-fuwuqi-xuanzhong1` : `${iconName}`;
+  } else if (name === "ModelList") {
+    return activeName.value === name
+      ? `icon-moxingliebiao-xuanzhong`
+      : `${iconName}`;
+  } else if (name === "AlarmList") {
+    return activeName.value === name
+      ? `icon-gaojingguanli-xuanzhong1`
+      : `${iconName}`;
+  } else if (name === "computePowerAllocationIndex") {
+    return activeName.value === name
+      ? `icon-suanlipeizhi-xuanzhong`
+      : `${iconName}`;
+  } else if (name === "DeviceScene") {
+    return activeName.value === name
+      ? `icon-shebeiguanli-xuanzhong`
+      : `${iconName}`;
+  } else {
+    return `${iconName}`;
+  }
+}
 // const fetchMenuIcon = routes => {
 //   return workbenchIcon;
 // };
@@ -132,7 +161,15 @@ onBeforeUnmount(() => {
           @click="changeRoute(routes)"
         >
           <div class="flex justify-center">
-            <i :class="['iconfont', routes.meta?.icon || 'icon-morencaidan']" />
+            <i
+              :class="[
+                'iconfont',
+                getIconClass(
+                  routes.name,
+                  routes.meta?.icon || 'icon-morencaidan'
+                )
+              ]"
+            />
           </div>
           <p>{{ transformI18n(routes.meta.title) }}</p>
         </li>

src/router/modules/alarm.ts

@@ -12,7 +12,7 @@ export default {
   path: "/alarm",
   meta: {
     title: $t("menus.hsalarm"),
-    icon: "icon-gaojingguanli-weixuanzhong",
+    icon: "icon-gaojingguanli-weixuan",
     // showLink: false,
     rank: 5,
     roles: ["admin", "common"]

src/router/modules/computePowerAllocation.ts

@@ -4,7 +4,7 @@ export default {
   path: "/computePowerAllocation",
   meta: {
     title: $t("menus.hsComputePowerAllocation"),
-    icon: "icon-suanlipeizhi",
+    icon: "icon-suanlipeizhi-weixuan",
     // showLink: false,
     bodyClass: "computePowerAllocation_page",
     rank: 6,

src/router/modules/device.ts

@@ -4,7 +4,7 @@ export default {
   path: "/device",
   meta: {
     title: $t("menus.hsdevice"),
-    icon: "icon-shebeiliebiao-weixuan",
+    icon: "icon-shebeixianchang-weixuan",
     // showLink: false,
     rank: 2,
     roles: ["admin", "common"]

src/router/modules/deviceScene.ts

@@ -12,7 +12,7 @@ export default {
   path: "/deviceScene",
   meta: {
     title: $t("menus.hsdeviceScene"),
-    icon: "icon-shebeixianchangweixuanzhong",
+    icon: "icon-shebeiguanli-weixuan",
     // showLink: false,
     bodyClass: "deviceScene_page",
     rank: 7,

src/router/modules/model.ts

@@ -4,7 +4,7 @@ export default {
   path: "/model",
   meta: {
     title: $t("menus.hsModelList"),
-    icon: "icon-moxingliebiao-weixuan",
+    icon: "icon-moxingliebiao-weixuan1",
     // showLink: false,
     rank: 4,
     roles: ["admin", "common"]

src/router/modules/server.ts

@@ -12,7 +12,7 @@ export default {
   path: "/server",
   meta: {
     title: $t("menus.hsserver"),
-    icon: "icon-fuwuqi-weixuan",
+    icon: "icon-fuwuqi-weixuan1",
     // showLink: false,
     rank: 3,
     roles: ["admin", "common"]

src/router/modules/workbench.ts

@@ -17,7 +17,7 @@ export default {
   redirect: "/workbench",
   meta: {
     title: $t("menus.hshome"),
-    icon: "icon-gongzuotai-weixuan",
+    icon: "icon-shouye-weixuan",
     // showLink: false,
     rank: 1
   },

src/views/device/components/DeviceCard.vue

@@ -183,7 +183,7 @@ const deviceStatusName = device => {
   // background-color: skyblue;
   border: 1.5px solid #52c41a;
   border-radius: 8px;
-  box-shadow: 0 8px 16px 0 rgb(0 0 0 / 10%);
+  // box-shadow: 0 8px 16px 0 rgb(0 0 0 / 10%);
 
   &_fault {
     border: 1.5px solid #f15d53;

src/views/device/components/TreeCard.vue

@@ -29,17 +29,35 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="treeCard"><CollapseTree :value="treeList" /></div>
+  <div class="treeCard">
+    <div class="collapseTree_header">设备组</div>
+    <CollapseTree :value="treeList" />
+  </div>
 </template>
 
 <style lang="scss" scoped>
 .treeCard {
   width: 240px;
-  height: calc(100% - 16px);
-  background: #f9f9f9;
+  height: calc(100% - 0px);
+  background: #fff;
 
-  border-radius: 12px;
-  overflow-y: scroll;
-  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+  border-radius: 8px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  border: 1px solid rgba(21, 77, 221, 0.2);
+  .collapseTree_header {
+    box-sizing: border-box;
+    padding-top: 28px;
+    padding-left: 20px;
+    width: 100%;
+    height: 62px;
+    text-align: left;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: bold;
+    font-size: 16px;
+    color: #000000;
+    border-bottom: 1px solid rgba(21, 77, 221, 0.2);
+  }
+  // box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
 }
 </style>

src/views/device/index.vue

@@ -86,6 +86,12 @@ const getCardListData = async () => {
     }, 500);
   }
 };
+const resetForm = () => {
+  (formData.value.classification = ""),
+    (formData.value.is_used = ""),
+    (formData.value.status = ""),
+    getCardListData();
+};
 
 nextTick(() => {
   emitter.on("changCollapseTreeNodeId", data => {
@@ -171,6 +177,11 @@ onMounted(() => {
               <el-option label="未启用" value="0" />
             </el-select>
           </el-form-item>
+          <el-form-item>
+            <el-button @click="resetForm">重置</el-button>
+
+            <el-button type="primary" @click="getCardListData">查询</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div
@@ -226,6 +237,7 @@ onMounted(() => {
 
 <style lang="scss">
 .device_wrap {
+  position: relative;
   .device_body {
     background-color: #ffffff;
     border-radius: 8px 8px 8px 8px;
@@ -247,7 +259,10 @@ onMounted(() => {
     }
   }
   .pagination_wrap {
-    width: calc(100% - 136px - 260px);
+    position: absolute;
+    bottom: 30px;
+    right: 16px;
+    // width: calc(100% - 136px - 260px);
     /* background-color: red; */
   }
 }

src/views/device/scene.scss

@@ -9,7 +9,7 @@
       }
       .left {
         width: 65.52%;
-        padding: 16px 48px;
+        padding: 16px;
         .deviceScene_box_top {
           font-weight: bold;
           font-size: 16px;

src/views/login/index.vue

@@ -25,6 +25,7 @@ import LoginLogo from "@/assets/login/login_logo.svg?component";
 import Lock from "@iconify-icons/ri/lock-fill";
 import Check from "@iconify-icons/ep/check";
 import User from "@iconify-icons/ri/user-3-fill";
+import loginTitle from "@/assets/login/login_title.png";
 
 defineOptions({
   name: "Login"
@@ -188,10 +189,13 @@ onBeforeUnmount(() => {
           <div class="login-form">
             <div class="flex justify-center">
               <component :is="toRaw(LoginLogo)" />
+              <!-- <component :is="toRaw(LoginUser)" /> -->
             </div>
             <!-- <avatar class="avatar" /> -->
-            <h2 class="hf-1">智能制造公共服务平台</h2>
-
+            <!-- <h2 class="hf-1">智能制造公共服务平台</h2> -->
+            <div class="mt-6 mb-8">
+              <img :src="loginTitle" alt="" />
+            </div>
             <el-form
               ref="ruleFormRef"
               :model="ruleForm"
@@ -214,8 +218,11 @@ onBeforeUnmount(() => {
                     clearable
                     v-model="ruleForm.username"
                     :placeholder="t('login.username')"
-                    :prefix-icon="useRenderIcon(User)"
-                  />
+                  >
+                    <template #prefix>
+                      <i class="iconfont icon-Frame text-[#154DDD]" />
+                    </template>
+                  </el-input>
                 </el-form-item>
               </Motion>
 
@@ -227,8 +234,11 @@ onBeforeUnmount(() => {
                     show-password
                     v-model="ruleForm.password"
                     :placeholder="t('login.password')"
-                    :prefix-icon="useRenderIcon(Lock)"
-                  />
+                  >
+                    <template #prefix>
+                      <i class="iconfont icon-mima1 text-[#154DDD]" />
+                    </template>
+                  </el-input>
                 </el-form-item>
               </Motion>
 

src/views/modelList/components/ModelCard.vue

@@ -1,6 +1,18 @@
 <script setup lang="ts">
 import { computed } from "vue";
-import { model_OCR, model_mark, model_colour } from "./static";
+import {
+  model_bank,
+  model_battery,
+  model_car,
+  model_ceramics,
+  model_medical,
+  model_metal,
+  model_metallurgy,
+  model_PCB,
+  model_phone,
+  model_photovoltaic,
+  model_PVC
+} from "./static";
 import dayjs from "dayjs";
 
 defineOptions({
@@ -33,37 +45,37 @@ function getModelIcon(params: string) {
     params == "手机、电子、SMT" ||
     params == "手机、液晶显示屏"
   ) {
-    return model_mark;
+    return model_phone;
   } else if (
     params ==
     "机械、金属工件、线缆、铸造、薄膜、玻璃、造纸、铝板带、铝箔、铜箔、无纺布"
   ) {
-    return model_colour;
+    return model_metal;
   } else if (
     params == "PVC管材、金属管材、金属工件、塑料水管、汽车软管、线缆"
   ) {
-    return model_colour;
+    return model_PVC;
   } else if (params == "锂电池") {
-    return model_colour;
+    return model_battery;
   } else if (params == "食品、饮料、医疗卫生" || params == "食品、饮料") {
-    return model_colour;
+    return model_medical;
   } else if (params == "陶瓷、卫浴、瓷砖") {
-    return model_colour;
+    return model_ceramics;
   } else if (
     params == "机加工、光伏、电子、SMT、手机、锂电池、精密零部件加工" ||
     params == "光伏"
   ) {
-    return model_colour;
+    return model_photovoltaic;
   } else if (params == "钢铁、冶金、铸造") {
-    return model_colour;
+    return model_metallurgy;
   } else if (params == "银行、营业厅") {
-    return model_colour;
+    return model_bank;
   } else if (params == "机加工、电子、手机、精密零部件加工、汽车") {
-    return model_colour;
+    return model_car;
   } else if (params == "PCB") {
-    return model_colour;
+    return model_PCB;
   } else {
-    return model_OCR;
+    return model_PCB;
   }
 }
 
@@ -91,7 +103,7 @@ const deepAlgorithm = computed(() => [
         {{ model?.model_type }}
       </div>
       <div class="model-icon">
-        <img :src="getModelIcon(model?.classification_name)" />
+        <img :src="getModelIcon(model?.industry)" />
       </div>
     </div>
     <div class="model-content">
@@ -139,7 +151,7 @@ const deepAlgorithm = computed(() => [
   width: 100%;
   height: 278px;
   border-radius: 8px;
-  box-shadow: 0 8px 16px 0 rgb(0 0 0 / 10%);
+  // box-shadow: 0 8px 16px 0 rgb(0 0 0 / 10%);
 
   .model-header {
     position: relative;
@@ -184,6 +196,8 @@ const deepAlgorithm = computed(() => [
       position: absolute;
       top: 8px;
       right: 16px;
+      width: 72px;
+      height: 88px;
     }
   }
 

src/views/modelList/components/static.ts

@@ -1,5 +1,25 @@
-import model_OCR from "@/assets/svg/model/model_OCR.png";
-import model_mark from "@/assets/svg/model/model_mark.png";
-import model_colour from "@/assets/svg/model/model_colour.png";
+import model_bank from "@/assets/svg/model/model_bank.png";
+import model_battery from "@/assets/svg/model/model_battery.png";
+import model_car from "@/assets/svg/model/model_car.png";
+import model_ceramics from "@/assets/svg/model/model_ceramics.png";
+import model_medical from "@/assets/svg/model/model_medical.png";
+import model_metal from "@/assets/svg/model/model_metal.png";
+import model_metallurgy from "@/assets/svg/model/model_metallurgy.png";
+import model_PCB from "@/assets/svg/model/model_PCB.png";
+import model_phone from "@/assets/svg/model/model_phone.png";
+import model_photovoltaic from "@/assets/svg/model/model_photovoltaic.png";
+import model_PVC from "@/assets/svg/model/model_PVC.png";
 
-export { model_OCR, model_mark, model_colour };
+export {
+  model_bank,
+  model_battery,
+  model_car,
+  model_ceramics,
+  model_medical,
+  model_metal,
+  model_metallurgy,
+  model_PCB,
+  model_phone,
+  model_photovoltaic,
+  model_PVC
+};

src/views/modelList/index.vue

@@ -129,8 +129,24 @@ onMounted(() => {
   .modelList_body {
     height: calc(100vh - 180px);
     padding: 16px;
+    padding-bottom: 60px;
     overflow-x: hidden;
     overflow-y: scroll;
   }
+  .pagination_wrap {
+    box-sizing: border-box;
+    position: absolute;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    padding-right: 16px;
+    width: 100%;
+    height: 60px;
+    background: #fff;
+    bottom: 0px;
+    right: 0px;
+    // width: calc(100% - 136px - 260px);
+    /* background-color: red; */
+  }
 }
 </style>

src/views/serverModule/components/ServerCard.scss

@@ -9,7 +9,7 @@
   background-size: 100% 100%;
   // border: 1.5px solid #52c41a;
   border-radius: 8px;
-  box-shadow: 0 8px 16px 0 rgb(0 0 0 / 10%);
+  // box-shadow: 0 8px 16px 0 rgb(0 0 0 / 10%);
 
   &_offline {
     // background-color: #f7f7f7;

src/views/serverModule/index.vue

@@ -153,5 +153,10 @@ onMounted(() => {
     overflow-x: hidden;
     overflow-y: scroll;
   }
+  .pagination_wrap {
+    position: absolute;
+    bottom: 30px;
+    right: 16px;
+  }
 }
 </style>

src/views/workbench/components/DeviceStatus.vue

@@ -8,10 +8,10 @@
 -->
 <script setup lang="ts">
 import { ref } from "vue";
-import deviceStatusOnline from "@/assets/svg/deviceStatus/online.svg?component";
-import deviceStatusProcess from "@/assets/svg/deviceStatus/process.svg?component";
-import deviceStatusError from "@/assets/svg/deviceStatus/error.svg?component";
-import deviceStatusOutline from "@/assets/svg/deviceStatus/outline.svg?component";
+import deviceStatusOnline from "@/assets/svg/deviceStatus/device_online.svg?component";
+import deviceStatusProcess from "@/assets/svg/deviceStatus/device_process.svg?component";
+import deviceStatusError from "@/assets/svg/deviceStatus/device_error.svg?component";
+import deviceStatusOutline from "@/assets/svg/deviceStatus/device_outline.svg?component";
 defineOptions({
   name: "DeviceStatus"
 });

src/views/workbench/index.vue

@@ -208,7 +208,7 @@ onMounted(() => {
       >
         <el-card
           class="line-card"
-          shadow="always"
+          shadow="never"
           :body-style="{ padding: '16px 20px' }"
         >
           <span :class="headStyles">数据总览</span>
@@ -222,7 +222,7 @@ onMounted(() => {
                   // backgroundColor: v.bigBgColor,
                   backgroundImage: `url(${v.bgImage})`,
                   backgroundSize: '100% 100%',
-                  padding: '20px 16px',
+                  padding: '16px',
                   position: 'relative'
                 }"
               >
@@ -275,7 +275,7 @@ onMounted(() => {
       >
         <el-card
           class="line-card"
-          shadow="always"
+          shadow="never"
           :body-style="{ padding: '16px' }"
         >
           <span :class="headStyles">设备状态</span>
@@ -305,7 +305,7 @@ onMounted(() => {
       >
         <el-card
           class="line-card"
-          shadow="always"
+          shadow="never"
           :body-style="{ padding: '16px' }"
         >
           <span :class="headStyles">设备告警情况</span>
@@ -335,7 +335,7 @@ onMounted(() => {
       >
         <el-card
           class="line-card"
-          shadow="always"
+          shadow="never"
           :body-style="{ padding: '16px' }"
         >
           <span :class="headStyles">算力占用</span>
@@ -366,7 +366,7 @@ onMounted(() => {
       >
         <el-card
           class="line-card"
-          shadow="always"
+          shadow="never"
           :body-style="{ padding: '16px' }"
         >
           <span :class="headStyles">违规总量</span>
@@ -394,7 +394,7 @@ onMounted(() => {
           }
         }"
       >
-        <el-card class="line-card" shadow="always" :body-style="{ padding: 0 }">
+        <el-card class="line-card" shadow="never" :body-style="{ padding: 0 }">
           <span :class="headStyles" class="mt-3 ml-4 mb-0">消息通知</span>
           <div class="flex justify-between h-[285px]">
             <Notify :MessageData="MessageData" />