From bfb94b685c82975dda240e3a2e7bf7c3420e8c51 Mon Sep 17 00:00:00 2001
From: wangqi <3188864257@qq.com>
Date: Wed, 25 Dec 2024 18:33:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../image/dashboard/common/icon_logo_pg.png   | Bin 25401 -> 551 bytes
 src/components/dashboard/Edfs-dialog.vue      |   2 +-
 src/hooks/useMessage.ts                       |  12 +
 src/main.ts                                   |   6 +-
 src/pages/deviceInfo/components/BasicInfo.vue |   2 +-
 .../deviceInfo/components/DeliveryInfo.vue    |   2 +-
 .../deviceInfo/components/MaintainInfo.vue    |   4 +-
 src/pages/deviceInfo/components/TestInfo.vue  |   2 +-
 .../deviceInfo/components/data-filter.vue     | 201 +++++++++++++++
 src/pages/deviceInfo/components/pie-chart.vue | 125 ++++++++++
 src/pages/deviceInfo/index.vue                | 235 ++++++++----------
 src/pages/deviceInfo/info.vue                 | 101 ++++----
 .../deviceStorage/components/data-filter.vue  |   2 +-
 .../deviceStorage/components/pie-chart.vue    |   1 +
 src/pages/deviceStorage/index.vue             |   4 +-
 .../testPlan/components/CaseDlg.vue           |   4 +-
 src/pages/home/components/line-chart.vue      |   2 +-
 src/pages/home/components/pie-chart.vue       |   4 +-
 src/pages/home/index.vue                      |  31 ++-
 src/pages/layout.vue                          |   4 +-
 src/pages/ota/firmware/index.vue              |   4 +-
 src/pages/ota/upgradeTask/index.vue           |   4 +-
 src/pages/system/deviceField/index.vue        |   4 +-
 src/pages/system/dict/data/index.vue          |   2 +-
 src/pages/system/dict/index.vue               |   2 +-
 src/pages/system/loginlog/index.vue           |   2 +-
 src/pages/system/operatelog/index.vue         |   2 +-
 src/pages/system/role/index.vue               |   2 +-
 src/pages/system/tenant/index.vue             |   4 +-
 src/pages/system/user/index.vue               |   2 +-
 src/styles/var.css                            |  20 +-
 src/styles/variables.scss                     |   1 +
 32 files changed, 570 insertions(+), 223 deletions(-)
 create mode 100644 src/pages/deviceInfo/components/data-filter.vue
 create mode 100644 src/pages/deviceInfo/components/pie-chart.vue

diff --git a/src/assets/image/dashboard/common/icon_logo_pg.png b/src/assets/image/dashboard/common/icon_logo_pg.png
index 953b56ac850f203e914ba45de08dcc2019b0fd2c..c6ad98f3ad74435af3e2172b3097c8cfab090a39 100644
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$;Ymb6R7gw3l|M)uaTLeD@Ar!$9jrMsDU@Pz4V~Lnuti64>RRa1=$##0OTm;5
zT{;MoAGqmM8tBr+K|xoCuF~W(IMqSDWROCUyJvp~7cVg;7jvP%<&OLF{k->k?|pxS
zAuk%TJ_0~S)t-6aFG<2kz;>6-;{afkDn*c3PZ9w3Ke~3l*aC1ZGm$Mbl*9iQU?}Gm
zfO2%pi22Qh{bW1NHpa>zs7qw|!ryMJJUvMa5J%{)Z|=-M7iJLQ=D)flJ9SYa;-N?s
zpr1`_I&(<^8t=?Qt=H`PIDpjXNaein__Uuu`kv(WVQlX<NKw`n5eCr;=uu<>okVBB
zP_<70e`w8!_FXHt&=Js&Rb<q!ybpN<@HgM1uUb$Fdc?##fLL>_>_)Q&q1i<Ny#_5^
zayE&u>S5GK@!zFD?9%`4jmtv<O-rKLv*oPQ(d^Qy_Ljg~-K-)yOu;<>-@^-i6%q#n
zo86>xelW18vrd<sk`})5P#j62Ou(Fw^zyurJGi%9PpaxXgZ9Em!&%bNGw``?neT7a
zpjUtYi}+{VGM|Uv8OqU)tDW~|5uJ{S2f5#csXt9X>?4zLT(?a-RC}nZGm`mrRG&#6
p)veraOPltJe318v9Fg4uxCWAg2`Hu^5_tds002ovPDHLkV1g0#1!({P

literal 25401
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

diff --git a/src/components/dashboard/Edfs-dialog.vue b/src/components/dashboard/Edfs-dialog.vue
index c41c684..563a4e1 100644
--- a/src/components/dashboard/Edfs-dialog.vue
+++ b/src/components/dashboard/Edfs-dialog.vue
@@ -17,7 +17,7 @@
       <template v-if="isShowFooter">
         <div class="dialog-footer">
           <edfs-button
-            type="success"
+            type="primary"
             @click="onSave"
             :loading="btnLoading"
             inner-text="确定"
diff --git a/src/hooks/useMessage.ts b/src/hooks/useMessage.ts
index 24c7d12..51ce7c3 100644
--- a/src/hooks/useMessage.ts
+++ b/src/hooks/useMessage.ts
@@ -59,6 +59,8 @@ export const useMessage = () => {
       return ElMessageBox.confirm(content, tip ? tip : '系统提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        confirmButtonClass: 'el-button--success',
+        cancelButtonClass: 'el-button--default',
         type: 'warning',
       })
     },
@@ -68,6 +70,8 @@ export const useMessage = () => {
         showCancelButton: false,
         closeOnClickModal: false,
         closeOnPressEscape: false,
+        confirmButtonClass: 'el-button--success',
+        cancelButtonClass: 'el-button--default',
         showClose: false,
         type: 'warning',
       })
@@ -82,6 +86,8 @@ export const useMessage = () => {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning',
+            confirmButtonClass: 'el-button--success',
+            cancelButtonClass: 'el-button--default',
           }
         )
           .then(() => {
@@ -100,6 +106,8 @@ export const useMessage = () => {
         {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
+          confirmButtonClass: 'el-button--success',
+          cancelButtonClass: 'el-button--default',
           type: 'warning',
         }
       )
@@ -109,6 +117,8 @@ export const useMessage = () => {
       return ElMessageBox.prompt(content, tip, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        confirmButtonClass: 'el-button--success',
+        cancelButtonClass: 'el-button--default',
         type: 'warning',
       })
     },
@@ -120,6 +130,8 @@ export const useMessage = () => {
       return ElMessageBox.prompt(content, tip, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        confirmButtonClass: 'el-button--success',
+        cancelButtonClass: 'el-button--default',
         inputPattern: PatternRegExp,
         inputErrorMessage: inputErrorMessage,
         type: 'warning',
diff --git a/src/main.ts b/src/main.ts
index db06f44..703e7bb 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,12 +1,10 @@
-import './styles/index.scss'
+import 'element-plus/dist/index.css'
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
-
 import App from '@/pages/App.vue'
 import router from '@/router'
 import i18n from '@/locales/index'
-import 'element-plus/dist/index.css'
-
+import './styles/index.scss'
 // 权限
 import { setupAuth } from '@/directives'
 
diff --git a/src/pages/deviceInfo/components/BasicInfo.vue b/src/pages/deviceInfo/components/BasicInfo.vue
index 30262ec..73b6ed6 100644
--- a/src/pages/deviceInfo/components/BasicInfo.vue
+++ b/src/pages/deviceInfo/components/BasicInfo.vue
@@ -90,7 +90,7 @@
       </div>
       <EdfsButton
         inner-text="提交基础信息"
-        type="success"
+        type="primary"
         class="save-button"
         v-if="isShowSaveButton"
         @click="onSave"
diff --git a/src/pages/deviceInfo/components/DeliveryInfo.vue b/src/pages/deviceInfo/components/DeliveryInfo.vue
index 1ff9fb3..b0c3bc7 100644
--- a/src/pages/deviceInfo/components/DeliveryInfo.vue
+++ b/src/pages/deviceInfo/components/DeliveryInfo.vue
@@ -32,7 +32,7 @@
       </div>
       <EdfsButton
         inner-text="出库"
-        type="success"
+        type="primary"
         class="save-button"
         @click="onSave"
         v-if="isShowSaveButton"
diff --git a/src/pages/deviceInfo/components/MaintainInfo.vue b/src/pages/deviceInfo/components/MaintainInfo.vue
index f4c3ed4..a0bf167 100644
--- a/src/pages/deviceInfo/components/MaintainInfo.vue
+++ b/src/pages/deviceInfo/components/MaintainInfo.vue
@@ -80,7 +80,7 @@
           <template v-if="scope.row.isEdit">
             <EdfsButton
               link
-              type="success"
+              type="primary"
               inner-text="确定"
               v-if="scope.row.isEdit"
               @click="onSave(scope.row)"
@@ -114,7 +114,7 @@
       style="width: 100%"
       @click="addMaintain"
       v-if="action !== 'view'"
-      type="success"
+      type="primary"
     >
       添加维修信息
     </el-button>
diff --git a/src/pages/deviceInfo/components/TestInfo.vue b/src/pages/deviceInfo/components/TestInfo.vue
index 91806fb..e8b5d62 100644
--- a/src/pages/deviceInfo/components/TestInfo.vue
+++ b/src/pages/deviceInfo/components/TestInfo.vue
@@ -39,7 +39,7 @@
       </EdfsTable>
       <EdfsButton
         inner-text="提交并入库"
-        type="success"
+        type="primary"
         class="save-button"
         v-if="isShowSaveButton"
         @click="onSave"
diff --git a/src/pages/deviceInfo/components/data-filter.vue b/src/pages/deviceInfo/components/data-filter.vue
new file mode 100644
index 0000000..f22ea04
--- /dev/null
+++ b/src/pages/deviceInfo/components/data-filter.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="storage-data-filter">
+    <div class="time-item">
+      <el-config-provider :locale="locale">
+        <span>开始时间:</span>
+        <div class="item item-time">
+          <el-date-picker
+            class="data-picker"
+            v-model="filterData.startDay"
+            type="date"
+            placeholder="请选择时间"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            :clearable="false"
+            :editable="false"
+          />
+          <el-checkbox v-model="checkbox.startDay" size="large" />
+        </div>
+        <span>终止时间:</span>
+        <div class="item item-time">
+          <el-date-picker
+            class="data-picker"
+            v-model="filterData.endDay"
+            type="date"
+            placeholder="请选择时间"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            :clearable="false"
+            :editable="false"
+            :disabled-date="endDisabledDate"
+          />
+          <el-checkbox v-model="checkbox.endDay" size="large" />
+        </div>
+      </el-config-provider>
+    </div>
+
+    <div class="item">
+      <el-input placeholder="请输入设备序列号" v-model="filterData.serialNo" />
+      <el-checkbox v-model="checkbox.serialNo" size="large" />
+    </div>
+    <div class="item">
+      <el-input placeholder="请输入设备名称" v-model="filterData.name" />
+      <el-checkbox v-model="checkbox.name" size="large" />
+    </div>
+
+    <div class="item">
+      <el-cascader
+        v-model="filterData.categoryId"
+        :options="categoryTreeData"
+        placeholder="请选择设备分类"
+        :props="{
+          checkStrictly: true,
+          value: 'id',
+          label: 'name',
+        }"
+      />
+      <el-checkbox v-model="checkbox.categoryId" size="large" />
+    </div>
+    <div class="item item-btn">
+      <EdfsButton
+        inner-text="搜索"
+        type="primary"
+        style="width: 100%"
+        @click="onSearch"
+      />
+      <EdfsButton inner-text="重置" style="width: 100%" @click="onReset" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import dayjs from 'dayjs'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import EdfsButton from '@/components/dashboard/Edfs-button/index.vue'
+
+import type { CustomerVO } from '@/api/module/eam/customer'
+
+const locale = zhCn
+
+const prop = defineProps<{
+  categoryTreeData: Array<Pick<CustomerVO, 'id' | 'name'>>
+}>()
+const endDisabledDate = (time: Date) => {
+  return (
+    time.getTime() <
+    dayjs(filterData.value.startDay).add(1, 'days').startOf('day').valueOf()
+  )
+}
+const emit = defineEmits(['search'])
+
+type FilterKeys = keyof typeof filterData.value
+
+const filterData = ref({
+  startDay: '',
+  endDay: '',
+  name: '',
+  serialNo: '',
+  categoryId: [],
+})
+
+const checkbox = ref<Record<FilterKeys, boolean>>({
+  startDay: false,
+  endDay: false,
+  name: false,
+  serialNo: false,
+  categoryId: false,
+})
+
+function onSearch() {
+  emit('search', formatParams())
+}
+
+function formatParams() {
+  const params: Partial<Record<FilterKeys, string>> = {}
+  const keys = Object.keys(checkbox.value) as FilterKeys[]
+  for (const key of keys) {
+    if (checkbox.value[key]) {
+      if (key === 'startDay' || key === 'endDay') {
+        params['createTime'] = [filterData.value.startDay, filterData.value.endDay]
+      } else {
+        params[key] = filterData.value[key]
+      }
+    }
+  }
+  return params
+}
+
+function onReset() {
+  filterData.value = {
+    startDay: '',
+    endDay: '',
+    name: '',
+    serialNo: '',
+    categoryId: [],
+  }
+  checkbox.value = {
+    startDay: false,
+    endDay: false,
+    name: false,
+    serialNo: false,
+    categoryId: false,
+  }
+  onSearch()
+}
+
+onMounted(() => {
+  onSearch()
+})
+</script>
+
+<style lang="scss" scoped>
+.storage-data-filter {
+  padding: 16px;
+  box-sizing: border-box;
+  span {
+    font-size: 14px;
+    color: var(--label-color);
+  }
+  .time-item {
+    margin-bottom: 32px;
+    .item {
+      margin-top: 0;
+
+      margin-bottom: 16px;
+    }
+  }
+  .item {
+    margin-top: 16px;
+    height: 32px;
+    display: flex;
+    align-items: center;
+
+    :deep(.el-checkbox:last-of-type) {
+      margin-left: 8px;
+    }
+  }
+
+  .item-btn {
+    margin-top: 36px;
+  }
+
+  :deep(.data-picker) {
+    width: 100%;
+  }
+  :deep(.el-input__icon) {
+    // margin: 0;
+  }
+  :deep(.el-date-editor .el-input__wrapper) {
+    height: 100%;
+    line-height: 100%;
+    flex-direction: row-reverse;
+    box-sizing: border-box;
+    padding: 1px 0 1px 11px;
+  }
+
+  :deep(.el-input__icon),
+  :deep(.el-input__prefix-inner),
+  :deep(.el-input__prefix),
+  :deep(.perfix-icon) {
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/pages/deviceInfo/components/pie-chart.vue b/src/pages/deviceInfo/components/pie-chart.vue
new file mode 100644
index 0000000..4fef4d8
--- /dev/null
+++ b/src/pages/deviceInfo/components/pie-chart.vue
@@ -0,0 +1,125 @@
+<template>
+  <v-chart class="chart" :option="option" :autoresize="autoresize" />
+</template>
+
+<script setup lang="ts">
+import VChart from 'vue-echarts'
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { PieChart } from 'echarts/charts'
+import {
+  TitleComponent,
+  TooltipComponent,
+  LegendComponent,
+  GraphicComponent,
+} from 'echarts/components'
+import type { EChartsOption } from 'echarts'
+import { useTheme } from '@/utils/useTheme'
+use([
+  CanvasRenderer,
+  PieChart,
+  TitleComponent,
+  TooltipComponent,
+  GraphicComponent,
+  LegendComponent,
+])
+
+interface Props {
+  data: any[]
+}
+const { chartGraphicTextColor } = useTheme()
+
+const props = withDefaults(defineProps<Props>(), {
+  data: () => [],
+})
+
+const updateTrigger = ref(0)
+const autoresize = {
+  throttle: 2500,
+  onResize: () => {
+    updateTrigger.value++
+  },
+}
+
+// 数据总数
+const total = computed(() => props.data.reduce((acc, cur) => acc + cur.value, 0))
+
+const option = computed(() => {
+  const trigger = updateTrigger.value
+  const res: EChartsOption = {
+    tooltip: {
+      show: false,
+    },
+    graphic: {
+      elements: [
+        {
+          type: 'text',
+          left: 'center',
+          top: '30%',
+          style: {
+            text: total.value.toString(),
+            fill: chartGraphicTextColor.value,
+            fontSize: 20,
+            fontWeight: 700,
+          },
+        },
+        {
+          type: 'text',
+          left: 'center',
+          top: '42%',
+          style: {
+            text: '设备总数',
+            fill: chartGraphicTextColor.value,
+            fontSize: 16,
+          },
+        },
+      ],
+    },
+    legend: {
+      show: true,
+      bottom: '3%',
+      itemWidth: 20,
+      itemHeight: 15,
+      itemGap: 10,
+      textStyle: {
+        fontSize: 16,
+      },
+      selectedMode: false,
+    },
+    color: ['#4CAF50', '#2196F3', '#FBB852', '#FF9800', '#F44336', '#ccc'],
+    series: [
+      {
+        type: 'pie',
+        radius: ['40%', '55%'],
+        center: ['50%', '40%'],
+        data: props.data,
+        avoidLabelOverlap: false,
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 1,
+            shadowColor: 'rgba(0, 0, 0, 0.5)',
+          },
+        },
+        label: {
+          show: true,
+          position: 'outside',
+          // formatter: '{b}: {c} ({d}%)',
+          formatter: ' {c}',
+        },
+        labelLine: {
+          show: true,
+        },
+      },
+    ],
+  }
+  return res
+})
+</script>
+
+<style scoped lang="scss">
+.chart {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/pages/deviceInfo/index.vue b/src/pages/deviceInfo/index.vue
index 8c8b409..f0c7006 100644
--- a/src/pages/deviceInfo/index.vue
+++ b/src/pages/deviceInfo/index.vue
@@ -1,60 +1,13 @@
 <template>
   <div class="device-info-wrap">
-    <EdfsWrap class="device-info-from-wrap">
-      <div class="from">
-        <div class="from-input">
-          <div class="from-row">
-            <div class="label">设备序列:</div>
-            <el-input
-              v-model="queryParams.serialNo"
-              placeholder="请输入设备序列号"
-              clearable
-              @keyup.enter="handleQuery"
-            />
-          </div>
-          <div class="from-row">
-            <div class="label">设备名称:</div>
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入设备名称"
-              clearable
-              @keyup.enter="handleQuery"
-            />
-          </div>
-
-          <div class="from-row">
-            <div class="label">注册时段:</div>
-            <el-date-picker
-              v-model="queryParams.createTime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="datetimerange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            />
-          </div>
-          <div class="from-row">
-            <div class="label">设备类别:</div>
-            <el-cascader
-              class="input"
-              v-model="queryParams.categoryId"
-              :options="categoryTreeData"
-              :props="{
-                checkStrictly: true,
-                value: 'id',
-                label: 'name',
-              }"
-            />
-          </div>
-
-          <div class="btn-group">
-            <el-button @click="addDevice"><Icon icon="ep:plus" />添加设备</el-button>
-
-            <el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
-            <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
-          </div>
-        </div>
+    <div class="left-wrap">
+      <EdfsWrap class="chart-box" title="设备概览">
+        <PieChart :data="pieData" />
+      </EdfsWrap>
+      <div class="filter">
+        <LeftFilter @search="onSearch" :categoryTreeData="categoryTreeData" />
       </div>
-    </EdfsWrap>
+    </div>
     <EdfsWrap title="设备信息列表" class="device-info-table">
       <EdfsTable
         class="table"
@@ -104,35 +57,28 @@
               inner-text="查看"
               @click="onView(scope.row)"
             /><el-divider direction="vertical" />
-            <EdfsButton
-              link
-              type="primary"
-              inner-text="编辑基础信息"
-              @click="editDevice(scope.row, 'info')"
-              v-if="scope.row.status < 2"
-            />
-            <EdfsButton
-              link
-              type="primary"
-              inner-text="测试结果录入"
-              @click="editDevice(scope.row, 'test')"
-              v-if="scope.row.status === 1"
-            />
-            <EdfsButton
-              link
-              type="primary"
-              inner-text="出库"
-              @click="editDevice(scope.row, 'delivery')"
-              v-if="scope.row.status === 2"
-            />
 
-            <EdfsButton
-              link
-              type="primary"
-              inner-text="设备报修"
-              @click="editDevice(scope.row, 'maintain')"
-              v-if="scope.row.status === 3"
-            />
+            <el-dropdown @command="command => handleCommand(command, scope.row)">
+              <el-button type="primary" link
+                ><Icon icon="ep:d-arrow-right" /> 更多</el-button
+              >
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item command="info" v-if="scope.row.status < 2">
+                    <Icon icon="solar:clapperboard-edit-linear" />编辑基础信息
+                  </el-dropdown-item>
+                  <el-dropdown-item command="test" v-if="scope.row.status === 1">
+                    <Icon icon="solar:document-add-outline" />测试结果录入
+                  </el-dropdown-item>
+                  <el-dropdown-item command="delivery" v-if="scope.row.status === 2">
+                    <Icon icon="solar:inbox-out-outline" />出库
+                  </el-dropdown-item>
+                  <el-dropdown-item command="maintain" v-if="scope.row.status === 3">
+                    <Icon icon="solar:minimalistic-magnifer-bug-outline" />设备报修
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
           </template>
         </el-table-column>
       </EdfsTable>
@@ -142,14 +88,19 @@
 
 <script setup lang="ts">
 import dayjs from 'dayjs'
+import LeftFilter from './components/data-filter.vue'
 import EdfsWrap from '@/components/dashboard/Edfs-wrap.vue'
 import EdfsTable from '@/components/dashboard/Edfs-table/index.vue'
 import EdfsButton from '@/components/dashboard/Edfs-button/index.vue'
 import { isResError } from '@/hooks/useMessage'
-import { dateFormatter } from '@/utils/formatTime'
 import type { TableColumnCtx } from 'element-plus'
 import { useRouter } from 'vue-router'
-import { getDevicePage, type IDevice } from '@/api/module/eam/device'
+import PieChart from './components/pie-chart.vue'
+import {
+  getDevicePage,
+  getDeviceSummaryByStatus,
+  type IDevice,
+} from '@/api/module/eam/device'
 import { deviceTableCol, DeviceStatus } from './utils'
 import { getCategoryTree, type ICategoryTree } from '@/api/module/eam/device/category'
 
@@ -159,11 +110,11 @@ const list = ref<IDevice[]>([])
 const queryParams = reactive({
   pageNo: 1,
   pageSize: undefined,
-  serialNo: undefined,
-  name: undefined,
-  status: undefined,
-  categoryId: [],
-  createTime: [],
+  // serialNo: undefined,
+  // name: undefined,
+  // status: undefined,
+  // categoryId: [],
+  // createTime: [],
 })
 const tableRef = ref()
 const getList = async () => {
@@ -172,10 +123,9 @@ const getList = async () => {
   }
   loading.value = true
 
-  const options = {
-    ...queryParams,
-    categoryId: queryParams.categoryId?.[queryParams.categoryId.length - 1],
-  }
+  const options = Object.assign({}, queryParams, filter.value, {
+    categoryId: filter.value.categoryId?.[filter.value.categoryId.length - 1],
+  })
 
   const res = await getDevicePage(options)
 
@@ -187,22 +137,16 @@ const getList = async () => {
   loading.value = false
 }
 
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
 function handleJump(page: number) {
   queryParams.pageNo = page
   getList()
 }
 
-function resetQuery() {
-  queryParams.serialNo = undefined
-  queryParams.name = undefined
-  queryParams.status = undefined
-  queryParams.categoryId = []
-  queryParams.createTime = []
-  handleQuery()
+const filter = ref<any>({})
+function onSearch(search: any) {
+  queryParams.pageNo = 1
+  filter.value = search
+  getList()
 }
 
 const categoryTreeData = ref<ICategoryTree[]>([])
@@ -241,6 +185,25 @@ function addDevice() {
 function onView(row: any) {
   router.push({ path: '/device/deviceOperation', query: { action: 'view', id: row.id } })
 }
+
+function handleCommand(command: string, row: any) {
+  editDevice(row, command)
+}
+
+const pieData = ref<any>([])
+async function loadPieChartData() {
+  const res = await getDeviceSummaryByStatus()
+  if (isResError(res)) return
+  pieData.value = res.data.map((item: any) => {
+    return {
+      name: item.statusName,
+      value: item.count,
+    }
+  })
+}
+onMounted(() => {
+  loadPieChartData()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -248,35 +211,43 @@ function onView(row: any) {
   width: 100%;
   height: 100%;
   display: flex;
-  flex-direction: column;
-  row-gap: 10px;
-  .device-info-from-wrap {
-    height: auto;
-    width: 100%;
-    .from {
-      display: flex;
-      flex-direction: column;
-      justify-content: space-around;
-      height: 100%;
-      width: 100%;
-      .from-input {
-        display: flex;
-        width: 100%;
-        column-gap: 20px;
-        row-gap: 10px;
-        flex-wrap: wrap;
-        .from-row {
-          min-width: 270px;
-          display: flex;
-          align-items: center;
-          column-gap: 4px;
-          .label {
-            white-space: nowrap;
-            width: 70px;
-            color: var(--label-color);
-          }
-        }
+  column-gap: 12px;
+  box-sizing: border-box;
+  .left-wrap {
+    width: 280px;
+    min-width: 100px;
+    height: 100%;
+    background: var(--warp-bg);
+    display: flex;
+    flex-direction: column;
+
+    box-sizing: border-box;
+    .station {
+      position: relative;
+      height: 60px;
+      padding-left: 20px;
+      border-bottom: 1px solid var(--pagination-border-color);
+      :deep(.el-input__inner) {
+        color: #666;
+      }
+
+      :deep(.el-input__wrapper) {
+        padding: 0;
       }
+
+      :deep(.el-input__suffix) {
+        display: none;
+      }
+    }
+    .chart-box {
+      height: 300px;
+    }
+    .filter {
+      height: calc(100% - 300px);
+      overflow: hidden;
+    }
+    :deep(.edfs-wrap) {
+      box-shadow: none;
     }
   }
   .device-info-table {
diff --git a/src/pages/deviceInfo/info.vue b/src/pages/deviceInfo/info.vue
index 59febf0..6f5606c 100644
--- a/src/pages/deviceInfo/info.vue
+++ b/src/pages/deviceInfo/info.vue
@@ -1,50 +1,52 @@
 <template>
-  <EdfsButton
-    inner-text="返 回"
-    type="success"
-    style="width: 80px"
-    @click="
-      () => {
-        router.go(-1)
-      }
-    "
-  />
-  <el-scrollbar class="demo-collapse">
-    <el-collapse v-model="activeNames" @change="handleChange">
-      <template v-for="item in collapses">
-        <el-collapse-item :name="item.name" :icon="CaretRight">
-          <template #title>
-            <div class="title">
-              <div class="title-rect"></div>
-              <div class="title-text">
-                {{ item.title }}
+  <div class="device-info-wrap">
+    <EdfsButton
+      inner-text="返回上一页"
+      type="primary"
+      class="back-btn"
+      @click="
+        () => {
+          router.go(-1)
+        }
+      "
+    />
+    <el-scrollbar class="demo-collapse">
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <template v-for="item in collapses">
+          <el-collapse-item :name="item.name" :icon="CaretRight">
+            <template #title>
+              <div class="title">
+                <div class="title-rect"></div>
+                <div class="title-text">
+                  {{ item.title }}
+                </div>
               </div>
-            </div>
-          </template>
-          <BasicInfo
-            v-if="item.name === 'info'"
-            :info="deviceInfo"
-            :disabled="isDisabledInfo"
-            @onSave="loadDeviceInfo"
-          />
-          <TestInfo
-            v-else-if="item.name === 'test'"
-            :info="deviceInfo"
-            :disabled="isDisabledTest"
-            @onSave="loadDeviceInfo"
-          />
-          <DeliveryInfo
-            :info="deviceInfo"
-            :disabled="false"
-            :deviceId="deviceInfoId"
-            v-else-if="item.name === 'delivery'"
-            @onSave="loadDeviceInfo"
-          />
-          <MaintainInfo :deviceId="deviceInfoId" v-else-if="item.name === 'maintain'" />
-        </el-collapse-item>
-      </template>
-    </el-collapse>
-  </el-scrollbar>
+            </template>
+            <BasicInfo
+              v-if="item.name === 'info'"
+              :info="deviceInfo"
+              :disabled="isDisabledInfo"
+              @onSave="loadDeviceInfo"
+            />
+            <TestInfo
+              v-else-if="item.name === 'test'"
+              :info="deviceInfo"
+              :disabled="isDisabledTest"
+              @onSave="loadDeviceInfo"
+            />
+            <DeliveryInfo
+              :info="deviceInfo"
+              :disabled="false"
+              :deviceId="deviceInfoId"
+              v-else-if="item.name === 'delivery'"
+              @onSave="loadDeviceInfo"
+            />
+            <MaintainInfo :deviceId="deviceInfoId" v-else-if="item.name === 'maintain'" />
+          </el-collapse-item>
+        </template>
+      </el-collapse>
+    </el-scrollbar>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -133,7 +135,16 @@ onMounted(async () => {
 </script>
 
 <style scoped lang="scss">
+.device-info-wrap {
+  background-color: var(--warp-bg);
+  width: 100%;
+  height: 100%;
+  .back-btn {
+    margin: 10px 10px;
+  }
+}
 .demo-collapse {
+  height: calc(100% - 50px);
   :deep(.el-collapse-item__arrow) {
     margin: 0 0 0 4px;
   }
diff --git a/src/pages/deviceStorage/components/data-filter.vue b/src/pages/deviceStorage/components/data-filter.vue
index 70c8b38..8bf04c2 100644
--- a/src/pages/deviceStorage/components/data-filter.vue
+++ b/src/pages/deviceStorage/components/data-filter.vue
@@ -61,7 +61,7 @@
     <div class="item item-btn">
       <EdfsButton
         inner-text="搜索"
-        type="success"
+        type="primary"
         style="width: 100%"
         @click="onSearch"
       />
diff --git a/src/pages/deviceStorage/components/pie-chart.vue b/src/pages/deviceStorage/components/pie-chart.vue
index 3230ccc..e345ea8 100644
--- a/src/pages/deviceStorage/components/pie-chart.vue
+++ b/src/pages/deviceStorage/components/pie-chart.vue
@@ -84,6 +84,7 @@ const option = computed(() => {
       textStyle: {
         fontSize: 14,
       },
+      selectedMode: false,
     },
     color: ['#437BF8', '#F84343', '#D1D1D1 ', '#FBB852'],
     series: [
diff --git a/src/pages/deviceStorage/index.vue b/src/pages/deviceStorage/index.vue
index 75bd807..4c9d3a3 100644
--- a/src/pages/deviceStorage/index.vue
+++ b/src/pages/deviceStorage/index.vue
@@ -55,14 +55,14 @@
           <template #default="scope">
             <EdfsButton
               link
-              type="success"
+              type="primary"
               inner-text="添加维修信息"
               v-if="scope.row.status === 3"
               @click="addMaintain(scope.row)"
             />
             <EdfsButton
               link
-              type="success"
+              type="primary"
               v-else-if="scope.row.status === 2"
               inner-text="添加出库信息"
               @click="addOutStorage(scope.row)"
diff --git a/src/pages/deviceTest/testPlan/components/CaseDlg.vue b/src/pages/deviceTest/testPlan/components/CaseDlg.vue
index d4f7af7..4910690 100644
--- a/src/pages/deviceTest/testPlan/components/CaseDlg.vue
+++ b/src/pages/deviceTest/testPlan/components/CaseDlg.vue
@@ -37,7 +37,7 @@
           <template #default="scope">
             <template v-if="scope.row.isEdit">
               <EdfsButton
-                type="success"
+                type="primary"
                 inner-text="确定"
                 v-loading="saveLoading"
                 @click="onCaseSave(scope.row)"
@@ -66,7 +66,7 @@
           </template>
         </el-table-column>
       </EdfsTable>
-      <el-button class="mt-4" style="width: 100%" @click="addCase" type="success">
+      <el-button class="mt-4" style="width: 100%" @click="addCase" type="primary">
         添加测试用例
       </el-button>
     </div>
diff --git a/src/pages/home/components/line-chart.vue b/src/pages/home/components/line-chart.vue
index e9145e8..b7c8dfb 100644
--- a/src/pages/home/components/line-chart.vue
+++ b/src/pages/home/components/line-chart.vue
@@ -61,7 +61,7 @@ const chartOption = computed<EChartsOption>(() => {
       left: 50,
       right: 10,
       top: '8%',
-      bottom: 50,
+      bottom: 30,
     },
     tooltip: {
       trigger: 'axis',
diff --git a/src/pages/home/components/pie-chart.vue b/src/pages/home/components/pie-chart.vue
index 01f6ca2..e7f64d6 100644
--- a/src/pages/home/components/pie-chart.vue
+++ b/src/pages/home/components/pie-chart.vue
@@ -55,7 +55,7 @@ const option = computed(() => {
         {
           type: 'text',
           left: 'center',
-          top: '36%',
+          top: '34%',
           style: {
             text: total.value.toString(),
             fill: chartGraphicTextColor.value,
@@ -66,7 +66,7 @@ const option = computed(() => {
         {
           type: 'text',
           left: 'center',
-          top: '42%',
+          top: '42.4%',
           style: {
             text: '设备总数',
             fill: chartGraphicTextColor.value,
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index e62a0ef..9898f43 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -23,7 +23,7 @@
               <EdfsButton
                 :inner-text="name"
                 @click="onTimeSearch(key)"
-                :type="currentFilter === key ? 'success' : ''"
+                :type="currentFilter === key ? 'success' : 'default'"
               />
             </template>
           </el-button-group>
@@ -39,8 +39,8 @@
         <div class="shortcut-list">
           <template v-for="(item, idx) in shortcutList" :key="idx">
             <div class="item" @click="onShortcutClick(item)">
-              <el-button :type="item.type as any" circle size="large">
-                <Icon :icon="item.icon" :size="24" />
+              <el-button :color="item.color" circle size="large">
+                <Icon :icon="item.icon" :size="36" />
               </el-button>
               <span>{{ item.title }}</span>
             </div>
@@ -72,19 +72,25 @@ const shortcutList = [
   {
     title: '设备管理',
     icon: 'solar:server-square-linear',
-    type: 'primary',
+    color: '#1E90FF',
     path: '/device/data',
   },
+  {
+    title: '设备添加',
+    icon: 'solar:add-circle-linear',
+    color: '#619925',
+    path: 'device/deviceOperation?action=create',
+  },
   {
     title: '设备库存',
     icon: 'solar:box-outline',
-    type: 'success',
+    color: '#909399',
     path: '/storage',
   },
   {
     title: '测试计划',
     icon: 'codicon:code-oss',
-    type: 'warning',
+    color: '#FF9800',
     path: '/testSheet/plan',
   },
 ]
@@ -210,6 +216,7 @@ onMounted(() => {
       overflow: hidden;
       background-color: var(--warp-bg);
       height: 100%;
+      color: #fff;
       width: 33%;
       padding: 0 30px;
       align-items: center;
@@ -247,11 +254,11 @@ onMounted(() => {
     }
   }
   footer {
-    height: 140px;
+    height: 180px;
     .shortcut-list {
       display: flex;
       align-items: center;
-      column-gap: 18px;
+      column-gap: 28px;
     }
     .item {
       display: flex;
@@ -260,16 +267,20 @@ onMounted(() => {
       cursor: pointer;
       span {
         margin-top: 8px;
+        font-size: 16px;
         color: var(--label-color);
       }
+      :deep(.el-icon) {
+        color: #fff;
+      }
     }
     :deep(.wrap-body) {
       padding-top: 0;
       padding-left: 20px;
     }
     :deep(.el-button) {
-      width: 52px;
-      height: 52px;
+      width: 84px;
+      height: 84px;
     }
   }
 }
diff --git a/src/pages/layout.vue b/src/pages/layout.vue
index a654114..35ba2a9 100644
--- a/src/pages/layout.vue
+++ b/src/pages/layout.vue
@@ -270,8 +270,8 @@ $header-height: 48px;
       font-weight: 400;
 
       .logo-icon {
-        width: 27px;
-        height: 27px;
+        width: 22px;
+        height: 22px;
       }
 
       .logo-label {
diff --git a/src/pages/ota/firmware/index.vue b/src/pages/ota/firmware/index.vue
index 19ffb2d..9005847 100644
--- a/src/pages/ota/firmware/index.vue
+++ b/src/pages/ota/firmware/index.vue
@@ -4,7 +4,7 @@
       <template #title-right>
         <div class="firmware-table-title">
           <EdfsButton
-            type="success"
+            type="primary"
             inner-text="新增固件"
             :icon="createIcon"
             @click="addFirmware"
@@ -63,7 +63,7 @@
         <!--  <el-table-column label="操作" min-width="14%">
           <template #default="scope">
            <EdfsButton
-              type="success"
+              type="primary"
               link
               inner-text="下载固件"
               @click="onDownload(scope.row)"
diff --git a/src/pages/ota/upgradeTask/index.vue b/src/pages/ota/upgradeTask/index.vue
index 65fdc75..2eef23a 100644
--- a/src/pages/ota/upgradeTask/index.vue
+++ b/src/pages/ota/upgradeTask/index.vue
@@ -4,7 +4,7 @@
       <template #title-right>
         <div class="task-table-title">
           <EdfsButton
-            type="success"
+            type="primary"
             inner-text="创建升级任务"
             :icon="createIcon"
             @click="addTask"
@@ -78,7 +78,7 @@
         <el-table-column label="操作" min-width="8%">
           <template #default="scope">
             <EdfsButton
-              type="success"
+              type="primary"
               link
               v-if="scope.row.status === 1 || scope.row.status === 2"
               inner-text="详情"
diff --git a/src/pages/system/deviceField/index.vue b/src/pages/system/deviceField/index.vue
index faec22b..d1adbba 100644
--- a/src/pages/system/deviceField/index.vue
+++ b/src/pages/system/deviceField/index.vue
@@ -3,7 +3,7 @@
     <EdfsWrap title="设备类别管理" class="category-box">
       <template #title-right>
         <EdfsButton
-          type="success"
+          type="primary"
           :icon="plusIcon"
           inner-text="新增"
           @click="addCategory"
@@ -18,7 +18,7 @@
     <!-- <EdfsWrap title="设备处置/报废/故障 常用原因管理" class="cause-box">
       <template #title-right>
         <EdfsButton
-          type="success"
+          type="primary"
           :icon="plusIcon"
           inner-text="新增"
         />
diff --git a/src/pages/system/dict/data/index.vue b/src/pages/system/dict/data/index.vue
index 91ad488..feeb54b 100644
--- a/src/pages/system/dict/data/index.vue
+++ b/src/pages/system/dict/data/index.vue
@@ -56,7 +56,7 @@
                   <Icon icon="ep:plus" /> 新增
                 </el-button>
                 <el-button
-                  type="success"
+                  type="primary"
                   plain
                   @click="handleExport"
                   :loading="exportLoading"
diff --git a/src/pages/system/dict/index.vue b/src/pages/system/dict/index.vue
index 5108d23..9992e3c 100644
--- a/src/pages/system/dict/index.vue
+++ b/src/pages/system/dict/index.vue
@@ -65,7 +65,7 @@
               v-hasPermi="['system:dict:export']"
               :loading="exportLoading"
               plain
-              type="success"
+              type="primary"
               @click="handleExport"
             >
               <Icon icon="ep:download" />
diff --git a/src/pages/system/loginlog/index.vue b/src/pages/system/loginlog/index.vue
index 1236a5a..7593b20 100644
--- a/src/pages/system/loginlog/index.vue
+++ b/src/pages/system/loginlog/index.vue
@@ -35,7 +35,7 @@
             <el-button @click="handleQuery"><Icon icon="ep:search" /> 搜索</el-button>
             <el-button @click="resetQuery"><Icon icon="ep:refresh" /> 重置</el-button>
             <el-button
-              type="success"
+              type="primary"
               plain
               @click="handleExport"
               :loading="exportLoading"
diff --git a/src/pages/system/operatelog/index.vue b/src/pages/system/operatelog/index.vue
index 4382f9c..87693dd 100644
--- a/src/pages/system/operatelog/index.vue
+++ b/src/pages/system/operatelog/index.vue
@@ -60,7 +60,7 @@
             <el-button @click="handleQuery"><Icon icon="ep:search" /> 搜索</el-button>
             <el-button @click="resetQuery"><Icon icon="ep:refresh" /> 重置</el-button>
             <el-button
-              type="success"
+              type="primary"
               plain
               @click="handleExport"
               :loading="exportLoading"
diff --git a/src/pages/system/role/index.vue b/src/pages/system/role/index.vue
index 9ef7465..6aec98b 100644
--- a/src/pages/system/role/index.vue
+++ b/src/pages/system/role/index.vue
@@ -67,7 +67,7 @@
               v-hasPermi="['system:role:export']"
               :loading="exportLoading"
               plain
-              type="success"
+              type="primary"
               @click="handleExport"
             >
               <Icon icon="ep:download" />
diff --git a/src/pages/system/tenant/index.vue b/src/pages/system/tenant/index.vue
index b06a603..ee60ed3 100644
--- a/src/pages/system/tenant/index.vue
+++ b/src/pages/system/tenant/index.vue
@@ -75,7 +75,7 @@
               新增
             </el-button>
             <el-button
-              type="success"
+              type="primary"
               plain
               @click="handleExport"
               :loading="exportLoading"
@@ -107,7 +107,7 @@
             <el-tag v-if="scope.row.packageId === 0" type="danger">系统租户</el-tag>
             <template v-else v-for="item in packageList">
               <el-tag
-                type="success"
+                type="primary"
                 :key="item.id"
                 v-if="item.id === scope.row.packageId"
               >
diff --git a/src/pages/system/user/index.vue b/src/pages/system/user/index.vue
index 3045146..aa19ec1 100644
--- a/src/pages/system/user/index.vue
+++ b/src/pages/system/user/index.vue
@@ -70,7 +70,7 @@
                   <Icon icon="ep:upload" /> 导入
                 </el-button>
                 <el-button
-                  type="success"
+                  type="primary"
                   plain
                   @click="handleExport"
                   :loading="exportLoading"
diff --git a/src/styles/var.css b/src/styles/var.css
index 286e229..3c0d23b 100644
--- a/src/styles/var.css
+++ b/src/styles/var.css
@@ -15,7 +15,7 @@ html[data-theme='dark'] {
   --station-header-text-color: #fff;
   --station-info-val-text: #fff;
   --label-color: #c7c8cb;
-  --text-desc: #8D9095;
+  --text-desc: #8d9095;
 }
 
 html[data-theme='light'] {
@@ -40,9 +40,25 @@ html[data-theme='light'] {
 
 html.dark {
   --el-bg-color: #212327;
-  /* --el-color-primary: #619925; */
   --el-border-color: rgba(255, 255, 255, 0.13);
   --el-button-divide-border-color: rgba(255, 255, 255, 0.13);
   --el-bg-color-overlay: #212327;
   --el-text-color-regular: #c7c8cb;
+  --el-color-primary: #619925;
+  --el-color-primary-light-3: rgb(78.1, 141.8, 46.6);
+  --el-color-primary-light-5: rgb(61.5, 107, 39);
+  --el-color-primary-light-7: rgb(44.9, 72.2, 31.4);
+  --el-color-primary-light-8: rgb(36.6, 54.8, 27.6);
+  --el-color-primary-light-9: rgb(28.3, 37.4, 23.8);
+  --el-color-primary-dark-2: rgb(133.4, 206.2, 97.4);
+}
+
+html.light {
+  --el-color-primary: #619925;
+  --el-color-primary-light-3: rgb(148.6, 212.3, 117.1);
+  --el-color-primary-light-5: rgb(179, 224.5, 156.5);
+  --el-color-primary-light-7: rgb(209.4, 236.7, 195.9);
+  --el-color-primary-light-8: rgb(224.6, 242.8, 215.6);
+  --el-color-primary-light-9: rgb(239.8, 248.9, 235.3);
+  --el-color-primary-dark-2: rgb(82.4, 155.2, 46.4);
 }
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 8b115ef..99cddb2 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -45,3 +45,4 @@ $H-scale-ratio-1440: math.div(1440, 1080);
     font-size: calc($W-scale-ratio-2560 * #{$base-font-size}px);
   }
 }
+