测试

src/api/screen/service.js

@@ -5,7 +5,7 @@ import request from '@/utils/request'
 // 获取员工类型
 export function getEmployeePieData(appOrg) {
   return request({
-    url: '/employee/getEmployeePieData?appOrg='+ appOrg,
+    url: '/large/employee/getEmployeePieData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -14,7 +14,7 @@ export function getEmployeePieData(appOrg) {
 // 获取入楼情况
 export function getEnterBuildData(appOrg) {
   return request({
-    url: '/employee/getEnterBuildData?appOrg='+ appOrg,
+    url: '/large/employee/getEnterBuildData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -22,7 +22,7 @@ export function getEnterBuildData(appOrg) {
 // 近一周人流量
 export function getPastWeekFlowData(appOrg) {
   return request({
-    url: '/employee/getPastWeekFlowData?appOrg='+ appOrg,
+    url: '/large/employee/getPastWeekFlowData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -31,7 +31,7 @@ export function getPastWeekFlowData(appOrg) {
 // 获取员工性别情况
 export function getSexChartData(appOrg) {
   return request({
-    url: '/employee/getSexChartData?appOrg='+ appOrg,
+    url: '/large/employee/getSexChartData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -39,7 +39,7 @@ export function getSexChartData(appOrg) {
 // 获取员工年龄分布类型
 export function getAgePieData(appOrg) {
   return request({
-    url: '/employee/getAgePieData?appOrg='+ appOrg,
+    url: '/large/employee/getAgePieData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -47,7 +47,7 @@ export function getAgePieData(appOrg) {
 // 其他数据信息
 export function getEmployeeOtherData(appOrg) {
   return request({
-    url: '/employee/getOtherData?appOrg='+ appOrg,
+    url: '/large/employee/getOtherData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -57,7 +57,7 @@ export function getEmployeeOtherData(appOrg) {
 // 健康服务
 export function getHealthData(appOrg) {
   return request({
-    url: '/health/getHealthData?appOrg='+ appOrg,
+    url: '/large/health/getHealthData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -65,7 +65,7 @@ export function getHealthData(appOrg) {
 // 近12月大病发现数量
 export function getHealthIllnessBrokenData(appOrg) {
   return request({
-    url: '/health/getHealthIllnessBrokenData?appOrg='+ appOrg,
+    url: '/large/health/getHealthIllnessBrokenData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -74,7 +74,7 @@ export function getHealthIllnessBrokenData(appOrg) {
 // 多发疾病排行
 export function getIllnessChartData(appOrg) {
   return request({
-    url: '/health/getIllnessChartData?appOrg='+ appOrg,
+    url: '/large/health/getIllnessChartData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -82,7 +82,7 @@ export function getIllnessChartData(appOrg) {
 // 体检情况 柱形图
 export function getPhysicalChartData(appOrg) {
   return request({
-    url: '/health/getPhysicalChartData?appOrg='+ appOrg,
+    url: '/large/health/getPhysicalChartData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -90,7 +90,7 @@ export function getPhysicalChartData(appOrg) {
 // 体检情况 饼图
 export function getPhysicalPieData(appOrg) {
   return request({
-    url: '/health/getPhysicalPieData?appOrg='+ appOrg,
+    url: '/large/health/getPhysicalPieData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -99,7 +99,7 @@ export function getPhysicalPieData(appOrg) {
 //食堂概览
 export function getCanteenData(appOrg) {
   return request({
-    url: '/smart/getCanteenData?appOrg='+ appOrg,
+    url: '/large/smart/getCanteenData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -107,7 +107,7 @@ export function getCanteenData(appOrg) {
 //食堂服务满意度
 export function getCanteenScoreData(appOrg, canteen) {
   return request({
-    url: '/smart/getCanteenScoreData?appOrg='+ appOrg + '&canteenName=' + canteen,
+    url: '/large/smart/getCanteenScoreData?appOrg='+ appOrg + '&canteenName=' + canteen,
     method: 'get'
   })
 }
@@ -115,7 +115,7 @@ export function getCanteenScoreData(appOrg, canteen) {
 //各食堂满意度排名
 export function getCanteenDegreeData(appOrg) {
   return request({
-    url: '/smart/getCanteenDegreeData?appOrg='+ appOrg,
+    url: '/large/smart/getCanteenDegreeData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -123,7 +123,7 @@ export function getCanteenDegreeData(appOrg) {
 //各单位统计排行
 export function getCanteenTotalRank(appOrg) {
   return request({
-    url: '/smart/getCanteenTotalRank?appOrg='+ appOrg,
+    url: '/large/smart/getCanteenTotalRank?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -131,7 +131,7 @@ export function getCanteenTotalRank(appOrg) {
 //资质证件
 export function getQualificationData(appOrg, canteen) {
   return request({
-    url: '/smart/getQualificationData?appOrg='+ appOrg + '&canteenName=' + canteen,
+    url: '/large/smart/getQualificationData?appOrg='+ appOrg + '&canteenName=' + canteen,
     method: 'get'
   })
 }
@@ -139,7 +139,7 @@ export function getQualificationData(appOrg, canteen) {
 //菜品信息
 export function getFoodData(appOrg) {
   return request({
-    url: '/smart/getFoodData?appOrg='+ appOrg,
+    url: '/large/smart/getFoodData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -147,7 +147,7 @@ export function getFoodData(appOrg) {
 //其他数据信息
 export function getOtherData(appOrg) {
   return request({
-    url: '/smart/getOtherData?appOrg='+ appOrg,
+    url: '/large/smart/getOtherData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -155,7 +155,7 @@ export function getOtherData(appOrg) {
 //食堂安全管理
 export function getSafetyData(appOrg) {
   return request({
-    url: '/smart/getSafetyData?appOrg='+ appOrg,
+    url: '/large/smart/getSafetyData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -163,7 +163,7 @@ export function getSafetyData(appOrg) {
 //能耗信息（本月）
 export function getPowerData(appOrg) {
   return request({
-    url: '/smart/getPowerData?appOrg='+ appOrg,
+    url: '/large/smart/getPowerData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -171,7 +171,7 @@ export function getPowerData(appOrg) {
 //热销菜品排行
 export function getFoodRankData(appOrg) {
   return request({
-    url: '/smart/getFoodRankData?appOrg='+ appOrg,
+    url: '/large/smart/getFoodRankData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -179,7 +179,7 @@ export function getFoodRankData(appOrg) {
 //绿智食堂参评情况
 export function geParticipateData(appOrg) {
   return request({
-    url: '/smart/geParticipateData?appOrg='+ appOrg,
+    url: '/large/smart/geParticipateData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -187,7 +187,7 @@ export function geParticipateData(appOrg) {
 //就餐情况
 export function getDiningPieData(appOrg) {
   return request({
-    url: '/smart/getDiningPieData?appOrg='+ appOrg,
+    url: '/large/smart/getDiningPieData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -196,7 +196,7 @@ export function getDiningPieData(appOrg) {
 //智慧食堂
 export function getSmartCanteenPieData(appOrg) {
   return request({
-    url: '/smart/getSmartCanteenPieData?appOrg='+ appOrg,
+    url: '/large/smart/getSmartCanteenPieData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -205,7 +205,7 @@ export function getSmartCanteenPieData(appOrg) {
 //员工服务
 export function getSmartEmployeePieData(appOrg) {
   return request({
-    url: '/smart/getEmployeePieData?appOrg='+ appOrg,
+    url: '/large/smart/getEmployeePieData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -213,7 +213,7 @@ export function getSmartEmployeePieData(appOrg) {
 //电子餐券
 export function getElectronicVouchersData(appOrg) {
   return request({
-    url: '/smart/getElectronicVouchersData?appOrg='+ appOrg,
+    url: '/large/smart/getElectronicVouchersData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -221,7 +221,7 @@ export function getElectronicVouchersData(appOrg) {
 //食堂列表
 export function getCanteenNameList(appOrg) {
   return request({
-    url: '/smart/getCanteenNameList?appOrg='+ appOrg,
+    url: '/large/smart/getCanteenNameList?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -230,7 +230,7 @@ export function getCanteenNameList(appOrg) {
 //菜谱列表
 export function getFoodsList(appOrg) {
   return request({
-    url: '/smart/getFoodsList?appOrg='+ appOrg,
+    url: '/large/smart/getFoodsList?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -239,7 +239,7 @@ export function getFoodsList(appOrg) {
 // 建设完成达标率
 export function getOverviewData(appOrg) {
   return request({
-    url: '/property/getOverviewData?appOrg='+ appOrg,
+    url: '/large/property/getOverviewData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -247,7 +247,7 @@ export function getOverviewData(appOrg) {
 // 单位列表
 export function getPropertyList(appOrg) {
   return request({
-    url: '/property/getPropertyList?appOrg='+ appOrg,
+    url: '/large/property/getPropertyList?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -255,7 +255,7 @@ export function getPropertyList(appOrg) {
 // 工具箱二具数量
 export function getToolsChartsList(appOrg) {
   return request({
-    url: '/property/getToolsChartsList?appOrg='+ appOrg,
+    url: '/large/property/getToolsChartsList?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -264,7 +264,7 @@ export function getToolsChartsList(appOrg) {
 // 数据概况
 export function getBasicOverviewData(appOrg) {
   return request({
-    url: '/basics/getOverviewData?appOrg='+ appOrg,
+    url: '/large/basics/getOverviewData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -272,7 +272,7 @@ export function getBasicOverviewData(appOrg) {
 // 服务器
 export function getServerListData(appOrg) {
   return request({
-    url: '/basics/getServerListData?appOrg='+ appOrg,
+    url: '/large/basics/getServerListData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -280,7 +280,7 @@ export function getServerListData(appOrg) {
 // 系统运行峰值情况分析
 export function getSystemRunData(appOrg) {
   return request({
-    url: '/basics/getSystemRunData?appOrg='+ appOrg,
+    url: '/large/basics/getSystemRunData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -288,7 +288,7 @@ export function getSystemRunData(appOrg) {
 // 系统运行报警信息
 export function getSystemRunErrData(appOrg) {
   return request({
-    url: '/basics/getSystemRunErrData?appOrg='+ appOrg,
+    url: '/large/basics/getSystemRunErrData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -296,7 +296,7 @@ export function getSystemRunErrData(appOrg) {
 // 获取活跃top10公司
 export function getTopTenCompany(appOrg) {
   return request({
-    url: '/basics/getTopTenCompany?appOrg='+ appOrg,
+    url: '/large/basics/getTopTenCompany?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -305,7 +305,7 @@ export function getTopTenCompany(appOrg) {
 // 数据概况
 export function getPostOverviewData(appOrg) {
   return request({
-    url: '/post/getOverviewData?appOrg='+ appOrg,
+    url: '/large/post/getOverviewData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -313,7 +313,7 @@ export function getPostOverviewData(appOrg) {
 // 近一个月报修分类占比
 export function getPastMonthPieData(appOrg) {
   return request({
-    url: '/post/getPastMonthPieData?appOrg='+ appOrg,
+    url: '/large/post/getPastMonthPieData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -321,7 +321,7 @@ export function getPastMonthPieData(appOrg) {
 // 近六个月报修订单分类
 export function getPastSixMonthChartsData(appOrg) {
   return request({
-    url: '/post/getPastSixMonthChartsData?appOrg='+ appOrg,
+    url: '/large/post/getPastSixMonthChartsData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -329,7 +329,7 @@ export function getPastSixMonthChartsData(appOrg) {
 //一周车流量统计
 export function getCarFlowData(appOrg) {
   return request({
-    url: '/post/getCarFlowData?appOrg='+ appOrg,
+    url: '/large/post/getCarFlowData?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -339,7 +339,7 @@ export function getCarFlowData(appOrg) {
 //碳排放量月度变化趋势图
 export function carbonEmissionStatistics() {
   return request({
-    url: '/build/carbonEmissionStatistics',
+    url: '/large/build/carbonEmissionStatistics',
     method: 'get'
   })
 }
@@ -347,7 +347,7 @@ export function carbonEmissionStatistics() {
 //数据中心机房信息
 export function dataCenterRoom(appOrg) {
   return request({
-    url: '/build/dataCenterRoom?appOrg='+ appOrg,
+    url: '/large/build/dataCenterRoom?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -355,13 +355,13 @@ export function dataCenterRoom(appOrg) {
 //年度累计电耗
 export function electricityStatistics() {
   return request({
-    url: '/build/electricityStatistics',
+    url: '/large/build/electricityStatistics',
     method: 'get'
   })
 }
 export function powerForYear() {
   return request({
-    url: '/build/powerForYear',
+    url: '/large/build/powerForYear',
     method: 'get'
   })
 }
@@ -369,13 +369,13 @@ export function powerForYear() {
 //年度累计综合能耗
 export function energyForYear() {
   return request({
-    url: '/build/energyForYear',
+    url: '/large/build/energyForYear',
     method: 'get'
   })
 }
 export function energyStatistics() {
   return request({
-    url: '/build/energyStatistics',
+    url: '/large/build/energyStatistics',
     method: 'get'
   })
 }
@@ -383,7 +383,7 @@ export function energyStatistics() {
 //燃气用量信息
 export function gasInfo(appOrg) {
   return request({
-    url: '/build/gasInfo?appOrg='+ appOrg,
+    url: '/large/build/gasInfo?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -391,7 +391,7 @@ export function gasInfo(appOrg) {
 //可再生电力信息
 export function greenPowerInfo(appOrg) {
   return request({
-    url: '/build/greenPowerInfo?appOrg='+ appOrg,
+    url: '/large/build/greenPowerInfo?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -399,7 +399,7 @@ export function greenPowerInfo(appOrg) {
 //供暖能耗信息
 export function heatingEnergy(appOrg) {
   return request({
-    url: '/build/heatingEnergy?appOrg='+ appOrg,
+    url: '/large/build/heatingEnergy?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -407,13 +407,13 @@ export function heatingEnergy(appOrg) {
 //年度累计非供暖能耗
 export function nonHeatingEnergyForYear() {
   return request({
-    url: '/build/nonHeatingEnergyForYear',
+    url: '/large/build/nonHeatingEnergyForYear',
     method: 'get'
   })
 }
 export function usePowerStatistics() {
   return request({
-    url: '/build/usePowerStatistics',
+    url: '/large/build/usePowerStatistics',
     method: 'get'
   })
 }
@@ -421,7 +421,7 @@ export function usePowerStatistics() {
 //办公碳排放情况
 export function officeCarbonForYear() {
   return request({
-    url: '/build/officeCarbonForYear',
+    url: '/large/build/officeCarbonForYear',
     method: 'get'
   })
 }
@@ -429,7 +429,7 @@ export function officeCarbonForYear() {
 //月用电量信息
 export function powerForMonth() {
   return request({
-    url: '/build/powerForMonth',
+    url: '/large/build/powerForMonth',
     method: 'get'
   })
 }
@@ -437,7 +437,7 @@ export function powerForMonth() {
 //资源信息
 export function resourceInfo(appOrg) {
   return request({
-    url: '/build/resourceInfo?appOrg='+ appOrg,
+    url: '/large/build/resourceInfo?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -446,7 +446,7 @@ export function resourceInfo(appOrg) {
 //楼宇月用水电热信息
 export function useHeatGas(appOrg) {
   return request({
-    url: '/build/useHeatGas?appOrg='+ appOrg,
+    url: '/large/build/useHeatGas?appOrg='+ appOrg,
     method: 'get'
   })
 }
@@ -455,13 +455,13 @@ export function useHeatGas(appOrg) {
 //年度累计水耗
 export function waterForYear() {
   return request({
-    url: '/build/waterForYear',
+    url: '/large/build/waterForYear',
     method: 'get'
   })
 }
 export function waterStatistics() {
   return request({
-    url: '/build/waterStatistics',
+    url: '/large/build/waterStatistics',
     method: 'get'
   })
 }
@@ -471,7 +471,7 @@ export function waterStatistics() {
 //统一视频（工程现场监控）
 export function videoList(code) {
   return request({
-    url: '/video/videoList?code=' + code,
+    url: '/large/video/videoList?code=' + code,
     method: 'get'
   })
 }
@@ -479,7 +479,7 @@ export function videoList(code) {
 //视频流列表 各公司出入口监控
 export function monitorList(code) {
   return request({
-    url: '/video/monitorList?code=' + code,
+    url: '/large/video/monitorList?code=' + code,
     method: 'get'
   })
 }
@@ -488,7 +488,7 @@ export function monitorList(code) {
 //获取视频推流地址
 export function openCamera(code) {
   return request({
-    url: '/video/openCamera?videoCode=' + code,
+    url: '/large/video/openCamera?videoCode=' + code,
     method: 'get'
   })
 }

src/views/screen/logistics/main.vue

@@ -16,7 +16,7 @@
               <logistics-assets :key="appOrg" @onClick="showAssets"></logistics-assets>
             </div>
           </div>
-          <div class="left-bottom bg">
+          <!-- <div class="left-bottom bg">
             <div class="cont-title-area">
               <img
                 class="cont-title-bg"
@@ -26,9 +26,9 @@
               <div class="cont-title">房产土地</div>
             </div>
             <div class="components-item">
-              <house-area :key="appOrg"></house-area>
+              <official-car :key="appOrg"></official-car>
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="middle">
@@ -142,10 +142,10 @@
                 src="@/assets/images/main/cont_title_bg.png"
                 alt=""
               />
-              <div class="cont-title">公务用车</div>
+              <div class="cont-title">房产土地</div>
             </div>
             <div class="components-item">
-              <official-car :key="appOrg"></official-car>
+              <house-area :key="appOrg"></house-area>
             </div>
           </div>
         </div>
@@ -893,16 +893,16 @@ export default {
     }
     .components-item {
       width: 550px;
-      height: 389px;
-      background: url("../../../assets/images/main/components_mid_bg.png")
+      height: 849px;
+      background: url("../../../assets/images/main/components_long_bg.png")
         no-repeat;
       background-size: cover;
-      margin-bottom: 28px;
       margin-left: 15px;
       overflow: hidden;
     }
     .components-item.bg3{
-      background: url("../../../assets/images/main/components_mid_bg2.png") no-repeat;
+      background: url("../../../assets/images/main/components_long_bg.png")
+      no-repeat;
     }
 
     .left-top {

src/views/screen/service/basicOperation.vue

@@ -27,7 +27,7 @@
               color="#00F7FF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
-            <div class="name">{{ onlineRate.name }}</div>
+            <div class="name">人数在线率</div>
           </div>
         </div>
       </div>
@@ -84,16 +84,11 @@ export default {
           )
           this.dataList.push(
             {
-              name: res.data.onlineNum.name,
-              data: res.data.onlineNum.value,
-            }
-          )
-          this.dataList.push(
-            {
               name: res.data.orderNum.name,
               data: res.data.orderNum.value,
             }
           )
+          console.log(dataList);
           this.onlineRate = res.data.onlineRate
         }
       });

src/views/screen/service/basicOperationDialog.vue

@@ -311,13 +311,10 @@ export default {
             data: res.data.registerNum.value,
           });
           this.dataList.push({
-            name: res.data.onlineNum.name,
-            data: res.data.onlineNum.value,
-          });
-          this.dataList.push({
             name: res.data.orderNum.name,
             data: res.data.orderNum.value,
           });
+          console.log(dataList);
           this.onlineRate = res.data.onlineRate;
         }
       });
@@ -460,8 +457,8 @@ export default {
         {
           name: "",
           type: "bar",
-          data: [0, 0, 0, 0],
-          barWidth: 40,
+          data: [50, 40,70, 60],
+          barWidth: 15,
           itemStyle: {
             color: "#E29439",
           },

src/views/screen/service/canteen.vue

@@ -5,8 +5,18 @@
       <div class="content-title">
         <span class="title">食堂概览</span>
       </div>
-
-      <div class="data-list">
+      <div class="choose-area">
+                <el-select v-model="canteen" @visible-change="selectOP" @change="getCanteenScoreData" placeholder="请选择">
+                  <el-option
+                    v-for="item in canteens"
+                    :key="item"
+                    :label="item"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+          </div>
+      <div class="data-list">   
         <div v-for="(item, index) in dataList" :key="index" class="data-item">
           <div class="data-fir">
             <img src="@/assets/images/service_new/img_1.png" class="icon" />
@@ -27,6 +37,7 @@
 
 import BarChart from "@/components/Echarts/BarChart.vue";
 import { getCanteenData } from "@/api/screen/service";
+import { getCanteenNameList } from "@/api/screen/service";
 
 
 export default {
@@ -48,9 +59,14 @@ export default {
   data() {
     return {
       dataList: [],
+      //食堂概览
+      canteen: "",
+      canteens: [],
     };
   },
   created() {
+    //食堂列表
+    this.getCanteenNameList();
     //数据概况
     this.getCanteenData();
   },
@@ -58,6 +74,33 @@ export default {
   beforeDestroy() {},
   mounted() {},
   methods: {
+     
+    
+    // 下拉触发时间
+    selectOP(value){
+      if(value){
+       this.select = 1;
+      }else{
+        this.select = 0;
+      }
+      console.log(value,"==================")
+    },
+
+    //获取食堂列表
+    getCanteenNameList() {
+      getCanteenNameList(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          let canteens = [];
+          res.data.forEach((item)=>{
+            canteens.push(item.canteenNum)
+          })
+          this.canteens = canteens;
+          this.canteen = canteens[0];
+
+        
+        }
+      });
+    },
 
     //获取数据概况
     getCanteenData() {
@@ -143,7 +186,7 @@ export default {
     .data-item{
       width:120px;
       border-right: 0 !important;
-      margin-top:25px;
+      margin-top:15px;
 
       .data-fir{
         width:100%;
@@ -179,6 +222,24 @@ export default {
     }
   }
 
+  .choose-area {
+    width: 148px;
+    height: 30px;
+    line-height: 30px;
+    padding-left: 15px;
+    font-size: 14px;
+    color: #00ffff;
+    background: url("../../../assets/images/main/choose_bg4.png") no-repeat;
+    cursor: pointer;
+    .el-input {
+      input {
+        background: rgba(255, 255, 255, 0);
+        color: #00ffff;
+        border: none;
+        padding: 0;
+      }
+    }
+  }
   ::-webkit-scrollbar {
     width: 3px;
     height: 3px;

src/views/screen/service/canteenDialog.vue

@@ -13,6 +13,17 @@
             <div class="content-title">
               <span class="title">食堂概览</span>
             </div>
+            <div class="choose-area">
+                <el-select v-model="canteen" @visible-change="selectOP" @change="getCanteenScoreData" placeholder="请选择">
+                  <el-option
+                    v-for="item in canteens"
+                    :key="item"
+                    :label="item"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
             <div class="data-list">
               <div v-for="(item, index) in dataList" :key="index" :class="'data-item ' + (index===0 || index===4 ? 'wid80' : 'wid130')">
                 <div class="data-fir">
@@ -94,7 +105,7 @@
           </div>
           <div class="dialog-item">
             <div class="content-title">
-              <span class="title">食堂服务人员情况
+              <span class="title">各单位统计排行
                 <el-tooltip class="item" effect="dark" content="人数相同按照食堂名称首字母排序" placement="top-start">
                   <img src="@/assets/images/main/tips.png" class="tips" />
                 </el-tooltip>
@@ -166,13 +177,13 @@
             </div>
             <div class="content">
               <div class="food-cont">
-                <div class="food-list" @click="foodsClick(1)">
+                <!-- <div class="food-list" @click="foodsClick(1)">
                   <div class="value">
                     <div>{{dailyMenu.value}}</div>
                     <div class="unit">道</div>
                   </div>
                   <div class="name">{{dailyMenu.name}}</div>
-                </div>
+                </div> -->
 
                 <div class="food-list" @click="foodsClick(0)">
                   <div class="value">
@@ -295,9 +306,9 @@
         </div>
 
         <div class="dialog-list">
-          <div class="dialog-item">
+          <!-- <div class="dialog-item">
             <div class="content-title">
-              <div class="title">食堂能耗信息（本月）</div>
+              <div class="title">能耗信息（本月）</div>
             </div>
             <div class="content">
               <div
@@ -316,8 +327,8 @@
                 </div>
               </div>
             </div>
-          </div>
-          <div class="dialog-item">
+          </div> -->
+          <div class="dialog-item wid100">
             <div class="content-title">
               <span class="title">热销菜品排行</span>
             </div>
@@ -325,6 +336,7 @@
               <bar-chart
                 :chart-data="foodsRankBarData"
                 :x-axis="foodsRankBarAxis"
+                
                 position="left"
                 :yAxis="{
                   name: '受欢迎度(百分制)',
@@ -333,7 +345,7 @@
                     padding: [0,0,0,20]
                   },
                   axisLabel: {
-                    color: '#FFF',
+                    color: 'white',
                   },
                   splitLine: {
                     show: false,
@@ -350,7 +362,7 @@
                 :legend="foodsRankBarLegend"
                 y-color="#FFF"
                 l-color="#FFF"
-                width="100%"
+                width="515px"
                 height="200px"
               />
             </div>
@@ -402,7 +414,7 @@
           </div>
           <div class="dialog-item">
             <div class="content-title">
-              <span class="title">就餐人数</span>
+              <span class="title">就餐情况</span>
             </div>
             <div class="content">
               <pie-chart
@@ -420,7 +432,7 @@
         <div class="dialog-list">
           <div class="dialog-item">
             <div class="content-title">
-              <div class="title">智慧食堂订单数量</div>
+              <div class="title">绿智食堂</div>
             </div>
             <div class="content">
               <pie-chart
@@ -434,7 +446,7 @@
           </div>
           <div class="dialog-item">
             <div class="content-title">
-              <span class="title">员工服务订单数量</span>
+              <span class="title">员工服务</span>
             </div>
             <div class="content">
               <pie-chart
@@ -454,6 +466,17 @@
             <div class="content-title">
               <span class="title">电子餐券</span>
             </div>
+            <div class="choose-area">
+                <el-select v-model="canteen" @visible-change="selectOP" @change="getCanteenScoreData" placeholder="请选择">
+                  <el-option
+                    v-for="item in canteens"
+                    :key="item"
+                    :label="item"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
             <div class="content">
 <!--              <div class="choose-area">-->
 <!--                <el-select v-model="canteen" @visible-change="selectOP" placeholder="请选择">-->
@@ -471,14 +494,14 @@
                 :chart-data="electronicVouchersBarData"
                 :x-axis="electronicVouchersBarAxis"
                 :yAxis="{
-                  name: '张',
+                  name: '',
                   nameTextStyle: {
                     color: '#fff',
                     padding: [0,20,0,0],
                     fontSize:14
                   },
                   axisLabel: {
-                    color: '#FFF',
+                    color: 'white',
                   },
                   splitLine: {
                     show: false,
@@ -582,13 +605,13 @@ export default {
       canteenScoreBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name:"%",
+        name:"",
         nameTextStyle: {
           color: "#fff",
           fontSize: 14,
         },
         axisLabel: {
-          color: "white", // 设置横坐标轴字体颜色为红色
+          color: "white", // 设置纵坐标轴字体颜色为红色
         },
         splitLine: {
           show: false,
@@ -614,7 +637,7 @@ export default {
       canteenDegreeBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name:"%",
+        name:"",
         nameTextStyle: {
           color: "#fff",
           fontSize: 14,
@@ -641,7 +664,7 @@ export default {
       canteenTotalRankBarYaxis: {
         type: "value",
         boundaryGap: [0, 0.01],
-        name:"人",
+        name:"",
         nameTextStyle: {
           color: "#fff",
           fontSize: 14,
@@ -932,7 +955,7 @@ export default {
             type: "category",
             data: ["其他人员", "服务人员", "厨师人数", "管理人员"],
             axisLabel: {
-              color: "white", // 设置横坐标轴字体颜色为红色
+              color: "white", // 设置纵坐标轴字体颜色为红色
             },
             axisTick: {
               show: false,
@@ -1194,7 +1217,7 @@ export default {
             axisLabel: {
               interval: 0,
               color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 65,
+              rotate: -20,
             },
             axisTick: {
               show: false,
@@ -1217,11 +1240,12 @@ export default {
             {
               name: res.data.chefs.name,
               type: "bar",
+              
               itemStyle: {
                 color: res.data.chefs.color,
                 //barBorderRadius: [5, 5, 0, 0], // 统一设置四个角的圆角大小
               },
-              barWidth: 10,
+              barWidth: 20,
               data: res.data.chefs.dataList,
             },
             {
@@ -1231,7 +1255,7 @@ export default {
                 color: res.data.service.color,
                 //barBorderRadius: [5, 5, 0, 0], // 统一设置四个角的圆角大小
               },
-              barWidth: 10,
+              barWidth: 20,
               data: res.data.service.dataList,
             },
           ];
@@ -1241,7 +1265,7 @@ export default {
             axisLabel: {
               interval: 0,
               color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 65,
+              rotate: -20,
             },
             axisTick: {
               show: false,
@@ -1306,18 +1330,18 @@ export default {
       getPowerData(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           let list3 = [
-            "waterConsumptionNum",
-            "quantityHeatNum",
-            "gasVolumeNum",
+            "quantityHeat",
+            "gasVolume",
+            "waterConsumption",
           ];
           for (let index = 0; index < list3.length; index++) {
             let name = "";
             if(index == 0){
-              name = '用水量';
+              name = '食堂用气量';
             }else if(index == 1){
-              name = '用热量';
+              name = '食堂用热量';
             }else if(index == 2){
-              name = '用气量';
+              name = '食堂用热量';
             }
             this.energyData.push({
               name: name,
@@ -1339,7 +1363,7 @@ export default {
               itemStyle: {
                 color: res.data.yData.color,
               },
-              barWidth: 30,
+              barWidth: 15,
               data: res.data.yData.yList,
             },
           ];
@@ -1357,7 +1381,7 @@ export default {
             data: res.data.xList,
             axisLabel: {
               color: "white", // 设置横坐标轴字体颜色为红色
-              rotate: 50,
+              rotate: 0,
               interval: 0,
             },
             axisTick: {
@@ -1697,7 +1721,7 @@ export default {
     width:100%;
     padding:0 15px;
     display: flex;
-    justify-content: space-between;
+    justify-content: center;
     align-items: center;
 
     .food-list{

src/views/screen/service/employeeHealth.vue

@@ -9,23 +9,19 @@
         <div class="health-cont">
           <div class="health-left">
             <div class="left-list">
-              <img src="@/assets/images/service_new/person.png">
+              <img src="@/assets/images/service_new/person2.png">
               <div class="left-info">
-                <div class="num">{{actualParticipateNum.value}}
-                  <span class="unit">人</span>
-                </div>
-                <div class="name">{{actualParticipateNum.name}}</div>
+                <div class="num">{{participateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{participateNum.name}}</div>
               </div>
             </div>
             <div class="left-list">
-              <img src="@/assets/images/service_new/person2.png">
+              <img src="@/assets/images/service_new/person.png">
               <div class="left-info">
-                <div class="num">{{participateNum.value}}
-                  <span class="unit">人</span>
-                </div>
-                <div class="name">{{participateNum.name}}</div>
+                <div class="num">{{actualParticipateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{actualParticipateNum.name}}</div>
               </div>
-            </div>
+            </div>          
           </div>
           <div class="health-right">
             <el-progress
@@ -33,10 +29,11 @@
               :width="112"
               :stroke-width="8"
               :percentage="participateProportionRate.value"
-              color="#00F7FF"
+             
+              text-color="#00F7FF"
               style="color:rgba(0, 247, 255, 0.18);"
             ></el-progress>
-            <div class="name">参检占比</div>
+            <div class="name">检查人数占比</div>
           </div>
         </div>
       </div>
@@ -151,15 +148,16 @@ export default {
 
         img{
           display: block;
-          width:80px;
-          height:80px;
+          width:60px;
+          height:60px;
         }
         .left-info{
           padding-left:12px;
+
           .num{
             font-size: 25px;
             color:#00FFFF;
-            font-family: 'electronicFont';
+            font-family: "electronicFont";
             display: flex;
             flex-direction: row;
             align-items: baseline;
@@ -184,8 +182,8 @@ export default {
       align-items: center;
 
       .name{
-        width:75px;
-        font-size: 18px;
+        //width:75px;
+        font-size: 14px;
         color:#FFFFFF;
         font-family: 'fashionZh';
         padding-top:10px;

src/views/screen/service/employeeHealthDialog.vue

@@ -15,36 +15,37 @@
             </div>
             <div class="data-chart">
               <div class="health-cont">
-                <div class="health-left">
-                  <div class="left-list">
-                    <img src="@/assets/images/service_new/person.png">
-                    <div class="left-info">
-                      <div class="num">{{actualParticipateNum.value}}<span class="unit">人</span></div>
-                      <div class="name">{{actualParticipateNum.name}}</div>
-                    </div>
-                  </div>
-                  <div class="left-list">
-                    <img src="@/assets/images/service_new/person2.png">
-                    <div class="left-info">
-                      <div class="num">{{participateNum.value}}<span class="unit">人</span></div>
-                      <div class="name">{{participateNum.name}}</div>
-                    </div>
-                  </div>
-                </div>
-                <div class="health-right">
-                  <el-progress
-                    type="circle"
-                    :width="112"
-                    :stroke-width="8"
-                    :percentage="participateProportionRate.value"
-                    color="#00F7FF"
-                    style="color:rgba(0, 247, 255, 0.18);"
-                  ></el-progress>
-                  <div class="name">参检占比</div>
-                </div>
+          <div class="health-left">
+            <div class="left-list">
+              <img src="@/assets/images/service_new/person2.png">
+              <div class="left-info">
+                <div class="num">{{participateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{participateNum.name}}</div>
               </div>
             </div>
+            <div class="left-list">
+              <img src="@/assets/images/service_new/person.png">
+              <div class="left-info">
+                <div class="num">{{actualParticipateNum.value}}<span class="unit">人</span></div>
+                <div class="name">{{actualParticipateNum.name}}</div>
+              </div>
+            </div>          
+          </div>
+          <div class="health-right">
+            <el-progress
+              type="circle"
+              :width="112"
+              :stroke-width="8"
+              :percentage="participateProportionRate.value"
+              color="#00F7FF"
+              style="color:rgba(0, 247, 255, 0.18);"
+            ></el-progress>
+            <div class="name">检查人数占比</div>
+          </div>
+        </div>
+            </div>
           </div>
+
         </div>
 
         <div class="dialog-list">
@@ -67,6 +68,9 @@
         </div>
 
       </div>
+
+ 
+
     </div>
   </div>
 </template>
@@ -104,15 +108,15 @@ export default {
       illnessBarData: [],
       illnessBarAxis: {},
       illnessBarYAxis:{
-        name: "人",
+        name: "",
         nameTextStyle: {
           color: "#fff",
           fontSize:14,
           padding:[0,10,0,0]
         },
         axisLabel: {
-          color: "#FFF",
-          formatter: "{value}人",
+          color: "white",
+          formatter: "{value}",
         },
         splitLine: {
           show: false,
@@ -175,12 +179,12 @@ export default {
               data: [{
                   value: res.data.yData.yList[0],
                   itemStyle: {
-                    color: '#43DCDB'
+                    color: res.data.yData.color,
                   }
                 },{
                   value: res.data.yData.yList[1],
                   itemStyle: {
-                    color: '#00FF9D'
+                    color: res.data.yData.color,
                   }
                 },res.data.yData.yList[2]],
               type: "bar",
@@ -266,14 +270,14 @@ export default {
     background-size: cover;
 
 
-    .dialog-left{
-      width: 520px;
-      float: left;
-    }
-    .dialog-right{
-      width: 520px;
-      float: right;
-    }
+    // .dialog-left{
+    //   width: 520px;
+    //   float: left;
+    // }
+    // .dialog-right{
+    //   width: 520px;
+    //   float: right;
+    // }
   }
 
   .dialog-list{
@@ -300,6 +304,7 @@ export default {
         width:100%;
         background: url("../../../assets/images/main/title_pro_long.png") no-repeat;
       }
+      
     }
   }
 
@@ -341,8 +346,8 @@ export default {
 
         img{
           display: block;
-          width:80px;
-          height:80px;
+          width:60px;
+          height:60px;
         }
         .left-info{
           padding-left:12px;
@@ -350,7 +355,7 @@ export default {
           .num{
             font-size: 25px;
             color:#00FFFF;
-            font-family: 'electronicFont';
+            font-family: "electronicFont";
             display: flex;
             flex-direction: row;
             align-items: baseline;
@@ -375,8 +380,8 @@ export default {
       align-items: center;
 
       .name{
-        width:75px;
-        font-size: 18px;
+        //width:75px;
+        font-size: 14px;
         color:#FFFFFF;
         font-family: 'fashionZh';
         padding-top:10px;

src/views/screen/service/employeeProfile.vue

@@ -212,7 +212,7 @@ export default {
         margin-right: 37px;
         .data{
           width: auto;
-          font-size: 20px;
+          font-size: 25px;
           color:#00FFFF;
           font-family: 'electronicFont';
         }

src/views/screen/service/employeeProfileDialog.vue

@@ -87,6 +87,25 @@
         </div>
 
         <div class="dialog-list">
+          <div class="dialog-item wid100">
+            <div class="content-title">
+              <span class="title">员工性别分布情况</span>
+            </div>
+            <div class="data-chart">
+              <bar-chart
+                :chart-data="sexBarData"
+                :x-axis="sexBarAxis"
+                :y-axis="sexBarYAxis"
+                y-color="#FFF"
+                l-color="#FFF"
+                width="515px"
+                height="180px"
+              />
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="dialog-list">
           <div class="dialog-item">
             <div class="content-title">
               <span class="title">员工年龄分布情况</span>
@@ -119,7 +138,7 @@
               />
             </div>
           </div>
-        </div>
+        </div> -->
 
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -601,7 +620,7 @@ export default {
       margin-right: 37px;
       .data{
         width: auto;
-        font-size: 20px;
+        font-size: 25px;
         color:#00FFFF;
         font-family: 'electronicFont';
       }

src/views/screen/service/property.vue

@@ -47,7 +47,7 @@
       </div>
 
       <div class="content-title mar">
-        <span class="title">近一个月报修数量占比</span>
+        <span class="title">近一个月报修分类占比</span>
       </div>
     </div>
   </div>

src/views/screen/service/propertyDialog.vue

@@ -66,7 +66,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">近一个月报修数量占比</span>
+              <span class="title">近一个月报修分类占比</span>
             </div>
             <div class="data-chart">
               <pie-chart
@@ -86,7 +86,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">近六个月报修订单分类</span>
+              <span class="title">近六个月报修分类</span>
             </div>
             <div class="data-chart">
 

src/views/screen/service/shareStation.vue

@@ -36,8 +36,11 @@
                   <div>{{parseFloat(participateProportionRate.value).toFixed(0)}}</div>
                   <div class="unit">%</div>
                 </div>
-              </div>
-              <div class="name">完成达标率</div>
+                 <div class="revo">
+                      <div class="name">完成</div>
+                      <div class="name">达标率</div>
+                     </div>
+              </div>          
             </div>
           </div>
         </div>
@@ -47,13 +50,21 @@
           <div class="title">服务内容</div>
         </div>
         <div class="content">
-          <pie-chart
+          <!-- <pie-chart
             :chart-data="pieData"
             :legend="pieLegend"
             :title="pieTitle"
             width="220px"
             height="180px"
-          />
+          /> -->
+          <div class="data-content">
+             <div class="imgPos">
+                <img src="@/assets/images/service_new/helath_self.png">
+             </div>
+             <div class="imgPos">
+              <img src="@/assets/images/service_new/remote_consultation.png">
+             </div>
+          </div>
         </div>
       </div>
     </div>
@@ -175,7 +186,7 @@ export default {
     .data-content{
       display: flex;
       justify-content: space-between;
-      padding-top:10px;
+      // padding-top:10px;
 
       .mar{
         margin-bottom: 15px;
@@ -223,15 +234,13 @@ export default {
         }
       }
       .data-right{
-        padding-top:3px;
         display: flex;
         flex-direction: column;
         align-items: center;
-
+        margin-top: -50px;
         .name{
-          font-size:14px;
+          font-size:13px;
           color:#fff;
-          padding-top:5px;
         }
         .circle{
           width: 100px;
@@ -239,9 +248,14 @@ export default {
           background: url("../../../assets/images/service_new/circle_2.png") no-repeat;
           background-size: 100% 100%;
           display: flex;
-          justify-content: center;
-          align-items: flex-start;
-
+          justify-content: space-around;
+        align-items:center;
+        flex-direction: column;
+          .revo{
+          display: flex;
+          flex-direction: column;
+          align-items: center;          
+        }
           .value{
             display: flex;
             align-items: center;
@@ -263,7 +277,18 @@ export default {
       }
     }
   }
-
+  .data-content{
+      display: flex;
+       justify-content:space-around;
+      align-items: center;
+      overflow: visible;
+      padding:10px 0px 0px 0px;
+      margin-left: 10px;
+      .imgPos{
+        padding-left: 15px;
+        padding-right: 15px;
+      }
+ }
   ::-webkit-scrollbar {
     width: 3px;
     height: 3px;

src/views/screen/service/shareStationDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main-data share-station-dialog-area" @click.stop="preventDefault" @mouseleave="leaveFun">
+  <div class="main-data share-station-dialog-area" @click.stop="preventDefault"  @mouseleave="leaveFun">
     <div class="dialog-title">
       <img
         src="@/assets/images/main/cont_title_bg.png"
@@ -43,8 +43,13 @@
                       <div>{{parseFloat(participateProportionRate.value).toFixed(0)}}</div>
                       <div class="unit">%</div>
                     </div>
+                     <div class="revo">
+                      <div class="name">完成</div>
+                      <div class="name">达标率</div>
+                     </div>
+                    
                   </div>
-                  <div class="name">完成达标率</div>
+                 
                 </div>
               </div>
             </div>
@@ -54,17 +59,23 @@
             <div class="content-title">
               <span class="title">服务内容</span>
             </div>
-            <div class="data-chart">
-              <pie-chart
-                :chart-data="pieData"
-                :legend="pieLegend"
-                :title="pieTitle"
-                :center='["35%", "40%"]'
-                position="left"
-                width="220px"
-                height="180px"
-              />
-            </div>
+            <div class="content">
+          <!-- <pie-chart
+            :chart-data="pieData"
+            :legend="pieLegend"
+            :title="pieTitle"
+            width="220px"
+            height="180px"
+          /> -->
+          <div class="data-content">
+             <div class="imgPos">
+                <img src="@/assets/images/service_new/helath_self.png">
+             </div>
+             <div class="imgPos">
+              <img src="@/assets/images/service_new/remote_consultation.png">
+             </div>
+          </div>
+        </div>
           </div>
         </div>
 
@@ -76,7 +87,7 @@
             <div class="data-chart">
               <div class="table-cont">
                 <div class="table-top">
-                  <div class="fir">驿站名称</div>
+                  <div class="fir">单位名称</div>
                   <div class="snd">驿站地址</div>
                   <div class="thd">服务次数</div>
                 </div>
@@ -294,14 +305,14 @@ export default {
   }
 
   .data-chart {
-    margin-top: 15px !important;
+    margin-top: 20px !important;
     margin-bottom: 5px !important;
   }
 
   .data-content{
     display: flex;
     justify-content: space-between;
-    padding-top:10px;
+    // padding-top:10px;
 
     .mar{
       margin-bottom: 15px;
@@ -349,15 +360,15 @@ export default {
       }
     }
     .data-right{
-      padding-top:3px;
+      // padding-top:3px;
       display: flex;
       flex-direction: column;
       align-items: center;
-
+      margin-top: -50px;
       .name{
-        font-size:14px;
+        font-size:13px;
         color:#fff;
-        padding-top:5px;
+        // padding-top:5px;
       }
 
       .circle{
@@ -366,9 +377,14 @@ export default {
         background: url("../../../assets/images/service_new/circle_2.png") no-repeat;
         background-size: 100% 100%;
         display: flex;
-        justify-content: center;
-        align-items: flex-start;
-
+        justify-content: space-around;
+        align-items:center;
+        flex-direction: column;
+        .revo{
+          display: flex;
+          flex-direction: column;
+          align-items: center;          
+        }
         .value{
           display: flex;
           align-items: center;
@@ -402,7 +418,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      font-size:12px;
+      font-size:14px;
       color:#00FFFF;
     }
     .table-bot{
@@ -411,13 +427,14 @@ export default {
       .table-list{
         width:100%;
         height:30px;
-        padding:5px 25px 0 10px;
+        padding:5px 25px 10px 10px;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        font-size:12px;
+        font-size:15px;
         color:#FFFFFF;
         font-weight: 500;
+        border: 1px dotted #14302F;
       }
     }
 
@@ -433,11 +450,25 @@ export default {
       width:12%;
       text-align: left;
     }
-    .color{
-      color:#FF8C00;
-    }
+    // .color{
+    //   color:#FF8C00;
+    // }
   }
-
+  .content {
+    margin-top: 20px;
+  }
+  .data-content{
+      display: flex;
+       justify-content:space-around;
+      align-items: center;
+      overflow: visible;
+      padding:10px 0px 0px 0px;
+      margin-left: 10px;
+      .imgPos{
+        padding-left: 15px;
+        padding-right: 15px;
+      }
+ }
   ::-webkit-scrollbar {
     display: none;
     width: 3px;

src/views/screen/service/weekFoods.vue

@@ -59,9 +59,10 @@ export default {
   data() {
     return {
       dataList: [],
-      weeks: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+      weeks: ["周一", "周二", "周三", "周四", "周五"],
       list: [],
       foodsList: [],
+   
       food: "早餐",
       foods: ["早餐", "中餐", "晚餐"],
       lists: [],
@@ -85,16 +86,46 @@ export default {
         if (Number(res.code) === 200) {
           let foodsList = JSON.parse(res.data.foodInfo);
           this.foodsList = foodsList;
-          let index = parseInt(this.weeks.indexOf(this.$props.week)) + 1;
-          let lists = foodsList[index];
+          // 转换后的数据
+    const transformedData = {};
+
+    // 映射关系
+    const dayMap = {"monday": "1","tuesday": "2","wednesday": "3","thursday": "4","friday": "5",};
+    const mealTypeMap = {"breakfast": "1", "lunch": "2", "dinner": "3"};
+
+   // 遍历原始数据并转换
+   for (const day in foodsList) {
+  if (foodsList.hasOwnProperty(day)) {
+    const dayNumber = dayMap[day];
+    transformedData[dayNumber] = [];
+    for (const mealTypeKey in foodsList[day]) { // 修改变量名以避免冲突
+      if (foodsList[day].hasOwnProperty(mealTypeKey)) {
+        const mealTypeNumber = mealTypeMap[mealTypeKey];
+        foodsList[day][mealTypeKey].forEach(meal => {
+          // 假设我们有一些逻辑来生成新的菜品名称
+          const newDishes = [
+            {"name": meal.name, "type": mealTypeNumber},
+          ];
+          transformedData[dayNumber] = transformedData[dayNumber].concat(newDishes);
+        });
+      }
+    }
+  }
+}
+      //console.log('888888888',JSON.parse(JSON.stringify(transformedData)));
+            this.foodsList=JSON.parse(JSON.stringify(transformedData))
+           let index = parseInt(this.weeks.indexOf(this.$props.week)) + 1;
+           let lists =JSON.parse(JSON.stringify(transformedData[index]));
+       
           this.lists = lists;
           // let list = foodsList[index];
           // this.list = list;
           //区分早中晚
           let list = [];
           let type = parseInt(this.foods.indexOf(this.food)) + 1;
-          let that = this;
-          lists.forEach((item) => {
+          let that = this;    
+     // 用于存储所有的"name"字段及其对应的餐次编号
+         lists.forEach((item) => {
             if (item.type == type) {
               //处理图片
               // item.img = require('../../../assets/caidanImgs/'+ pinyin.chineseToPinYin(item.name) +'.jpg');
@@ -102,15 +133,14 @@ export default {
               list.push(item);
             }
           });
-          this.list = list;
+     this.list = list;
         }
       });
     },
-
     //选择周几
     changeWeek(e) {
       let index = parseInt(this.weeks.indexOf(e)) + 1;
-      let lists = this.foodsList[index];
+     let lists = this.foodsList[index];
       this.lists = lists;
       //联动选择早中晚
       this.food = '早餐';
@@ -119,18 +149,20 @@ export default {
 
     //选择菜品
     changeFoods(e) {
-      let type = parseInt(this.foods.indexOf(e)) + 1;
+      let type = parseInt(this.foods.indexOf(e)) + 1;   
       let lists = this.lists;
       let list = [];
       let that = this;
-      lists.forEach((item) => {
-        if (item.type == type) {
+      lists.forEach((item) => {     
+        
+        if (item.type == type) { 
           //处理图片
           that.loadImage(item);
           list.push(item);
         }
       });
       this.list = list;
+      // console.log(list,'菜品');
     },
 
     //默认显示暂无菜品