From 283450270b3a9e2a2c0e7a5c08a3a01e9ecf8e9d Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Wed, 24 Sep 2025 15:25:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ALOps_sys_fe/alops-ui/package.json            |   1 +
 ALOps_sys_fe/alops-ui/src/api/device/files.js |   6 +-
 ALOps_sys_fe/alops-ui/src/main.js             |   2 +
 .../src/views/QandA/Aiassistant/index.vue     |   6 +-
 ALOps_sys_fe/alops-ui/src/views/index.vue     | 437 +++++++++++-------
 ALOps_sys_fe/alops-ui/src/views/index_v1.vue  |  98 ----
 6 files changed, 284 insertions(+), 266 deletions(-)
 delete mode 100644 ALOps_sys_fe/alops-ui/src/views/index_v1.vue

diff --git a/ALOps_sys_fe/alops-ui/package.json b/ALOps_sys_fe/alops-ui/package.json
index 7a122d05..77b1102f 100644
--- a/ALOps_sys_fe/alops-ui/package.json
+++ b/ALOps_sys_fe/alops-ui/package.json
@@ -24,6 +24,7 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
+    "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.28.1",
     "clipboard": "2.0.8",
diff --git a/ALOps_sys_fe/alops-ui/src/api/device/files.js b/ALOps_sys_fe/alops-ui/src/api/device/files.js
index 2d1afa91..53fc7e3d 100644
--- a/ALOps_sys_fe/alops-ui/src/api/device/files.js
+++ b/ALOps_sys_fe/alops-ui/src/api/device/files.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 import { parseStrEmpty } from "@/utils/ruoyi";
-const api = '/equipment/'
+const api = '/device/files/'
 
 // 查询详细
 export function getDict() {
@@ -13,8 +13,8 @@ export function getDict() {
 // 查询列表
 export function list(query) {
   return request({
-    url: api + 'queryByVO',
-    method: 'get',
+    url: api + 'list',
+    method: 'post',
     params: query
   })
 }
diff --git a/ALOps_sys_fe/alops-ui/src/main.js b/ALOps_sys_fe/alops-ui/src/main.js
index da017509..6d9d91f7 100644
--- a/ALOps_sys_fe/alops-ui/src/main.js
+++ b/ALOps_sys_fe/alops-ui/src/main.js
@@ -35,6 +35,7 @@ import ImagePreview from "@/components/ImagePreview"
 import DictTag from '@/components/DictTag'
 // 字典数据组件
 import DictData from '@/components/DictData'
+import dataV from '@jiaminghi/data-view'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -58,6 +59,7 @@ Vue.component('ImagePreview', ImagePreview)
 
 Vue.use(directive)
 Vue.use(plugins)
+Vue.use(dataV)
 DictData.install()
 
 /**
diff --git a/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue b/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue
index 12316a09..97029c7a 100644
--- a/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/QandA/Aiassistant/index.vue
@@ -10,7 +10,7 @@
       
       <div class="service-container">
         <!-- 左侧常见问题 -->
-        <div class="faq-section">
+        <!-- <div class="faq-section">
           <h3>常见问题</h3>
           <div 
             v-for="(faq, index) in faqs" 
@@ -20,7 +20,7 @@
           >
             {{ faq.question }}
           </div>
-        </div>
+        </div> -->
         
         <!-- 右侧聊天区域 -->
         <div class="chat-section">
@@ -205,7 +205,7 @@ export default {
       padding: 15px;
     }
     .chat-section {
-      width: 70%;
+      width: 100%;
       display: flex;
       flex-direction: column;
     }
diff --git a/ALOps_sys_fe/alops-ui/src/views/index.vue b/ALOps_sys_fe/alops-ui/src/views/index.vue
index 88f6122d..4f703508 100644
--- a/ALOps_sys_fe/alops-ui/src/views/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/index.vue
@@ -1,187 +1,300 @@
 <template>
-  <div class="dashboard">
-    <h1>唐山烟草智能网络设备运维与问答系统</h1>
-    
-    <el-row :gutter="20">
-      <!-- 设备状态监控 -->
-      <el-col :span="12">
-        <el-card>
-          <h2>设备状态监控</h2>
-          <!-- 这里可以添加设备状态监控的具体内容，例如表格或图表 -->
-          <el-table :data="deviceStatusData" style="width: 100%">
-            <el-table-column prop="name" label="设备名称"></el-table-column>
-            <el-table-column prop="location" label="设备位置"></el-table-column>
-            <el-table-column prop="cpuUsage" label="CPU使用率"></el-table-column>
-            <el-table-column prop="memoryUsage" label="内存使用率"></el-table-column>
-            <el-table-column prop="status" label="状态">
-              <template slot-scope="scope">
-                <el-tag :type="scope.row.status === '正常' ? 'success' : 'danger'">
-                  {{ scope.row.status }}
-                </el-tag>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-      </el-col>
-      
-      <!-- 设备状态统计图表 -->
-      <el-col :span="12">
-        <el-card>
-          <h2>检测设备信息 (按状态统计，饼状图)</h2>
-          <!-- 这里可以使用echarts或其他图表库来展示饼状图 -->
-          <div id="statusChart" style="width: 100%; height: 300px;"></div>
-        </el-card>
-        
-        <el-card>
-          <h2>检测设备信息 (按设备类型，饼状图)</h2>
-          <div id="typeChart" style="width: 100%; height: 300px;"></div>
-        </el-card>
+  <div class="dashboard-editor-container">
+
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <div class="card-title"><i class="el-icon-data-line"></i>预警信息统计</div>
+          <div class="data-overview">
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+            <div class="data-item">
+              <div class="data-label">预警总数</div>
+              <digital :configData="{number:[111]}" />
+            </div>
+          </div>
+        </div>
       </el-col>
-    </el-row>
-    
-    <el-row :gutter="20" style="margin-top: 20px;">
-      <!-- 设备预警信息 -->
-      <el-col :span="12">
-        <el-card>
-          <h2>设备预警信息</h2>
-          <el-table :data="alertData" style="width: 100%">
-            <el-table-column prop="time" label="预警时间"></el-table-column>
-            <el-table-column prop="device" label="设备名称"></el-table-column>
-            <el-table-column prop="location" label="设备位置"></el-table-column>
-            <el-table-column prop="level" label="预警等级">
-              <template slot-scope="scope">
-                <el-tag :type="getTagType(scope.row.level)">
-                  {{ scope.row.level }}
-                </el-tag>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <div class="card-title"><i class="el-icon-pie-chart"></i>检测设备信息</div>
+          <pie-chart />
+        </div>
       </el-col>
-      
-      <!-- 预警信息统计 -->
-      <el-col :span="12">
-        <el-card>
-          <h2>预警信息统计</h2>
-          <div id="alertStatsChart" style="width: 100%; height: 300px;"></div>
-        </el-card>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <div class="card-title"><i class="el-icon-monitor"></i>设备预警信息</div>
+          
+          <div class="div0">
+            <div class="div1" v-for="(alert, index) in alerts" :key="index" :class="`alert-level-${alert.level}`">
+              <dv-border-box-13 class="div2">
+                <el-row>
+                  <el-col span="12">
+                    <span class="alert-lable">预警时间:{{ alert.time }}</span>
+                  </el-col>
+                  <el-col span="12">
+                    <span class="alert-lable">设备名称:{{ alert.deviceName }}</span>
+                  </el-col>
+                  <el-col span="12">
+                    <span class="alert-lable">设备位置:{{ alert.deviceLocation }}</span>
+                  </el-col>
+                  <el-col span="12">
+                    <span class="alert-lable">预警等级:<span class="alert-lable" :style="{ color: getLevelColor(alert.level) }">{{ alert.level }}</span></span>
+                  </el-col>
+                  <el-col span="12">
+                    <span class="alert-lable">预警信息:{{ alert.message }}</span>
+                  </el-col>
+                  <el-col span="12">
+                    <span class="alert-lable">预警状态:{{ alert.status }}</span>
+                  </el-col>
+                </el-row>
+              </dv-border-box-13>
+            </div>
+          </div>
+        </div>
       </el-col>
     </el-row>
+    <el-row style="background:#fff;padding:16px;">
+          <div class="card-title"><i class="el-icon-s-data"></i> 设备状态监控</div>
+      <dv-scroll-board :config="scrollConfig" style="height:220px;" />
+    </el-row>
+    
   </div>
 </template>
 
 <script>
-import * as echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
+import digital from './dashboard/digital'
+
+const lineChartData = {
+  newVisitis: {
+    expectedData: [100, 120, 161, 134, 105, 160, 165],
+    actualData: [120, 82, 91, 154, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+}
 
 export default {
+  name: 'Index',
+  components: {
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart,
+    digital
+  },
   data() {
     return {
-      deviceStatusData: [
-        // 示例数据
-        { name: '设备1', location: '位置1', cpuUsage: '30%', memoryUsage: '40%', status: '正常' },
-        { name: '设备2', location: '位置2', cpuUsage: '70%', memoryUsage: '80%', status: '异常' },
-      ],
-      alertData: [
-        // 示例数据
-        { time: '2023-10-01 10:00:00', device: '设备2', location: '位置2', level: '高' },
-        { time: '2023-10-01 11:00:00', device: '设备3', location: '位置3', level: '中' },
-      ],
-    };
-  },
-  mounted() {
-    this.initCharts();
+      lineChartData: lineChartData.newVisitis,
+      scrollConfig:{
+        header: ['设备名称', '设备位置', 'CPU使用率','内存使用率','温度', '健康度', '设备运行时长','采集时间'],
+        data: [
+          ['行1列1', '行1列2', '行1列3', '行1列4', '行1列5', '行1列6','行1列7', '行1列8'],
+          ['行2列1', '行2列2', '行2列3', '行2列4', '行2列5', '行2列6','行2列7', '行2列8'],
+          ['行3列1', '行3列2', '行3列3', '行3列4', '行3列5', '行3列6','行3列7', '行3列8'],
+          ['行4列1', '行4列2', '行4列3', '行4列4', '行4列5', '行4列6','行4列7', '行4列8'],
+          ['行5列1', '行5列2', '行5列3', '行5列4', '行5列5', '行5列6','行5列7', '行5列8'],
+          ['行6列1', '行6列2', '行6列3', '行6列4', '行6列5', '行6列6','行6列7', '行6列8'],
+          ['行7列1', '行7列2', '行7列3', '行7列4', '行7列5', '行7列6','行7列7', '行7列8'],
+          ['行8列1', '行8列2', '行8列3', '行8列4', '行8列5', '行8列6','行8列7', '行8列8'],
+          ['行9列1', '行9列2', '行9列3', '行9列4', '行9列5', '行9列6','行9列7', '行9列8'],
+          ['行10列1', '行10列2', '行10列3', '行10列4', '行10列5', '行10列6','行10列7', '行10列8']
+        ],
+        headerBGC:'#f8f8f9',
+        headerHeight:60,
+        oddRowBGC:'#f5f7fa',
+        evenRowBGC:'#fff',
+      },
+      alerts: [
+        {
+          time: '2021-10-16 14:54:11',
+          deviceName: 'PLC远程监控系统',
+          deviceLocation: '污水处理监控系统',
+          level: 1,
+          message: '2#电机运行状态等于1',
+          status: '触发值: 1'
+        },
+        {
+          time: '2021-10-16 14:54:04',
+          deviceName: 'PLC远程监控系统',
+          deviceLocation: '污水处理监控系统',
+          level: 0,
+          message: '2#电机运行状态报警恢复',
+          status: '触发值: 0'
+        },
+        {
+          time: '2021-10-16 14:54:11',
+          deviceName: 'PLC远程监控系统',
+          deviceLocation: '污水处理监控系统',
+          level: 1,
+          message: '2#电机运行状态等于1',
+          status: '触发值: 1'
+        },
+        {
+          time: '2021-10-16 14:54:04',
+          deviceName: 'PLC远程监控系统',
+          deviceLocation: '污水处理监控系统',
+          level: 0,
+          message: '2#电机运行状态报警恢复',
+          status: '触发值: 0'
+        },
+        // 可以继续添加更多预警信息
+      ]
+    }
   },
   methods: {
-    getTagType(level) {
-      const types = { '高': 'danger', '中': 'warning', '低': 'success' };
-      return types[level] || 'info';
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type]
     },
-    initCharts() {
-      // 初始化状态统计图表
-      const statusChart = echarts.init(document.getElementById('statusChart'));
-      statusChart.setOption({
-        title: { text: '设备状态统计', subtext: '按状态', left: 'center' },
-        tooltip: { trigger: 'item' },
-        series: [
-          {
-            name: '设备状态',
-            type: 'pie',
-            radius: '50%',
-            data: [
-              { value: 44, name: '自主房屋' },
-              { value: 33, name: '出租房屋' },
-              { value: 11, name: '空置房屋' },
-              { value: 11, name: '其他' },
-            ],
-          },
-        ],
-      });
+    getLevelColor(level) {
+      const levelColors = {
+        0: 'green',
+        1: 'orange',
+        2: 'red'
+      };
+      return levelColors[level] || 'black'; // 默认颜色
+    }
+  }
+}
+</script>
 
-      // 初始化设备类型统计图表
-      const typeChart = echarts.init(document.getElementById('typeChart'));
-      typeChart.setOption({
-        title: { text: '设备类型统计', subtext: '按设备类型', left: 'center' },
-        tooltip: { trigger: 'item' },
-        series: [
-          {
-            name: '设备类型',
-            type: 'pie',
-            radius: '50%',
-            data: [
-              { value: 44, name: '自主房屋' },
-              { value: 33, name: '出租房屋' },
-              { value: 11, name: '空置房屋' },
-              { value: 11, name: '其他' },
-            ],
-          },
-        ],
-      });
+<style lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
 
-      // 初始化预警信息统计图表
-      const alertStatsChart = echarts.init(document.getElementById('alertStatsChart'));
-      alertStatsChart.setOption({
-        title: { text: '预警信息统计', left: 'center' },
-        tooltip: {},
-        radar: {
-          indicator: [
-            { name: '火警类', max: 500 },
-            { name: '冲禁类', max: 500 },
-            { name: '灾害', max: 500 },
-            { name: '群体性', max: 500 },
-            { name: '行政类', max: 500 },
-            { name: '交通类', max: 500 },
-            { name: '重大', max: 500 },
-          ],
-        },
-        series: [{
-          name: '预警统计',
-          type: 'radar',
-          data: [
-            {
-              value: [75, 452, 64, 94, 44, 0, 29],
-              name: '预警次数',
-            },
-          ],
-        }],
-      });
-    },
-  },
-};
-</script>
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px;
+    margin-bottom: 32px;
+    height: 420px;
+  }
+}
 
-<style>
-.dashboard {
-  padding: 20px;
-  background-color: #f0f2f5;
-  min-height: 100vh;
+@media (max-width:1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
+.dv-scroll-board{
+  color: #3d3d3d;
+}
+.card-title {
+  font-size: 16px;
+  margin-bottom: 15px;
+  display: flex;
+  align-items: center;
+  color: #3d3d3d;
+  font-weight: bold;
+}
+
+.card-title i {
+  margin-right: 8px;
+  font-size: 18px;
+}
+    
+.data-overview {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
 }
 
-h1, h2 {
+.data-item {
+  flex: 1;
+  min-width: 30%;
   text-align: center;
+  padding: 15px 10px;
+  background: #f5f7fa;
+  border-radius: 8px;
+  transition: all 0.3s ease;
 }
 
-.el-card {
-  margin-bottom: 20px;
+.data-item:hover {
+  background: #f1f2f4;
+  transform: translateY(-3px);
+  box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
+}
+
+.data-value {
+  font-size: 24px;
+  font-weight: bold;
+  margin: 10px 0;
+  color: #3d3d3d;
+}
+
+.data-label {
+  font-size: 14px;
+  color: #3d3d3d;
+}
+.alert-list .div0 {
+  list-style-type: none;
+  padding: 0;
+}
+ 
+.alert-list .div1 {
+  display: flex;
+  justify-content: space-between;
+}
+.div1{
+  margin-bottom: 5px;
+}
+.div2{
+  padding: 20px 16px;
+}
+ 
+.alert-time, .alert-device-name, .alert-device-location, .alert-message, .alert-status {
+  flex: 1;
+}
+ 
+.alert-level {
+  flex: 0.5;
+  text-align: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/ALOps_sys_fe/alops-ui/src/views/index_v1.vue b/ALOps_sys_fe/alops-ui/src/views/index_v1.vue
deleted file mode 100644
index d2d2ec63..00000000
--- a/ALOps_sys_fe/alops-ui/src/views/index_v1.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
-  <div class="dashboard-editor-container">
-
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
-
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
-      </el-col>
-    </el-row>
-
-    
-  </div>
-</template>
-
-<script>
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
-
-export default {
-  name: 'Index',
-  components: {
-    PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart
-  },
-  data() {
-    return {
-      lineChartData: lineChartData.newVisitis
-    }
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.dashboard-editor-container {
-  padding: 32px;
-  background-color: rgb(240, 242, 245);
-  position: relative;
-
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
-  }
-}
-
-@media (max-width:1024px) {
-  .chart-wrapper {
-    padding: 8px;
-  }
-}
-</style>

From 705a2f6ddf2cfdde1c925d2ccf943f811e9f9eb4 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Wed, 24 Sep 2025 15:57:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alops-ui/src/views/dashboard/digital.vue  |  40 ++
 .../src/views/device/deviceSupplier/index.vue | 449 ++++++++++++++++++
 2 files changed, 489 insertions(+)
 create mode 100644 ALOps_sys_fe/alops-ui/src/views/dashboard/digital.vue
 create mode 100644 ALOps_sys_fe/alops-ui/src/views/device/deviceSupplier/index.vue

diff --git a/ALOps_sys_fe/alops-ui/src/views/dashboard/digital.vue b/ALOps_sys_fe/alops-ui/src/views/dashboard/digital.vue
new file mode 100644
index 00000000..cbbf3c69
--- /dev/null
+++ b/ALOps_sys_fe/alops-ui/src/views/dashboard/digital.vue
@@ -0,0 +1,40 @@
+<template>
+  <dv-digital-flop :config="config" />
+</template>
+
+<script>
+export default {
+  props: {
+    configData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      config:{
+          number: [123456],
+          content: '{nt}个',
+          formatter: this.formatter,
+          style:{
+            fill: '#000',
+            fontSize: 26,
+            fontWeight: 'bold'
+          },
+          ...this.configData
+      }
+    }
+  },
+  methods: {
+    formatter (number) {
+      const numbers = number.toString().split('').reverse()
+      const segs = []
+      while (numbers.length) segs.push(numbers.splice(0, 3).join(''))
+      return segs.join(',').split('').reverse().join('')
+    },
+
+  }
+}
+</script>
diff --git a/ALOps_sys_fe/alops-ui/src/views/device/deviceSupplier/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/deviceSupplier/index.vue
new file mode 100644
index 00000000..2a1cefef
--- /dev/null
+++ b/ALOps_sys_fe/alops-ui/src/views/device/deviceSupplier/index.vue
@@ -0,0 +1,449 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
+        <!--供应商-->
+        <pane size="84">
+          <el-col>
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+              <el-form-item label="供应商名称" prop="name">
+                <el-input v-model="queryParams.name" placeholder="请输入厂商名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+              </el-form-item>
+              <el-form-item label="联系人" prop="contactBy">
+                <el-input v-model="queryParams.contactBy" placeholder="请输入联系人" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['device:deviceManufacturer:add']">新增</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['device:deviceManufacturer:import']">导入</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['device:deviceManufacturer:export']">导出</el-button>
+              </el-col> -->
+            </el-row>
+
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column label="序号" align="center" key="Id" prop="Id" />
+              <el-table-column label="供应商名称" align="center" key="name" prop="name" width="120" />
+              <el-table-column label="联系人" align="center" key="contactBy" prop="contactBy" width="120" />
+              <el-table-column label="联系方式" align="center" key="contactWay" prop="contactWay" width="120" />
+              <el-table-column label="供应商简介" align="center" key="contactWay" prop="contactWay" width="120" />
+              <el-table-column label="创建人" align="center" key="CreateBy" prop="CreateBy" width="120" />
+              <el-table-column label="创建日期" align="center" prop="CreateDate" width="160">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.CreateDate) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="状态" align="center" key="Status" prop="Status" width="120" />
+              <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:deviceManufacturer:edit']">修改</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['device:deviceManufacturer:remove']">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+          </el-col>
+        </pane>
+      </splitpanes>
+    </el-row>
+
+    <el-dialog :title="title" :visible.sync="open" width="760px"  append-to-body>
+  <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="厂商名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入用户昵称" maxlength="30" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="联系人" prop="contactBy">
+          <el-input v-model="form.contactBy" placeholder="请输入手机号码" maxlength="30" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="联系方式" prop="contactWay">
+          <el-input v-model="form.contactWay" placeholder="请输入手机号码" maxlength="11" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+   <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </span>
+  
+</el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的供应商
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import { getToken } from "@/utils/auth"
+import Treeselect from "@riophae/vue-treeselect"
+import "@riophae/vue-treeselect/dist/vue-treeselect.css"
+import { Splitpanes, Pane } from "splitpanes"
+import "splitpanes/dist/splitpanes.css"
+
+export default {
+  name: "User",
+  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  components: { Treeselect, Splitpanes, Pane },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 所有部门树选项
+      deptOptions: undefined,
+      // 过滤掉已禁用部门树选项
+      enabledDeptOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 部门名称
+      deptName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的供应商
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        contactBy: undefined,
+        status: undefined,
+        deptId: undefined
+      },
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
+          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        contactBy: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    }
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    this.getList()
+    // this.getDeptTree()
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg
+    })
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows
+          this.total = response.total
+          this.loading = false
+        }
+      )
+    },
+    // /** 查询部门下拉树结构 */
+    // getDeptTree() {
+    //   deptTreeSelect().then(response => {
+    //     this.deptOptions = response.data
+    //     this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)))
+    //   })
+    // },
+    // 过滤禁用的部门
+    filterDisabledDept(deptList) {
+      return deptList.filter(dept => {
+        if (dept.disabled) {
+          return false
+        }
+        if (dept.children && dept.children.length) {
+          dept.children = this.filterDisabledDept(dept.children)
+        }
+        return true
+      })
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id
+      this.handleQuery()
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用"
+      this.$modal.confirm('确认要"' + text + '""' + row.name + '"用户吗？').then(function() {
+        return changeUserStatus(row.Id, row.status)
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功")
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0"
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        Id: undefined,
+        deptId: undefined,
+        name: undefined,
+        nickName: undefined,
+        password: undefined,
+        contactBy: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: []
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm("queryForm")
+      this.queryParams.deptId = undefined
+      this.$refs.tree.setCurrentKey(null)
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.Id)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleResetPwd":
+          this.handleResetPwd(row)
+          break
+        case "handleAuthRole":
+          this.handleAuthRole(row)
+          break
+        default:
+          break
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      getUser().then(response => {
+        this.postOptions = response.posts
+        this.roleOptions = response.roles
+        this.open = true
+        this.title = "添加用户"
+        this.form.password = this.initPassword
+      })
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const Id = row.Id || this.ids
+      getUser(Id).then(response => {
+        this.form = response.data
+        this.postOptions = response.posts
+        this.roleOptions = response.roles
+        this.$set(this.form, "postIds", response.postIds)
+        this.$set(this.form, "roleIds", response.roleIds)
+        this.open = true
+        this.title = "修改用户"
+        this.form.password = ""
+      })
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.name + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+        inputValidator: (value) => {
+          if (/<|>|"|'|\||\\/.test(value)) {
+            return "不能包含非法字符：< > \" ' \\\ |"
+          }
+        },
+      }).then(({ value }) => {
+          resetUserPwd(row.Id, value).then(response => {
+            this.$modal.msgSuccess("修改成功，新密码是：" + value)
+          })
+        }).catch(() => {})
+    },
+    /** 分配角色操作 */
+    handleAuthRole: function(row) {
+      const Id = row.Id
+      this.$router.push("/system/user-auth/role/" + Id)
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.Id != undefined) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const Ids = row.Id || this.ids
+      this.$modal.confirm('是否确认删除用户编号为"' + Ids + '"的数据项？').then(function() {
+        return delUser(Ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/user/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入"
+      this.upload.open = true
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/user/importTemplate', {
+      }, `user_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+      this.getList()
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit()
+    }
+  }
+}
+</script>
\ No newline at end of file