From 1399bcbfc65447503b2ccbd5b655fe1b5a05ddb8 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 5 Jan 2026 11:08:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/EquipmentLedger/index.vue           |   5 +-
 src/views/home/index.vue                      |   2 +-
 .../screen/components-old/countryMap.vue      |   4 +-
 .../gwScreen/components/center/index.vue      | 138 +++++++++---------
 .../wsScreen/components/center/index.vue      |   2 +-
 .../components/center/index.vue               |   2 +-
 .../entryApply/components/AddEquip.vue        |  53 +++++--
 7 files changed, 115 insertions(+), 91 deletions(-)

diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index b488c1a8..dc1e1ede 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -389,6 +389,9 @@
                   <i class="el-icon-view"></i> 查看
                 </el-button>
                 <el-button type="text" icon="el-icon-edit" @click="onHandleEdit(scope.row)"> 编辑 </el-button>
+                <el-button type="text" icon="el-icon-delete" @click="onHandleDelete(scope.row)" style="color: red">
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1508,8 +1511,6 @@ export default {
           if (res.code === 200) {
             this.$message.success('删除成功')
             this.getDeviceList()
-          } else {
-            this.$message.error(res.msg || '删除失败')
           }
         } catch (error) {
           this.$message.error('删除失败：' + (error.message || '未知错误'))
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ee2fa682..892d99a1 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -21,7 +21,7 @@ export default {
   created() {
     const deptName = sessionStorage.getItem('deptName')
     // 如果 deptName 包含 省公司 则显示ProvincialCompany 否则 显示 MunicipalCompany
-    this.isShowComponent = deptName.includes('省公司') ? 'ProvincialCompany' : 'MunicipalCompany'
+    this.isShowComponent = deptName.includes('省公司') ? 'MunicipalCompany' : 'MunicipalCompany'
   },
   methods: {},
 }
diff --git a/src/views/screen/components-old/countryMap.vue b/src/views/screen/components-old/countryMap.vue
index 4eb1e353..d13237db 100644
--- a/src/views/screen/components-old/countryMap.vue
+++ b/src/views/screen/components-old/countryMap.vue
@@ -209,10 +209,10 @@ export default {
                         },
                         label: {
                             normal: {
-                                show: false,
+                                show: true,
                                 fontSize: 12,
                                 fontWeight: 500,
-                                color: 'rgba(255,255,255,0.5)',
+                                color: 'rgba(255,255,255,0.8)',
                             },
                             emphasis: {
                                 show: true,
diff --git a/src/views/screen/gwScreen/components/center/index.vue b/src/views/screen/gwScreen/components/center/index.vue
index 824201e8..7d3d873b 100644
--- a/src/views/screen/gwScreen/components/center/index.vue
+++ b/src/views/screen/gwScreen/components/center/index.vue
@@ -34,8 +34,8 @@ export default {
         {
           cityName: '北京市',
           deptName: '北京',
-          value: [116.407396, 39.9042, 350000000],
-          totalValue: 350000000,
+          value: [116.407396, 39.9042, 3500],
+          totalValue: 3500,
           totalEquipmentQuantity: 520,
           configRate: 92,
           lineNum: 80,
@@ -45,8 +45,8 @@ export default {
         {
           cityName: '天津市',
           deptName: '天津',
-          value: [117.190182, 39.125596, 260000000],
-          totalValue: 260000000,
+          value: [117.190182, 39.125596, 2600],
+          totalValue: 2600,
           totalEquipmentQuantity: 480,
           configRate: 90,
           lineNum: 70,
@@ -56,8 +56,8 @@ export default {
         {
           cityName: '上海市',
           deptName: '上海',
-          value: [121.472644, 31.231706, 420000000],
-          totalValue: 420000000,
+          value: [121.472644, 31.231706, 4200],
+          totalValue: 4200,
           totalEquipmentQuantity: 600,
           configRate: 95,
           lineNum: 88,
@@ -67,8 +67,8 @@ export default {
         {
           cityName: '重庆市',
           deptName: '重庆',
-          value: [106.551556, 29.563009, 300000000],
-          totalValue: 300000000,
+          value: [106.551556, 29.563009, 3000],
+          totalValue: 3000,
           totalEquipmentQuantity: 510,
           configRate: 91,
           lineNum: 75,
@@ -79,8 +79,8 @@ export default {
         {
           cityName: '石家庄市',
           deptName: '石家庄',
-          value: [114.514859, 38.042307, 230000000],
-          totalValue: 230000000,
+          value: [114.514859, 38.042307, 2300],
+          totalValue: 2300,
           totalEquipmentQuantity: 450,
           configRate: 89,
           lineNum: 68,
@@ -90,8 +90,8 @@ export default {
         {
           cityName: '太原市',
           deptName: '太原',
-          value: [112.548879, 37.87059, 210000000],
-          totalValue: 210000000,
+          value: [112.548879, 37.87059, 2100],
+          totalValue: 2100,
           totalEquipmentQuantity: 430,
           configRate: 88,
           lineNum: 60,
@@ -101,8 +101,8 @@ export default {
         {
           cityName: '沈阳市',
           deptName: '沈阳',
-          value: [123.431474, 41.805698, 240000000],
-          totalValue: 240000000,
+          value: [123.431474, 41.805698, 2400],
+          totalValue: 2400,
           totalEquipmentQuantity: 455,
           configRate: 89,
           lineNum: 66,
@@ -112,8 +112,8 @@ export default {
         {
           cityName: '长春市',
           deptName: '长春',
-          value: [125.323544, 43.817072, 205000000],
-          totalValue: 205000000,
+          value: [125.323544, 43.817072, 2050],
+          totalValue: 2050,
           totalEquipmentQuantity: 410,
           configRate: 87,
           lineNum: 58,
@@ -123,8 +123,8 @@ export default {
         {
           cityName: '哈尔滨市',
           deptName: '哈尔滨',
-          value: [126.534967, 45.803775, 260000000],
-          totalValue: 260000000,
+          value: [126.534967, 45.803775, 2600],
+          totalValue: 2600,
           totalEquipmentQuantity: 470,
           configRate: 90,
           lineNum: 72,
@@ -135,8 +135,8 @@ export default {
         {
           cityName: '南京市',
           deptName: '南京',
-          value: [118.796877, 32.060255, 380000000],
-          totalValue: 380000000,
+          value: [118.796877, 32.060255, 3800],
+          totalValue: 3800,
           totalEquipmentQuantity: 580,
           configRate: 94,
           lineNum: 85,
@@ -146,8 +146,8 @@ export default {
         {
           cityName: '杭州市',
           deptName: '杭州',
-          value: [120.15507, 30.274084, 360000000],
-          totalValue: 360000000,
+          value: [120.15507, 30.274084, 3600],
+          totalValue: 3600,
           totalEquipmentQuantity: 540,
           configRate: 93,
           lineNum: 82,
@@ -157,8 +157,8 @@ export default {
         {
           cityName: '合肥市',
           deptName: '合肥',
-          value: [117.227239, 31.820586, 280000000],
-          totalValue: 280000000,
+          value: [117.227239, 31.820586, 2800],
+          totalValue: 2800,
           totalEquipmentQuantity: 520,
           configRate: 92,
           lineNum: 80,
@@ -168,8 +168,8 @@ export default {
         {
           cityName: '福州市',
           deptName: '福州',
-          value: [119.296494, 26.074508, 250000000],
-          totalValue: 250000000,
+          value: [119.296494, 26.074508, 2500],
+          totalValue: 2500,
           totalEquipmentQuantity: 485,
           configRate: 90,
           lineNum: 74,
@@ -179,8 +179,8 @@ export default {
         {
           cityName: '南昌市',
           deptName: '南昌',
-          value: [115.892151, 28.676493, 240000000],
-          totalValue: 240000000,
+          value: [115.892151, 28.676493, 2400],
+          totalValue: 2400,
           totalEquipmentQuantity: 465,
           configRate: 89,
           lineNum: 70,
@@ -190,8 +190,8 @@ export default {
         {
           cityName: '济南市',
           deptName: '济南',
-          value: [117.000923, 36.675807, 310000000],
-          totalValue: 310000000,
+          value: [117.000923, 36.675807, 3100],
+          totalValue: 3100,
           totalEquipmentQuantity: 550,
           configRate: 93,
           lineNum: 84,
@@ -202,8 +202,8 @@ export default {
         {
           cityName: '郑州市',
           deptName: '郑州',
-          value: [113.625368, 34.746599, 330000000],
-          totalValue: 330000000,
+          value: [113.625368, 34.746599, 3300],
+          totalValue: 3300,
           totalEquipmentQuantity: 560,
           configRate: 94,
           lineNum: 86,
@@ -213,8 +213,8 @@ export default {
         {
           cityName: '武汉市',
           deptName: '武汉',
-          value: [114.305393, 30.593099, 340000000],
-          totalValue: 340000000,
+          value: [114.305393, 30.593099, 3400],
+          totalValue: 3400,
           totalEquipmentQuantity: 570,
           configRate: 94,
           lineNum: 87,
@@ -224,8 +224,8 @@ export default {
         {
           cityName: '长沙市',
           deptName: '长沙',
-          value: [112.938814, 28.228209, 290000000],
-          totalValue: 290000000,
+          value: [112.938814, 28.228209, 2900],
+          totalValue: 2900,
           totalEquipmentQuantity: 530,
           configRate: 92,
           lineNum: 78,
@@ -236,8 +236,8 @@ export default {
         {
           cityName: '广州市',
           deptName: '广州',
-          value: [113.264435, 23.129163, 420000000],
-          totalValue: 420000000,
+          value: [113.264435, 23.129163, 4200],
+          totalValue: 4200,
           totalEquipmentQuantity: 600,
           configRate: 95,
           lineNum: 90,
@@ -247,8 +247,8 @@ export default {
         {
           cityName: '海口市',
           deptName: '海口',
-          value: [110.33119, 20.031971, 200000000],
-          totalValue: 200000000,
+          value: [110.33119, 20.031971, 2000],
+          totalValue: 2000,
           totalEquipmentQuantity: 400,
           configRate: 86,
           lineNum: 55,
@@ -259,8 +259,8 @@ export default {
         {
           cityName: '成都市',
           deptName: '成都',
-          value: [104.065735, 30.659462, 390000000],
-          totalValue: 390000000,
+          value: [104.065735, 30.659462, 3900],
+          totalValue: 3900,
           totalEquipmentQuantity: 580,
           configRate: 94,
           lineNum: 83,
@@ -270,8 +270,8 @@ export default {
         {
           cityName: '贵阳市',
           deptName: '贵阳',
-          value: [106.630153, 26.647661, 210000000],
-          totalValue: 210000000,
+          value: [106.630153, 26.647661, 2100],
+          totalValue: 2100,
           totalEquipmentQuantity: 440,
           configRate: 88,
           lineNum: 62,
@@ -281,8 +281,8 @@ export default {
         {
           cityName: '昆明市',
           deptName: '昆明',
-          value: [102.833722, 24.88149, 220000000],
-          totalValue: 220000000,
+          value: [102.833722, 24.88149, 2200],
+          totalValue: 2200,
           totalEquipmentQuantity: 450,
           configRate: 88,
           lineNum: 63,
@@ -292,8 +292,8 @@ export default {
         {
           cityName: '西安市',
           deptName: '西安',
-          value: [108.93977, 34.341574, 300000000],
-          totalValue: 300000000,
+          value: [108.93977, 34.341574, 3000],
+          totalValue: 3000,
           totalEquipmentQuantity: 525,
           configRate: 92,
           lineNum: 76,
@@ -304,8 +304,8 @@ export default {
         {
           cityName: '兰州市',
           deptName: '兰州',
-          value: [103.834304, 36.061089, 180000000],
-          totalValue: 180000000,
+          value: [103.834304, 36.061089, 1800],
+          totalValue: 1800,
           totalEquipmentQuantity: 390,
           configRate: 85,
           lineNum: 54,
@@ -315,8 +315,8 @@ export default {
         {
           cityName: '西宁市',
           deptName: '西宁',
-          value: [101.777795, 36.617134, 150000000],
-          totalValue: 150000000,
+          value: [101.777795, 36.617134, 1500],
+          totalValue: 1500,
           totalEquipmentQuantity: 350,
           configRate: 84,
           lineNum: 50,
@@ -326,8 +326,8 @@ export default {
         {
           cityName: '台北市',
           deptName: '台北',
-          value: [121.565418, 25.033964, 300000000],
-          totalValue: 300000000,
+          value: [121.565418, 25.033964, 3000],
+          totalValue: 3000,
           totalEquipmentQuantity: 520,
           configRate: 92,
           lineNum: 78,
@@ -338,8 +338,8 @@ export default {
         {
           cityName: '呼和浩特市',
           deptName: '呼和浩特',
-          value: [111.75199, 40.84149, 160000000],
-          totalValue: 160000000,
+          value: [111.75199, 40.84149, 1600],
+          totalValue: 1600,
           totalEquipmentQuantity: 360,
           configRate: 84,
           lineNum: 52,
@@ -349,8 +349,8 @@ export default {
         {
           cityName: '南宁市',
           deptName: '南宁',
-          value: [108.366543, 22.817002, 210000000],
-          totalValue: 210000000,
+          value: [108.366543, 22.817002, 2100],
+          totalValue: 2100,
           totalEquipmentQuantity: 440,
           configRate: 88,
           lineNum: 62,
@@ -360,8 +360,8 @@ export default {
         {
           cityName: '拉萨市',
           deptName: '拉萨',
-          value: [91.171924, 29.652491, 120000000],
-          totalValue: 120000000,
+          value: [91.171924, 29.652491, 1200],
+          totalValue: 1200,
           totalEquipmentQuantity: 300,
           configRate: 82,
           lineNum: 40,
@@ -371,8 +371,8 @@ export default {
         {
           cityName: '银川市',
           deptName: '银川',
-          value: [106.278179, 38.46637, 150000000],
-          totalValue: 150000000,
+          value: [106.278179, 38.46637, 1500],
+          totalValue: 1500,
           totalEquipmentQuantity: 340,
           configRate: 83,
           lineNum: 48,
@@ -382,8 +382,8 @@ export default {
         {
           cityName: '乌鲁木齐市',
           deptName: '乌鲁木齐',
-          value: [87.616848, 43.825592, 190000000],
-          totalValue: 190000000,
+          value: [87.616848, 43.825592, 1900],
+          totalValue: 1900,
           totalEquipmentQuantity: 380,
           configRate: 85,
           lineNum: 55,
@@ -394,8 +394,8 @@ export default {
         {
           cityName: '香港',
           deptName: '香港',
-          value: [114.173355, 22.320048, 250000000],
-          totalValue: 250000000,
+          value: [114.173355, 22.320048, 2500],
+          totalValue: 2500,
           totalEquipmentQuantity: 420,
           configRate: 88,
           lineNum: 65,
@@ -405,8 +405,8 @@ export default {
         {
           cityName: '澳门',
           deptName: '澳门',
-          value: [113.54909, 22.198951, 160000000],
-          totalValue: 160000000,
+          value: [113.54909, 22.198951, 1600],
+          totalValue: 1600,
           totalEquipmentQuantity: 330,
           configRate: 83,
           lineNum: 48,
@@ -717,7 +717,7 @@ export default {
                 // console.log('🚀 ~ initChart ~ params:', params)
                 const val = params.data.value || []
                 let unit = ''
-                if (this.btnIndex === 1) unit = '亿'
+                if (this.btnIndex === 1) unit = '万元'
                 else if (this.btnIndex === 2) unit = '台'
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue
index b1c8f8a0..976550ad 100644
--- a/src/views/screen/wsScreen/components/center/index.vue
+++ b/src/views/screen/wsScreen/components/center/index.vue
@@ -312,7 +312,7 @@ export default {
               animationEasingUpdate: 'cubicInOut', // 过渡动画的缓动效果。[ default: cubicInOut ]
             },
             label: {
-              show: false,
+              show: true,
               color: '#FFF',
               position: 'top',
               fontSize: 18,
diff --git a/src/views/screen/wsScreenWidescreen/components/center/index.vue b/src/views/screen/wsScreenWidescreen/components/center/index.vue
index 6e3f7975..2130afef 100644
--- a/src/views/screen/wsScreenWidescreen/components/center/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/center/index.vue
@@ -312,7 +312,7 @@ export default {
               animationEasingUpdate: 'cubicInOut', // 过渡动画的缓动效果。[ default: cubicInOut ]
             },
             label: {
-              show: false,
+              show: true,
               color: '#FFF',
               position: 'top',
               fontSize: 18,
diff --git a/src/views/stockManagement/entryApply/components/AddEquip.vue b/src/views/stockManagement/entryApply/components/AddEquip.vue
index 4e2a6db3..cab8d28f 100644
--- a/src/views/stockManagement/entryApply/components/AddEquip.vue
+++ b/src/views/stockManagement/entryApply/components/AddEquip.vue
@@ -35,7 +35,6 @@
         label-width="120px"
         ref="formRef"
         style="padding: 12px; overflow-y: auto; height: calc(100vh - 180px); width: 100%"
-        label-position="right"
         :model="form"
         :rules="equipRules"
       >
@@ -96,10 +95,12 @@
                 clearable
                 :disabled="isEdit"
               />
+              <!-- <div class="select-box">
+                <div class="no-data">暂无数据</div>
+              </div> -->
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
+
           <el-col :span="6">
             <el-form-item label="规格型号" prop="specificationModel">
               <el-input
@@ -160,8 +161,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
+
           <el-col :span="6">
             <el-form-item label="下次维保日期" prop="nextMaintenanceDate">
               <el-date-picker
@@ -212,8 +212,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="24">
+
           <el-col :span="6">
             <el-form-item label="采购日期" prop="purchaseDate">
               <el-date-picker
@@ -517,10 +516,10 @@ export default {
         // manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
         count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
         unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }],
-        purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
-        certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
-        inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
-        mainFileList: [{ required: true, message: '请上传图片', trigger: 'change' }],
+        // purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
+        // certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
+        // inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
+        // mainFileList: [{ required: true, message: '请上传图片', trigger: 'change' }],
       },
       propertyVoList: [], // 特征属性集合
     }
@@ -757,8 +756,8 @@ export default {
               console.log('🚀 ~ handleSubmit ~ certificates:', certificates)
             } else {
               // 提示
-              this.$message.error('请上传合格证')
-              return
+              // this.$message.error('请上传合格证')
+              // return
             }
             if (this.form.inspectionList) {
               const arr = this.form.inspectionList.split(',')
@@ -772,8 +771,8 @@ export default {
               console.log('🚀 ~ handleSubmit ~ inspectionReports:', inspectionReports)
             } else {
               // 提示
-              this.$message.error('请上传检测证书')
-              return
+              // this.$message.error('请上传检测证书')
+              // return
             }
             if (this.form.purchaseInvoices) {
               const arr = this.form.purchaseInvoices.split(',')
@@ -944,4 +943,28 @@ export default {
 ::v-deep .el-input-number.is-without-controls .el-input__inner {
   text-align: left;
 }
+.select-box {
+  width: 100%;
+  height: 260px;
+  border: 1px solid #dcdcdc;
+  margin-top: 5px;
+  padding: 5px;
+  position: absolute;
+  background-color: #fff;
+  z-index: 999;
+  overflow-y: auto;
+  box-sizing: border-box;
+  border-radius: 4px;
+
+  .no-data {
+    // 居中显示
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    text-align: center;
+    color: #C0C4CC;
+  }
+}
 </style>

From 71d29687170b7ba2477198b85204eb48404be004 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 5 Jan 2026 11:27:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/sidebar.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index f1619228..a92604a3 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -92,6 +92,7 @@
       &:hover {
         background-color: rgba(0, 0, 0, 0.06) !important;
         border: 1px solid $base-menu-color-active !important;
+        color: #fff !important;
       }
     }