Kaynağa Gözat

后勤服务

敲代码的猫 3 ay önce
ebeveyn
işleme
47de62d9c4

+ 5 - 6
src/api/screen/service.js

@@ -245,21 +245,20 @@ export function getOverviewData(appOrg) {
 }
 
 // 单位列表
-export function getPropertyList(appOrg) {
+export function getSelfTestAndConsultation(appOrg) {
   return request({
-    url: '/large/property/getPropertyList?appOrg='+ appOrg,
+    url: '/large/property/getSelfTestAndConsultation?appOrg='+ appOrg,
     method: 'get'
   })
 }
 
-// 工具箱二具数量
-export function getToolsChartsList(appOrg) {
+//服务内容
+export function getPropertyList(appOrg) {
   return request({
-    url: '/large/property/getToolsChartsList?appOrg='+ appOrg,
+    url: '/large/property/getPropertyList?appOrg='+ appOrg,
     method: 'get'
   })
 }
-
 //----------------------------------- 基础运行数据 -------------------------------
 // 数据概况
 export function getBasicOverviewData(appOrg) {

BIN
src/assets/images/logistics_guarantee/estate.png


BIN
src/assets/images/logistics_guarantee/stock.png


BIN
src/assets/images/logistics_guarantee/tateSwin.png


+ 123 - 133
src/views/screen/logistics/assets/codeBillDialog.vue

@@ -8,51 +8,7 @@
     </div>
     <div class="dialog-cont">
       <div class="dialog-left">
-        <div class="dialog-list">
-          <div class="dialog-item wid100">
-            <div class="content-title">
-              <span class="title">赋码贴签</span>
-            </div>
-            <div class="content">
-              <div class="device-cont">
-                <div class="device-info">
-                  <div class="device-item1">
-                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
-                    <div class="rate">
-                      <div class="rate-data">
-                        <div class="data">100</div>
-                        <div class="unit">%</div>
-                      </div>
-                      <div class="desc">赋码率</div>
-                    </div>
-                  </div>
-                  <div class="device-item1">
-                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
-                    <div class="rate">
-                      <div class="rate-data">
-                        <div class="data">100</div>
-                        <div class="unit">%</div>
-                      </div>
-                      <div class="desc">贴签率</div>
-                    </div>
-                  </div>
-                  <div class="device-item1">
-                    <pie-chart
-                    position="left"
-                  :chart-data="pieData"
-                  :legend="pieLegend"
-                  :center="['35%','40%']"
-
-                  width="220px"
-                  height="180px"
-                />
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
+       
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
@@ -64,19 +20,19 @@
               :class="['model', 0 == curIndex ? 'cur' : '']"
               @click="chooseTab(0, 'main')"
             >
-              楼宇资产占比
+              楼宇各类资产占比
             </div>
             <div
               :class="['model', 1 == curIndex ? 'cur' : '']"
               @click="chooseTab(1, 'service')"
             >
-             服务资产占比
+             服务各类资产占比
             </div>
             <div
               :class="['model', 2 == curIndex ? 'cur' : '']"
               @click="chooseTab(2, 'logistics')"
             >
-             办公资产占比
+             办公各类资产占比
             </div>
                </div>
                <div class="device-item1" v-if="showTab === 'main'">
@@ -112,14 +68,17 @@
         </div>
         <div class="content">
               <div class="total-cont">
-                <span class="title">资产存量</span>
+                <span class="title">资产存量
+                  <span class="smallTitle">截止至2025年1月17日</span>
+                </span>
+               
               </div>
               <div class="rightList1">
                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>楼宇</div>
+                      <div>楼宇设备</div>
                     </div>
                     <div class="num">56<span class="unit">件</span></div>
                   </div>
@@ -128,7 +87,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div>
+                      <div>服务设备</div>
                     </div>
                     <div class="num">51<span class="unit">件</span></div>
                   </div>
@@ -137,7 +96,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div>
+                      <div>办公设备</div>
                     </div>
                     <div class="num">48<span class="unit">件</span></div>
                   </div>
@@ -148,14 +107,14 @@
 
             <div class="content">
               <div class="total-cont">
-                <span class="title">资产新增数量</span>
+                <span class="title">2025年度资产新增数量</span>
               </div>
               <div class="rightList1">
                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>楼宇</div>
+                      <div>楼宇设备</div>
                     </div>
                     <div class="num">56<span class="unit">件</span></div>
                   </div>
@@ -164,7 +123,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div>
+                      <div>服务设备</div>
                     </div>
                     <div class="num">51<span class="unit">件</span></div>
                   </div>
@@ -173,7 +132,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div>
+                      <div>办公设备</div>
                     </div>
                     <div class="num">48<span class="unit">件</span></div>
                   </div>
@@ -184,14 +143,16 @@
 
             <div class="content">
               <div class="total-cont">
-                <span class="title">资产报废数量</span>
+                <span class="title">资产报废数量
+                  <span class="smallTitle">截止至2025年1月17日</span>
+                </span>
               </div>
               <div class="rightList1">
                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>楼宇</div>
+                      <div>楼宇设备</div>
                     </div>
                     <div class="num">56<span class="unit">件</span></div>
                   </div>
@@ -200,7 +161,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div>
+                      <div>服务设备</div>
                     </div>
                     <div class="num">51<span class="unit">件</span></div>
                   </div>
@@ -209,7 +170,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div>
+                      <div>办公设备</div>
                     </div>
                     <div class="num">48<span class="unit">件</span></div>
                   </div>
@@ -218,6 +179,50 @@
               </div>
             </div>
 
+            <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">赋码贴签</span>
+            </div>
+            <div class="content">
+              <div class="device-cont">
+                <div class="device-info">
+                  <div class="device-item1">
+                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
+                    <div class="rate">
+                      <div class="rate-data">
+                        <div class="data">100</div>
+                        <div class="unit">%</div>
+                      </div>
+                      <div class="desc">赋码率</div>
+                    </div>
+                  </div>
+                  <div class="device-item1">
+                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
+                    <div class="rate">
+                      <div class="rate-data">
+                        <div class="data">100</div>
+                        <div class="unit">%</div>
+                      </div>
+                      <div class="desc">贴签率</div>
+                    </div>
+                  </div>
+                  <div class="device-item1">
+                    <pie-chart
+                    position="left"
+                  :chart-data="pieData"
+                  :legend="pieLegend"
+                  :center="['35%','40%']"
+
+                  width="220px"
+                  height="180px"
+                />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
 
       <div class="dialog-right">
@@ -228,7 +233,7 @@
             </div>
             <div class="content">
               <div class="total-cont">
-                <span class="title">地市及直属单位典型场景应用率</span>
+                <span class="title">典型场景应用率</span>
                 <div class="leftNav">
                 <div
               :class="['model1', 0 == curBodex ? 'cur' : '']"
@@ -271,7 +276,44 @@
 
             <div class="content">
               <div class="total-cont">
-                <span class="title">账户活跃度</span>
+                <span class="title">楼宇设备运行情况</span>
+              </div>
+              <div class="rightList">
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/grow.png">
+                    <div class="left-info">
+                    <div class="name">巡检异常数量</div>
+                    <div class="num">42<span class="unit">个</span></div>
+                  </div>
+                 </div>
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/grow.png">
+                    <div class="left-info">
+                    <div class="name">检修记录数量</div>
+                    <div class="num">51<span class="unit">条</span></div>
+                  </div>
+                 </div>
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/grow.png">
+                    <div class="left-info">
+                    <div class="name">维保记录数量</div>
+                    <div class="num">24<span class="unit">条</span></div>
+                  </div>
+                 </div>
+                 <div class="left-list">
+                   <img src="@/assets/images/service_new/setting.png">
+                    <div class="left-info">
+                    <div class="name">重点设备巡检覆盖率</div>
+                    <div class="num">63<span class="unit">%</span></div>
+                  </div>
+                 </div>
+              </div>
+
+            </div>
+
+            <div class="content">
+              <div class="total-cont">
+                <span class="title">地市巡检执行数量</span>
               </div>
               <div class="charts-cont">
                 <bar-chart
@@ -290,7 +332,7 @@
 
             <div class="content">
               <div class="total-cont">
-                <span class="title">角色活跃度</span>
+                <span class="title">直属单位巡检执行数量</span>
               </div>
               <div class="charts-cont">
                 <bar-chart
@@ -307,53 +349,7 @@
             </div>
             </div>
 
-            <div class="content">
-              <div class="total-cont">
-                <span class="title">楼宇设备运行情况</span>
-              </div>
-              <div class="rightList">
-                <div class="left-list">
-                   <img src="@/assets/images/service_new/grow.png">
-                    <div class="left-info">
-                    <div class="name">
-                      <div></div>
-                      <div> 巡检执行数量</div>
-
-                    </div>
-                    <div class="num">56<span class="unit">个</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/grow.png">
-                    <div class="left-info">
-                    <div class="name">巡检异常数量</div>
-                    <div class="num">42<span class="unit">个</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/grow.png">
-                    <div class="left-info">
-                    <div class="name">检修记录数</div>
-                    <div class="num">51<span class="unit">个</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/grow.png">
-                    <div class="left-info">
-                    <div class="name">维保记录数量</div>
-                    <div class="num">24<span class="unit">个</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list">
-                   <img src="@/assets/images/service_new/setting.png">
-                    <div class="left-info">
-                    <div class="name">重点设备巡检覆盖率</div>
-                    <div class="num">63<span class="unit">个</span></div>
-                  </div>
-                 </div>
-              </div>
-
-            </div>
+       
           </div>
         </div>
       </div>
@@ -510,7 +506,7 @@ export default {
         ],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
-          rotate: 0,
+          rotate: 30,
           interval: 0
         },
         axisLine:{
@@ -568,7 +564,7 @@ export default {
         ],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
-          rotate: 0,
+          rotate: 30,
           interval: 0
         },
         axisLine:{
@@ -604,7 +600,7 @@ export default {
         splitArea:false
       },
 
-      //账户活跃度
+      //地市巡检执行数量
       addBuildingAreaBarData: [
         {
           name: "",
@@ -625,7 +621,7 @@ export default {
         ],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
-          rotate: 0,
+          rotate: 30,
           interval: 0
         },
         axisLine:{
@@ -660,7 +656,7 @@ export default {
         },
         splitArea:false
       },
-      //角色活跃度
+      //直属单位巡检执行数量
       jueBuildingAreaBarData: [
         {
           name: "",
@@ -672,16 +668,7 @@ export default {
           barWidth: 15,
           data: [70, 90, 75, 70, 90, 75,65,70,75,70,70,85],
         },
-        {
-          name: "",
-          type: "bar",
-          itemStyle: {
-            color: "#6DE4E4",
-            //barBorderRadius: [10, 10, 0, 0], // 统一设置四个角的圆角大小
-          },
-          barWidth: 15,
-          data: [30, 50, 40, 30, 60, 45,55,30,45,50,30,55],
-        },
+       
 
       ],
       jueBuildingAreaBarAxis: {
@@ -691,7 +678,7 @@ export default {
         ],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
-          rotate: 0,
+          rotate: 30,
           interval: 0
         },
         axisLine:{
@@ -850,7 +837,7 @@ export default {
     font-size: 16px;
     font-weight: bold;
     color: #00ffff;
-    padding-left: 25px;
+    padding-left: 20px;
     .title {
       display: block;
       position: relative;
@@ -889,7 +876,10 @@ export default {
       opacity: 1;
       background: rgba(25, 252, 222, 0.2);
     }
-
+    .smallTitle{
+      font-size: 10px;
+      font-weight: 100;
+    }
     .total-list{
       width:auto;
 
@@ -957,10 +947,10 @@ export default {
         display: flex;
         align-items: center;
         margin-bottom: 15px;
-        margin-right: 60px;
+        margin-right: 40px;
         img{
           display: block;
-          width:20px;
+          width:25px;
           height:20px;
           margin-right: 5px;
         }
@@ -991,7 +981,7 @@ export default {
   .rightList{
     display: flex;
     flex-wrap: wrap;
-    padding: 15px;
+    padding: 0 15px 0 15px;
     .left-list{
         display: flex;
         align-items: center;
@@ -1039,7 +1029,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      padding-top:15px;
+      //padding-top:15px;
 
       .device-item {
         position: relative;
@@ -1126,7 +1116,7 @@ export default {
     display: flex;
     .model {
           margin-right: 15px;
-          width: 130px;
+          width: 145px;
           height: 45px;
           line-height: 30px;
           text-align: center;

+ 119 - 40
src/views/screen/logistics/houseArea.vue

@@ -2,19 +2,19 @@
   <div class="main-data house-area-operation">
     <!-- <div class="title-area">房产土地</div> -->
     <div class="content-area">
-      <div class="content-left">
+      <div class="content-left wid100">
         <div class="content-title">
           <span class="title">房产资源存量</span>
         </div>
         <div class="content">
           <div class="total-cont">
             <div class="total-list">
-              <div class="total">551</div>
+              <div class="total">5251</div>
               <div class="unitY">栋</div>
             </div>
-            <div class="total-list">
+            <div class="total-list1">
               <div class="total">175.11</div>
-              <div class="unitY">万m²</div>
+              <div class="unitY">万m³</div>
             </div>
           </div>
           <div class="charts-cont">
@@ -23,13 +23,12 @@
               :chart-data="pieData"
               :legend="pieLegend"
               :center="pieCenter"
-              width="220px"
+              width="520px"
               height="250px"
             />
           </div>
         </div>
-      </div>
-      <div class="content-right">
+
         <div class="content-title">
           <span class="title">土地资源存量</span>
         </div>
@@ -43,40 +42,50 @@
             :grid="barGrid"
             y-color="#FFF"
             l-color="#FFF"
-            width="220px"
-            height="120px"
+            width="520px"
+            height="140px"
           />
         </div>
-        <div class="content-title" style="margin-top: 20px">
-          <span class="title">年度投资房产完成情况</span>
+        <div class="content-title" style="margin-top: 25px">
+          <span class="title">2025年度投资房产完成情况</span>
         </div>
         <div class="content">
           <div class="data-list">
             <div class="data-item">
-              <div class="data-detail">
-                <div class="data">56</div>
-                <div class="unit">个</div>
-              </div>
+             
               <img
-                src="@/assets/images/logistics_guarantee/img_7.png"
+                src="@/assets/images/logistics_guarantee/estate.png"
                 class="img"
               />
-              <div class="desc">新增房产</div>
             </div>
             <div class="data-item">
-              <div class="data-detail">
-                <div class="data">56</div>
-                <div class="unit">个</div>
+              <div class="rightList1">
+                <div class="left-list">
+                    <div class="left-info">
+                    <div class="name">
+                      <div> <img src="@/assets/images/logistics_guarantee/tateSwin.png"></div>
+                      <div>新增房产</div>
+                    </div>
+                    <div class="num">23<span class="unit">个</span></div>
+                  </div>
+                 </div>
+                 <div class="left-list">
+                    <div class="left-info">
+                    <div class="name">
+                      <div> <img src="@/assets/images/logistics_guarantee/tateSwin.png"></div>
+                      <div>投资计划房产</div>
+                    </div>
+                    <div class="num">43<span class="unit">个</span></div>
+                  </div>
+                 </div>
+   
+
               </div>
-              <img
-                src="@/assets/images/logistics_guarantee/img_7.png"
-                class="img"
-              />
-              <div class="desc">投资计划房产</div>
             </div>
           </div>
         </div>
       </div>
+   
     </div>
   </div>
 </template>
@@ -124,17 +133,16 @@ export default {
         { value: 2.92, name: "单身公寓/单身宿舍" , itemStyle: {color:'#00AEFF'} },
       ],
       pieLegend: {
-        bottom: 0,
-        orient: "horizontal",
-        right: -5,
+        top: 55,
+        orient: "vertical",
+        left: 300,
         itemWidth: 8, // 设置图例标记的宽度
         itemHeight: 8, // 设置图例标记的高度
         textStyle: {
           color: "#FFF",
         },
       },
-      pieCenter: ["50%", "40%"],
-      pieRadius: ["35%", "50%"],
+      pieCenter: ["30%", "50%"],
       buildingAreaBarData: [
         {
           name: "",
@@ -146,6 +154,7 @@ export default {
           barWidth: 10,
           data: [110, 30, 100],
         },
+        
       ],
       buildingAreaBarYaxis: {
         type: "category",
@@ -231,7 +240,7 @@ export default {
   .content-title {
     width: 230px;
     height: 26px;
-    background: url("../../../assets/images/main/title_pro.png") no-repeat !important;
+    background: url("../../../assets/images/main/title_pro_long.png") no-repeat !important;
     background-size: 100% 100%;
     font-family: "PingFangSC";
     font-size: 16px;
@@ -248,7 +257,14 @@ export default {
     width: 100%;
     background: url("../../../assets/images/main/title_pro_long.png") no-repeat !important;
   }
+  .wid100{
+      width:100%;
 
+      .content-title{
+        width:100%;
+        background: url("../../../assets/images/main/title_pro_long.png") no-repeat;
+      }
+    }
   .title-format {
     display: flex;
     flex-direction: row;
@@ -297,24 +313,25 @@ export default {
     }
   }
   .total-cont {
-    width: 100%;
-    padding-top: 20px;
-    padding-left: 15px;
+    height: 110px;
+    margin: 15px 50px 0 50px;
+ 
     display: flex;
     align-items: center;
     justify-content: space-between;
-
+    background: url("../../../assets/images/logistics_guarantee/stock.png") no-repeat;
+    background-size: 100% 100%;
     .total-list {
       display: flex;
       align-items: baseline;
-
+      margin-left: 40px;
       .total {
         font-size: 32px;
-        color: #19fcde;
+        color: #00FFFF;
         font-weight: bold;
         font-family: "electronicFont";
       }
-      .unit {
+      .unit { 
         font-size: 12px;
         color: #00ffff;
         font-weight: 500;
@@ -322,7 +339,30 @@ export default {
       }
       .unitY {
         font-size: 12px;
-        color: #ffffff;
+        color: #00FFFF;
+        font-weight: 500;
+        padding-left:4px;
+      }
+    }
+    .total-list1{
+      display: flex;
+      align-items: baseline;
+      margin-right: 30px;
+      .total {
+        font-size: 32px;
+        color: #00FFFF;
+        font-weight: bold;
+        font-family: "electronicFont";
+      }
+      .unit { 
+        font-size: 12px;
+        color: #00ffff;
+        font-weight: 500;
+        padding-left:4px;
+      }
+      .unitY {
+        font-size: 12px;
+        color: #00FFFF;
         font-weight: 500;
         padding-left:4px;
       }
@@ -402,7 +442,7 @@ export default {
       justify-content: center;
       flex: 1;
       img {
-        width: 70px;
+        // width: 70px;
       }
       .data-detail {
         display: flex;
@@ -426,7 +466,46 @@ export default {
       }
     }
   }
+    //左边菜单
+    .rightList1{
+    display: flex;
+    flex-wrap: wrap;
+    padding: 15px;
+    .left-list{
+        display: flex;
+        align-items: center;
+        margin-bottom: 25px;
+        margin-right: 40px;
+        img{
+          display: block;
+          width:25px;
+          height:20px;
+          margin-right: 5px;
+        }
+        .left-info{
+          padding-left:12px;
 
+          .num{
+            font-size: 30px;
+            color:#00FFFF;
+            font-family: "electronicFont";
+            display: flex;
+            flex-direction: row;
+            align-items: baseline;
+            .unit{
+              font-size: 12px;
+            }
+          }
+          .name{
+            display: flex;
+            font-size: 14px;
+            color:#FFFFFF;
+            font-family: 'fashionZh';
+            padding-top:4px;
+          }
+        }
+      }
+  }
   ::-webkit-scrollbar {
     width: 3px;
     height: 3px;

+ 73 - 64
src/views/screen/logistics/logisticsAssets.vue

@@ -3,49 +3,6 @@
     <!-- <div class="title-area">后勤资产</div> -->
     <div class="content-area">
       <div class="dialog-left">
-        <div class="dialog-list">
-          <div class="dialog-item wid100">
-            <div class="content-title">
-              <span class="title">赋码贴签</span>
-            </div>
-            <div class="content">
-              <div class="device-cont">
-                <div class="device-info">
-                  <div class="device-item1">
-                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
-                    <div class="rate">
-                      <div class="rate-data">
-                        <div class="data">100</div>
-                        <div class="unit">%</div>
-                      </div>
-                      <div class="desc">赋码率</div>
-                    </div>
-                  </div>
-                  <div class="device-item1">
-                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
-                    <div class="rate">
-                      <div class="rate-data">
-                        <div class="data">100</div>
-                        <div class="unit">%</div>
-                      </div>
-                      <div class="desc">贴签率</div>
-                    </div>
-                  </div>
-                  <div class="device-item1">
-                    <pie-chart
-                    position="left"
-                  :chart-data="pieData"
-                  :legend="pieLegend"
-                  :center="['35%','40%']"
-                  width="220px"
-                  height="180px"
-                />
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
 
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -58,19 +15,19 @@
               :class="['model', 0 == curIndex ? 'cur' : '']"
               @click="chooseTab(0, 'main')"
             >
-              楼宇资产占比
+              楼宇各类资产占比
             </div>
             <div
               :class="['model', 1 == curIndex ? 'cur' : '']"
               @click="chooseTab(1, 'service')"
             >
-             服务资产占比
+             服务各类资产占比
             </div>
             <div
               :class="['model', 2 == curIndex ? 'cur' : '']"
               @click="chooseTab(2, 'logistics')"
             >
-             办公资产占比
+             办公各类资产占比
             </div>
                </div>
                <div class="device-item1" v-if="showTab === 'main'">
@@ -109,14 +66,16 @@
         </div>
         <div class="content">
               <div class="total-cont">
-                <span class="title">资产存量</span>
+                <span class="title">资产存量
+                  <span class="smallTitle">截止至2025年1月17日</span>
+                </span>
               </div>
               <div class="rightList1">
                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>楼宇</div>
+                      <div>楼宇设备</div>
                     </div>
                     <div class="num">56<span class="unit">件</span></div>
                   </div>
@@ -125,7 +84,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div>
+                      <div>服务设备</div>
                     </div>
                     <div class="num">51<span class="unit">件</span></div>
                   </div>
@@ -134,7 +93,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div>
+                      <div>办公设备</div>
                     </div>
                     <div class="num">48<span class="unit">件</span></div>
                   </div>
@@ -145,14 +104,14 @@
 
             <div class="content">
               <div class="total-cont">
-                <span class="title">资产新增数量</span>
+                <span class="title">2025年度资产新增数量</span>
               </div>
               <div class="rightList1">
                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>楼宇</div>
+                      <div>楼宇设备</div>
                     </div>
                     <div class="num">56<span class="unit">件</span></div>
                   </div>
@@ -161,7 +120,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div>
+                      <div>服务设备</div>
                     </div>
                     <div class="num">51<span class="unit">件</span></div>
                   </div>
@@ -170,7 +129,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div>
+                      <div>办公设备</div>
                     </div>
                     <div class="num">48<span class="unit">件</span></div>
                   </div>
@@ -181,14 +140,16 @@
 
             <div class="content">
               <div class="total-cont">
-                <span class="title">资产报废数量</span>
+                <span class="title">资产报废数量
+                  <span class="smallTitle">截止至2025年1月17日</span>
+                </span>
               </div>
               <div class="rightList1">
                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>楼宇</div>
+                      <div>楼宇设备</div>
                     </div>
                     <div class="num">56<span class="unit">件</span></div>
                   </div>
@@ -197,7 +158,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div>
+                      <div>服务设备</div>
                     </div>
                     <div class="num">51<span class="unit">件</span></div>
                   </div>
@@ -206,7 +167,7 @@
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div>
+                      <div>办公设备</div>
                     </div>
                     <div class="num">48<span class="unit">件</span></div>
                   </div>
@@ -215,6 +176,50 @@
               </div>
             </div>
 
+            <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">赋码贴签</span>
+            </div>
+            <div class="content">
+              <div class="device-cont">
+                <div class="device-info">
+                  <div class="device-item1">
+                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
+                    <div class="rate">
+                      <div class="rate-data">
+                        <div class="data">100</div>
+                        <div class="unit">%</div>
+                      </div>
+                      <div class="desc">赋码率</div>
+                    </div>
+                  </div>
+                  <div class="device-item1">
+                    <img src="@/assets/images/logistics_guarantee/boxhigh.png" class="icon" alt="" />
+                    <div class="rate">
+                      <div class="rate-data">
+                        <div class="data">100</div>
+                        <div class="unit">%</div>
+                      </div>
+                      <div class="desc">贴签率</div>
+                    </div>
+                  </div>
+                  <div class="device-item1">
+                    <pie-chart
+                    position="left"
+                  :chart-data="pieData"
+                  :legend="pieLegend"
+                  :center="['35%','40%']"
+                  width="220px"
+                  height="180px"
+                />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
       </div>
 
     </div>
@@ -525,7 +530,7 @@ export default {
 
   .device-cont{
     width:100%;
-    padding:10px 15px 0 15px;
+    padding:0px 15px 0px 10px;
 
     .title{
       font-size: 14px;
@@ -536,7 +541,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      padding-top:15px;
+      //padding-top:15px;
 
       .device-item1 {
         position: relative;
@@ -587,6 +592,10 @@ export default {
   .content {
     margin-top: 10px;
     padding-left: 20px;
+    .smallTitle{
+      font-size: 10px;
+      font-weight: 100;
+    }
   }
   .dialog-left{
       width: 520px;
@@ -627,10 +636,10 @@ export default {
         display: flex;
         align-items: center;
         margin-bottom: 15px;
-        margin-right: 60px;
+        margin-right: 40px;
         img{
           display: block;
-          width:20px;
+          width:25px;
           height:20px;
           margin-right: 5px;
         }
@@ -662,7 +671,7 @@ export default {
     display: flex;
     .model {
           margin-right: 15px;
-          width: 130px;
+          width: 145px;
           height: 45px;
           line-height: 30px;
           text-align: center;
@@ -670,7 +679,7 @@ export default {
           font-size: 14px;
           font-weight: bold;
            background: url("../../../assets/images/main/choose_bg_long.png") no-repeat;
-         // background-size: 95% 95%;
+           background-size: 95% 70%;
           color: #CED6D6;
           cursor: pointer;
         }

+ 8 - 5
src/views/screen/logistics/main.vue

@@ -32,12 +32,13 @@
         </div>
       </div>
       <div class="middle">
-        <province
+        <!-- 中间地图 -->
+        <asset
           v-if="showMap"
-          ref="province"
+          ref="asset"
           height="900px"
           @mapClick="onMapClick"
-        ></province>
+        ></asset>
         <img
           v-if="showLocal"
           class="build"
@@ -672,6 +673,7 @@ import HouseArea from "./houseArea.vue";
 import ProjectItem from "./projectItem.vue";
 import OfficialCar from "./officialCar.vue";
 import Province from "../map/province.vue";
+import Asset from "../map/asset.vue";
 import MenuBar from "@/views/screen/logistics/menu_bar.vue";
 import MainData from "@/views/screen/logistics/assets/mainData.vue";
 import AssetsStock from "@/views/screen/logistics/assets/assetsStock.vue";
@@ -710,6 +712,7 @@ export default {
     ProjectItem,
     OfficialCar,
     Province,
+    Asset,
     MenuBar,
     MainData,
     AssetsStock,
@@ -819,7 +822,7 @@ export default {
         this.curCompany = [];
       }
       this.appOrg = "0000";
-      this.$refs.province.reloadMap(this.curDeep);
+      this.$refs.asset.reloadMap(this.curDeep);
     },
 
     //显示公务用车菜单
@@ -847,7 +850,7 @@ export default {
         this.showBack = true;
         // return;
       }
-      this.$refs.province.chooseUnit(e);
+      this.$refs.asset.chooseUnit(e);
     },
 
 

+ 64 - 21
src/views/screen/main.vue

@@ -4,21 +4,19 @@
       <div class="main-wrapper">
         <div class="header-area">
           <div class="left">
-            <div
-              :class="['model', 0 == curIndex ? 'cur' : '']"
-              @click="chooseTab(0, 'main')"
-            >
-              首页
+            <div class="modelTime" >
+              <div>{{timeString}}</div>
+              <div>{{timeDay}}</div>
             </div>
             <div
-              :class="['model', 1 == curIndex ? 'cur' : '']"
-              @click="chooseTab(1, 'service')"
+              :class="['model',  0== curIndex ? 'cur' : '']"
+              @click="chooseTab(0, 'service')"
             >
               服务保障中心
             </div>
             <div
-              :class="['model', 2 == curIndex ? 'cur' : '']"
-              @click="chooseTab(2, 'logistics')"
+              :class="['model',  1== curIndex ? 'cur' : '']"
+              @click="chooseTab(1, 'logistics')"
             >
               后勤资源监控
             </div>
@@ -26,20 +24,20 @@
           <div class="mid" @dblclick="fullScreen"></div>
           <div class="right">
             <div
-              :class="['model', 3 == curIndex ? 'cur' : '']"
-              @click="chooseTab(3, 'building')"
+              :class="['model', 2== curIndex ? 'cur' : '']"
+              @click="chooseTab(2, 'building')"
             >
               楼宇运行监控
             </div>
             <div
-              :class="['model', 4 == curIndex ? 'cur' : '']"
-              @click="chooseTab(4, 'engineering')"
+              :class="['model', 3 == curIndex ? 'cur' : '']"
+              @click="chooseTab(3, 'engineering')"
             >
               工程现场监控
             </div>
             <div
-              :class="['model', 5 == curIndex ? 'cur' : '']"
-              @click="chooseTab(5, 'official')"
+              :class="['model',4 == curIndex ? 'cur' : '']"
+              @click="chooseTab(4, 'official')"
             >
               公务用车监控
             </div>
@@ -98,13 +96,10 @@ export default {
   data() {
     return {
       curIndex: 0,
-      showTab: "main",
+      showTab: "service",
+      currentTime: new Date(),
       tabs: [
         {
-          name: "首页",
-          tab: "main",
-        },
-        {
           name: "服务保障中心",
           tab: "service",
         },
@@ -127,14 +122,47 @@ export default {
       ],
     };
   },
-
+  computed: {
+    timeString() {
+      const year = this.currentTime.getFullYear();
+      const month = String(this.currentTime.getMonth() + 1).padStart(2, '0');
+      const day = String(this.currentTime.getDate()).padStart(2, '0');
+      const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+      const weekday = weekdays[this.currentTime.getDay()];
+      const hours = String(this.currentTime.getHours()).padStart(2, '0');
+      const minutes = String(this.currentTime.getMinutes()).padStart(2, '0');
+      const seconds = String(this.currentTime.getSeconds()).padStart(2, '0');
+
+      return `${year}-${month}-${day}`;
+    },
+    timeDay(){
+      const year = this.currentTime.getFullYear();
+      const month = String(this.currentTime.getMonth() + 1).padStart(2, '0');
+      const day = String(this.currentTime.getDate()).padStart(2, '0');
+      const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+      const weekday = weekdays[this.currentTime.getDay()];
+      const hours = String(this.currentTime.getHours()).padStart(2, '0');
+      const minutes = String(this.currentTime.getMinutes()).padStart(2, '0');
+      const seconds = String(this.currentTime.getSeconds()).padStart(2, '0');
+
+      return `${weekday} ${hours}:${minutes}:${seconds}`;
+    }
+  },
+  mounted() {
+    this.updateTime();
+    setInterval(this.updateTime, 1000);
+  },
   created() {
     document.documentElement.requestFullscreen();
+   
   },
   methods: {
     fullScreen(){
       document.documentElement.requestFullscreen();
     },
+    updateTime() {
+      this.currentTime = new Date();
+    },
     //切换菜单
     chooseTab(index) {
       this.curIndex = index;
@@ -146,6 +174,7 @@ export default {
       this.curIndex = 5;
       this.showTab = this.tabs[5].tab;
     },
+
   },
 };
 </script>
@@ -208,6 +237,20 @@ export default {
           color: #ffffff;
           cursor: pointer;
         }
+        .modelTime {
+          margin-right: 15px;
+          width: 130px;
+          height: 45px;
+          text-align: center;
+          font-family: "PingFangSc";
+          font-size: 12px;
+          padding-top: 5px;
+          font-weight: bold;
+          background: url("../../assets/images/main/menu_bg.png") no-repeat;
+          background-size: 100% 100%;
+          color: #ffffff;
+          cursor: pointer;
+        }
         .model:last-child {
           margin-right: 0;
         }

+ 1020 - 0
src/views/screen/map/asset.vue

@@ -0,0 +1,1020 @@
+<template>
+    <div class="main-map-data data-province">
+      <div
+        ref="map"
+        :class="className"
+        class="map"
+        :style="{ height: height, width: width }"
+      />
+      <img
+        id="mapBackground"
+        src="@/assets/images/main/map_bg.jpg"
+        alt=""
+        style="display: none"
+      />
+    </div>
+  </template>
+  
+  <script>
+  import echarts from "echarts";
+  import "echarts-gl";
+  require("echarts/theme/macarons"); // echarts theme
+  import resize from "../../../components/Echarts/mixins/resize";
+  import 山西省 from "./山西省.json";
+  import 大同市 from "./大同市.json";
+  import 朔州市 from "./朔州市.json";
+  import 忻州市 from "./忻州市.json";
+  import 吕梁市 from "./吕梁市.json";
+  import 太原市 from "./太原市.json";
+  import 阳泉市 from "./阳泉市.json";
+  import 晋中市 from "./晋中市.json";
+  import 临汾市 from "./临汾市.json";
+  import 长治市 from "./长治市.json";
+  import 运城市 from "./运城市.json";
+  import 晋城市 from "./晋城市.json";
+  // 临汾市
+  import 安泽县 from "./临汾市/安泽县.json";
+  import 大宁县 from "./临汾市/大宁县.json";
+  import 汾西县 from "./临汾市/汾西县.json";
+  import 浮山县 from "./临汾市/浮山县.json";
+  import 古县 from "./临汾市/古县.json";
+  import 洪洞县 from "./临汾市/洪洞县.json";
+  import 侯马市 from "./临汾市/侯马市.json";
+  import 霍州市 from "./临汾市/霍州市.json";
+  import 吉县 from "./临汾市/吉县.json";
+  import 蒲县 from "./临汾市/蒲县.json";
+  import 曲沃县 from "./临汾市/曲沃县.json";
+  import 隰县 from "./临汾市/隰县.json";
+  import 乡宁县 from "./临汾市/乡宁县.json";
+  import 襄汾县 from "./临汾市/襄汾县.json";
+  import 尧都区 from "./临汾市/尧都区.json";
+  import 翼城县 from "./临汾市/翼城县.json";
+  import 永和县 from "./临汾市/永和县.json";
+  // 长治市
+  import 壶关县 from "./长治市/壶关县.json";
+  import 黎城县 from "./长治市/黎城县.json";
+  import 潞城区 from "./长治市/潞城区.json";
+  import 潞州区 from "./长治市/潞州区.json";
+  import 平顺县 from "./长治市/平顺县.json";
+  import 沁县 from "./长治市/沁县.json";
+  import 沁源县 from "./长治市/沁源县.json";
+  import 上党区 from "./长治市/上党区.json";
+  import 屯留区 from "./长治市/屯留区.json";
+  import 武乡县 from "./长治市/武乡县.json";
+  import 襄垣县 from "./长治市/襄垣县.json";
+  import 长子县 from "./长治市/长子县.json";
+  // 运城市
+  import 河津市 from "./运城市/河津市.json";
+  import 稷山县 from "./运城市/稷山县.json";
+  import 绛县 from "./运城市/绛县.json";
+  import 临猗县 from "./运城市/临猗县.json";
+  import 平陆县 from "./运城市/平陆县.json";
+  import 芮城县 from "./运城市/芮城县.json";
+  import 万荣县 from "./运城市/万荣县.json";
+  import 闻喜县 from "./运城市/闻喜县.json";
+  import 夏县 from "./运城市/夏县.json";
+  import 新绛县 from "./运城市/新绛县.json";
+  import 盐湖区 from "./运城市/盐湖区.json";
+  import 永济市 from "./运城市/永济市.json";
+  import 垣曲县 from "./运城市/垣曲县.json";
+  //晋城市
+  import 城区 from "./晋城市/城区.json";
+  import 高平市 from "./晋城市/高平市.json";
+  import 陵川县 from "./晋城市/陵川县.json";
+  import 沁水县 from "./晋城市/沁水县.json";
+  import 阳城县 from "./晋城市/阳城县.json";
+  import 泽州县 from "./晋城市/泽州县.json";
+  //吕梁市
+  import 方山县 from "./吕梁市/方山县.json";
+  import 汾阳市 from "./吕梁市/汾阳市.json";
+  import 交城县 from "./吕梁市/交城县.json";
+  import 交口县 from "./吕梁市/交口县.json";
+  import 岚县 from "./吕梁市/岚县.json";
+  import 离石区 from "./吕梁市/离石区.json";
+  import 临县 from "./吕梁市/临县.json";
+  import 柳林县 from "./吕梁市/柳林县.json";
+  import 娄烦县 from "./吕梁市/娄烦县.json";
+  import 石楼县 from "./吕梁市/石楼县.json";
+  import 文水县 from "./吕梁市/文水县.json";
+  import 孝义市 from "./吕梁市/孝义市.json";
+  import 兴县 from "./吕梁市/兴县.json";
+  import 中阳县 from "./吕梁市/中阳县.json";
+  //太原市
+  import 古交市 from "./太原市/古交市.json";
+  import 尖草坪区 from "./太原市/尖草坪区.json";
+  import 娄烦县2 from "./太原市/娄烦县.json";
+  import 清徐县 from "./太原市/清徐县.json";
+  import 万柏林区 from "./太原市/万柏林区.json";
+  import 小店区 from "./太原市/小店区.json";
+  import 杏花岭区 from "./太原市/杏花岭区.json";
+  import 阳曲县 from "./太原市/阳曲县.json";
+  import 迎泽区 from "./太原市/迎泽区.json";
+  //阳泉市
+  import 城区2 from "./阳泉市/城区.json";
+  import 郊区 from "./阳泉市/郊区.json";
+  import 矿区 from "./阳泉市/矿区.json";
+  import 平定县 from "./阳泉市/平定县.json";
+  import 盂县 from "./阳泉市/盂县.json";
+  //晋中市
+  import 和顺县 from "./晋中市/和顺县.json";
+  import 介休市 from "./晋中市/介休市.json";
+  import 灵石县 from "./晋中市/灵石县.json";
+  import 平遥县 from "./晋中市/平遥县.json";
+  import 祁县 from "./晋中市/祁县.json";
+  import 寿阳县 from "./晋中市/寿阳县.json";
+  import 太谷区 from "./晋中市/太谷区.json";
+  import 昔阳县 from "./晋中市/昔阳县.json";
+  import 榆次区 from "./晋中市/榆次区.json";
+  import 榆社县 from "./晋中市/榆社县.json";
+  import 左权县 from "./晋中市/左权县.json";
+  //大同市
+  import 广灵县 from "./大同市/广灵县.json";
+  import 浑源县 from "./大同市/浑源县.json";
+  import 灵丘县 from "./大同市/灵丘县.json";
+  import 平城区 from "./大同市/平城区.json";
+  import 天镇县 from "./大同市/天镇县.json";
+  import 新荣区 from "./大同市/新荣区.json";
+  import 阳高县 from "./大同市/阳高县.json";
+  import 云冈区 from "./大同市/云冈区.json";
+  import 云州区 from "./大同市/云州区.json";
+  import 左云县 from "./大同市/左云县.json";
+  //朔州市
+  import 怀仁市 from "./朔州市/怀仁市.json";
+  import 平鲁区 from "./朔州市/平鲁区.json";
+  import 山阴县 from "./朔州市/山阴县.json";
+  import 朔城区 from "./朔州市/朔城区.json";
+  import 应县 from "./朔州市/应县.json";
+  import 右玉县 from "./朔州市/右玉县.json";
+  //忻州市
+  import 保德县 from "./忻州市/保德县.json";
+  import 代县 from "./忻州市/代县.json";
+  import 定襄县 from "./忻州市/定襄县.json";
+  import 繁峙县 from "./忻州市/繁峙县.json";
+  import 河曲县 from "./忻州市/河曲县.json";
+  import 静乐县 from "./忻州市/静乐县.json";
+  import 岢岚县 from "./忻州市/岢岚县.json";
+  import 宁武县 from "./忻州市/宁武县.json";
+  import 偏关县 from "./忻州市/偏关县.json";
+  import 神池县 from "./忻州市/神池县.json";
+  import 五台县 from "./忻州市/五台县.json";
+  import 五寨县 from "./忻州市/五寨县.json";
+  import 忻府区 from "./忻州市/忻府区.json";
+  import 原平市 from "./忻州市/原平市.json";
+  
+  // 引入json数据
+  import company from "../data/company.json";
+  
+  var imgElement;
+  
+  export default {
+    mixins: [resize],
+    name: "Province",
+    props: {
+      className: {
+        type: String,
+        default: "chart",
+      },
+      width: {
+        type: String,
+        default: "100%",
+      },
+      height: {
+        type: String,
+        default: "950px",
+      },
+      autoResize: {
+        type: Boolean,
+        default: true,
+      },
+      top: {
+        type: Number,
+        default: 50,
+      },
+      bottom: {
+        type: Number,
+        default: 100,
+      }
+    },
+    data() {
+      return {
+        poiName: "", //当前选择的点
+        showEchart: false,
+        showLocal: false,
+        chart: null,
+        province: "山西省",
+        city: "",
+        area: "",
+        region: 山西省,
+        deep: 1,
+        dataSource: {
+          大同市: 大同市,
+          朔州市: 朔州市,
+          忻州市: 忻州市,
+          吕梁市: 吕梁市,
+          太原市: 太原市,
+          阳泉市: 阳泉市,
+          晋中市: 晋中市,
+          临汾市: 临汾市,
+          长治市: 长治市,
+          运城市: 运城市,
+          晋城市: 晋城市,
+  
+          安泽县: 安泽县,
+          大宁县: 大宁县,
+          汾西县: 汾西县,
+          浮山县: 浮山县,
+          古县: 古县,
+          洪洞县: 洪洞县,
+          侯马市: 侯马市,
+          霍州市: 霍州市,
+          吉县: 吉县,
+          蒲县: 蒲县,
+          曲沃县: 曲沃县,
+          隰县: 隰县,
+          乡宁县: 乡宁县,
+          襄汾县: 襄汾县,
+          尧都区: 尧都区,
+          翼城县: 翼城县,
+          永和县: 永和县,
+  
+          壶关县: 壶关县,
+          黎城县: 黎城县,
+          潞城区: 潞城区,
+          潞州区: 潞州区,
+          平顺县: 平顺县,
+          沁县: 沁县,
+          沁源县: 沁源县,
+          上党区: 上党区,
+          屯留区: 屯留区,
+          武乡县: 武乡县,
+          襄垣县: 襄垣县,
+          长子县: 长子县,
+  
+          河津市: 河津市,
+          稷山县: 稷山县,
+          绛县: 绛县,
+          临猗县: 临猗县,
+          平陆县: 平陆县,
+          芮城县: 芮城县,
+          万荣县: 万荣县,
+          闻喜县: 闻喜县,
+          夏县: 夏县,
+          新绛县: 新绛县,
+          盐湖区: 盐湖区,
+          永济市: 永济市,
+          垣曲县: 垣曲县,
+  
+          城区: 城区,
+          高平市: 高平市,
+          陵川县: 陵川县,
+          沁水县: 沁水县,
+          阳城县: 阳城县,
+          泽州县: 泽州县,
+  
+          方山县: 方山县,
+          汾阳市: 汾阳市,
+          交城县: 交城县,
+          交口县: 交口县,
+          岚县: 岚县,
+          离石区: 离石区,
+          临县: 临县,
+          柳林县: 柳林县,
+          娄烦县: 娄烦县,
+          石楼县: 石楼县,
+          文水县: 文水县,
+          孝义市: 孝义市,
+          兴县: 兴县,
+          中阳县: 中阳县,
+  
+          古交市: 古交市,
+          尖草坪区: 尖草坪区,
+          娄烦县2: 娄烦县2,
+          清徐县: 清徐县,
+          万柏林区: 万柏林区,
+          小店区: 小店区,
+          杏花岭区: 杏花岭区,
+          阳曲县: 阳曲县,
+          迎泽区: 迎泽区,
+  
+          城区: 城区2,
+          郊区: 郊区,
+          矿区: 矿区,
+          平定县: 平定县,
+          盂县: 盂县,
+  
+          和顺县: 和顺县,
+          介休市: 介休市,
+          灵石县: 灵石县,
+          平遥县: 平遥县,
+          祁县: 祁县,
+          寿阳县: 寿阳县,
+          太谷区: 太谷区,
+          昔阳县: 昔阳县,
+          榆次区: 榆次区,
+          榆社县: 榆社县,
+          左权县: 左权县,
+  
+          广灵县: 广灵县,
+          浑源县: 浑源县,
+          灵丘县: 灵丘县,
+          平城区: 平城区,
+          天镇县: 天镇县,
+          新荣区: 新荣区,
+          阳高县: 阳高县,
+          云冈区: 云冈区,
+          云州区: 云州区,
+          左云县: 左云县,
+  
+          怀仁市: 怀仁市,
+          平鲁区: 平鲁区,
+          山阴县: 山阴县,
+          朔城区: 朔城区,
+          应县: 应县,
+          右玉县: 右玉县,
+  
+          保德县: 保德县,
+          代县: 代县,
+          定襄县: 定襄县,
+          繁峙县: 繁峙县,
+          河曲县: 河曲县,
+          静乐县: 静乐县,
+          岢岚县: 岢岚县,
+          宁武县: 宁武县,
+          偏关县: 偏关县,
+          神池县: 神池县,
+          五台县: 五台县,
+          五寨县: 五寨县,
+          忻府区: 忻府区,
+          原平市: 原平市,
+        },
+      };
+    },
+    destroyed() {},
+    beforeDestroy() {},
+    mounted() {
+      this.$nextTick(() => {
+        imgElement = document.getElementById("mapBackground");
+        setTimeout(() => {
+          this.initChart();
+        }, 500);
+      });
+    },
+    methods: {
+      initChart(name = "") {
+  
+        echarts.registerMap("shanxi", this.region);
+        this.chart = echarts.init(this.$refs.map, "macarons");
+        if (name) {
+          name = name.slice(0, -1);
+        }
+        let poiName = this.poiName;
+        let poiInfo = {};
+        //处理省地图
+        let markers = [];
+        let lines = [];
+        company.forEach((item) => {
+          item.children.forEach((childs) => {
+            if (name) {
+              //只渲染本市的
+              if (childs.children && childs.children.length > 0) {
+                if (childs.label.indexOf(name) != -1) {
+                  childs.children.forEach((child) => {
+                    let symbol =
+                      "image://" + require("@/assets/images/main/map/xian.png");
+                    let symbolSize = [10, 10];
+                    if (child.label != poiName) {
+                      if (this.deep < 3) {
+                        if (child.value.length == 5 && child.city != "临汾市" && child.city != "运城市") {
+                          //市级单位
+                          symbol =
+                            "image://" +
+                            require("@/assets/images/main/map/shi.png");
+                        } else if (
+                          child.city == "临汾市" ||
+                          child.city == "运城市"
+                        ) {
+                          //不点亮
+                          symbol =
+                            "image://" +
+                            require("@/assets/images/main/map/none.png");
+                          symbolSize = [10, 10];
+                        }
+                        markers.push({
+                          name: child.label,
+                          coord: child.poi,
+                          symbol: symbol,
+                          symbolSize: symbolSize,
+                          level: 20 // 设置 level 值
+                        });
+                      }
+                    } else {
+                      // symbol =
+                      //   "image://" +
+                      //   require("@/assets/images/main/map/choosed.png");
+                      symbolSize = [20, 20];
+                      if (child.city == "临汾市" || child.city == "运城市") {
+                        //不点亮
+                        symbol =
+                          "image://" +
+                          require("@/assets/images/main/map/none.png");
+                        symbolSize = [20, 20];
+                      }
+                      if (child.value.length == 5 && (child.city != "临汾市" && child.city != "运城市")) {
+                        //市级单位
+                        symbol =
+                          "image://" +
+                          require("@/assets/images/main/map/shi.png");
+                      }
+                      markers.push({
+                        name: child.label,
+                        coord: child.poi,
+                        symbol: symbol,
+                        symbolSize: symbolSize,
+                        level: 20 // 设置 level 值
+                      });
+                    }
+                  });
+                } else if (this.deep == 3) {
+                  let symbol =
+                    "image://" + require("@/assets/images/main/map/xian.png");
+                  let symbolSize = [10,10];
+                  childs.children.forEach((child) => {
+                    // if (child.label == poiName) {
+                    //   symbol =
+                    //     "image://" +
+                    //     require("@/assets/images/main/map/choosed.png");
+                    //   symbolSize = [50, 50];
+                    // }
+                    if (child.label.indexOf(name) != -1) {
+                      markers.push({
+                        name: child.label,
+                        coord: child.poi,
+                        symbol: symbol,
+                        symbolSize: symbolSize,
+                        level: 20 // 设置 level 值
+                      });
+                    }
+                  });
+                  //手动处理单位
+                  let symbol2 =
+                    "image://" + require("@/assets/images/main/map/shi.png");
+                  let symbolSize2 = [10,10];
+                  if(name == '离石'){
+                    markers.push({
+                        name: "国网吕梁供电公司",
+                        coord: [111.152032, 37.516873],
+                        symbol: symbol2,
+                        symbolSize: symbolSize2,
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '平城'){
+                    markers.push({
+                        name: "国网大同供电公司",
+                        coord: [113.293305, 40.07701],
+                        symbol: symbol2,
+                        symbolSize: symbolSize2,
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '朔城'){
+                    markers.push({
+                        name: "国网朔州供电公司",
+                        coord: [112.428691, 39.326848],
+                        symbol: symbol2,
+                        symbolSize: symbolSize2,
+                        level: 20 // 设置 level 值
+                    });
+                    markers.push({
+                        name: "神头供电公司",
+                        coord: [112.489562, 39.342887],
+                        symbol: symbol,
+                        symbolSize: symbolSize,
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '忻府'){
+                    markers.push({
+                        name: "国网忻州供电公司",
+                        coord: [112.732551, 38.455998],
+                        symbol: symbol2,
+                        symbolSize: symbolSize2,
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '榆次'){
+                    markers.push({
+                        name: "国网晋中供电公司",
+                        coord: [112.751429, 37.699199],
+                        symbol: symbol2,
+                        symbolSize: symbolSize2,
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '沁'){
+                    markers.push({
+                        name: "国网长治供电公司",
+                        coord: [112.768247, 36.82958],
+                        symbol: symbol2,
+                        symbolSize: symbolSize2,
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '洪洞'){
+                    markers.push({
+                        name: "国网临汾供电公司",
+                        coord: [111.502956, 36.098799],
+                        symbol: symbol2,
+                        symbolSize: symbolSize2,
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '尧都'){
+                    markers.push({
+                        name: "国网临汾供电公司",
+                        coord: [111.536574, 36.079109],
+                        symbol: symbol2,
+                        symbolSize: [20, 20],
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '盐湖'){
+                    markers.push({
+                        name: "运城市公司(本部)",
+                        coord: [110.952935, 35.136313],
+                        symbol: symbol2,
+                        symbolSize: [20, 20],
+                        level: 20 // 设置 level 值
+                    });
+                  }else if(name == '沁水'){
+                    markers.push({
+                        name: "国网晋城供电公司",
+                        coord: [112.266473, 35.683795],
+                        symbol: symbol2,
+                        symbolSize: [20, 20],
+                        level: 20 // 设置 level 值
+                    });
+                  }
+                }
+              }else{//直属单位
+                if (childs.city.indexOf(name) != -1) {
+                  let symbol =
+                  "image://" + require("@/assets/images/main/map/zhishu.png");
+                  let symbolSize = [10,10];
+                  if (poiName && childs.label == poiName) {
+                      // symbol =
+                      //   "image://" +
+                      //   require("@/assets/images/main/map/choosed.png");
+                      symbolSize = [20, 20];
+                    }
+                  markers.push({
+                    name: childs.label,
+                    coord: childs.poi,
+                    symbol: symbol,
+                    symbolSize,
+                    level: 20 // 设置 level 值
+                  });
+                }
+              }
+            } else {
+              //渲染全部
+              if (childs.children && childs.children.length > 0) {
+                //地市级
+                childs.children.forEach((child) => {
+                  let symbol =
+                    "image://" + require("@/assets/images/main/map/xian.png");
+                  let symbolSize = [10,10];
+                  if (child.label != poiName) {
+                    if (child.value.length == 5) {
+                      if (child.city == "临汾市" || child.city == "运城市") {
+                        //不点亮
+                        symbol =
+                          "image://" +
+                          require("@/assets/images/main/map/none.png");
+                        symbolSize = [10, 10];
+                      } else {
+                        //市级单位
+                        symbol =
+                          "image://" +
+                          require("@/assets/images/main/map/shi.png");
+                        lines.push({
+                          coords: [
+                            child.poi,
+                            [112.316448, 38.000045]
+                          ]
+                        })
+                      }
+                    } else if (child.city == "临汾市" || child.city == "运城市") {
+                      //不点亮
+                      symbol =
+                        "image://" + require("@/assets/images/main/map/none.png");
+                      symbolSize = [10, 10];
+                    }else{
+                      // lines.push({
+                      //     coords: [
+                      //       child.poi,
+                      //       [112.316448, 38.000045]
+                      //     ]
+                      //   })
+                    }
+                  } else {
+                    // symbol =
+                    //   "image://" +
+                    //   require("@/assets/images/main/map/choosed.png");
+                    symbolSize = [20, 20];
+                  }
+                  markers.push({
+                    name: child.label,
+                    coord: child.poi,
+                    symbol: symbol,
+                    symbolSize,
+                    level: 20 // 设置 level 值
+                  });
+                });
+              } else {
+                //省公司 直属单位
+                let symbol =
+                  "image://" + require("@/assets/images/main/map/shi.png");
+                let symbolSize = [10,10];
+                if (childs.value == "10001") {
+                  //省公司
+                  symbol = "image://" + require("@/assets/images/build_icon.png");
+                  symbolSize = [0,0];
+                } else if (childs.value == "1A001" || childs.value == "1A002") {
+                  //直属单位
+                  symbol =
+                    "image://" + require("@/assets/images/main/map/zhishu.png");
+                    lines.push({
+                          coords: [
+                          childs.poi,
+                            [112.316448, 38.000045]
+                          ]
+                        })
+                }else if (childs.value == "") {
+                  //直属单位
+                  symbol =
+                    "image://" + require("@/assets/images/main/map/zhishu.png");
+                }
+                if (childs.label == poiName) {
+                  // symbol =
+                  //   "image://" + require("@/assets/images/main/map/choosed.png");
+                  symbolSize = [20, 20];
+                }
+                markers.push({
+                  name: childs.label,
+                  coord: childs.poi,
+                  symbol: symbol,
+                  symbolSize,
+                  level: 20 // 设置 level 值
+                });
+              }
+            }
+          });
+        });
+        //处理太原市 添加太原市图标
+        if (name && name.indexOf("太原") != "-1") {
+          let symbol = "image://" + require("@/assets/images/build_icon.png");
+          let symbolSize = [50,60];
+          markers.push({
+            name: "山西省公司(本部)",
+            coord: [112.316448, 38.000045],
+            symbol: symbol,
+            symbolSize,
+            level: 20 // 设置 level 值
+          });
+        }
+        // console.log(markers,'==========');
+        this.setOptions(markers, name, poiInfo,lines);
+      },
+  
+      setOptions(markers, name, poiInfo,lines) {
+        this.chart.setOption({
+          tooltip: {
+            trigger: 'item',
+            formatter: "{b}"
+          },
+          geo: {
+            map: "shanxi",
+            zoom: 1.1, // 这里设置了初始缩放级别为1.2,可以根据需要调整
+            // top: this.$props.top, // 可以是数值或者百分比
+            // bottom:this.$props.bottom,
+            itemStyle: {
+              borderColor: "#11F6F2", // 外轮廓描边颜色
+              borderWidth: 5, // 外轮廓描边宽度
+              // 阴影
+              shadowColor: "#0E7683", // 阴影颜色
+              shadowBlur: 0, // 阴影模糊度
+              shadowOffsetX: 5, // 阴影水平偏移
+              shadowOffsetY: 13, // 阴影垂直偏移
+            },
+            layoutCenter: ["50%", "50%"], // 设置地图中心点,百分比为相对于容器的位置
+            // layoutSize: {
+            //   // 设置地图大小
+            //   width: 600,
+            //   height: 600,
+            // },
+          },
+          series: [
+            {
+              type: "map",
+              zoom: 1.1, // 这里设置了初始缩放级别为1.2,可以根据需要调整
+              // top: this.$props.top, // 可以是数值或者百分比
+              // bottom:this.$props.bottom,
+              map: "shanxi",
+              itemStyle: {
+                normal: {
+                  areaColor: {
+                    image: imgElement,
+                    repeat: "no-repeat",
+                  }, // 使用图片作为背景颜色,
+                  borderColor: "#11F4F0",
+                  borderWidth: 1,
+                  color: "#333",
+                },
+                emphasis: {
+                  areaColor: "#0D7481",
+                  borderWidth: 0,
+                  color: "#fff",
+                  textStyle: {
+                    color: '#fff' // 高亮状态下文字颜色
+                  }
+                },
+              },
+              label: {
+                show: true,
+                color: "#FFF",
+                fontSize:16,
+                fontWeight:600
+              },
+              markPoint: {
+                data: markers,
+              },
+            },
+            {
+              type: "scatter",
+              coordinateSystem: "geo",
+              zlevel: 10,
+              rippleEffect: {
+                period: 4,
+                brushType: "stroke",
+                scale: 4,
+              },
+              label: {
+                show: false,
+                color: "#fff",
+              },
+              symbol: this.deep <= 1 
+                ? "image://" + require("@/assets/images/build_icon.png")
+                : "",
+              symbolSize: this.deep <= 1 ? 40 : 0,
+              //点的名称和经纬度
+              data: [{ name: "山西省公司(本部)", value: [112.316448, 38.000045] }],
+            },
+            // {
+            //   type: "effectScatter",
+            //   coordinateSystem: "geo",
+            //   data: province,
+            //   symbolSize: 10,
+            //   label: {
+            //     normal: {
+            //       formatter: "{b}",
+            //       position: "right",
+            //       show: false
+            //     },
+            //     emphasis: {
+            //       show: true
+            //     }
+            //   },
+            //   itemStyle: {
+            //     normal: {
+            //       color: "#ddb926"
+            //     }
+            //   }
+            // },
+            // {
+            //   type: "lines",
+            //   coordinateSystem: "geo",
+            //   zlevel:1,
+            //   // polyline: true,
+            //   data: lines,
+            //   // 线样式
+            //   lineStyle: {
+            //     color: '#11F4F0',
+            //     normal: {
+            //       show: true,
+            //       width: 2, //尾迹线条宽度
+            //       opacity: 0.1, //尾迹线条透明度
+            //       curveness: -0.3, //尾迹线条曲直度
+            //       color: "#4CFF8D", // 飞线颜色
+            //     },
+            //     // width: 2,
+            //     // color: '#11F4F0',
+            //   },
+            //   // 箭头样式
+            //   symbol: ['none', 'none'],
+            //   // 线两端的标记样式
+            //   symbolSize: 5,
+            //   // 线两端的标记样式
+            //   effect: {
+            //     show: true,
+            //     period: 2,
+            //     trailLength: 0.1,
+            //     symbol: "pin",
+            //     color: "#4CFF8D",
+            //     symbolSize: 12
+            //   }
+            // }
+          ],
+        });
+  
+        //监听地图点击事件
+        this.chart.off("click");
+        this.chart.on("click", (e) => {
+          this.handleClick(e);
+        });
+      },
+  
+      //监听地图点击事件
+      handleClick(e) {
+        if(e.componentSubType == 'lines'){
+          return;
+        }
+        if (e.componentType == "markPoint" || e.componentSubType == "scatter") {
+          //点击图标
+          if (e.name == "山西省公司(本部)") {
+            this.$emit("mapClick", {
+              name: e.name,
+              deep: 2,
+            });
+          } else {
+            if (this.deep == 1) {
+              this.deep++;
+            }
+            // if(this.deep <= 2){
+            //   this.deep = 2;
+            // }
+            //根据点击的姓名 获取当前的省市区
+            this.handleMarkerClick(e);
+          }
+        } else {
+          //点击地图
+          this.deep++;
+          if (this.deep >= 3) {
+            this.deep = 3;
+          }
+          let name = e.name;
+          if (this.deep == 2) {
+            this.city = name;
+          }
+          if(this.deep > 1){
+            this.$props.top = 100;
+            this.$props.bottom = 100;
+          }
+          this.region = this.dataSource[name];
+          //重新加载地图
+          setTimeout(() => {
+            this.initChart(name);
+            this.$emit("mapClick", {
+              name: name,
+              deep: this.deep,
+            });
+          }, 200);
+        }
+      },
+  
+      //处理点击marker问题
+      handleMarkerClick(e) {
+        let poiName = e.name;
+        let cityName = "";
+        let cityValue = "";
+        let cityValues = "";
+        company.forEach((item) => {
+          item.children.forEach((childs) => {
+            //渲染全部
+            if (childs.children && childs.children.length > 0) {
+              childs.children.forEach((child, index) => {
+                if (child.label == poiName) {
+                  cityName = child.city;
+                  cityValue = child.value;
+                }
+              });
+            } else {
+              if (childs.label == poiName) {
+                cityName = childs.city;
+                cityValue = childs.value;
+              }
+            }
+          });
+        });
+  
+        this.poiName = poiName;
+        //根据childValue 设置默认城市
+        if (cityValue.length > 5) {
+          cityValues = ["10001", cityValue.slice(0, 5), cityValue];
+        } else if(cityValue == '1A001' || cityValue == '1A002' || cityValue == '1A004' || cityValue == '1A005'){
+          cityValues = ["10001", cityValue];
+        }else{
+          cityValues = ["10001", cityValue,cityValue];
+        }
+  
+        this.city = cityName;
+        //地级市不处理地图渲染
+        if (this.deep < 3) {
+          this.region = this.dataSource[cityName];
+        }
+        //重新加载地图
+        setTimeout(() => {
+          this.initChart(cityName);
+          this.$emit("mapClick", {
+            name: cityName,
+            deep: this.deep,
+            curCompany: cityValues,
+          });
+        }, 200);
+      },
+  
+      //返回重置
+      reloadMap(curDeep) {
+        this.poiName = "";
+        this.poiInfo = {};
+        this.deep = curDeep;
+        if (curDeep <= 1) {
+          this.city = "";
+          this.region = 山西省;
+          this.initChart();
+        } else {
+          this.region = this.dataSource[this.city];
+          this.initChart(this.city);
+        }
+      },
+  
+      //父组件调用子组件
+      chooseUnit(e) {
+        let value = "";
+        if (e.length == 3) {
+          value = e[2];
+        } else {
+          value = e[1];
+        }
+        let cityName = "";
+        let poiName = "";
+        let poiInfo = "";
+        //根据公司查询当前的城市
+        company.forEach((item) => {
+          item.children.forEach((childs) => {
+            //渲染全部
+            if (childs.children && childs.children.length > 0) {
+              childs.children.forEach((child, index) => {
+                if (child.value == value) {
+                  cityName = child.city;
+                  poiName = child.label;
+                  poiInfo = child;
+                }
+              });
+            } else {
+              if (childs.value == value) {
+                cityName = childs.city;
+                poiName = childs.label;
+                poiInfo = childs;
+              }
+            }
+          });
+        });
+        this.poiName = poiName;
+        this.poiInfo = poiInfo;
+        if (cityName != "") {
+          this.city = cityName;
+          this.region = this.dataSource[cityName];
+          //重新加载地图
+          setTimeout(() => {
+            this.initChart(cityName);
+            this.$emit("mapClick", {
+              name: cityName,
+              deep: 2,
+              curCompany: e,
+            });
+          }, 200);
+        }
+      },
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  .data-province {
+    display: flex;
+    flex: 1;
+    width: 100%;
+    height: 100%;
+    // background: url("../../../assets/images/main/map_bg2.gif") no-repeat;
+    // background-size: 100% 90%;
+    // mix-blend-mode: multiply;
+    .map{
+      margin-top: -30px;
+    }
+  }
+  .main-map-data {
+    position: relative;
+    .bottom-area {
+      position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 999;
+    }
+  }
+  </style>
+  
+  

+ 2 - 2
src/views/screen/service/basicOperation.vue

@@ -23,7 +23,7 @@
               type="circle"
               :width="70"
               :stroke-width="5"
-              :percentage="95"
+              :percentage=onlineRate
               color="#00F7FF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
@@ -59,7 +59,7 @@ export default {
   data() {
     return {
       dataList: [],
-      onlineRate: {},
+      onlineRate: '',
     };
   },
   created() {

+ 2 - 2
src/views/screen/service/basicOperationDialog.vue

@@ -38,7 +38,7 @@
                     type="circle"
                     :width="70"
                     :stroke-width="5"
-                    :percentage="95"
+                    :percentage="onlineRate"
                     color="#00F7FF"
                     style="color: rgba(0, 247, 255, 0.18)"
                   ></el-progress>
@@ -254,7 +254,7 @@ export default {
       },
 
       dataList: [],
-      onlineRate: {},
+      onlineRate: '',
       //活跃率TOP10公司
       companyBarData: [],
       companyBarAxis: {},

+ 2 - 2
src/views/screen/service/canteen.vue

@@ -5,7 +5,7 @@
       <div class="content-title">
         <span class="title">食堂概览</span>
       </div>
-      <div class="choose-area">
+      <!-- <div class="choose-area">
                 <el-select v-model="canteen" @visible-change="selectOP"  placeholder="请选择">
                   <el-option
                     v-for="item in canteens"
@@ -15,7 +15,7 @@
                   >
                   </el-option>
                 </el-select>
-          </div>
+          </div> -->
       <div class="data-list">
         <div v-for="(item, index) in dataList" :key="index" class="data-item">
           <div class="data-fir">

+ 23 - 20
src/views/screen/service/shareStation.vue

@@ -55,20 +55,20 @@
                   <div class="data-item">
                     <div class="data-fir">
                       <img src="@/assets/images/service_new/img_1.png" class="icon" />
-                      <div class="name">健康自测</div>
+                      <div class="name">{{serviceContent[0].name}}</div>
                     </div>
                     <div class="data-snd">
-                      <div class="num">53</div>
+                      <div class="num">{{serviceContent[0].value}}</div>
                       <div class="unit">个</div>
                     </div>
                   </div>
                   <div class="data-item">
                     <div class="data-fir">
                       <img src="@/assets/images/service_new/img_1.png" class="icon" />
-                      <div class="name">远程问诊</div>
+                      <div class="name">{{serviceContent[1].name}}</div>
                     </div>
                     <div class="data-snd">
-                      <div class="num">27</div>
+                      <div class="num">{{serviceContent[0].value}}</div>
                       <div class="unit">个</div>
                     </div>
                   </div>
@@ -94,7 +94,7 @@
 
 <script>
 
-import {getOverviewData, getToolsChartsList} from "@/api/screen/service";
+import {getOverviewData,getSelfTestAndConsultation} from "@/api/screen/service";
 import PieChart from "@/components/Echarts/PieChart.vue";
 
 
@@ -130,19 +130,13 @@ export default {
       },
       pieTitle: {},
       constructionQuantityNum: {},
+        // 服务内容
+      serviceContent :{},
       completedNum: {},
       participateProportionRate: {
         value:0
       },
-        //服务内容
-        fwData: [
-        { value: 44.15, name: "健康自测" },
-        { value: 24.15, name: "远程问诊" },
-
-        // { value: 24.15, name: "供热采暖" },
-        // { value: 24.15, name: "消防" },
-        // { value: 24.15, name: "给排水" },
-      ],
+      fwData: [],
       fwLegend: {
         top: 115,
         orient: "vertical",
@@ -159,8 +153,8 @@ export default {
   created() {
     //建设完成率
     this.getOverviewData();
-    //工具箱二具数量
-    this.getToolsChartsList();
+    // 服务内容
+    this.getSelfTestAndConsultation()
   },
   destroyed() {},
   beforeDestroy() {},
@@ -176,14 +170,23 @@ export default {
         }
       });
     },
-    //工具箱二具数量
-    getToolsChartsList() {
-      getToolsChartsList(this.$props.appOrg).then((res) => {
+        // 服务内容
+        getSelfTestAndConsultation(){
+      getSelfTestAndConsultation(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
-          this.pieData = res.data;
+          this.serviceContent = res.data;
+          this.fwData = res.data;
         }
       });
     },
+    // //工具箱二具数量
+    // getToolsChartsList() {
+    //   getToolsChartsList(this.$props.appOrg).then((res) => {
+    //     if (Number(res.code) === 200) {
+    //       this.pieData = res.data;
+    //     }
+    //   });
+    // },
   },
 };
 </script>

+ 23 - 20
src/views/screen/service/shareStationDialog.vue

@@ -65,20 +65,20 @@
                   <div class="data-item">
                     <div class="data-fir">
                       <img src="@/assets/images/service_new/img_1.png" class="icon" />
-                      <div class="name">健康自测</div>
+                      <div class="name">{{serviceContent[0].name}}</div>
                     </div>
                     <div class="data-snd">
-                      <div class="num">53</div>
+                      <div class="num">{{serviceContent[0].value}}</div>
                       <div class="unit">个</div>
                     </div>
                   </div>
                   <div class="data-item">
                     <div class="data-fir">
                       <img src="@/assets/images/service_new/img_1.png" class="icon" />
-                      <div class="name">远程问诊</div>
+                      <div class="name">{{serviceContent[1].name}}</div>
                     </div>
                     <div class="data-snd">
-                      <div class="num">27</div>
+                      <div class="num">{{serviceContent[0].value}}</div>
                       <div class="unit">个</div>
                     </div>
                   </div>
@@ -133,7 +133,7 @@
 import PieChart from "@/components/Echarts/PieChart";
 import BarChart from "@/components/Echarts/BarChart.vue";
 
-import { getOverviewData, getToolsChartsList,getPropertyList } from "@/api/screen/service";
+import { getOverviewData,getSelfTestAndConsultation,getPropertyList } from "@/api/screen/service";
 
 export default {
   name: "ShareStationDialog",
@@ -151,6 +151,8 @@ export default {
     return {
       //建设完成达标率
       constructionQuantityNum: {},
+      // 服务内容
+      serviceContent :{},
       completedNum: {},
       participateProportionRate: {
         value:0
@@ -173,14 +175,7 @@ export default {
       //单位列表
       unitDataList: [],
         //服务内容
-        fwData: [
-        { value: 44.15, name: "健康自测" },
-        { value: 24.15, name: "远程问诊" },
-
-        // { value: 24.15, name: "供热采暖" },
-        // { value: 24.15, name: "消防" },
-        // { value: 24.15, name: "给排水" },
-      ],
+      fwData: [],
       fwLegend: {
         top: 115,
         orient: "vertical",
@@ -197,8 +192,8 @@ export default {
   created() {
     //建设完成率
     this.getOverviewData();
-    //工具箱数量
-    this.getToolsChartsList();
+    // 服务内容
+    this.getSelfTestAndConsultation()
     //单位列表
     this.getPropertyList();
   },
@@ -217,15 +212,23 @@ export default {
       });
     },
 
-    //工具箱二具数量
-    getToolsChartsList() {
-      getToolsChartsList(this.$props.appOrg).then((res) => {
+    // //工具箱二具数量
+    // getToolsChartsList() {
+    //   getToolsChartsList(this.$props.appOrg).then((res) => {
+    //     if (Number(res.code) === 200) {
+    //       this.pieData = res.data;
+    //     }
+    //   });
+    // },
+    // 服务内容
+    getSelfTestAndConsultation(){
+      getSelfTestAndConsultation(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
-          this.pieData = res.data;
+          this.serviceContent = res.data;
+          this.fwData = res.data;
         }
       });
     },
-
     //单位数量
     getPropertyList() {
       getPropertyList(this.$props.appOrg).then((res) => {

+ 1 - 1
vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.110.130:8115`,
+        target: `http://192.168.1.197:8115`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''