Browse Source

更新提交

敲代码的猫 4 tháng trước cách đây
mục cha
commit
5eabb63775

+ 0 - 32
src/api/screen/service.js

@@ -36,14 +36,6 @@ export function getSexChartData(appOrg) {
   })
 }
 
-// 获取员工年龄分布类型
-export function getAgePieData(appOrg) {
-  return request({
-    url: '/large/employee/getAgePieData?appOrg='+ appOrg,
-    method: 'get'
-  })
-}
-
 // 其他数据信息
 export function getEmployeeOtherData(appOrg) {
   return request({
@@ -120,14 +112,6 @@ export function getCanteenDegreeData(appOrg) {
   })
 }
 
-//各单位统计排行
-export function getCanteenTotalRank(appOrg) {
-  return request({
-    url: '/large/smart/getCanteenTotalRank?appOrg='+ appOrg,
-    method: 'get'
-  })
-}
-
 //资质证件
 export function getQualificationData(appOrg, canteen) {
   return request({
@@ -160,22 +144,6 @@ export function getSafetyData(appOrg) {
   })
 }
 
-//能耗信息(本月)
-export function getPowerData(appOrg) {
-  return request({
-    url: '/large/smart/getPowerData?appOrg='+ appOrg,
-    method: 'get'
-  })
-}
-
-//热销菜品排行
-export function getFoodRankData(appOrg) {
-  return request({
-    url: '/large/smart/getFoodRankData?appOrg='+ appOrg,
-    method: 'get'
-  })
-}
-
 //绿智食堂参评情况
 export function geParticipateData(appOrg) {
   return request({

+ 44 - 0
src/components/VideoComponent/index.vue

@@ -17,6 +17,7 @@ export default {
       clientId: "UVP" + Math.floor(Math.random() * 99999999),
       nrUvpVideoObj: '',
       cameraConfig: {},
+      location:'',
     };
   },
   destroyed() {
@@ -121,6 +122,8 @@ export default {
     //授权验证
     initViewer() {
       const that = this;
+      // console.log("session获取id",that.generateUUID())
+      // console.log("时间戳",that.getCurrentTimestamp())
       DataFunc.post('/uvp-backend-common/api/v1/authorization', {
         ak: that.cameraConfig.ak,
         sk: that.cameraConfig.sk
@@ -134,6 +137,26 @@ export default {
         }
       });
     },
+    
+    //开始播放
+    // videoPlay(options) {
+    //   const that = this;
+    //   DataFunc.get('/uvp-micro-service/mediatranscode/api/v1/play', {
+    //     code: options.code,
+    //     sessionId: that.generateUUID(),
+    //     ak: that.cameraConfig.ak,
+    //     token: that.cameraConfig.token,
+    //     redirect:false,
+    //     timestamp: that.getCurrentTimestamp(),
+    //     nonce:that.generateUUID(),
+    //   },{location: true}).then(res => {
+    //     console.log("==获取的视频地址==",res.location);
+    //     if(res && res.location){
+    //       that.location = res.location;
+
+    //     }
+    //   });
+    // },
 
     //开始播放
     videoPlay(options) {
@@ -168,6 +191,27 @@ export default {
       const that = this;
       that.nrUvpVideoObj && that.nrUvpVideoObj.uvpVideoClose({winNum});
     },
+    // 生成UUID
+     generateUUID() {
+    var d = new Date().getTime(); 
+    var d2 = (performance && performance.now && (performance.now()*1000)) || 0; 
+    return 'xxxxxxxxxxxx4xxxy'.replace(/[xy]/g, function(c) {
+        var r = Math.random() * 16; 
+        if(d > 0) { 
+            r = (d + r)%16 | 0;
+            d = Math.floor(d/16);
+        } else { 
+            r = (d2 + r)%16 | 0;
+            d2 = Math.floor(d2/16);
+        }
+        return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+    });
+},
+
+    getCurrentTimestamp() {
+    return new Date().getTime();
+   }
+ 
   },
 };
 </script>

+ 2 - 2
src/router/index.js

@@ -182,8 +182,8 @@ Router.prototype.push = function push(location) {
 }
 
 export default new Router({
-  base: "",
-  mode: 'history', // 去掉url中的#
+  base: "/screen",
+  mode: '', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })

+ 3 - 4
src/views/screen/building/cameraDataDialog.vue

@@ -213,7 +213,7 @@
                     y-color="#FFF"
                     l-color="#FFF"
                     width="565px"
-                    height="160px"
+                    height="300px"
                   />
                 </div>  
 
@@ -231,12 +231,11 @@
             </div>
           </div>
 
-          <div class="dialog-list">
+          <!-- <div class="dialog-list">
             <div class="dialog-item wid100">
               <div class="content-title">
                 <span class="title">能耗设备</span>
               </div>
-               <!-- 能耗设备 -->
               <div class="rightList1">
                   <div class="left-list">                
                       <div class="left-info">
@@ -306,7 +305,7 @@
                 </div>
 
             </div>
-          </div>
+          </div> -->
         </div>
   
         <div class="dialog-right">

+ 2 - 2
src/views/screen/engineering/main.vue

@@ -333,8 +333,8 @@ export default {
       this.showHealth = 1
     },
     onChooseUnit(){
-      this.showC = true;
-      this.showProject = 1;
+      this.showCenter = true;
+      this.showType = 2;
     },
     onCloseRes(){
       this.showC = false

+ 130 - 234
src/views/screen/engineering/projectCameraDia.vue

@@ -1,233 +1,99 @@
 <template>
-  <div class="main-data data-weeks-foods">
-    <div class="title-area">摄像头列表</div>
+  <div class="main-data data-week-foods">
+    <div class="title-area">监控列表</div>
+    <!-- 选择日期 -->
     <div class="close-btn" @click="close"></div>
-    <div class="me">
-      <div v-for="(item, index) in unitDataList" :key="index">
-        <img src="../../../assets/camera/camera.png" width="200px" @click="choose" style="cursor: pointer">
+    <div class="content-area">
+      <div class="content">
+        <div class="monitor-cont">
+          <div class="monitor-list" v-for="(item,index) in monitorList" :key="index" @click="chooseItem(index)">
+            <img src="@/assets/images/building_guarantee/img_12.png" class="img" />
+            <div class="monitor-info">
+              <div class="name">{{item.abbreviation}}</div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getFoodsList } from "@/api/screen/service";
-import pinyin from "../data/pinyin.js";
+import {videoList} from "@/api/screen/service";
 
 export default {
-  name: "UnitCamera",
+  name: "projectCameraDia",
+  props: {
+    // monitorName:{
+    //   type: String,
+    //   default: "",
+    //   required: true,
+    // }
+  },
   data() {
     return {
-      unitDataList: [
-        {
-          name: "国网山西省电力公司",
-          num: 56,
-          onLineNum: 46
-        },
-        {
-          name: "国网太原供电公司",
-          num: 10,
-          onLineNum: 8
-        },
-        {
-          name: "国网运城供电公司",
-          num: 8,
-          onLineNum: 4
-        },
-        {
-          name: "国网山西省电力公司",
-          num: 56,
-          onLineNum: 46
-        },
-        {
-          name: "国网太原供电公司",
-          num: 10,
-          onLineNum: 8
-        },
-        {
-          name: "国网运城供电公司",
-          num: 8,
-          onLineNum: 4
-        },
-        {
-          name: "国网山西省电力公司",
-          num: 56,
-          onLineNum: 46
-        },
-        {
-          name: "国网太原供电公司",
-          num: 10,
-          onLineNum: 8
-        },
-        {
-          name: "国网运城供电公司",
-          num: 8,
-          onLineNum: 4
-        },
-        {
-          name: "国网山西省电力公司",
-          num: 56,
-          onLineNum: 46
-        },
-        {
-          name: "国网太原供电公司",
-          num: 10,
-          onLineNum: 8
-        },
-        {
-          name: "国网运城供电公司",
-          num: 8,
-          onLineNum: 4
-        },
-        {
-          name: "国网山西省电力公司",
-          num: 56,
-          onLineNum: 46
-        },
-        {
-          name: "国网太原供电公司",
-          num: 10,
-          onLineNum: 8
-        },
-        {
-          name: "国网运城供电公司",
-          num: 8,
-          onLineNum: 4
-        },
-        {
-          name: "国网山西省电力公司",
-          num: 56,
-          onLineNum: 46
-        },
-        {
-          name: "国网太原供电公司",
-          num: 10,
-          onLineNum: 8
-        },
-        {
-          name: "国网运城供电公司",
-          num: 8,
-          onLineNum: 4
-        }],
+      monitorList: [],
     };
   },
+  created() {
+    this.videoList();
+  },
+  destroyed() {},
+  beforeDestroy() {},
   mounted() {},
   methods: {
-    choose(){
-      this.$emit("choose");
+    //统一视频(工程现场监控)
+    videoList() {
+      let code = "";
+      videoList(code).then((res) => {
+        if (Number(res.code) === 200) {
+          this.monitorList = res.data
+        }
+      });
     },
 
-    close() {
-      this.$emit("close");
+    close(){
+      this.$emit("close")
     },
+
+    //选择单个摄像头
+    chooseItem(index){
+      alert(JSON.stringify(this.monitorList[index]))
+      this.$emit("choose", this.monitorList[index]);
+    }
+
   },
 };
 </script>
 
-<style lang="scss" scoped>
-.me{
-  display: flex;flex-wrap: wrap;justify-content: space-around;height: 380px;overflow: auto;
-}
-.me::-webkit-scrollbar {
-  display: none;
-}
-.said{
-  width: 2px;
-  margin-right: 8px;
-  height: 16px;
-  background-color: #00FFFF;
-}
-.table-cont{
-  width:100%;
-
-  .table-top{
-    width:100%;
-    height: 26px;
-    background: url("../../../assets/images/building_guarantee/img_11.png") no-repeat;
-    background-size: 100% 100%;
-    padding:0 4px 0 10px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size:14px;
-    color:#00FFFF;
-  }
-  .table-bot{
-    width:100%;
-    height: 300px;
-    overflow: auto;
-    .table-list{
-      margin-bottom: 10px;
-      align-items: center;
-      background: radial-gradient(
-          190% 71% at 50% 49%,
-          rgba(21, 105, 107, 0.54) 0%,
-          rgba(27, 95, 97, 0) 100%
-      );
-      width:100%;
-      height:30px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      font-size:14px;
-      color:#FFFFFF;
-      font-weight: 500;
-    }
-    .table-list:hover{
-      background: radial-gradient(
-          190% 71% at 50% 49%,
-          rgba(47, 204, 208, 0.74) 0%,
-          rgba(27, 95, 97, 0) 100%
-      );
-      cursor: pointer;
-    }
-  }
-  .table-bot::-webkit-scrollbar {
-    display: none; /* 隐藏滚动条 */
-  }
-
-  .fir{
-    width:40%;
-    text-align: left;
-    display: flex;
-  }
-  .snd{
-    width:30%;
-    text-align: left;
-  }
-  .thd{
-    width:30%;
-    text-align: left;
-  }
-}
+<style lang="scss">
 
-.el-scrollbar {
-  background: #15696b;
+.el-scrollbar{
+  background: #15696B;
   border: 1px solid #00ffff;
-  ul {
-    li {
-      color: #fff;
+  ul{
+    li{
+      color: #FFF;
     }
   }
 }
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
-  background: #15696b;
-  color: #00ffff;
+.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+  background: #15696B;
+  color: #00FFFF;
 }
-.el-select-dropdown__item.selected {
-  color: #00ffff;
+.el-select-dropdown__item.selected{
+  color: #00FFFF;
 }
-.el-select .el-input .el-select__caret {
+.el-select .el-input .el-select__caret{
   display: none;
 }
-.data-weeks-foods {
+.data-week-foods {
   position: relative;
-  width: 668px;
-  height: 432px;
+  width: 890px;
+  height: 576px;
   background: url("../../../assets/images/main/dialog-bg.png") no-repeat;
   background-size: cover;
-  .close-btn {
+  .close-btn{
     position: absolute;
     right: 0;
     top: 0;
@@ -235,7 +101,7 @@ export default {
     height: 50px;
     cursor: pointer;
   }
-  .choose-area {
+  .choose-area{
     position: absolute;
     right: 100px;
     top: 7px;
@@ -244,18 +110,15 @@ export default {
     line-height: 30px;
     padding-left: 15px;
     font-size: 14px;
-    color: #00ffff;
+    color: #00FFFF;
     background: url("../../../assets/images/main/choose_short.png") no-repeat;
     cursor: pointer;
-  }
-  .choose-area.choose-week{
-    right: 200px;
+
   }
   .content-area {
     display: flex;
     flex-direction: column;
     padding: 15px 20px 0 15px;
-    padding-top: 0 !important;
   }
 
   .content-title {
@@ -263,7 +126,7 @@ export default {
     height: 26px;
     background: url("../../../assets/images/main/title_pro_long.png") no-repeat;
     background-size: 100% 100%;
-    font-family: "PingFangSC";
+    font-family: PingFang SC;
     font-size: 16px;
     font-weight: bold;
     color: #00ffff;
@@ -279,11 +142,7 @@ export default {
     flex-direction: row;
     align-items: center;
     .data-list {
-      background: radial-gradient(
-          190% 71% at 50% 49%,
-          rgba(21, 105, 107, 0.54) 0%,
-          rgba(27, 95, 97, 0) 100%
-      );
+      background: radial-gradient(190% 71% at 50% 49%, rgba(21, 105, 107, 0.54) 0%, rgba(27, 95, 97, 0) 100%);
       width: 100%;
       height: 492px;
       padding: 20px;
@@ -291,23 +150,10 @@ export default {
       white-space: pre-wrap;
       .data-item {
         display: inline-block;
-        color: #00ffff;
+        color: #00FFFF;
         font-weight: bold;
-        margin: 0 20px 20px 0;
+        margin: 0 40px 28px 0;
         font-size: 14px;
-        img {
-          width: 80px;
-          height: 80px;
-          object-fit: cover;
-        }
-        .name {
-          width: 80px;
-          display: block;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          text-align: center;
-        }
       }
     }
   }
@@ -334,26 +180,77 @@ export default {
     }
   }
 
-  .choose-area {
-    .el-select {
-      width: 90%;
+  .choose-area{
+    .el-select{
+      width: 50%;
     }
-    .el-input {
-      input {
+    .el-input{
+      input{
         background: rgba(255, 255, 255, 0);
-        color: #00ffff;
+        color: #00FFFF;
         border: none;
         padding: 0;
         width: 30px;
       }
     }
+
+
+  }
+
+  .monitor-cont{
+    width:100%;
+    display: flex;
+    flex-wrap: wrap;
+    padding:0 15px 20px;
+    background: url("../../../assets/images/main/data_bg6.png") no-repeat;
+    background-size: 100% 100%;
+    .monitor-list{
+      width:151px;
+      position: relative;
+      margin:0 10px 10px 0;
+      cursor: pointer;
+      .img{
+        display: block;
+        width:151px;
+        height:104px;
+      }
+      .monitor-info{
+        position: absolute;
+        left:0;
+        bottom: 0;
+        width: 100%;
+        height: 25px;
+        opacity: 0.55;
+        background: #000000;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 8px;
+
+        .name{
+          font-size: 13px;
+          color: #FFFFFF;
+          font-weight: 500;
+        }
+        .online{
+          font-size: 12px;
+          color: #00F6EC;
+          font-weight: 500;
+        }
+        .offline{
+          font-size: 12px;
+          color: #F60000;
+          font-weight: 500;
+        }
+      }
+    }
+    .monitor-list:nth-child(5n){
+      margin-right: 0;
+    }
   }
 
-  .no-data{
-    text-align: center;
-    color: #62ffe5;
-    font-size: 25px;
-    margin-top: 150px;
+  .title-area{
+    padding-left: 40px !important;
   }
 
   ::-webkit-scrollbar {
@@ -375,4 +272,3 @@ export default {
   }
 }
 </style>
-

+ 47 - 1
src/views/screen/logistics/assets/codeBillDialog.vue

@@ -40,6 +40,7 @@
                   :chart-data="lyData"
                   :legend="lyLegend"
                   :center="['30%','60%']"
+                  :title="lyTitle"
                   width="400px"
                   height="180px"
                 />
@@ -212,6 +213,7 @@
                     position="left"
                   :chart-data="pieData"
                   :legend="pieLegend"
+                  :title="pieTitle"
                   :center="['35%','40%']"
 
                   width="220px"
@@ -410,7 +412,7 @@ export default {
         { value: 24.15, name: "服务" },
       ],
       pieLegend: {
-        top: 25,
+        top: 30,
         orient: "vertical",
         right: 15,
         itemWidth: 8, // 设置图例标记的宽度
@@ -420,6 +422,28 @@ export default {
         },
 
       },
+      pieTitle: {
+        text: "{title|三大类}\n{subtitle|资产占比}",
+        left: "20%",//对齐方式居中
+        top: "28%",//距离顶部
+        textStyle: {
+              rich: {
+                title: {
+                  color: '#ffffff',
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  align: 'center',
+                },
+                subtitle: {
+                  fontSize: 14,
+                  color: '#ffffff',
+                  fontWeight: 'normal',
+                  lineHeight: 30,
+                  align: 'center',
+                },
+              }
+            }
+      },
       pieCenter: ["50%", "40%"],
       //楼宇资产占比
       lyData: [
@@ -441,6 +465,28 @@ export default {
         },
 
       },
+      lyTitle: {
+        text: "{title|资产数量}\n{subtitle|5656}",
+        left: "22%",//对齐方式居中
+        top: "48%",//距离顶部
+        textStyle: {
+              rich: {
+                title: {
+                  color: '#ffffff',
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  align: 'center',
+                },
+                subtitle: {
+                  fontSize: 16,
+                  color: '#00FFFF',
+                  fontFamily: 'electronicFont',
+                  lineHeight: 30,
+                  align: 'center',
+                },
+              }
+            }
+      },
       //服务资产占比
       fwData: [
         { value: 24.15, name: "电梯" },

+ 46 - 1
src/views/screen/logistics/logisticsAssets.vue

@@ -35,6 +35,7 @@
                     position="left"
                   :chart-data="lyData"
                   :legend="lyLegend"
+                  :title="lyTitle"
                   :center="['30%','60%']"
                   width="400px"
                   height="180px"
@@ -209,6 +210,7 @@
                     position="left"
                   :chart-data="pieData"
                   :legend="pieLegend"
+                  :title="pieTitle"
                   :center="['35%','40%']"
                   width="220px"
                   height="180px"
@@ -269,7 +271,28 @@ export default {
         },
 
       },
-
+      pieTitle: {
+        text: "{title|三大类}\n{subtitle|资产占比}",
+        left: "20%",//对齐方式居中
+        top: "28%",//距离顶部
+        textStyle: {
+              rich: {
+                title: {
+                  color: '#ffffff',
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  align: 'center',
+                },
+                subtitle: {
+                  fontSize: 14,
+                  color: '#ffffff',
+                  fontWeight: 'normal',
+                  lineHeight: 30,
+                  align: 'center',
+                },
+              }
+            }
+      },
      //楼宇资产占比
      lyData: [
         { value: 24.15, name: "电梯" },
@@ -290,6 +313,28 @@ export default {
         },
 
       },
+      lyTitle: {
+        text: "{title|资产数量}\n{subtitle|5656}",
+        left: "22%",//对齐方式居中
+        top: "48%",//距离顶部
+        textStyle: {
+              rich: {
+                title: {
+                  color: '#ffffff',
+                  fontSize: 14,
+                  fontWeight: 'normal',
+                  align: 'center',
+                },
+                subtitle: {
+                  fontSize: 16,
+                  color: '#00FFFF',
+                  fontFamily: 'electronicFont',
+                  lineHeight: 30,
+                  align: 'center',
+                },
+              }
+            }
+      },
       //服务资产占比
       fwData: [
         { value: 24.15, name: "电梯" },

+ 0 - 133
src/views/screen/service/canteenDialog.vue

@@ -538,13 +538,10 @@ import {
   getCanteenData,
   getCanteenScoreData,
   getCanteenDegreeData,
-  getCanteenTotalRank,
   getQualificationData,
   getFoodData,
   getOtherData,
   getSafetyData,
-  getPowerData,
-  getFoodRankData,
   geParticipateData,
   getDiningPieData,
   getSmartCanteenPieData,
@@ -773,9 +770,6 @@ export default {
     //各食堂满意度排名
     this.getCanteenDegreeData();
 
-    //各单位统计排行
-    this.getCanteenTotalRank();
-
     //菜品信息
     this.getFoodData();
 
@@ -785,12 +779,6 @@ export default {
     //食堂安全管理
     this.getSafetyData();
 
-    //能耗信息(本月)
-    this.getPowerData();
-
-    //热销菜品排行
-    this.getFoodRankData();
-
     //绿智食堂参评情况
     this.geParticipateData();
 
@@ -1232,53 +1220,6 @@ export default {
       });
     },
 
-    //各单位统计排行
-    getCanteenTotalRank() {
-      getCanteenTotalRank(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.canteenTotalRankBarData = [
-            {
-              name: res.data.chefs.name,
-              type: "bar",
-
-              itemStyle: {
-                color: res.data.chefs.color,
-                //barBorderRadius: [5, 5, 0, 0], // 统一设置四个角的圆角大小
-              },
-              barWidth: 20,
-              data: res.data.chefs.dataList,
-            },
-            {
-              name: res.data.service.name,
-              type: "bar",
-              itemStyle: {
-                color: res.data.service.color,
-                //barBorderRadius: [5, 5, 0, 0], // 统一设置四个角的圆角大小
-              },
-              barWidth: 20,
-              data: res.data.service.dataList,
-            },
-          ];
-          this.canteenTotalRankBarAxis = {
-            type: "category",
-            data: res.data.xList,
-            axisLabel: {
-              interval: 0,
-              color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: -20,
-            },
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              lineStyle: {
-                color: "#465A64",
-              },
-            },
-          };
-        }
-      });
-    },
 
     //获取资质证件
     getQualificationData() {
@@ -1324,80 +1265,6 @@ export default {
       });
     },
 
-    //能耗信息(本月)
-    getPowerData() {
-      this.energyData = [];
-      getPowerData(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          let list3 = [
-            "quantityHeat",
-            "gasVolume",
-            "waterConsumption",
-          ];
-          for (let index = 0; index < list3.length; index++) {
-            let name = "";
-            if(index == 0){
-              name = '食堂用气量';
-            }else if(index == 1){
-              name = '食堂用热量';
-            }else if(index == 2){
-              name = '食堂用热量';
-            }
-            this.energyData.push({
-              name: name,
-              data: res.data[list3[index]].value,
-            });
-          }
-        }
-      });
-    },
-
-    //热销菜品排行
-    getFoodRankData() {
-      getFoodRankData(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.foodsRankBarData = [
-            {
-              name: "",
-              type: "bar",
-              itemStyle: {
-                color: res.data.yData.color,
-              },
-              barWidth: 30,
-              data: res.data.yData.yList,
-            },
-          ];
-
-          this.foodsRankBarGrid = {
-            top: 30,
-            bottom: 0,
-            left: "3%",
-            right: "2%",
-            containLabel: true,
-          };
-
-          this.foodsRankBarAxis = {
-            type: "category",
-            data: res.data.xList,
-            axisLabel: {
-              color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 0,
-              interval: 0,
-            },
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              lineStyle: {
-                color: "#0A7C80",
-              },
-            },
-            splitArea: false,
-          };
-        }
-      });
-    },
-
     //绿智食堂参评情况
     geParticipateData() {
       geParticipateData(this.$props.appOrg).then((res) => {

+ 1 - 13
src/views/screen/service/employeeProfileDialog.vue

@@ -187,7 +187,6 @@ import {
   getEnterBuildData,
   getEmployeePieData,
   getPastWeekFlowData,
-  getAgePieData,
   getSexChartData, getEmployeeOtherData,
 } from "@/api/screen/service";
 
@@ -252,8 +251,7 @@ export default {
         splitArea:false
       },
 
-      //员工年龄分布情况
-      sexPieData: [],
+     
 
       //员工性别分布情况
       sexBarData: [],
@@ -301,8 +299,6 @@ export default {
     this.getEnterBuildData();
     //一周人流量
     this.getPastWeekFlowData();
-    //员工年龄分布情况
-    this.getAgePieData();
     //员工性别分布情况
     this.getSexChartData();
     //其他数据信息
@@ -422,14 +418,6 @@ export default {
       });
     },
 
-    //员工年龄分布情况
-    getAgePieData() {
-      getAgePieData(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.sexPieData = res.data;
-        }
-      });
-    },
 
     //员工性别分布情况
     getSexChartData() {