diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index d348a7f4..ba2a6391 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -185,6 +185,14 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="附件" prop="fileList" v-if="Number(form.level) > 4">
+          <ImageUpload
+            v-model="form.fileList"
+            :value="form.fileList"
+            :limit="5"
+            @input="handleImageChange"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <template>
@@ -207,10 +215,11 @@
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { getMaTypeList, getListByMaType, delMaType, addMaType, updateMaType } from '@/api/ma/base'
+import ImageUpload from '@/components/ImageUpload'
 
 export default {
   name: 'ToolsType',
-  components: { Treeselect },
+  components: { Treeselect, ImageUpload },
   dicts: ['dev_unit_type'],
   data() {
     return {
@@ -259,7 +268,8 @@ export default {
         label: '',
         typeName: '',
         manageType: '', // 0数量管理 1编码管理
-        unitName: ''
+        unitName: '',
+        fileList: ''
       },
       chosenTypeId: '',
       leasePrice: '',
@@ -285,7 +295,8 @@ export default {
       rules: {
         typeName: [{ required: true, message: '规格型号不能为空', trigger: 'blur' }],
         manageType: [{ required: true, message: '管理模式不能为空', trigger: 'blur' }],
-        unitName: [{ required: true, message: '计量单位不能为空', trigger: 'blur' }]
+        unitName: [{ required: true, message: '计量单位不能为空', trigger: 'blur' }],
+        fileList: [{ required: true, message: '请上传附件', trigger: 'blur' }],
       },
       companyId: undefined,
       dialogImageUrl: '',
@@ -345,6 +356,11 @@ export default {
       this.queryParams.typeId = data.typeId
       this.handleQuery()
     },
+    handleImageChange(val) {
+      console.log('🚀 ~ val:', val)
+      console.log('🚀 ~ val:', this.form.fileList)
+      
+    },
 
     // 表单重置
     reset() {
@@ -355,7 +371,8 @@ export default {
         label: '',
         manageType: '',
         unitName: '',
-        level: ''
+        level: '',
+        fileList: ''
       }
       this.resetForm('form')
     },
diff --git a/src/views/screen/gwScreen/components/center/index.vue b/src/views/screen/gwScreen/components/center/index.vue
index 7a71d206..4b15b789 100644
--- a/src/views/screen/gwScreen/components/center/index.vue
+++ b/src/views/screen/gwScreen/components/center/index.vue
@@ -674,7 +674,7 @@ export default {
               animationEasingUpdate: 'cubicInOut', // 过渡动画的缓动效果。[ default: cubicInOut ]
             },
             label: {
-              show: true,
+              show: false,
               color: '#FFF',
               position: 'top',
               fontSize: 18,
diff --git a/src/views/screen/gwScreen/components/left/EquipItem.vue b/src/views/screen/gwScreen/components/left/EquipItem.vue
index 0e741d04..0635eca0 100644
--- a/src/views/screen/gwScreen/components/left/EquipItem.vue
+++ b/src/views/screen/gwScreen/components/left/EquipItem.vue
@@ -77,6 +77,10 @@ export default {
       const option = {
         tooltip: {
           trigger: 'item',
+          backgroundColor: '#0E1835',
+          textStyle: {
+            color: '#fff',
+          },
         },
         series: [
           {
diff --git a/src/views/screen/gwScreen/components/left/index.vue b/src/views/screen/gwScreen/components/left/index.vue
index d2967b2f..4fa1ba25 100644
--- a/src/views/screen/gwScreen/components/left/index.vue
+++ b/src/views/screen/gwScreen/components/left/index.vue
@@ -7,11 +7,11 @@
       </div>
       <div class="equip-box">
         <div class="equip-item-1">装备总数</div>
-        <div class="equip-item-2" @click="openSystemEquip">{{ equipData.total }} <span class="unit">台</span></div>
+        <div class="equip-item-2" @click="">{{ equipData.total }} <span class="unit">台</span></div>
         <div class="equip-item-3">总价值</div>
-        <div class="equip-item-4" @click="openTotalPrice"
-          >{{ equipData.totalPrice }} <span class="unit">亿元</span></div
-        >
+        <div class="equip-item-4" @click="">
+          {{ (equipData.totalPrice / 100000000).toFixed(4) }} <span class="unit">亿元</span>
+        </div>
       </div>
       <div class="item-box">
         <el-row :gutter="20">
@@ -149,7 +149,7 @@ export default {
         const { data } = await getEquipmentClassificationApi()
         console.log('🚀 ~ getEquipList ~ data:', data)
         if (!data || data.length === 0) return
-        data.forEach(item => {
+        data.forEach((item) => {
           if (item.targetType == 'line') {
             this.state1.num = item.num || 0
             this.state1.price = item.price || 0
@@ -231,10 +231,10 @@ export default {
     padding-top: 8px;
     padding-left: 40px;
     font-family: DS-TITLE;
-    background: linear-gradient(180deg, #FFF 19.35%, #5DCBFE 77.42%);
-        background-clip: text;
-        -webkit-background-clip: text;
-        -webkit-text-fill-color: transparent;
+    background: linear-gradient(180deg, #fff 19.35%, #5dcbfe 77.42%);
+    background-clip: text;
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
 
     .more {
       margin-right: 20px;
@@ -260,10 +260,6 @@ export default {
       background-size: 100% 100%;
       position: relative;
 
-      .unit {
-        font-size: 15px;
-        color: #ccc;
-      }
       .equip-item-1 {
         position: relative;
         left: 40px;
@@ -273,10 +269,14 @@ export default {
         position: relative;
         left: 35px;
         top: 30px;
-        color: #fefbdc;
         font-size: 28px;
         font-weight: 800;
         cursor: pointer;
+        font-family: 'DIN';
+        background: linear-gradient(180deg, #fff 25.81%, #fdf277 77.42%);
+        background-clip: text;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
       }
       .equip-item-3 {
         position: relative;
@@ -287,10 +287,23 @@ export default {
         position: relative;
         left: 700px;
         top: -30px;
-        color: #fefbdc;
         font-size: 28px;
         font-weight: 800;
         cursor: pointer;
+        font-family: 'DIN';
+        background: linear-gradient(180deg, #fff 25.81%, #fdf277 77.42%);
+        background-clip: text;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+      }
+      .unit {
+        margin-left : 6px;
+        font-size: 14px;
+        font-weight: 300;
+        background: linear-gradient(180deg, #fff 25.81%, #FFF 77.42%);
+        background-clip: text;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
       }
     }
 
diff --git a/src/views/screen/gwScreen/components/right/ProEquipSituationList.vue b/src/views/screen/gwScreen/components/right/ProEquipSituationList.vue
index 1b432722..ad8366bc 100644
--- a/src/views/screen/gwScreen/components/right/ProEquipSituationList.vue
+++ b/src/views/screen/gwScreen/components/right/ProEquipSituationList.vue
@@ -3,11 +3,11 @@
     <div class="title-tip">
       <div class="title-text">工程在用装备情况</div>
       <div class="more more-warp">
-        <div>
+        <!-- <div>
           <el-select v-model="proCode" placeholder="" clearable filterable size="mini" @change="getList">
             <el-option v-for="item in options" :key="item.proCode" :label="item.proName" :value="item.proCode" />
           </el-select>
-        </div>
+        </div> -->
         <div style="margin-left: 50px" @click="">更多 ></div>
       </div>
     </div>
diff --git a/src/views/screen/gwScreen/components/right/index.vue b/src/views/screen/gwScreen/components/right/index.vue
index eedc1fdd..690e7ae6 100644
--- a/src/views/screen/gwScreen/components/right/index.vue
+++ b/src/views/screen/gwScreen/components/right/index.vue
@@ -192,6 +192,11 @@ export default {
       .number {
         font-size: 22px;
         font-weight: 800;
+        font-family: 'DIN';
+        background: linear-gradient(180deg, #fff 25.81%, #fdf277 77.42%);
+        background-clip: text;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
       }
       .unit {
         font-size: 12px;
diff --git a/src/views/screen/gwScreen/index.vue b/src/views/screen/gwScreen/index.vue
index 63991dc1..8172f4c5 100644
--- a/src/views/screen/gwScreen/index.vue
+++ b/src/views/screen/gwScreen/index.vue
@@ -44,6 +44,10 @@ export default {
   font-family: 'Alibaba-PuHuiTi-Regular';
   src: url('../../../assets/font-family/alibaba/Alibaba-PuHuiTi-Regular.ttf');
 }
+@font-face {
+  font-family: 'DIN';
+  src: url('../../../assets/font-family/DIN/DIN-Medium.otf');
+}
 .wrap {
   width: 100%;
   height: 100%;
diff --git a/src/views/screen/wsScreenWidescreen/components/left/index.vue b/src/views/screen/wsScreenWidescreen/components/left/index.vue
index 1986d9da..52cca796 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/index.vue
@@ -286,6 +286,7 @@ export default {
         font-size: 28px;
         font-weight: 800;
         cursor: pointer;
+        font-family: 'DIN';
         background: linear-gradient(180deg, #fff 25.81%, #fdf277 77.42%);
         background-clip: text;
         -webkit-background-clip: text;
@@ -303,6 +304,7 @@ export default {
         color: #fefbdc;
         font-size: 28px;
         font-weight: 800;
+        font-family: 'DIN';
         background: linear-gradient(180deg, #fff 25.81%, #fdf277 77.42%);
         background-clip: text;
         -webkit-background-clip: text;
diff --git a/src/views/screen/wsScreenWidescreen/components/right/index.vue b/src/views/screen/wsScreenWidescreen/components/right/index.vue
index 68052e29..216bc38e 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/index.vue
@@ -208,7 +208,8 @@ export default {
       .number {
         font-size: 22px;
         font-weight: 800;
-        background: linear-gradient(180deg, #FFF 25.81%, #FDF277 77.42%);
+        font-family: 'DIN';
+        background: linear-gradient(180deg, #fff 25.81%, #fdf277 77.42%);
         background-clip: text;
         -webkit-background-clip: text;
         -webkit-text-fill-color: transparent;
diff --git a/src/views/screen/wsScreenWidescreen/index.vue b/src/views/screen/wsScreenWidescreen/index.vue
index 63991dc1..8172f4c5 100644
--- a/src/views/screen/wsScreenWidescreen/index.vue
+++ b/src/views/screen/wsScreenWidescreen/index.vue
@@ -44,6 +44,10 @@ export default {
   font-family: 'Alibaba-PuHuiTi-Regular';
   src: url('../../../assets/font-family/alibaba/Alibaba-PuHuiTi-Regular.ttf');
 }
+@font-face {
+  font-family: 'DIN';
+  src: url('../../../assets/font-family/DIN/DIN-Medium.otf');
+}
 .wrap {
   width: 100%;
   height: 100%;