优化

src/views/EquipmentEntryApply/EquipmentDetailList.vue

@@ -156,7 +156,7 @@
       </el-row>
 
       <!-- 表格 -->
-      <el-table :data="tableData" :span-method="handleSpanMethod">
+      <el-table :data="tableData" :span-method="handleSpanMethod" :max-height="580">
         <!--      <el-table :data="tableData"  >-->
         <el-table-column label="序号" align="center" width="55" type="index" fixed/>
         <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip

src/views/EquipmentEntryApproval/EquipmentDetailList.vue

@@ -32,15 +32,13 @@
 
         <el-form-item label="审批状态" prop="entryStatus">
           <el-select
-            clearable
             style="width: 240px"
             placeholder="请选择审批状态"
             v-model="queryParams.entryStatus"
           >
             <el-option label="待审批" value="0"/>
-            <el-option label="已审批" value="1"/>
+            <el-option label="已通过" value="1"/>
-            <el-option label="驳回" value="2"/>
+            <el-option label="已驳回" value="2"/>
-            <el-option label="草稿" value="3"/>
           </el-select>
         </el-form-item>
 
@@ -148,9 +146,10 @@
         </el-form-item>
 
       </el-row>
+      </el-form>
 
       <!-- 表格 -->
-      <el-table :data="tableData" :span-method="handleSpanMethod">
+      <el-table :data="tableData" :span-method="handleSpanMethod" :max-height="530">
         <!--      <el-table :data="tableData"  >-->
         <el-table-column label="序号" align="center" width="55" type="index" fixed/>
         <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip
@@ -227,7 +226,7 @@
         >
           <template slot-scope="{ row }">
             <el-tag v-if="row.entryStatus == 0" size="small" type="warning">待审批</el-tag>
-            <el-tag v-if="row.entryStatus == 1" size="small" type="success">已审批</el-tag>
+            <el-tag v-if="row.entryStatus == 1" size="small" type="success">已通过</el-tag>
             <el-tag v-if="row.entryStatus == 2" size="small" type="success">已驳回</el-tag>
             <el-tag v-if="row.entryStatus == 3" size="small" type="info">草稿</el-tag>
           </template>
@@ -264,7 +263,6 @@
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
       />
-    </el-form>
 
     <!-- 弹框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
@@ -304,7 +302,7 @@ export default {
       queryParams: {
         orderCreateUser: '',
         orderCreateTime: '',
-        entryStatus: '',
+        entryStatus: '0',
         name: '',
         specificationModel: '',
         originalCode: '',

src/views/EquipmentLedger/index.vue

@@ -102,8 +102,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="装备名称" prop="name">
+                <el-form-item label="类型分支" prop="name">
-                  <el-input v-model="queryParams.name" placeholder="请输入装备名称" clearable />
+                  <el-input v-model="queryParams.name" placeholder="请输入类型分支" clearable />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -466,7 +466,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="装备名称" prop="name">
+            <el-form-item label="类型分支" prop="name">
               <el-input v-model="formData.name" disabled />
             </el-form-item>
           </el-col>
@@ -598,7 +598,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="装备名称" prop="name">
+            <el-form-item label="类型分支" prop="name">
               <el-input v-model="formData.name" />
             </el-form-item>
           </el-col>
@@ -771,7 +771,7 @@ export default {
       queryParams: {
         province: undefined, // 省份
         propertyUnitId: undefined, // 产权单位
-        name: undefined, // 装备名称
+        name: undefined, // 类型分支
         specificationModel: undefined, // 规格型号
         major: undefined, // 专业
         process: undefined, // 工序
@@ -809,7 +809,7 @@ export default {
         { key: 2, label: `专业`, prop: 'major', visible: true },
         { key: 3, label: `工序`, prop: 'process', visible: true },
         { key: 4, label: `装备类目`, prop: 'devType', visible: true },
-        { key: 5, label: `装备名称`, prop: 'name', visible: true },
+        { key: 5, label: `类型分支`, prop: 'name', visible: true },
         { key: 6, label: `规格型号`, prop: 'specificationModel', visible: true },
         { key: 7, label: `装备编码`, prop: 'code', visible: true },
         { key: 8, label: `装备状态`, prop: 'status', visible: true },
@@ -896,7 +896,7 @@ export default {
       },
       // 表单验证规则
       formRules: {
-        name: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入类型分支', trigger: 'blur' }],
         code: [{ required: true, message: '请输入装备编号', trigger: 'blur' }],
         changeStatus: [{ required: true, message: '请选择装备状态', trigger: 'change' }],
       },

src/views/screen/cityScreen/components/retire/index.vue

@@ -123,6 +123,11 @@ export default {
     width: 100%;
     height: 84%; 
     overflow-y: auto;
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none;  /* IE 10+ */
+}
+.tableBox::-webkit-scrollbar {
+  display: none; /* Chrome, Safari, Opera */
 }
 .tableTr{
     width: 100%;

src/views/screen/wsScreen/components/center/index.vue

@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       btnIndex: 1,
-      cityDate: [
+      cityData: [
         // {
         //   cityName: '合肥市',
         //   deptName: '安徽送变电工程有限公司',
@@ -57,7 +57,7 @@ export default {
     }
   },
   mounted() {
-    this.initChart()
+    // this.initChart()
     this.getInfo()
   },
 
@@ -97,19 +97,19 @@ export default {
         } else if (this.btnIndex == 3) {
           res = await getMechanizationRateApi()
         }
-        setTimeout(() => {
+        this.$nextTick(() => {
           console.log('🚀 ~ 地图数据 ~ this.cityData:', this.cityData)
-          this.initMap()
+          this.initChart()
-        }, 300)
+        })
         console.log('🚀 ~ 地图数据 ~ res:', res)
       } catch (error) {
         console.log('🚀 ~ 地图数据 ~ error:', error)
-        // this.initMap()
+        // this.initChart()
       }
     },
     initChart(jsonData = mapJson) {
       // 模拟数据
-      let arr = this.cityDate.map((item) => {
+      let arr = this.cityData.map((item) => {
         return {
           ...item,
           name: item.cityName,
@@ -129,7 +129,7 @@ export default {
             let n = e.name
             let res = ''
             arr.forEach((data) => {
-              console.log('🚀 ~ 提示数据 ~ data:', data)
+              // console.log('🚀 ~ 提示数据 ~ data:', data)
               if (data.cityName === n) {
                 res =
                   "<div style='width: 330px;height: 285px; background: url(" +
@@ -315,6 +315,7 @@ export default {
               show: true,
               color: '#FFF',
               position: 'top',
+              fontSize: 18,
             },
             light: {
               //光照阴影
@@ -359,9 +360,9 @@ export default {
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
                   ? `{val|${this.btnIndex === 1 ? (val[2] / 100000000).toFixed(4) : val[2]} ${unit}}\n{name|${
-                      params.data.deptName
+                      params.data.deptAbbreviation
                     }}`
-                  : `{name|${params.data.deptName}}`
+                  : `{name|${params.data.deptAbbreviation}}`
               },
               rich: {
                 val: {
@@ -373,12 +374,12 @@ export default {
                   align: 'center',
                   verticalAlign: 'middle',
                   color: '#fff',
-                  fontSize: 22,
+                  fontSize: 23,
                 },
                 name: {
                   color: '#fff',
                   fontFamily: 'DS-TITLE',
-                  fontSize: 20,
+                  fontSize: 21,
                   padding: [6, 0, 0, 0],
                 },
               },