zhanghao il y a 5 mois
Parent
commit
4ebba76443

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


BIN
src/assets/images/main/lightLone.png


BIN
src/assets/images/service_new/grow.png


BIN
src/assets/images/service_new/liveSwin.png


Fichier diff supprimé car celui-ci est trop grand
+ 632 - 267
src/views/screen/logistics/assets/codeBillDialog.vue


+ 14 - 8
src/views/screen/logistics/houseArea.vue

@@ -10,11 +10,11 @@
           <div class="total-cont">
             <div class="total-list">
               <div class="total">551</div>
-              <div class="unit">栋</div>
+              <div class="unitY">栋</div>
             </div>
             <div class="total-list">
               <div class="total">175.11</div>
-              <div class="unit">万m²</div>
+              <div class="unitY">万m²</div>
             </div>
           </div>
           <div class="charts-cont">
@@ -55,7 +55,7 @@
             <div class="data-item">
               <div class="data-detail">
                 <div class="data">56</div>
-                <div class="unit"></div>
+                <div class="unit"></div>
               </div>
               <img
                 src="@/assets/images/logistics_guarantee/img_7.png"
@@ -66,7 +66,7 @@
             <div class="data-item">
               <div class="data-detail">
                 <div class="data">56</div>
-                <div class="unit"></div>
+                <div class="unit"></div>
               </div>
               <img
                 src="@/assets/images/logistics_guarantee/img_7.png"
@@ -144,12 +144,12 @@ export default {
             //barBorderRadius: [0, 0, 0, 0], // 统一设置四个角的圆角大小
           },
           barWidth: 10,
-          data: [110, 10, 100],
+          data: [110, 30, 100],
         },
       ],
       buildingAreaBarYaxis: {
         type: "category",
-        data: ["现有建筑", "新增建筑", "使用权"],
+        data: ["使用权", "新增建筑", "现有建筑"],
         axisLabel: {
           color: "white", // 设置横坐标轴字体颜色为红色
         },
@@ -309,7 +309,7 @@ export default {
       align-items: baseline;
 
       .total {
-        font-size: 24px;
+        font-size: 32px;
         color: #19fcde;
         font-weight: bold;
         font-family: "electronicFont";
@@ -320,12 +320,18 @@ export default {
         font-weight: 500;
         padding-left:4px;
       }
+      .unitY {
+        font-size: 12px;
+        color: #ffffff;
+        font-weight: 500;
+        padding-left:4px;
+      }
     }
   }
 
   .charts-cont {
     width: 100%;
-    padding-top: 20px;
+    //padding-top: 20px;
   }
 
   .device-cont {

+ 454 - 126
src/views/screen/logistics/logisticsAssets.vue

@@ -1,112 +1,223 @@
 <template>
-  <div class="main-data logistics-assets-operation">
+  <div class="main-data logistics-assets-operation" @click="showAssets" @mouseover="showAssets">
     <!-- <div class="title-area">后勤资产</div> -->
     <div class="content-area">
-      <div class="content-left">
-        <div class="content-title">
-          <span class="title">后勤资产总数</span>
-        </div>
-        <div class="content">
-          <div class="total-cont">
-            <div class="total">203836</div>
-            <div class="unit">个</div>
-          </div>
-          <div class="charts-cont">
-            <pie-chart
-            v-if="show"
-              :chart-data="pieData"
-              :legend="pieLegend"
-              :center="pieCenter"
-              width="240px"
-              height="240px"
-            />
-          </div>
-        </div>
-      </div>
-      <div class="content-right" @click="showAssets" @mouseover="showAssets">
-        <div class="content-title">
-          <span class="title">赋码贴签情况</span>
-        </div>
-        <div class="content">
-          <div class="device-cont">
-            <div class="title">楼宇设备</div>
-            <div class="device-info">
-              <div class="device-item">
-                <img src="@/assets/images/logistics_guarantee/img_5.png" class="icon" alt="" />
-                <div class="rate">
-                  <div class="rate-data">
-                    <div class="data">100</div>
-                    <div class="unit">%</div>
+      <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="desc">赋码率</div>
-                </div>
-              </div>
-              <div class="device-item">
-                <img src="@/assets/images/logistics_guarantee/img_5.png" class="icon" alt="" />
-                <div class="rate">
-                  <div class="rate-data">
-                    <div class="data">100</div>
-                    <div class="unit">%</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 class="desc">贴签率</div>
                 </div>
               </div>
             </div>
           </div>
+        </div>
 
-          <div class="device-cont">
-            <div class="title">服务设备</div>
-            <div class="device-info">
-              <div class="device-item">
-                <img src="@/assets/images/logistics_guarantee/img_5.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 class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">资产台账</span>
+            </div>
+            <div class="content">
+              <div class="leftNav">
+                <div
+              :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'">
+                    <pie-chart
+                    position="left"
+                  :chart-data="lyData"
+                  :legend="lyLegend"
+                  :center="['30%','60%']"                             
+                  width="400px"
+                  height="180px"
+                />
+                </div>
+                <div class="device-item1" v-else-if="showTab === 'service'">
+                    <pie-chart
+                    position="left"
+                  :chart-data="fwData"
+                  :legend="fwLegend"
+                  :center="['30%','60%']"                             
+                  width="400px"
+                  height="180px"
+                />
+                </div>
+                <div class="device-item1" v-else-if="showTab === 'logistics'">
+                    <pie-chart
+                    position="left"
+                  :chart-data="bgData"
+                  :legend="bgLegend"
+                  :center="['30%','60%']"                             
+                  width="400px"
+                  height="180px"
+                />
                 </div>
+            </div>
+          </div>
+
+        </div>
+        <div class="content">
+              <div class="total-cont">
+                <span class="title">资产存量</span>
               </div>
-              <div class="device-item">
-                <img src="@/assets/images/logistics_guarantee/img_5.png" class="icon" alt="" />
-                <div class="rate">
-                  <div class="rate-data">
-                    <div class="data">100</div>
-                    <div class="unit">%</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 class="num">56<span class="unit">m²</span></div>                
                   </div>
-                  <div class="desc">贴签率</div>
-                </div>
+                 </div>
+                 <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 class="num">51<span class="unit">m²</span></div>                
+                  </div>
+                 </div>
+                 <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 class="num">48<span class="unit">m²</span></div>                
+                  </div>
+                 </div>
+           
               </div>
             </div>
-          </div>
 
-          <div class="device-cont">
-            <div class="title">办公物资</div>
-            <div class="device-info">
-              <div class="device-item">
-                <img src="@/assets/images/logistics_guarantee/img_5.png" class="icon" alt="" />
-                <div class="rate">
-                  <div class="rate-data">
-                    <div class="data">100</div>
-                    <div class="unit">%</div>
+            <div class="content">
+              <div class="total-cont">
+                <span class="title">资产新增数量</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 class="num">56<span class="unit">m²</span></div>                
                   </div>
-                  <div class="desc">赋码率</div>
-                </div>
+                 </div>
+                 <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 class="num">51<span class="unit">m²</span></div>                
+                  </div>
+                 </div>
+                 <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 class="num">48<span class="unit">m²</span></div>                
+                  </div>
+                 </div>
+           
+              </div>
+            </div>
+           
+            <div class="content">
+              <div class="total-cont">
+                <span class="title">资产报废数量</span>
               </div>
-              <div class="device-item">
-                <img src="@/assets/images/logistics_guarantee/img_5.png" class="icon" alt="" />
-                <div class="rate">
-                  <div class="rate-data">
-                    <div class="data">100</div>
-                    <div class="unit">%</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 class="num">56<span class="unit">m²</span></div>                
                   </div>
-                  <div class="desc">贴签率</div>
-                </div>
+                 </div>
+                 <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 class="num">51<span class="unit">m²</span></div>                
+                  </div>
+                 </div>
+                 <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 class="num">48<span class="unit">m²</span></div>                
+                  </div>
+                 </div>
+           
               </div>
             </div>
-          </div>
-        </div>
+   
       </div>
+  
     </div>
   </div>
 </template>
@@ -136,27 +247,84 @@ export default {
   },
   data() {
     return {
-      show:true,
+      curIndex: 0,
+      showTab: "main",
       pieData: [
-        { value: 117813, name: "办公物资" },
-        { value: 21851, name: "楼宇资源" },
-        { value: 1801, name: "房产资源" },
-        { value: 3738, name: "服务设备" },
-        { value: 1056, name: "土地资源" },
-        { value: 314, name: "车辆资源" },
+        { value: 24.15, name: "楼宇" },
+        { value: 24.15, name: "办公" },
+        { value: 24.15, name: "服务" },
       ],
       pieLegend: {
-        bottom: 0,
-        orient: "horizontal",
-        right: 0,
+        top: 25,
+        orient: "vertical",
+        right: 15,
+        itemWidth: 8, // 设置图例标记的宽度
+        itemHeight: 8, // 设置图例标记的高度
+        textStyle: {
+          color: "#FFF",
+        },
+      
+      },
+      
+     //楼宇资产占比
+     lyData: [
+        { value: 24.15, name: "电梯" },
+        { value: 24.15, name: "电气" },
+        { value: 44.15, name: "楼宇通风" },
+        { value: 24.15, name: "供热采暖" },
+        { value: 24.15, name: "消防" },
+        { value: 24.15, name: "给排水" },
+      ],
+      lyLegend: {
+        top: 25,
+        orient: "vertical",
+        left: 200,
+        itemWidth: 8, // 设置图例标记的宽度
+        itemHeight: 8, // 设置图例标记的高度
+        textStyle: {
+          color: "#FFF",
+        },
+      
+      },
+      //服务资产占比
+      fwData: [
+        { value: 24.15, name: "电梯" },
+        { value: 24.15, name: "电气" },
+        { value: 44.15, name: "楼宇通风" },
+        // { value: 24.15, name: "供热采暖" },
+        // { value: 24.15, name: "消防" },
+        // { value: 24.15, name: "给排水" },
+      ],
+      fwLegend: {
+        top: 25,
+        orient: "vertical",
+        left: 200,
+        itemWidth: 8, // 设置图例标记的宽度
+        itemHeight: 8, // 设置图例标记的高度
+        textStyle: {
+          color: "#FFF",
+        },
+      
+      },
+      //办公资产占比
+      bgData: [
+        { value: 24.15, name: "电梯" },
+        { value: 24.15, name: "电气" },
+        { value: 44.15, name: "楼宇通风" },
+        { value: 24.15, name: "供热采暖" },
+   
+      ],
+      bgLegend: {
+        top: 25,
+        orient: "vertical",
+        left: 200,
         itemWidth: 8, // 设置图例标记的宽度
         itemHeight: 8, // 设置图例标记的高度
         textStyle: {
           color: "#FFF",
         },
+      
       },
-      pieCenter: ["50%", "40%"],
-      pieRadius: ["35%", "50%"],
     };
   },
   created() {
@@ -166,6 +334,11 @@ export default {
   beforeDestroy() {},
   mounted() {},
   methods: {
+           //切换菜单
+           chooseTab(index) {
+      this.curIndex = index;
+      this.showTab = this.tabs[index].tab;
+    },
 
     //点击显示
     showAssets(){
@@ -203,7 +376,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;
@@ -270,25 +443,79 @@ export default {
     }
   }
   .total-cont{
-    width:100%;
-    padding-top:20px;
-    padding-left: 15px;
-    display: flex;
-    align-items: center;
-
-    .total{
-      font-size: 24px;
-      color: #19FCDE;
-      font-weight: bold;
-      font-family: "electronicFont";
+    width: 100%;
+    height: 35px;
+    background: url("../../../assets/images/main/lightLone.png") no-repeat;
+    background-size: 100% 100%;
+    font-family: "PingFangSC";
+    font-size: 14px;
+    font-weight: bold;
+    color: #ffffff;
+    padding-left: 25px;
+    padding-top: 8px;
+    .line{
+      width: 1px;
+      height: 45px;
+      opacity: 1;
+      background: rgba(25, 252, 222, 0.2);
     }
-    .unit{
-      font-size: 12px;
-      color: #00FFFF;
-      font-weight: 500;
-      position: relative;
-      top:4px;
-      left:2px;
+
+    .total-list{
+      width:auto;
+
+      .total-top{
+        display: flex;
+        align-items: center;
+
+        .img{
+          display: block;
+          width: 14px !important;
+          height: 14px !important;
+        }
+        .total-top-info{
+          padding-left: 6px;
+
+          .name{
+            font-size:14px;
+            color:#FFFFFF;
+          }
+          .desc{
+            font-size:8px;
+            color:#FFFFFF;
+            opacity: 0.4;
+          }
+        }
+      }
+      .total-bot{
+        width:100%;
+        padding-top:6px;
+        display: flex;
+        align-items: center;
+
+        .num-list{
+          display: flex;
+          align-items: center;
+          padding-right:15px;
+
+          .num{
+            font-size: 26px;
+            color: #00FFFF;
+            font-weight: bold;
+            font-family: "electronicFont";
+          }
+          .unit{
+            font-size: 12px;
+            color: #00FFFF;
+            font-weight: 500;
+            position: relative;
+            top:3px;
+            left:2px;
+          }
+        }
+        .num-list:last-child{
+          padding-right: 0;
+        }
+      }
     }
   }
 
@@ -312,11 +539,11 @@ export default {
       align-items: center;
       padding-top:15px;
 
-      .device-item {
+      .device-item1 {
         position: relative;
         img {
-          width: 117px;
-          height: 68px;
+          width: 95px;
+          height: 88px;
         }
         .rate {
           display: flex;
@@ -334,27 +561,128 @@ export default {
             align-items: baseline;
             color: #00ffff;
             .data {
-              font-size: 30px;
+              font-size: 35px;
               font-family: "electronicFont";
+              text-shadow:
+              0px 0px 0 #bbb,
+              -1px -1px 0 #bbb,
+              0px -1px 0 #bbb,
+               -1px 1px 0 #bbb;
+            transform: translateZ(1px);
+            transform: translate3d(0, 0, 1px);
             }
             .unit {
               font-size: 12px;
             }
           }
           .desc {
-            font-size: 12px;
+            font-size: 14px;
             text-align: center;
+            margin-top: 18px;
           }
         }
       }
     }
   }
+  
+  .content {
+    margin-top: 10px;
+    padding-left: 20px;
+  }
+  .dialog-left{
+      width: 520px;
+      float: left;
+    }
+    .dialog-list{
+    width: 100%;
+    display: flex;
+    justify-content: space-between !important;
+    margin-bottom:20px;
+
+    .dialog-item{
+      width: calc(50% - 20px);
+    }
+
+    .dialog-item-cont{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top:40px;
+    }
+
+    .wid100{
+      width:100%;
 
-  ::-webkit-scrollbar {
-    width: 3px;
-    height: 3px;
+      .content-title{
+        width:100%;
+        background: url("../../../assets/images/main/title_pro_long.png") no-repeat;
+      }
+    }
   }
+    //左边菜单
+    .rightList1{
+    display: flex;
+    flex-wrap: wrap;
+    padding: 15px;
+    .left-list{
+        display: flex;
+        align-items: center;
+        margin-bottom: 15px;
+        margin-right: 60px;
+        img{
+          display: block;
+          width:20px;
+          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;
+          }
+        }
+      }
+  }
+  .leftNav{
+    display: flex;
+    .model {
+          margin-right: 15px;
+          width: 130px;
+          height: 45px;
+          line-height: 30px;
+          text-align: center;
+          font-family: "PingFangSc";
+          font-size: 14px;
+          font-weight: bold;
+           background: url("../../../assets/images/main/choose_bg_long.png") no-repeat;
+         // background-size: 95% 95%;
+          color: #CED6D6;
+          cursor: pointer;
+        }
+        .model:last-child {
+          margin-right: 0;
+        }
+        .cur {
+          color: #05FEFE;
+          //  background: url("../../../../assets/images/main/menu_chooe.png") no-repeat;
+        }
+  }
   ::-webkit-scrollbar-thumb {
     //滑块部分
     // border-radius: 5px;

+ 33 - 18
src/views/screen/logistics/projectItem.vue

@@ -22,7 +22,7 @@
                   <div class="unit">个</div>
                 </div>
                 <div class="num-list">
-                  <div class="num">2.55</div>
+                  <div class="num">56</div>
                   <div class="unit">亿元</div>
                 </div>
               </div>
@@ -32,7 +32,7 @@
 
             <div class="total-list">
               <div class="total-top">
-                <img src="@/assets/images/main/blue.png" class="icon" alt="" />
+                <img src="@/assets/images/main/yellow.png" class="icon" alt="" />
                 <div class="total-top-info">
                   <div class="name">投资计算完成率</div>
 
@@ -40,8 +40,8 @@
               </div>
               <div class="total-bot">
                 <div class="num-list">
-                  <div class="num">83</div>
-                  <div class="unit">%</div>
+                  <div class="numT">83</div>
+                  <div class="unitY">%</div>
                 </div>
               </div>
             </div>
@@ -78,7 +78,7 @@
                   <div class="unit">个</div>
                 </div>
                 <div class="num-list">
-                  <div class="num">0.43</div>
+                  <div class="num">43</div>
                   <div class="unit">亿元</div>
                 </div>
               </div>
@@ -88,7 +88,7 @@
 
             <div class="total-list">
               <div class="total-top">
-                <img src="@/assets/images/main/blue.png" class="icon" alt="" />
+                <img src="@/assets/images/main/yellow.png" class="icon" alt="" />
                 <div class="total-top-info">
                   <div class="name">投资计算完成率</div>
 
@@ -96,8 +96,8 @@
               </div>
               <div class="total-bot">
                 <div class="num-list">
-                  <div class="num">82</div>
-                  <div class="unit">%</div>
+                  <div class="numT">92</div>
+                  <div class="unitY">%</div>
                 </div>
               </div>
             </div>
@@ -144,19 +144,20 @@ export default {
       pieCenter: ["50%", "50%"],
       pieRadius: ["35%", "50%"],
       powerGridDataList: [
-        { value: 98, name: "建设完成率" },
-        { value: 63, name: "开工许可率" },
-        { value: 70, name: "开工率" },
-        { value: 70, name: "开工完成率" },
-        { value: 50, name: "竣工验收率" },
+        { value: 75, name: "建设完成率",color:"#00FFFF" },
+        { value: 63, name: "开工许可率",color:"#2F82FE" },
+        { value: 70, name: "开工率",color:"#4D30EF" },
+        { value: 70, name: "开工完成率",color:"#11D861" },
+        { value: 50, name: "竣工验收率",color:"#06A4E1" },
       ],
       powerGridDataList2: [
-        { value: 98, name: "建设完成率" },
-        // { value: 63, name: "开工许可率" },
-        { value: 70, name: "开工率" },
-        // { value: 70, name: "开工完成率" },
-        { value: 50, name: "竣工验收率" },
+      { value: 75, name: "建设完成率",color:"#00FFFF" },
+        { value: 63, name: "开工许可率",color:"#2F82FE" },
+        { value: 70, name: "开工率",color:"#4D30EF" },
+        { value: 70, name: "开工完成率",color:"#11D861" },
+        { value: 50, name: "竣工验收率",color:"#06A4E1" },
       ]
+      
     };
   },
   created() {
@@ -277,6 +278,12 @@ export default {
             font-weight: bold;
             font-family: "electronicFont";
           }
+          .numT{
+            font-size: 26px;
+            color: #E4A34C;
+            font-weight: bold;
+            font-family: "electronicFont";
+          }
           .unit{
             font-size: 12px;
             color: #00FFFF;
@@ -285,6 +292,14 @@ export default {
             top:3px;
             left:2px;
           }
+          .unitY{
+            font-size: 12px;
+            color: #E4A34C;
+            font-weight: 500;
+            position: relative;
+            top:3px;
+            left:2px;
+          }
         }
         .num-list:last-child{
           padding-right: 0;

+ 4 - 3
src/views/screen/service/basicOperation.vue

@@ -23,7 +23,7 @@
               type="circle"
               :width="70"
               :stroke-width="5"
-              :percentage="onlineRate.value"
+              :percentage="95"
               color="#00F7FF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
@@ -88,8 +88,9 @@ export default {
               data: res.data.orderNum.value,
             }
           )
-          console.log(dataList);
-          this.onlineRate = res.data.onlineRate
+          // console.log(dataList);
+          this.onlineRate =JSON.stringify((res.data.orderNum.value/res.data.registerNum.value)*100);
+          //alert(this.onlineRate);
         }
       });
     },

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

@@ -38,7 +38,7 @@
                     type="circle"
                     :width="70"
                     :stroke-width="5"
-                    :percentage="onlineRate.value"
+                    :percentage="95"
                     color="#00F7FF"
                     style="color: rgba(0, 247, 255, 0.18)"
                   ></el-progress>
@@ -314,8 +314,8 @@ export default {
             name: res.data.orderNum.name,
             data: res.data.orderNum.value,
           });
-          console.log(dataList);
-          this.onlineRate = res.data.onlineRate;
+          //console.log(dataList);
+          this.onlineRate =(res.data.orderNum.value/res.data.registerNum.value)*100;
         }
       });
     },

+ 9 - 2
src/views/screen/service/property.vue

@@ -29,19 +29,26 @@
             <div class="name">{{ suggestedNum.name }}</div>
           </div>
           <div class="data-item">
+                  <div class="data">
+                    <div>{{repairOrdersNum.value}}</div>
+                    <div class="unit">个</div>
+                  </div>
+                  <div class="name">{{ repairOrdersNum.name }}</div>
+                </div>
+          <div class="data-item">
             <div class="data">
               <div>{{questionnairesNum.value}}</div>
               <div class="unit">个</div>
             </div>
             <div class="name">{{ questionnairesNum.name }}</div>
           </div>
-          <div class="data-item">
+          <!-- <div class="data-item">
             <div class="data">
               <div>{{carlicense.value}}</div>
               <div class="unit">个</div>
             </div>
             <div class="name">{{ carlicense.name }}</div>
-          </div>
+          </div> -->
           
         </div>
       </div>

+ 9 - 8
src/views/screen/service/propertyDialog.vue

@@ -39,25 +39,26 @@
                 </div>
                 <div class="data-item mar">
                   <div class="data">
-                    <div>{{questionnairesNum.value}}</div>
+                    <div>{{repairOrdersNum.value}}</div>
                     <div class="unit">个</div>
                   </div>
-                  <div class="name">{{ questionnairesNum.name }}</div>
+                  <div class="name">{{ repairOrdersNum.name }}</div>
                 </div>
                 <div class="data-item mar">
                   <div class="data">
-                    <div>{{carlicense.value}}</div>
+                    <div>{{questionnairesNum.value}}</div>
                     <div class="unit">个</div>
                   </div>
-                  <div class="name">{{ carlicense.name }}</div>
+                  <div class="name">{{ questionnairesNum.name }}</div>
                 </div>
-                <div class="data-item mar">
+                <!-- <div class="data-item mar">
                   <div class="data">
-                    <div>{{repairOrdersNum.value}}</div>
+                    <div>{{carlicense.value}}</div>
                     <div class="unit">个</div>
                   </div>
-                  <div class="name">{{ repairOrdersNum.name }}</div>
-                </div>
+                  <div class="name">{{ carlicense.name }}</div>
+                </div> -->
+             
               </div>
             </div>
           </div>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff