diff --git a/pages/index/index.vue b/pages/index/index.vue
index 26425f5..995f0f6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -452,7 +452,7 @@
             <view class="firstBox">
               <view class="boxItem">
                 <text class="itemValue">{{dailyExamineObj.RectifyCount||'0'}}</text>
-                <text class="itemLabel">整改中<text class="unit">/个</text></text>
+                <text class="itemLabel">已整改<text class="unit">/个</text></text>
               </view>
 
               <view class="boxItem">
@@ -1500,7 +1500,7 @@ export default {
     },
     // 跳转到考核
     handleGoExamine(type){
-      this.$util.toNextRoute('navigateTo', `/pages/examine/index?come=index&type=${type}&time=${this.single}`)
+      this.$util.toNextRoute('navigateTo', `/pages/newamine/index?come=index&type=${type}&time=${this.single}`)
     },
     async initYesterdayData(type){
         // type 判断如果是滑动的 就是true  日期就传空  别的地方调用 默认传入时间
diff --git a/pages/newamine/component/yearCharts.vue b/pages/newamine/component/yearCharts.vue
index 5ad089a..cc1d4f3 100644
--- a/pages/newamine/component/yearCharts.vue
+++ b/pages/newamine/component/yearCharts.vue
@@ -45,7 +45,7 @@ export default {
         width: 28,
         height: 28,
         series: data.series,
-        animation: true,
+        animation: false,
         rotate: false,
         rotateLock: false,
         background: "#FFFFFF",
diff --git a/pages/newamine/index.vue b/pages/newamine/index.vue
index 7072cdb..20af86d 100644
--- a/pages/newamine/index.vue
+++ b/pages/newamine/index.vue
@@ -9,7 +9,7 @@
           <view class="titleModule" :style="{height:(menu.bottom-menu.top)+'px'}">
             <image @click="handleBack" class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"></image>
             <view class="selectDateBox">
-              <image class="leftIcon" @click="handleAddDate(1)" style="transform: rotate(-180deg)" src="/static/images/newExamine/rightIcon.svg"/>
+              <image class="leftIcon" @click="handleAddDate(1)" style="transform: rotate(-180deg)" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/rightIcon.svg"/>
               <view class="dateBox">
                 <image class="dateIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDateTime.svg"></image>
                 <picker v-if="selectTab===2" mode="date" fields="day" :value="singleDay" :start="startDateDay" :end="endData" @change="bindDateChange" >
@@ -24,7 +24,7 @@
                   </view>
                 </picker>
               </view>
-              <image class="leftIcon" @click="handleAddDate(2)" src="/static/images/newExamine/rightIcon.svg"/>
+              <image class="leftIcon" @click="handleAddDate(2)" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/rightIcon.svg"/>
             </view>
           </view>
         </view>
@@ -79,16 +79,17 @@
             <view class="detailDaily">
               <view class="dailyItem">
                 <text class="itemValue">{{dailyExamineObj.RectifyCount||'0'}}</text>
-                <text class="itemLabel">整改中<text class="itemValue">/个</text></text>
+                <text class="itemLabel">已整改<text class="itemValue">/个</text></text>
               </view>
               <view class="dailyItem">
                 <text class="itemValue">{{dailyExamineObj.UnRectifyCount||'0' }}</text>
                 <text class="itemLabel">未整改<text class="itemValue">/个</text></text>
               </view>
               <view class="otherItem">
-                <view class="otherLeft">
+                <view class="otherLeft" v-show="rate">
                   <YearCharts :success="rate"/>
                 </view>
+                <view class="otherLeft" v-show="!rate"></view>
                 <view class="otherDetail">
                   <text class="itemValue">{{dailyExamineObj.CompleteRate?dailyExamineObj.CompleteRate + '%' :'-' }}</text>
                   <text class="itemLabel">达标率<text class="itemUnit">/全省</text></text>
@@ -107,7 +108,7 @@
           <text class="contentTitle">服务区排名</text>
           <view class="sort" @click="handleSort">
             <text class="sortLabel">排序</text>
-            <image class="sortIcon" :style="{transform: `rotate(${sortType==='sequence'?'':'180deg'})`}" src="/static/images/newExamine/sort.svg"/>
+            <image class="sortIcon" :style="{transform: `rotate(${sortType==='sequence'?'':'180deg'})`}" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/sort.svg"/>
           </view>
         </view>
 
@@ -120,10 +121,10 @@
             <view class="scrollItem" v-for="(item,index) in serviceList" :key="index" @click="handleDetail(item,index)">
               <view class="scrollItemTop">
                 <view class="itemTopLeft">
-                  <view class="index" :style="{backgroundImage:`url(${index===0?'/static/images/revenueBox/fistBg.svg':index===1?'/static/images/revenueBox/secondBg.svg':index===2?'/static/images/revenueBox/thirdBg.svg':'/static/images/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
+                  <view class="index" :style="{backgroundImage:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/fistBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/secondBg.svg':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/thirdBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
                   <text class="itemName">{{item.SERVERPART_NAME}}</text>
 <!--                  <span class="unit">月度</span>-->
-                  <span :class="item.EXAMINE_MQUARTER!=='0'?'secondUnit':'unit'">{{item.EXAMINE_MQUARTER!=='0'?item.EXAMINE_MQUARTER==='1'?'一'+'季度':item.EXAMINE_MQUARTER==='2'?'二'+'季度':item.EXAMINE_MQUARTER==='3'?'三'+'季度':'四' + '季度':'月度'}}</span>
+                  <span :class="item.EXAMINE_MQUARTER!=='月度'?'secondUnit':'unit'">{{item.EXAMINE_MQUARTER}}</span>
                 </view>
                 <image class="rightIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
               </view>
@@ -132,9 +133,9 @@
                 <view class="detailItem" v-for="(subItem,subIndex) in item.list">
                   <view class="fixBox">{{ subItem.REGION_NAME }}</view>
                   <view class="markBox">
-                    <text class="markValue">{{subItem.SERVERPARTList[0].EXAMINE_SCORE}}<text class="markUnit">分</text></text>
+                    <text class="markValue">{{subItem.EXAMINE_SCORE}}<text class="markUnit">分</text></text>
                     <view class="progress">
-                      <view class="have" :style="{width: subItem.SERVERPARTList[0].EXAMINE_SCORE+'%'}"></view>
+                      <view class="have" :style="{width: subItem.EXAMINE_SCORE+'%'}"></view>
                     </view>
                   </view>
                 </view>
@@ -149,7 +150,7 @@
           <text class="contentTitle">服务区排名</text>
           <view class="sort" @click="handleSort">
             <text class="sortLabel">排序</text>
-            <image class="sortIcon" src="/static/images/newExamine/sort.svg"/>
+            <image class="sortIcon" :style="{transform: `rotate(${sortType==='sequence'?'':'180deg'})`}" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/sort.svg"/>
           </view>
         </view>
 
@@ -159,23 +160,24 @@
 
         <view class="dailyList">
           <scroll-view class="big" :show-scrollbar="false" scroll-with-animation  scroll-y="true" enable-flex>
-            <view class="scrollItem" v-for="(item,index) in 20" :key="index" @click="handleOpenPopup">
+            <view class="scrollItem" v-for="(item,index) in dailyServiceList" :key="index" @click="handleOpenPopup(item,index)">
               <view class="scrollItemTop">
                 <view class="scrollTopLeft">
-                  <view class="index" :style="{background:`url(${index===0?'/static/images/revenueBox/fistBg.svg':index===1?'/static/images/revenueBox/secondBg.svg':index===2?'/static/images/revenueBox/thirdBg.svg':'/static/images/revenueBox/otherBg.svg'})`}">{{index+1}}</view>
-                  <text class="scrollName">黄山服务区</text>
+                  <view class="index" :style="{backgroundImage:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/fistBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/secondBg.svg':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/thirdBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBg.svg'})`}">{{index+1}}</view>
+                  <text class="scrollName">{{item.SERVERPART_NAME}}</text>
                   <image class="rightIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
                 </view>
 
                 <view class="scrollTopRight">
-                  <text class="scueessNum">1</text>
-                  <text class="all">/6</text>
+                  <text class="scueessNum">{{item.first}}</text>
+                  <text class="all">/</text>
+                  <text class="all">{{item.second}}</text>
                 </view>
               </view>
 
               <view class="detailMark">
                 <text class="wordHeader">描述</text>
-                <text class="wordValue">广场、洗漱台、绿化带、宣传栏、标识标牌、垃圾桶、玻璃门窗、镜面保洁</text>
+                <text class="wordValue">{{item.EXAMINE_DESC}}</text>
               </view>
             </view>
           </scroll-view>
@@ -186,123 +188,105 @@
     <uniPopup type="bottom" :round="true" :showIndex="1" :show="showPop" @hidePopup="hidePopup">
       <view class="popup" :style="{height:'85vh'}">
         <view class="top">
-          <text class="popupTitle">{{ selectTab===1?popupShow===4?'':'服务区详情':selectTab===2?`${popupServiceName}`:'会议内容' }}</text>
+          <text class="popupTitle">服务区详情</text>
           <image @click="hidePopup" class="close" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/close.svg"></image>
         </view>
         <view class="areaList">
           <view class="popupDetail">
-            <scroll-view :show-scrollbar="false" scroll-with-animation  scroll-y="true" enable-flex class="detailLeft" :scrollIntoView="selectMenu">
-              <view :id="index" :class="index===selectMenu?'serviceSelect currentSelect':'serviceSelect'" v-for="(item,index) in serviceList" :key="index" @click="handleChangeMenu(index,item)">{{item.SERVERPART_NAME.split('服务区')[0]}}</view>
-            </scroll-view>
+            <view v-if="selectTab===1" >
+              <scroll-view v-if="showPop" class="detailLeft" :show-scrollbar="false" scroll-with-animation  scroll-y="true" enable-flex :scroll-into-view="'item' + selectMenu">
+                <view :id="'item'+index" :class="index===selectMenu?'serviceSelect currentSelect':'serviceSelect'" v-for="(item,index) in serviceList" :key="index" @click="handleChangeMenu(index)">{{item.SERVERPART_NAME.split('服务区')[0]}}</view>
+              </scroll-view>
+            </view>
+           <view v-if="selectTab===2" >
+             <scroll-view  v-if="showPop" class="detailLeft" :show-scrollbar="false" scroll-with-animation  scroll-y="true" enable-flex :scroll-into-view="'item' + selectMenu">
+               <view :id="'item'+index" :class="index===selectMenu?'serviceSelect currentSelect':'serviceSelect'" v-for="(item,index) in dailyServiceList" :key="index" @click="handleChangeMenu(index)">{{item.SERVERPART_NAME.split('服务区')[0]}}</view>
+             </scroll-view>
+           </view>
+
 
             <scroll-view scroll-y="true" class="serviceDetail">
               <view class="serviceDetailItem" v-for="(item,index) in currentObj.list" :key="index">
-                <view class="detailItemTop" v-if="selectTab===1">
+                <view class="detailItemTop" >
                   <view class="fixedName">{{item.REGION_NAME}}</view>
-                  <view class="store"><text class="unit">分</text></view>
-                </view>
-                <view class="detailItemTop"  v-if="selectTab===2">
-                  <view class="detailItemTopLeft">
-                    <image class="leftIcon" src="/static/images/newExamine/fixedIcon.svg"/>
-                    <text class="leftName">前厅</text>
-                  </view>
-                  <image class="rightIcon" src="/static/images/newExamine/OK.svg"/>
-                </view>
-                <view class="messageItem">
-                  <image class="itemIcon" src="/static/images/newExamine/userIcon.svg"/>
-                  <text class="itemValue">{{item.EXAMINE_PERSON}}</text>
-                </view>
-                <view class="messageItem">
-                  <image class="itemIcon" src="/static/images/newExamine/timeIcon.svg"/>
-                  <text class="itemValue">{{item.EXAMINE_OPERATEDATE}}</text>
                 </view>
+                <view v-for="(subItem,subIndex) in item.SERVERPARTList" :key="index">
 
-                <view v-if="selectTab===1">
-                  <view class="detailItemMessage" v-for="(subItem,subIndex) in 10" :key="subIndex">
-                    <view class="messageBox">
-                      <view class="messageBoxTop">
-                        <view class="messageBoxTopLeft">
-                          <image class="fixedIcon" src="/static/images/newExamine/fixedIcon.svg"/>
-                          <text class="name">便利店</text>
+
+                  <view v-if="selectTab===1">
+                    <view class="detailItemMessage" v-for="(thirdItem,thirdIndex) in subItem.DetailList" :key="thirdIndex">
+                      <view class="messageBox">
+                        <view class="messageBoxTop">
+                          <view class="messageBoxTopLeft">
+                            <image class="fixedIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/fixedIcon.svg"/>
+                            <text class="name" :style="{fontSize: thirdItem.EXAMINE_POSITION && thirdItem.EXAMINE_POSITION.length>7?'28rpx':'32rpx'}">{{thirdItem.EXAMINE_POSITION || ''}}</text>
+                          </view>
+                          <view class="messageBoxTopRight">
+                            <text class="mark">{{thirdItem.EXAMINE_SCORE}}<text class="unit">分</text></text>
+                          </view>
                         </view>
-                        <view class="messageBoxTopRight">
-                          <text class="mark">-2<text class="unit">分</text></text>
+                        <view :style="{marginBottom:forthIndex === thirdItem.DetailList.length-1?'':'12rpx'}" v-for="(forthItem,forthIndex) in thirdItem.DetailList" :key="forthIndex">
+                          <view class="desc">{{forthItem.EXAMINEDETAIL_DESC}}</view>
+                          <view class="imgList">
+                            <image v-for="(fifthItem,fifthIndex) in forthItem.imgList" :key="fifthIndex" class="img"
+                                   :src="fifthItem" :data-src="forthItem.imgList"  @click="previewImage($event,fifthIndex)"></image>
+                          </view>
                         </view>
                       </view>
-                      <view class="desc">便利店标签内容与信息不符, 酒类商品无温馨提示; </view>
+                    </view>
+                  </view>
+
+                  <view v-if="selectTab===2">
+
+                    <view class="detailItemTop">
+                      <view class="detailItemTopLeft">
+                        <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/fixedIcon.svg"/>
+                        <text class="leftName">{{subItem.PATROL_POSITION}}</text>
+                      </view>
+                      <image class="rightIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/OK.svg"/>
+                    </view>
+
+                    <view class="rectifyBox" v-for="(thirdItem,thirdIndex) in subItem.PositionDetailList">
+                      <view class="messageItem" style="align-items: flex-start;text-align: left">
+                        <image class="itemIcon" style="margin-top: 4rpx" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/userIcon.svg"/>
+                        <text class="itemValue">{{thirdItem.PATROL_PERSON}}</text>
+                      </view>
+                      <view class="messageItem">
+                        <image class="itemIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newExamine/timeIcon.svg"/>
+                        <text class="itemValue">{{thirdItem.PATROL_DATE}}</text>
+                      </view>
+
+                      <view class="beforeTop">
+                        <view class="beforeTitle">前</view>
+                      </view>
+                      <view class="beforeText">{{thirdItem.PATROL_SITUATION}}</view>
                       <view class="imgList">
-                        <!--                      <image v-for="(imgItem,imgIndex) in subItem.imgList" :key="imgIndex" class="img" :src="imgItem" :data-src="imgItem"  @click.stop="previewImage($event,subItem)"></image>-->
+                        <image v-for="(imgItem,imgIndex) in thirdItem.imgList" :key="imgIndex" class="img" :src="imgItem" :data-src="thirdItem.imgList"  @click="previewImage($event,imgIndex)"></image>
+                      </view>
+
+                      <view class="afterTop">
+                        <view class="afterTitle">后</view>
+<!--                        <text class="afterTime">{{thirdItem.PATROL_DATE}}</text>-->
+                      </view>
+<!--                      <view class="afterText">这是整改前的问题描述,这是整改前的问题描述, 这是整改前的问题描述;   这是整改前的问题描述;  </view>-->
+                      <view class="imgList">
+                        <image v-for="(imgItem,imgIndex) in thirdItem.haveImgList" :key="imgIndex" class="img" :src="imgItem" :data-src="thirdItem.haveImgList" @click="previewImage($event,imgIndex)"></image>
                       </view>
                     </view>
                   </view>
                 </view>
-
-                <view v-if="selectTab===2">
-                  <view class="rectifyBox">
-                    <view class="beforeTop">
-                      <view class="beforeTitle">前</view>
-                    </view>
-                    <view class="beforeText">这是整改前的问题描述,这是整改前的问题描述, 这是整改前的问题描述;   这是整改前的问题描述;  </view>
-                    <view class="imgList">
-                      <!--                      <image v-for="(imgItem,imgIndex) in subItem.imgList" :key="imgIndex" class="img" :src="imgItem" :data-src="imgItem"  @click.stop="previewImage($event,subItem)"></image>-->
-                    </view>
-
-                    <view class="afterTop">
-                      <view class="afterTitle">后</view>
-                      <text class="afterTime">2023/05/11 14:21:03</text>
-                    </view>
-                    <view class="afterText">这是整改前的问题描述,这是整改前的问题描述, 这是整改前的问题描述;   这是整改前的问题描述;  </view>
-                    <view class="imgList">
-                      <!--                      <image v-for="(imgItem,imgIndex) in subItem.imgList" :key="imgIndex" class="img" :src="imgItem" :data-src="imgItem"  @click.stop="previewImage($event,subItem)"></image>-->
-                    </view>
-                  </view>
-                </view>
-
               </view>
             </scroll-view>
           </view>
         </view>
-        <view class="examineList" v-if="popupShow===4">
-          <scroll-view scroll-y="true" style="height: calc(60vh - 40px)">
-            <view class="examineItem" v-for="(item,index) in examineList" :key="index">
-              <view class="itemTop">{{item.REGION_NAME}}<span style="margin-left: 4px">(<span style="color: red">{{`${item.mark}`}}</span>分)</span></view>
-              <div class="itemMessage" v-for="(subItem,subIndex) in item.SERVERPARTList" :key="subIndex" @click="handleChangeChild(subItem)">
-                {{subItem.EXAMINE_CONTENT}}<span style="margin-left: 4px">(<span style="color: red">{{subItem.DEDUCTION_SCORE}}</span>分)</span>
-                <view class="childItem" v-if="subItem.showChild">
-                  <span>{{subItem.DEDUCTION_REASON}}</span>
-                  <span>(<span style="color: red">{{subItem.DEDUCTION_SCORE}}</span>分;</span>
-                  <span style="margin-left: 4px">备注: {{subItem.EXAMINEDETAIL_DESC}})</span>
-                  <div class="imgList">
-                    <image v-for="(imgItem,imgIndex) in subItem.imgList" :key="imgIndex" class="img" :src="imgItem" :data-src="imgItem"  @click.stop="previewImage($event,subItem)"></image>
-                  </div>
-                </view>
-              </div>
-            </view>
-          </scroll-view>
-        </view>
-      </view>
-    </uniPopup>
-    <uniPopup type="bottom" :round="true" :showIndex="2" :show="showImg" @hidePopup="hideShowImg"  style="z-index: 1001!important;">
-      <view class="previewImg">
-        <view class="top">
-          <text class="popupTitle"></text>
-          <image @click="hideShowImg" class="close" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/close.svg"></image>
-        </view>
-        <view class="content">
-          <view class="contentTitle">整改前</view>
-          <image class="img" :src="showImgUrl.PATROLDETAIL_URL" @click="previewShowImage($event,showImgUrl)"/>
-          <view class="contentTitle" v-if="showImgUrl.PATROLDEAL_URL">整改后</view>
-          <image v-if="showImgUrl.PATROLDEAL_URL" class="img" :src="showImgUrl.PATROLDEAL_URL" @click="previewShowImage($event,showImgUrl)"/>
-          <view class="contentTitle" v-if="!showImgUrl.PATROLDEAL_URL">暂未整改完成</view>
-        </view>
       </view>
     </uniPopup>
+
   </view>
 </template>
 <script>
 import request from '@/util/index.js'
 import uniPopup from '@/components/uni-popup'
-import Store from "../../store/store";
 import YearCharts from "./component/yearCharts.vue";
 import {timestampToTimeMonth} from "../../util/dateTime";
 export default {
@@ -312,10 +296,7 @@ export default {
   },
   data(){
     return {
-      searchTime:'',// 查询的时间默认是拿首页的时间
       lastDay:'',// 首页的时间
-      monthList:[{label:'1月',value:'01'},{label:'2月',value:'02'},{label:'3月',value:'03'},{label:'4月',value:'04'},{label:'5月',value:'05'},{label:'6月',value:'06'},{label:'7月',value:'07'},
-        {label:'8月',value:'08'},{label:'9月',value:'09'},{label:'10月',value:'10'},{label:'11月',value:'11'},{label:'12月',value:'12'}],
       selectMonth:0,
       current:'',
       menu:{},
@@ -323,32 +304,21 @@ export default {
       showPop:false,
       showImg:false,// 整改图片的弹出
       areaList:[],// 片区列表
-      selectAreaValue:'',// 选择的片区value
-      selectAreaName:'',// 选择的片区名字
       tabList:[{label:'考核管理',value:1},{label:'日常巡检',value:2}],// tab选项卡  ,{label:'晨会管理',value:3}
       selectTab:1,// 选中的tab选项卡
       serviceAllList:[],// 三种类型总的服务区考核信息
       serviceList:[],// 服务区列表
       inspectionList:[],// 日常巡检列表
-      meetDetailList:[],// 晨会管理列表
-      scrollTop:0,// 页面整体滚动了多少
       windowHeight:0,// 页面高度
-      dateList:[],// 日历滚动条
       selectDate:'',// 当前选中的日期
-      currentDate:'',// 当前选中的月份
       popupShow:1,
-      popupTab:[],// 弹出框中的选项卡
       popupTabSelect:0,// 选中的弹出框选项卡
-      popupServiceList:[],// tab选中第二个的时候的点击更多记录全部表单
-      popupServiceShowList:[],// 显示的表单内容
-      popupServiceName:'',// 点击更多记录的表单名称
-      popupMeetDetail:{},// 弹出框的会议详情内容
       come:'',// 来自首页还是用户页
       examineList:[],
       showImgUrl:{},// 展示的图片地址
       queryTime:'',// 传入的时间
       contentTabList:[{label:'优秀',value:1},{label:'良好',value:2},{label:'一般',value:3}],
-      dailyTabList:[{label:'已整改',value:1},{label:'未整改',value:2}],
+      dailyTabList:[{label:'整改中',value:1},{label:'未整改',value:2}],
       selectDaily:1,
       selectContentTab:1,
       rate:0,
@@ -363,6 +333,8 @@ export default {
       examineObj:{},
       useInfo:{},
       sortType:'sequence',//  reverse倒序   sequence正序
+      dailyServiceList:[],// 整改显示的列表
+      dailyAllList:[] // 整改的全部列表
     }
   },
   onLoad(query){
@@ -373,18 +345,31 @@ export default {
     if (query.type){
       this.selectTab = Number(query.type)
     }
-    // 首页的时间
-    if (query.time){
-      this.queryTime = query.time
-    }
+
     //  获取手机参数对页面进行适配
     let systemInfo = uni.getSystemInfoSync()
     this.windowHeight = systemInfo.windowHeight
     this.statusBarHeight = Number(systemInfo.statusBarHeight)
     this.menu = uni.getMenuButtonBoundingClientRect()
-    // 先拿到首页的时间 作为调用接口的统一时间  存的lastDay存当前月份的具体日期切换回本月的日期判断有用
-    this.searchTime = new Date()
     this.lastDay = uni.getStorageSync('lastDay')
+    // 首页的时间
+    if (query.time){
+      this.queryTime = query.time
+      const date = new Date(this.queryTime)
+      let y = date.getFullYear()
+      this.selectMonth = date.getMonth() + 1
+      this.single = this.queryTime
+      console.log('this.single',this.single)
+      let day = this.$util.getThisMonthDay(`${y}-${this.selectMonth<10?'0'+this.selectMonth:this.selectMonth}`)
+      this.singleDay = `${y}-${this.selectMonth<10?'0'+this.selectMonth:this.selectMonth}-${day<10?'0'+day:day}`
+      console.log('this.singleDay',this.singleDay)
+    }else{
+      const date = new Date(this.lastDay)
+      this.selectMonth = date.getMonth() + 1
+    }
+
+    // 先拿到首页的时间 作为调用接口的统一时间  存的lastDay存当前月份的具体日期切换回本月的日期判断有用
+
     // 顶部时间显示的月份的
     this.single = timestampToTimeMonth((new Date(this.lastDay).getTime()))
     // 顶部时间显示到日期的
@@ -399,180 +384,61 @@ export default {
     let userInfo = uni.getStorageSync('vuex')
     userInfo = JSON.parse(userInfo)
     this.useInfo = JSON.parse(JSON.stringify(userInfo))
-    // 该页面全部接口接上之后可以删除
-    setTimeout(()=>{
-      this.rate = 92.81
-    },100)
-
-    // 拿到顶部的考核数据详情
+    uni.showLoading({
+      title:'正在加载'
+    })
+    // 拿到顶部的巡检数据
     this.handleGetDailyPatrol()
     // 获取月度考核数据
     this.handleGetExamine()
-  },
-  onReady(){
-    // 只有在页面已经渲染好了 才能把选中的日期 移到可视区域里面
-    var _this = this;
-    _this.getThisMonth()
+
+    if (this.selectTab===1){
+      this.handleNewGetExamine()
+    }else if(this.selectTab===2){
+      this.handleNewGetPatrol()
+    }
   },
   methods:{
     handleSort(){
       if (this.sortType==='sequence'){
         this.sortType = 'reverse'
-        this.serviceList = this.serviceList.reverse()
+        if (this.selectTab===1){
+          this.serviceList = this.serviceList.reverse()
+        }else if(this.selectTab===2){
+          this.dailyServiceList = this.dailyServiceList.reverse()
+        }
       }else{
         this.sortType = 'sequence'
-        this.serviceList = this.serviceList.reverse()
+        if (this.selectTab===1){
+          this.serviceList = this.serviceList.reverse()
+        }else if(this.selectTab===2){
+          this.dailyServiceList = this.dailyServiceList.reverse()
+        }
       }
     },
     handleDetail(item,index){
       this.selectMenu = index
-      console.log(item)
-      this.handleGetExamineDetail(item.list[0],true)
-    },
-    handleOpenPopup(){
+      this.currentObj = item
       this.showPop = true
+      this.$forceUpdate()
     },
-    // 拿到当前月份 用于页面一开始自动滚动到相对应的月份
-    getThisMonth(){
-      // 判断是否有传入的时间 如果有就以传入的时间为准 反之以当前时间为准
-      const date = this.queryTime ? new Date(this.queryTime): new Date()
-      let year = date.getFullYear()
-      let month = date.getMonth() + 1
-      if (month<10){
-        month = '0' + month
-      }
-      let day = date.getDate()
-      let showDay = day - 4 >0?  day - 4:1
-      if (showDay<10){
-        showDay = '0'+showDay
-      }
-      // 月份选择器 拿到当前月份 和自动滚动到当前月份
-      this.selectMonth = month
-      this.current='item'+month
-      // 日期选择器
-      if (day<10){
-        day = '0' + day
-      }
-      const realDate = new Date(this.lastDay)
-      let realMonth = realDate.getMonth() + 1
-      if (realMonth>month){
-        // let d = this.$util.getThisMonthDay(`${year}-${month}`)
-        this.selectDate = `${year}-${month}-01`
-        this.dateList = this.$util.getThisMonthDateList(`${year}-${month}`)
-        this.currentDate = 'item'+`${year}-${month}-01`
-      }else{
-        this.selectDate = `${year}-${month}-${day}`
-        this.dateList = this.$util.getThisMonthDateList(`${year}-${month}`)
-      }
-      console.log('this.selectDate',this.selectDate)
-      this.currentDate = 'item'+`${year}-${month}-${showDay}`
-      // 获得片区列表
-      // this.getAreaList(`${year}-${month}-${day}`)
-      if (this.selectTab===1){
-        // 考核管理列表
-        this.getManagerList(date)
-      }else if(this.selectTab===2){
-        // 日常巡检列表
-        this.getDailyInspectionList()
-      }
-    },
-    // 是否显示弹出框
-    handleShowPopup(value,obj){
-      console.log('value',value)
-      console.log('obj',obj)
-      this.popupShow = value
-      if (value===2){
-        // 是日常巡检时
-        // 显示的服务区名称从点击的更多记录的那个item里面拿 方法的第二个形参就是item这个对象
-        this.popupServiceName = obj.SERVERPART_NAME
-        // 两个区一起的数组
-        this.popupServiceList = obj.list
-        this.popupServiceList.forEach(item=>{
-          item.DetailList.forEach(subItem=>{
-            subItem.showChild = true
-          })
-          // 反转给的考核列表 让时间从小到大
-          // item.DetailList.reverse()
-        })
-        // 页面上展示的数组
-        this.popupServiceShowList = this.popupServiceList[0]
-        console.log('this.popupServiceShowList',this.popupServiceShowList)
-        console.log('obj',obj)
-        // 方位选项卡的数组判断
-        let  list = []
-        obj.list.forEach((item,index)=>{
-          list.push({label:`${item.REGION_NAME}区`,value:index})
-        })
-        this.popupTab = list
-      }else if (value===3){
-        this.popupMeetDetail = obj.list[0].SERVERPARTList[0]
-      }else if(value===4){
-        this.handleGetExamineDetail(obj)
-      }
-      // 弹出框显示
+    handleOpenPopup(item,index){
+      this.selectMenu = index
+      this.currentObj = item
       this.showPop = true
-    },
-    async handleGetExamineDetail(obj,type){
-      uni.showLoading({
-        title: '正在加载...'
-      })
-      const total = await request.$webGet(`CommercialApi/Examine/WeChat_GetExamineDetail`,{ExamineId: obj.SERVERPARTList[0].EXAMINE_ID})
-      let list = total.Result_Data.List
-      list.forEach(item=>{
-        let mark = 0
-        item.SERVERPARTList.forEach(subItem=>{
-          subItem.showChild = true
-          mark+=subItem.DEDUCTION_SCORE
-          subItem.imgList = subItem.EXAMINEDETAIL_URL.split(',')
-        })
-        item.mark = mark
-      })
-      console.log('list',list)
-      this.examineList = list
-      uni.hideLoading()
-      if (type){
-        this.showPop = true
-      }
+      this.$forceUpdate()
     },
     // 拿到考核和巡检上面的详情
     handleGetDailyPatrol(){
-      console.log('this.lastDay',this.lastDay)
-      console.log('this.selectMonth',this.selectMonth)
-      const date = new Date(this.lastDay)
-      let obj ={
-        start:'',
-        end:''
-      }
-      if (this.selectMonth === date.getMonth()+1){
-        const date = new Date(this.singleDay)
-        let y = date.getFullYear()
-        let m = date.getMonth() + 1
-        if(m<10){
-          m='0'+m
-        }
-        obj.start = `${y}-${m}-01`
-      }else{
-        const date = new Date(this.singleDay)
-        let y = date.getFullYear()
-        let m = date.getMonth() + 1
-        if(m<10){
-          m='0'+m
-        }
-        obj.start = `${y}-${m}-01`
-        let d = this.$util.getThisMonthDay(this.singleDay)
-        if (d<10){
-          d = '0'+ d
-        }
-        obj.end = `${y}-${m}-${d}`
-      }
       const req = {
-        StartDate:obj.start,
-        EndDate:obj && obj.end?obj.end:this.singleDay,
+        StartDate:this.singleDay,
+        EndDate:this.singleDay,
         provinceCode:this.useInfo.userData.ProvinceCode || '340000'
       }
       request.$webGet('CommercialApi/Examine/GetPatrolAnalysis',req).then(res=>{
         this.dailyExamineObj = res.Result_Data
-        console.log('this.dailyExamineObj',this.dailyExamineObj)
+        // 给达标率的图表重新赋值
+        this.rate = this.dailyExamineObj && this.dailyExamineObj.CompleteRate?this.dailyExamineObj.CompleteRate:0
       })
     },
     // 获取月度考核数据
@@ -584,7 +450,6 @@ export default {
         EndMonth: date,
         provinceCode:this.useInfo.userData.ProvinceCode || '340000'
       }
-
       request.$webGet('CommercialApi/Examine/GetExamineAnalysis',req).then(res=>{
         let obj={
           A:0,
@@ -603,27 +468,135 @@ export default {
         this.examineObj = obj
       })
     },
+    handleNewGetExamine(){
+      const time = this.$util.cutDate(this.single,'YYYYMM')
+      const req = {
+        DataType:null,
+        StartMonth:time,
+        EndMonth:time,
+        provinceCode:this.useInfo.userData.ProvinceCode || '340000'
+      }
+      request.$webGet('CommercialApi/Examine/GetExamineResultList',req).then(data=>{
+        let resList = JSON.parse(JSON.stringify(data.Result_Data.List))
+        let allList = []
+        let typeA = []
+        let typeB = []
+        let typeC = []
+        resList.forEach(item=>{
+          item.list.forEach(subItem=>{
+            subItem.SERVERPARTList.forEach(thirdItem=>{
+              thirdItem.DetailList.forEach(fourthItem=>{
+                let sum = 0
+                fourthItem.DetailList.forEach(fifthItem=>{
+                  sum+=fifthItem.DEDUCTION_SCORE
+                  fifthItem.imgList = fifthItem.EXAMINEDETAIL_URL.split(',')
+                })
+                fourthItem.EXAMINE_SCORE = sum
+              })
+            })
+          })
+          if (item.SERVERPART_TAG==='A'){
+            typeA.push(item)
+          }else if(item.SERVERPART_TAG==='B'){
+            typeB.push(item)
+          }else if(item.SERVERPART_TAG==='C'){
+            typeC.push(item)
+          }
+        })
+        allList = [typeA,typeB,typeC]
+        this.serviceAllList = allList
+        this.serviceList = this.serviceAllList[this.selectContentTab - 1]
+        uni.hideLoading()
+      })
+    },
+
+    handleNewGetPatrol(){
+      // let obj = {
+      //   start:null,
+      //   end:null
+      // }
+      // const date = new Date(this.singleDay)
+      // let y = date.getFullYear()
+      // let m = date.getMonth() + 1
+      // if (this.selectMonth === m){
+      //   obj.start = this.singleDay
+      //   obj.end = this.singleDay
+      // }else{
+      //   let day = this.$util.getThisMonthDay(`${y}-${m<10?'0'+m:m}`)
+      //   obj.start = `${y}-${m<10?'0'+m:m}-01`
+      //   obj.end = `${y}-${m<10?'0'+m:m}-${day}`
+      // }
+
+      const req = {
+        StartDate:this.singleDay,
+        EndDate:this.singleDay,
+        provinceCode:this.useInfo.userData.ProvinceCode || '340000'
+      }
+
+      request.$webGet('CommercialApi/Examine/GetPatrolResultList',req).then(data=>{
+        let list = JSON.parse(JSON.stringify(data.Result_Data.List))
+        let noList = []
+        let peddingList = []
+        let allList = []
+        list.forEach(item=>{
+          item.first = item.EXAMINE_MQUARTER.split('/')[0]
+          item.second = item.EXAMINE_MQUARTER.split('/')[1]
+          if (item.SERVERPART_TAG==='未整改'){
+            noList.push(item)
+          }else if(item.SERVERPART_TAG==='整改中'){
+            peddingList.push(item)
+          }
+          item.list.forEach(subItem=>{
+            subItem.SERVERPARTList.forEach(thirdItem=>{
+              thirdItem.PositionDetailList.forEach(fourthItem=>{
+                // 未处理
+                if (fourthItem.PATROLDETAIL_URL){
+                  fourthItem.imgList = fourthItem.PATROLDETAIL_URL.split(',')
+                }
+                // 处理
+                if (fourthItem.PATROLDEAL_URL){
+                  fourthItem.haveImgList = fourthItem.PATROLDEAL_URL.split(',')
+                }
+              })
+            })
+          })
+        })
+        allList = [peddingList,noList]
+        this.dailyAllList = allList
+        this.dailyServiceList = allList[this.selectDaily - 1]
+        uni.hideLoading()
+      })
+    },
     bindDateChange(e){
-      console.log('e',e)
       const date = new Date(e.detail.value)
+      this.selectContentTab = 1
       this.selectMonth = date.getMonth() + 1
+      uni.showLoading({
+        title:'正在加载'
+      })
       if (this.selectTab===1){
         this.single = e.detail.value
         this.handleGetExamine()
+        this.handleNewGetExamine()
       }else if(this.selectTab===2){
         this.singleDay = e.detail.value
         this.handleGetDailyPatrol()
+        this.handleNewGetPatrol()
       }
     },
     handleChangeChild(subItem){
-      console.log('subItem',subItem)
       subItem.showChild = !subItem.showChild
     },
     // 增加日期
     handleAddDate(type){
+      this.selectContentTab = 1
       const nowDate = new Date(this.lastDay)
       let nowMonth = nowDate.getMonth() + 1
       let nowDay = nowDate.getDate()
+      this.rate = null
+      uni.showLoading({
+        title:'正在加载'
+      })
       // 1 是减  2是加
       if (type===1){
         if (this.selectTab===1){
@@ -637,6 +610,9 @@ export default {
             }
             this.single = `${y}-${m}`
           }
+          // 获取月度考核数据
+          this.handleGetExamine()
+          this.handleNewGetExamine()
         }else if(this.selectTab===2){
           const date = new Date(this.singleDay)
           let y = date.getFullYear()
@@ -660,6 +636,9 @@ export default {
             }
             this.singleDay = `${y}-${m}-${d}`
           }
+          // 拿到顶部的巡检数据
+          this.handleGetDailyPatrol()
+          this.handleNewGetPatrol()
         }
       }else{
         if (this.selectTab===1){
@@ -674,6 +653,10 @@ export default {
             m = '0'+m
           }
           this.single = `${y}-${m}`
+          // 获取月度考核数据
+
+          this.handleGetExamine()
+          this.handleNewGetExamine()
         }else if(this.selectTab===2){
           const date = new Date(this.singleDay)
           let y = date.getFullYear()
@@ -696,6 +679,9 @@ export default {
               this.singleDay = `${y}-${m<10?'0'+m:m}-${d<10?'0'+d:d}`
             }
           }
+          // 拿到顶部的巡检数据
+          this.handleGetDailyPatrol()
+          this.handleNewGetPatrol()
         }
       }
     },
@@ -709,13 +695,11 @@ export default {
       this.showImgUrl = subItem
       this.$forceUpdate()
     },
-    previewImage(event,subItem){
-      console.log('event',event)
-      console.log('subItem',subItem)
+    previewImage(event,index){
       // 预览图片的方法
       wx.previewImage({
-        current: event.currentTarget.dataset.src, // 当前显示图片的http链接
-        urls: subItem.imgList // 需要预览的图片http链接列表 数组形式
+        current: event.currentTarget.dataset.src[index], // 当前显示图片的http链接
+        urls: event.currentTarget.dataset.src // 需要预览的图片http链接列表 数组形式
       })
     },
     // 整改的预览图片
@@ -732,90 +716,37 @@ export default {
       // 弹出框选择的选项卡变回默认
       this.popupTabSelect = 0
     },
-    // 点击月份改变选中月份
-    handleSelectMonth(value){
-      this.selectMonth = value
-      // 当前时间
-      const nowDate = new Date()
-      let nowMonth = nowDate.getMonth() + 1
-      if (nowMonth<10){
-        nowMonth = '0' + nowMonth
-      }
-      // 搜索时间
-      const date = new Date(this.searchTime)
-      let y = date.getFullYear()
-      // 如果当前的时间 和 选中的时间一样 那么 搜索的时间就是当前时间的前一天 否则就是当前月份的最后一天
-      if (nowMonth === this.selectMonth){
-        // this.searchTime = this.lastDay
-        this.searchTime = new Date()
-      }else{
-        let howDay = this.$util.getThisMonthDay(`${y}-${this.selectMonth}`)
-        this.searchTime = `${y}-${this.selectMonth}-${howDay}`
-      }
-      let howDay = this.$util.getThisMonthDay(`${y}-${this.selectMonth}`)
-      const listDate = new Date(`${y}-${this.selectMonth}`)
-      let listY = listDate.getFullYear()
-      let listM = listDate.getMonth() + 1
-      let list = []
-      for (let i = 0;i <= howDay,++i;) {
-        if (i>howDay){
-          break
-        }else{
-          list.push({label:`${listM}月${i}日`,value:`${listY}-${listM<10?'0'+listM:listM}-${i<10?'0'+i:i}`})
-        }
-      }
-      // 月份改变之后 重新渲染选择日期的数组
-      this.dateList = list
-      // 当月份改变了之后 日期栏也会根据当前选中的时间  选择新月份默认的时间
-      this.selectDate = this.$util.handleReduceAMonth(`${this.selectDate}`,`${y}-${this.selectMonth}`)
-      // 日期的自动滚动设置
-      const selectTime = new Date(this.selectDate)
-      let selectY = selectTime.getFullYear()
-      let selectM = selectTime.getMonth() + 1
-      // 要让选中的日期展示在最右边 不展示最左边
-      let selectD = selectTime.getDate() - 4 > 0?selectTime.getDate() - 4:1
-      this.currentDate = 'item' + `${selectY}-${selectM<10?'0'+selectM:selectM}-${selectD<10?'0'+selectD:selectD}`
-
-      if (this.selectTab===1){
-        // 选中的是考核管理 调用拿到考核管理的列表
-        this.getManagerList()
-      }else if (this.selectTab===2){
-        // 选中日常巡检 就调用拿到日常巡检的方法
-        // 调用日常巡检的方法
-        this.getDailyInspectionList()
-      }else if(this.selectTab===3){
-        // 选中日常巡检 就调用拿到日常巡检的方法
-        // 晨会管理列表
-        this.getMeetingDetail()
-      }
-    },
     handleChangeContentTab(value){
       this.selectContentTab = value
       this.sortType = 'sequence'
       this.serviceList = this.serviceAllList[value - 1]
     },
-    handleChangeMenu(value,obj){
+    handleChangeMenu(value){
       this.selectMenu = value
-      this.currentObj = obj
-      console.log('obj',this.currentObj)
+      if (this.selectTab===1){
+        this.currentObj = this.serviceList[value]
+      }else if(this.selectTab===2){
+        this.currentObj = this.dailyServiceList[value]
+      }
     },
     handleChangeDailyTab(value){
+      this.sortType = 'sequence'
       this.selectDaily = value
+      this.dailyServiceList = this.dailyAllList[value - 1]
     },
     // 点击选项卡改变选择的种类
     // 根据点击的 去请求这个种类下面的列表
     handleChangeTab(value){
       this.selectTab = value
-      // uni.showLoading({
-      //   title: '正在加载...'
-      // })
-      // if (value===1){
-      //   // 考核管理列表
-      //   this.getManagerList()
-      // }else if(value===2){
-      //   // 日常巡检列表
-      //   this.getDailyInspectionList()
-      // }
+      if (value===2){
+        this.rate = null
+        setTimeout(()=>{
+          this.rate = this.dailyExamineObj.CompleteRate
+        },100)
+        this.handleNewGetPatrol()
+      }else if(value===1){
+        this.handleNewGetExamine()
+      }
     },
     // 返回按钮的方法
     handleBack(){
@@ -830,207 +761,16 @@ export default {
       }
 
     },
-    // 选择日期的方法
-    handleChangeDate(value){
-      const date = new Date()
-      let m = date.getMonth() +1
-      let d = date.getDate()
-      const selectDay = new Date(value)
-      let selectM = selectDay.getMonth() +1
-      let selectD = selectDay.getDate()
-      if (d < selectD && m <= selectM){
-        uni.showModal({
-          title: `日常巡检仅支持查看${m}月${d}号及之前的数据`,
-          icon:'none',
-          showCancel: false,
-          duration:3000
-        })
-      }else{
-        uni.showLoading({
-          title: '正在加载...'
-        })
-        this.selectDate = value
-        // 切换日期日常巡检列表 选项卡为2的时候调用
-        if (this.selectTab===2){
-          this.getDailyInspectionList()
-        }else if(this.selectTab===3){
-          // 晨会管理列表
-          this.getMeetingDetail()
-        }
-      }
-    },
-    // 搜索
-    handleNoShow(item){
-      console.log('item',item)
-      item.showChild = !item.showChild
-      this.$forceUpdate()
-    },
     hideShowImg(){
       this.showImg = false
       this.showImgUrl = {}
     },
-    // 改变弹出框中的选项卡
-    handleChangePopupTab(value){
-      this.popupTabSelect = value
-      // 弹出框选项卡切换 表单内容切换
-      this.popupServiceShowList = this.popupServiceList[this.popupTabSelect]
-    },
-    // 片区列表
-    async getAreaList(date){
-      const total = await request.$webGet(`CommercialApi/BaseInfo/GetSPRegionList`,{Province_Code:Store.state.userData.ProvinceCode})
-      uni.hideLoading()
-      if (total.Result_Code===100){
-        let list = []
-        total.Result_Data.List.forEach(item=>{
-          list.push({label:item.name.split('片区')[0],value:item.value})
-        })
-        this.areaList = list
-        // 默认选中第一个片区
-        this.selectAreaValue = this.areaList[0].value
-        this.selectAreaName = this.areaList[0].label
-        // 只能先拿到 selectAreaValue 再去请求列表
-        // 获得考核管理列表 第一次进度肯定是考核管理
-        if (this.selectTab===1){
-          // 考核管理列表
-          this.getManagerList(date)
-        }else if(this.selectTab===2){
-          // 日常巡检列表
-          this.getDailyInspectionList()
-        }
-      }
-    },
-    // 修改当前选中的片区
-    handleChangeArea(item){
-      // 选择的片区名称和片区id
-      this.selectAreaValue = item.value
-      this.selectAreaName = item.label
-      uni.showLoading({
-        title: '正在加载...'
-      })
-      if (this.selectTab===1){
-
-        // 考核管理列表重新调用
-        this.getManagerList()
-      }else if (this.selectTab===2){
-        // 日常巡检列表重新调用
-        this.getDailyInspectionList()
-      }else if(this.selectTab===3){
-        // 晨会管理列表
-        this.getMeetingDetail()
-      }
-      // 关闭弹出框方法
-      this.hidePopup()
-    },
-    // 考核管理列表
-    async getManagerList(time){
-      console.log('time123',time)
-      uni.showLoading({
-        title: '正在加载...'
-      })
-      const realDate = new Date(this.lastDay)
-      let realMonth = realDate.getMonth() + 1
-
-      const date = time ? new Date(time) :new Date(this.searchTime)
-      let y = date.getFullYear()
-      let m = date.getMonth() + 1
-      let d = date.getDate()
-      if (d<10){
-        d = '0' + d
-      }
-      let startTime
-      let endTime
-      console.log('realMonth',realMonth)
-      console.log('m',m)
-      if (realMonth>m){
-        if (m<10){
-          m = '0' + m
-        }
-        let day = this.$util.getThisMonthDay(`${y}-${m}`)
-        startTime=`${y}-${m}-01`
-        endTime=`${y}-${m}-${day}`
-      }else{
-        if (m<10){
-          m = '0' + m
-        }
-        startTime=`${y}-${m}-01`
-        endTime=`${y}-${m}-${d}`
-      }
-
-      const res = await request.$webGet(`CommercialApi/Examine/WeChat_GetExamineList`,{
-        // SearchStartDate: startTime,// 考核日期（开始时间）
-        // SearchEndDate: endTime,// 考核日期（结束时间）
-        SearchStartDate: '2023-07-01',
-        SearchEndDate: '2023-07-31'
-      })
-      let list = []
-      let good = []
-      let normal = []
-      let bad = []
-      res.Result_Data.forEach(item=>{
-        item.list.forEach(subItem=>{
-          subItem.SERVERPARTList.forEach(thirdItem=>{
-            if (thirdItem.EXAMINE_SCORE>=90){
-              good.push(item)
-            }else if(thirdItem.EXAMINE_SCORE>=80 && thirdItem.EXAMINE_SCORE<90){
-              normal.push(item)
-            }else if (thirdItem.EXAMINE_SCORE<80){
-              bad.push(item)
-            }
-          })
-        })
-      })
-      console.log('res',res)
-      list = [good,normal,bad]
-      this.serviceAllList = JSON.parse(JSON.stringify(list))
-      this.serviceList = this.serviceAllList[this.selectContentTab - 1]
-      console.log('this.serviceAllList',this.serviceAllList)
-      console.log('this.serviceList',this.serviceList)
-      uni.hideLoading()
-    },
-    // 日常巡检列表
-    async getDailyInspectionList(){
-      const res = await request.$webGet(`CommercialApi/Examine/WeChat_GetPatrolList`,{
-        SearchStartDate:this.selectDate,// 巡检日期（开始时间）
-        SearchEndDate:this.selectDate,// 巡检日期（结束时间）
-      })
-      this.inspectionList = res.Result_Data
-
-      this.inspectionList.forEach(item=>{
-        item.list.forEach(subItem=>{
-          let i = 0
-          subItem.SERVERPARTList.forEach(thirdItem=>{
-            if (thirdItem.COMPLETE_STATE===0){
-              i++
-            }
-          })
-          if (i>0){
-            subItem.warning=false
-          }else{
-            subItem.warning=true
-          }
-        })
-      })
-
-      console.log('inspectionList',this.inspectionList)
-      uni.hideLoading()
-    },
-    // 晨会管理列表
-    async getMeetingDetail(){
-      const res = await request.$webGet(`CommercialApi/Examine/WeChat_GetMeetingList`,{
-        SearchStartDate:this.selectDate,// 巡检日期（开始时间）
-        SearchEndDate:this.selectDate,// 巡检日期（结束时间）
-        SPRegionType_ID:this.selectAreaValue,// 片区内码，多个片区用","隔开
-        Serverpart_ID:'',// 服务区内码，多个服务区用","隔开
-      })
-      this.meetDetailList = res.Result_Data
-      uni.hideLoading()
-    }
   }
 }
 
 </script>
 <style scoped lang="scss">
-@import '/static/public/font/stylesheet.css';
+@import '/static/public/dataAll/stylesheet.css';
 .main{
   width: 100%;
   height: calc(100vh);
@@ -1124,11 +864,11 @@ export default {
           position: relative;
         }
         .bigItem:after{
-          content:url("/static/images/newExamine/tabIcon.svg");
+          content:url("https://eshangtech.com/ShopICO/ahyd-BID/newExamine/tabIcon.svg");
           width: 56rpx;
           height: 16rpx;
           position: absolute;
-          left: 50%;bottom: -4px;
+          left: 50%;bottom: 5px;
           transform: translateX(-50%);
         }
       }
@@ -1495,6 +1235,7 @@ export default {
                   box-sizing: border-box;
                   background-repeat: no-repeat;
                   background-size: 100% 100%;
+                  background-position: 0 0;
                 }
                 .itemName{
                   font-size: 28rpx;
@@ -1622,16 +1363,17 @@ export default {
                 align-items: center;
                 .index{
                   display: inline-block;
-                  width: 36rpx;
-                  height: 32rpx;
                   font-size: 24rpx;
+                  padding: 2rpx 12rpx 2rpx 8rpx;
                   font-family: PingFangSC-Regular, PingFang SC;
                   font-weight: 400;
                   color: #FEFFFF;
                   line-height: 32rpx;
                   text-align: center;
                   box-sizing: border-box;
-                  padding-right: 4rpx;
+                  background-repeat: no-repeat;
+                  background-size: 100% 100%;
+                  background-position: 0 0;
                 }
                 .scrollName{
                   font-size: 28rpx;
@@ -1695,453 +1437,6 @@ export default {
     }
   }
 
-
-
-
-
-  .content{
-    width: 100%;
-    box-sizing: border-box;
-    padding: 16px 16px 4px;
-    border-top-left-radius: 16px;
-    border-top-right-radius: 16px;
-    position: relative;
-    background: #fff;
-    z-index:99;
-    .date{
-      width: 100%;
-      height: 31px;
-      border-bottom: 1px solid #F3F1F5;
-      margin-bottom: 12px;
-      .dateList{
-        height: 100%;
-        white-space: nowrap;
-        .dateItem{
-          display: inline-block;
-          margin-right: 16px;
-          font-size: 14px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #786B6C;
-          line-height: 20px;
-        }
-        .selectDateItem{
-          font-size: 14px;
-          font-family: PingFangSC-Semibold, PingFang SC;
-          font-weight: 600;
-          color: #8441F3;
-          line-height: 20px;
-          position: relative;
-        }
-        .selectDateItem:after{
-          content:'';
-          display: block;
-          position: absolute;
-          width: 100%;
-          height: 3px;
-          background: rgba(132, 65, 243, 1);
-          bottom: -4px;
-        }
-      }
-    }
-    .tab{
-      width: 100%;
-      height: 38px;
-      background: #F3F1F5;
-      border-radius: 4px;
-      box-sizing: border-box;
-      padding: 4px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .tabItem{
-        width: 33%;
-        height: 100%;
-        font-size: 14px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: #786B6C;
-        text-align: center;
-        line-height: 30px;
-      }
-      .selectItem{
-        background: #fff;
-        font-size: 14px;
-        font-family: PingFangSC-Semibold, PingFang SC;
-        font-weight: 600;
-        color: #8441F3;
-        border-radius: 4px;
-      }
-    }
-    .serviceList{
-      width: 100%;
-      .serviceItem{
-        width: 100%;
-        box-sizing: border-box;
-        padding: 16px;
-        border-radius: 8px;
-        margin-bottom: 12px;
-        background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
-        .itemTitle{
-          display: flex;
-          align-items: center;
-          .title{
-            font-size: 18px;
-            font-family: Alimama ShuHeiTi;
-            color: #33077A;
-            line-height: 26px;
-          }
-          .unit{
-            font-size: 12px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #3B48E3;
-            line-height: 12px;
-            padding: 3px 4px;
-            background: rgba(59, 72, 227, 0.1);
-            margin-left: 8px;
-            border-radius: 2px;
-          }
-          .secondUnit{
-            background:rgba(0, 147, 46, 0.1);
-            border-radius: 2px;
-            font-size: 12px;
-            padding: 3px 4px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #00932E;
-            margin-left: 8px;
-            line-height: 12px;
-          }
-        }
-        .detail{
-          margin-top: 18px;
-          .detailTop{
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            border-bottom: 1px solid rgba(212, 196, 244, 0.2);
-            padding: 0 0 8px;
-            .left{
-              display: flex;
-              align-items: center;
-              .icon{
-                width: 22px;
-                height: 22px;
-              }
-              .type{
-                font-size: 14px;
-                font-family: PingFangSC-Semibold, PingFang SC;
-                font-weight: 600;
-                color: #160002;
-                line-height: 20px;
-                margin-left: 8px;
-              }
-            }
-            .right{
-              font-size: 22px;
-              font-family: DINAlternate-Bold, DINAlternate;
-              font-weight: bold;
-              color: #160002;
-              line-height: 22px;
-              .unit{
-                font-size: 12px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #786B6C;
-                line-height: 18px;
-                margin-left: 2px;
-              }
-            }
-          }
-          .detailMessage{
-            margin-top: 14px;
-            .message{
-              display: flex;
-              align-items: center;
-              .icon{
-                width: 16px;
-                height: 16px;
-              }
-              .value{
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #160002;
-                line-height: 20px;
-                margin-left: 8px;
-                width: 90%;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-              }
-              .moreIcon{
-                width: 16px;
-                height: 16px;
-              }
-            }
-          }
-        }
-      }
-      .dailyInspection{
-        width: 100%;
-        height: 267px;
-        background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
-        border-radius: 8px;
-        margin-bottom: 12px;
-        box-sizing: border-box;
-        padding: 16px;
-        .itemTitle{
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          .title{
-            font-size: 18px;
-            font-family: Alimama ShuHeiTi;
-            color: #33077A;
-            line-height: 26px;
-          }
-          .more{
-            display: flex;
-            align-items: center;
-            .moreText{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #786B6C;
-              line-height: 20px;
-            }
-            .icon{
-              width: 15px;
-              height: 15px;
-              margin-left: 7px;
-            }
-          }
-        }
-        .detail{
-          margin-top: 19px;
-          .detailTop{
-            width: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            .left{
-              display: flex;
-              align-items: center;
-              .icon{
-                width: 22px;
-                height: 22px;
-                margin-right: 8px;
-              }
-              .type{
-                font-size: 14px;
-                font-family: PingFangSC-Semibold, PingFang SC;
-                font-weight: 600;
-                color: #160002;
-                line-height: 20px;
-                margin-right: 4px;
-              }
-              .number{
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #786B6C;
-                line-height: 20px;
-              }
-            }
-            .right{
-              width: 20px;
-              height: 20px;
-            }
-          }
-          .detailMessage{
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding-bottom: 16px;
-            .person{
-              margin-top: 12px;
-              .value{
-                font-size: 14px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #160002;
-                line-height: 20px;
-                margin-bottom: 2px;
-              }
-              .label{
-                font-size: 12px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #786B6C;
-                line-height: 18px;
-              }
-              .icon{
-                margin-bottom:-2px;
-                width: 16px;
-                height: 19px;
-              }
-            }
-
-          }
-        }
-      }
-      .meeting{
-        width: 100%;
-        height: 209px;
-        background: linear-gradient(314deg, #FFF1F8 0%, #F2F2FF 32%, #FCFAFF 54%, #FCF6FF 70%, #F2EAFF 100%);
-        border-radius: 8px;
-        margin-bottom: 12px;
-        box-sizing: border-box;
-        padding: 16px;
-        .title{
-          font-size: 18px;
-          font-family: Alimama ShuHeiTi;
-          color: #33077A;
-          line-height: 26px;
-          margin-bottom: 18px;
-        }
-        .meetContent{
-          width: 100%;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          padding-bottom: 8px;
-          border-bottom: 1px solid rgba(212, 196, 244, 0.2);
-          .left{
-            display: flex;
-            align-items: center;
-            .icon{
-              width: 24px;
-              height: 24px;
-              margin-right: 8px;
-            }
-            .text{
-              font-size: 14px;
-              font-family: PingFangSC-Semibold, PingFang SC;
-              font-weight: 600;
-              color: #160002;
-              line-height: 20px;
-            }
-          }
-          .right{
-            display: flex;
-            align-items: center;
-            .icon{
-              width: 12px;
-              height: 12px;
-              margin-right: 4px;
-            }
-            .text{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px
-            }
-          }
-        }
-        .noDataItem{
-          width: 100%;
-          display: flex;
-          flex-direction: column;
-          justify-content: center;
-          align-items: center;
-          margin-top: 6px;
-          .img{
-            width: 80px;
-            height: 80px;
-          }
-          .text{
-            text-align: center;
-            font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #A69E9F;
-          }
-        }
-        .detail{
-          margin-top: 12px;
-          .message{
-            display: flex;
-            align-items: center;
-            position: relative;
-            .icon{
-              width: 16px;
-              height: 16px;
-            }
-            .value{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px;
-              margin-left: 8px;
-              width: 90%;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              overflow: hidden;
-            }
-            .more{
-              width: 12px;
-              height: 12px;
-              position: absolute;
-              right: 0;
-            }
-          }
-          .other{
-            display: flex;
-            align-items: flex-start;
-            position: relative;
-            .icon{
-              width: 16px;
-              height: 16px;
-              margin-top: 2px;
-            }
-            .value{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px;
-              margin-left: 8px;
-              width: 90%;
-              display: -webkit-box;
-              -webkit-line-clamp: 2;
-              -webkit-box-orient: vertical;
-              overflow: hidden;
-            }
-            .more{
-              width: 12px;
-              height: 12px;
-              position: absolute;
-              right: 0;bottom: 3px;
-            }
-          }
-        }
-      }
-      .noData{
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        margin-top: 20vh;
-        .img{
-          width: 80px;
-          height: 80px;
-        }
-        .text{
-          text-align: center;
-          font-size: 20px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #A69E9F;
-          line-height: 20px;
-          margin-top: 8px;
-        }
-      }
-    }
-  }
   .popup{
     width: 100%;
     box-sizing: border-box;
@@ -2176,7 +1471,7 @@ export default {
         display: flex;
         .detailLeft{
           width: 184rpx;
-          height: calc(100vh - 108rpx);
+          height: calc(85vh - 148rpx);
           .serviceSelect{
             padding:24rpx 32rpx;
             font-size: 32rpx;
@@ -2207,13 +1502,15 @@ export default {
 
         .serviceDetail{
           width: calc(100vw - 200rpx);
-          height: calc(100vh - 108rpx);
+          height: calc(85vh - 148rpx);
+          background: #fff;
           .serviceDetailItem{
             width: 100%;
             box-sizing: border-box;
             padding: 24rpx;
             background: #F8F8F8;
             border-radius: 12rpx;
+            margin-bottom: 24rpx;
             .detailItemTop{
               width: 100%;
               display: flex;
@@ -2267,6 +1564,7 @@ export default {
             }
             .messageItem{
               display: flex;
+              align-items: center;
               justify-content: flex-start;
               margin-bottom: 8rpx;
               .itemIcon{
@@ -2338,13 +1636,17 @@ export default {
                   font-weight: 400;
                   color: #160002;
                   line-height: 40rpx;
+                  text-align: left;
                 }
                 .imgList{
                   width: 100%;
+                  display: flex;
+                  justify-content: flex-start;
                   .img{
                     width: 88rpx;
                     height: 88rpx;
                     margin-right: 16rpx;
+                    margin-top: 12rpx;
                   }
                 }
               }
@@ -2355,6 +1657,57 @@ export default {
               padding: 24rpx;
               background: #fff;
               margin-top: 16rpx;
+              .detailItemTop{
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                margin-bottom: 16rpx;
+                .fixedName{
+                  padding: 8rpx 14rpx;
+                  font-size: 28rpx;
+                  font-family: PingFangSC-Semibold, PingFang SC;
+                  font-weight: 600;
+                  color: #EC6C00;
+                  line-height: 40rpx;
+                  background: #F6E9DE;
+                  border-radius: 10rpx;
+                }
+                .store{
+                  font-size: 36rpx;
+                  font-family: DINAlternate-Bold, DINAlternate;
+                  font-weight: bold;
+                  color: #160002;
+                  line-height: 44rpx;
+                  .unit{
+                    font-size: 24rpx;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    font-weight: 400;
+                    color: #A69E9F;
+                    line-height: 36rpx;
+                  }
+                }
+                .detailItemTopLeft{
+                  display: flex;
+                  align-items: center;
+                  .leftIcon{
+                    width: 27rpx;
+                    height: 32rpx;
+                    margin-right: 16rpx;
+                  }
+                  .leftName{
+                    font-size: 32rpx;
+                    font-family: PingFangSC-Semibold, PingFang SC;
+                    font-weight: 600;
+                    color: #160002;
+                    line-height: 44rpx;
+                  }
+                }
+                .rightIcon{
+                  width: 40rpx;
+                  height: 40rpx;
+                }
+              }
               .beforeTop{
                 width: 100%;
                 display: flex;
@@ -2382,10 +1735,14 @@ export default {
                 text-align: left;
               }
               .imgList{
-                margin-top: 12rpx;
                 width: 100%;
+                display: flex;
+                justify-content: flex-start;
                 .img{
-
+                  width: 88rpx;
+                  height: 88rpx;
+                  margin-right: 16rpx;
+                  margin-top: 12rpx;
                 }
               }
               .afterTop{
@@ -2410,7 +1767,6 @@ export default {
                   font-weight: 400;
                   color: #786B6C;
                   line-height: 32rpx;
-                  text-align: left;
                 }
               }
               .afterText{
@@ -2419,209 +1775,13 @@ export default {
                 font-weight: 400;
                 color: #160002;
                 line-height: 40rpx;
+                text-align: left;
               }
             }
           }
         }
       }
     }
-    .serviceList{
-      .assessmentTable{
-        width: 100%;
-        height: calc(78vh - 150px);
-        box-sizing: border-box;
-        overflow-y: scroll;
-        .bigBox{
-          border-radius: 16rpx;
-          border: 2rpx solid #D9DBE0;
-          margin-top: 12px;
-          .assessmentItem{
-            width: 100%;
-            box-sizing: border-box;
-            padding: 16px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            background: linear-gradient(314deg, #EAEFFF 0%, #F3F5FF 32%, #F5FCFF 50%, #F0F7FF 67%, #DBE5FF 100%);
-            border-radius: 16rpx;
-            border-bottom: 2rpx solid #D9DBE0;
-            .left{
-              font-size: 16px;
-              font-family: AlimamaShuHeiTi;
-              color: #1A5FFF;
-              line-height: 22px;
-              background: rgba(26, 95, 255, 0.1);
-              border-radius: 14px;
-              padding: 4px 16px;
-              display: inline-block;
-            }
-            .right{
-              display: flex;
-              align-items: center;
-              .label{
-                font-size: 14px;
-                font-family: DINAlternate-Bold, DINAlternate;
-                font-weight: 400;
-                color: #160002;
-                .name{
-                  font-size: 16px;
-                  font-family: DINAlternate-Bold, DINAlternate;
-                  font-weight: 600;
-                  color: #160002;
-                  margin-left: 4px;
-                }
-              }
-              .more{
-                width: 14px;
-                height: 26px;
-                margin-left: 8px;
-              }
-            }
-          }
-          .smallItem{
-            box-sizing: border-box;
-            padding: 16px;
-            border-bottom: 2px solid #EEEEEE;
-            .top{
-              width: 100%;
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 12px;
-              .time{
-                font-size: 16px;
-                font-family: PingFangSC-Semibold, PingFang SC;
-                font-weight: 600;
-                color: #160002;
-              }
-              .label{
-                font-size: 14px;
-                font-family: DINAlternate-Bold, DINAlternate;
-                font-weight: 400;
-                color: #160002;
-                .name{
-                  font-size: 16px;
-                  font-family: DINAlternate-Bold, DINAlternate;
-                  font-weight: 600;
-                  color: #160002;
-                  margin-left: 4px;
-                }
-              }
-            }
-
-            .itemBox{
-              width: 100%;
-              display: flex;
-              align-items: flex-end;
-              .detailItem{
-                width: 100%;
-                .detailValue{
-                  .right{
-                    width: 20px;
-                    height: 20px;
-                  }
-                  .detailText{
-                    font-size: 14px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #160002;
-                    line-height: 20px;
-                  }
-                }
-                .detailLabel{
-                  font-size: 24rpx;
-                  font-family: PingFangSC-Regular, PingFang SC;
-                  font-weight: 400;
-                  color: #786B6C;
-                  line-height: 36rpx;
-                }
-              }
-            }
-          }
-
-        }
-      }
-      .tab{
-        width: 100%;
-        height: 38px;
-        background: #F3F1F5;
-        border-radius: 4px;
-        margin-top: 16px;
-        box-sizing: border-box;
-        padding: 4px;
-        margin-bottom: 8px;
-        .tabItem{
-          display: inline-block;
-          width: 50%;
-          font-size: 14px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #786B6C;
-          line-height: 30px;
-        }
-        .selectTabItem{
-          background: #fff;
-          border-radius: 4px;
-        }
-      }
-      .list{
-        margin-top: 12px;
-        height: calc(78vh - 130px);
-        overflow-y: scroll;
-        .item{
-          display: flex;
-          justify-content: space-between;
-          .person{
-            margin-top: 12px;
-            text-align: left;
-            .value{
-              font-size: 14px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #160002;
-              line-height: 20px;
-              margin-bottom: 2px;
-            }
-            .label{
-              font-size: 12px;
-              font-family: PingFangSC-Regular, PingFang SC;
-              font-weight: 400;
-              color: #786B6C;
-              line-height: 18px;
-            }
-            .icon{
-              margin-bottom:-2px;
-              width: 16px;
-              height: 19px;
-            }
-          }
-        }
-      }
-    }
-    .meetList{
-      margin-top: 16px;
-      height: calc(60vh - 80px);
-      overflow-y: scroll;
-      .message{
-        display: flex;
-        align-items: flex-start;
-        .icon{
-          width: 16px;
-          height: 16px;
-          margin-top: 2px;
-        }
-        .value{
-          display: inline-block;
-          text-align: left;
-          font-size: 14px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #160002;
-          line-height: 20px;
-          margin-left: 8px;
-          width: 90%;
-        }
-      }
-    }
     .examineList{
       .examineItem{
         width: 100%;
@@ -2656,10 +1816,13 @@ export default {
             background: #fff;
             .imgList{
               width: 100%;
+              display: flex;
+              justify-content: flex-start;
               .img{
-                width: 40px;
-                height: 40px;
-                margin-right: 8px;
+                width: 88rpx;
+                height: 88rpx;
+                margin-right: 16rpx;
+                margin-top: 12rpx;
               }
             }
 
diff --git a/pages/revenue/expenditureDetail.vue b/pages/revenue/expenditureDetail.vue
index 3db6777..05cdeb5 100644
--- a/pages/revenue/expenditureDetail.vue
+++ b/pages/revenue/expenditureDetail.vue
@@ -16,7 +16,7 @@
       <view class="detailItem">
         <view class="itemTop">
           <view class="itemTitle">服务区自营小计</view>
-          <image class="monthSumBg" src="/static/images/revenueBox/expenditure.png"/>
+          <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/expenditure.png"/>
           <view class="itemBox">
             <view class="leftChar">
               <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']"/>
@@ -50,7 +50,7 @@
         <view class="contentBox">
           <view class="contentItem" v-for="(item,index) in 3" :key="index">
             <view class="topItem">
-              <view class="index" :style="{background:`url(${index===0?'/static/images/revenueBox/secondBg.svg':index===1?'/static/images/revenueBox/thirdBg.svg':'/static/images/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
+              <view class="index" :style="{background:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/secondBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/thirdBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
               <view class="smallItemName">餐饮小吃</view>
             </view>
             <view class="bottomItem">
@@ -74,7 +74,7 @@
       <view class="detailItem">
         <view class="itemTop">
           <view class="itemTitle">分公司收入小计</view>
-          <image class="monthSumBg" src="/static/images/revenueBox/expenditure.png"/>
+          <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/expenditure.png"/>
           <view class="itemBox">
             <view class="leftChar">
               <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']"/>
@@ -108,7 +108,7 @@
         <view class="contentBox">
           <view class="contentItem" v-for="(item,index) in 3" :key="index">
             <view class="topItem">
-              <view class="index" :style="{background:`url(${index===0?'/static/images/revenueBox/secondBg.svg':index===1?'/static/images/revenueBox/thirdBg.svg':'/static/images/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
+              <view class="index" :style="{background:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/secondBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/thirdBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
               <view class="smallItemName">餐饮小吃</view>
             </view>
             <view class="bottomItem">
diff --git a/pages/revenue/incomeDetail.vue b/pages/revenue/incomeDetail.vue
index 754e945..de1122b 100644
--- a/pages/revenue/incomeDetail.vue
+++ b/pages/revenue/incomeDetail.vue
@@ -16,7 +16,7 @@
       <view class="detailItem">
         <view class="itemTop">
           <view class="itemTitle">服务区自营小计</view>
-          <image class="monthSumBg" src="/static/images/revenueBox/allInCome.png"/>
+          <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/allInCome.png"/>
           <view class="itemBox">
             <view class="leftChar">
               <OtherCharts :success="number" :colorList="['#FC7909', '#FEE4CE']"/>
@@ -50,7 +50,7 @@
         <view class="contentBox">
           <view class="contentItem" v-for="(item,index) in 10" :key="index">
             <view class="topItem">
-              <view class="index" :style="{background:`url(${index===0?'/static/images/revenueBox/secondBg.svg':index===1?'/static/images/revenueBox/thirdBg.svg':'/static/images/revenueBox/otherBg.svg'})`}">{{index+1}}</view>
+              <view class="index" :style="{background:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/secondBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/thirdBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBg.svg'})`}">{{index+1}}</view>
               <view class="smallItemName">餐饮小吃</view>
             </view>
             <view class="bottomItem">
@@ -74,7 +74,7 @@
       <view class="detailItem">
         <view class="itemTop">
           <view class="itemTitle">分公司收入小计</view>
-          <image class="monthSumBg" src="/static/images/revenueBox/allInCome.png"/>
+          <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/allInCome.png"/>
           <view class="itemBox">
             <view class="leftChar">
               <OtherCharts :success="number" :colorList="['#FC7909', '#FEE4CE']"/>
@@ -108,7 +108,7 @@
         <view class="contentBox">
           <view class="contentItem" v-for="(item,index) in 3" :key="index">
             <view class="topItem">
-              <view class="index" :style="{background:`url(${index===0?'/static/images/revenueBox/secondBg.svg':index===1?'/static/images/revenueBox/thirdBg.svg':'/static/images/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
+              <view class="index" :style="{background:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/secondBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/thirdBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBg.svg'})`}">{{index + 1}}</view>
               <view class="smallItemName">餐饮小吃</view>
             </view>
             <view class="bottomItem">
@@ -295,8 +295,6 @@ export default {
             margin-bottom: 8rpx;
             display: flex;
             flex-direction: column;
-            align-items: center;
-            justify-content: center;
             .rateText{
               font-size: 40rpx;
               font-family: DINAlternate-Bold, DINAlternate;
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
index 52d5e07..d821a62 100644
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@@ -9,7 +9,7 @@
 
       <view class="headerDetail" :style="{top: (menu.bottom+68) +'px'}">
         <view class="detailBox">
-          <image class="monthSumBg" src="/static/images/revenueBox/monthSum.png"/>
+          <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/monthSum.png"/>
 
           <view class="detailPage">月度累计收支金额</view>
 
@@ -54,7 +54,7 @@
       <view class="profitYear">
         <view class="itemBox">
           <view class="itemBoxTitle">年度累计利润</view>
-          <image class="monthSumBg" src="/static/images/revenueBox/yearSum.png"/>
+          <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/yearSum.png"/>
           <view class="itemDetailBox">
             <view class="detailBoxTop">
               <text class="successLabel">完成率</text>
@@ -88,7 +88,7 @@
        <view class="accrueYear">
            <view class="itemBox">
                <view class="itemBoxTitle">年度营收累计</view>
-             <image class="monthSumBg" src="/static/images/revenueBox/yearRevenue.png"/>
+             <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/yearRevenue.png"/>
                <view class="itemDetailBox">
                    <view class="leftCharts">
                        <OtherCharts :success="number" :colorList="['#9E3CE9', '#ECD8FB']"/>
@@ -123,7 +123,7 @@
         <view class="incomeAll">
             <view class="itemBox">
                 <view class="itemBoxTitle" style="color: #EC6C00">收入合计</view>
-              <image class="monthSumBg" src="/static/images/revenueBox/allInCome.png"/>
+              <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/allInCome.png"/>
                 <view class="itemDetailBox">
                     <view class="leftCharts">
                         <OtherCharts :success="number" :colorList="['#FC7909', '#FEE4CE']"/>
@@ -158,13 +158,13 @@
                     <view class="itemSmallTop">
                         <view class="leftBox">
                             <view class="smallIcon">
-                              <image class="img" src="/static/images/revenueBox/selfOperat.svg"/>
+                              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/selfOperat.svg"/>
                             </view>
                             <view class="smallTitle">自营收入小计</view>
                         </view>
                         <view class="leftRight" @click="handleGoInComeDetail">
                             <text class="more">查看更多</text>
-                            <image class="moreIcon" src="/static/images/revenueBox/moreIcon.svg"/>
+                            <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg"/>
                         </view>
                     </view>
 
@@ -228,13 +228,13 @@
                     <view class="itemSmallTop">
                         <view class="leftBox">
                             <view class="smallIcon">
-                              <image class="img" src="/static/images/revenueBox/otherSum.svg"/>
+                              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherSum.svg"/>
                             </view>
                             <view class="smallTitle">其他收入小计</view>
                         </view>
                         <view class="leftRight"  @click="handleGoInComeDetail">
                             <text class="more">查看更多</text>
-                          <image class="moreIcon" src="/static/images/revenueBox/moreIcon.svg"/>
+                          <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg"/>
                         </view>
                     </view>
 
@@ -299,7 +299,7 @@
         <view class="expenditure">
             <view class="itemBox">
                 <view class="itemBoxTitle" style="color: #096EF7">支出合计</view>
-              <image class="monthSumBg" src="/static/images/revenueBox/expenditure.png"/>
+              <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/expenditure.png"/>
                 <view class="itemDetailBox">
                     <view class="leftCharts">
                         <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']"/>
@@ -334,13 +334,13 @@
                     <view class="itemSmallTop">
                         <view class="leftBox">
                             <view class="smallIcon">
-                              <image class="img" src="/static/images/revenueBox/operateSum.svg"/>
+                              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/operateSum.svg"/>
                             </view>
                             <view class="smallTitle">运营成本小计</view>
                         </view>
                         <view class="leftRight" @click="handleGoExpenditure">
                             <text class="more">查看更多</text>
-                          <image class="moreIcon" src="/static/images/revenueBox/moreIcon.svg"/>
+                          <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg"/>
                         </view>
                     </view>
 
@@ -404,13 +404,13 @@
                     <view class="itemSmallTop">
                         <view class="leftBox">
                             <view class="smallIcon">
-                              <image class="img" src="/static/images/revenueBox/operateManager.svg"/>
+                              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/operateManager.svg"/>
                             </view>
                             <view class="smallTitle">管理费用小计</view>
                         </view>
                         <view class="leftRight" @click="handleGoExpenditure">
                             <text class="more">查看更多</text>
-                          <image class="moreIcon" src="/static/images/revenueBox/moreIcon.svg"/>
+                          <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg"/>
                         </view>
                     </view>
 
@@ -474,13 +474,13 @@
                     <view class="itemSmallTop">
                         <view class="leftBox">
                             <view class="smallIcon">
-                              <image class="img" src="/static/images/revenueBox/buySum.svg"/>
+                              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/buySum.svg"/>
                             </view>
                             <view class="smallTitle">销售费用小计</view>
                         </view>
                         <view class="leftRight" @click="handleGoExpenditure">
                             <text class="more">查看更多</text>
-                          <image class="moreIcon" src="/static/images/revenueBox/moreIcon.svg"/>
+                          <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg"/>
                         </view>
                     </view>
 
@@ -544,13 +544,13 @@
                     <view class="itemSmallTop">
                         <view class="leftBox">
                             <view class="smallIcon">
-                              <image class="img" src="/static/images/revenueBox/otherBuy.svg"/>
+                              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBuy.svg"/>
                             </view>
                             <view class="smallTitle">其他费用小计</view>
                         </view>
                         <view class="leftRight" @click="handleGoExpenditure">
                             <text class="more">查看更多</text>
-                          <image class="moreIcon" src="/static/images/revenueBox/moreIcon.svg"/>
+                          <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg"/>
                         </view>
                     </view>
 
diff --git a/static/images/newExamine/OK.svg b/static/images/newExamine/OK.svg
deleted file mode 100644
index a3d6437..0000000
--- a/static/images/newExamine/OK.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="21px" height="20px" viewBox="0 0 21 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>考核图标/已完成备份@2x</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-359.000000, -1349.000000)" fill="#049E77" fill-rule="nonzero">
-            <g id="考核图标/已完成备份" transform="translate(359.000000, 1349.000000)">
-                <g id="checkbox-circle-fill" transform="translate(0.000217, 0.000000)">
-                    <path d="M10,20 C4.47715,20 0,15.5228 0,10 C0,4.47715 4.47715,0 10,0 C15.5228,0 20,4.47715 20,10 C20,15.5228 15.5228,20 10,20 Z M9.0026,14 L16.0737,6.92893 L14.6595,5.51472 L9.0026,11.1716 L6.17421,8.3431 L4.75999,9.7574 L9.0026,14 Z" id="形状"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/newExamine/error.svg b/static/images/newExamine/error.svg
deleted file mode 100644
index 86e97a4..0000000
--- a/static/images/newExamine/error.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="21px" height="20px" viewBox="0 0 21 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>考核图标/已完成备份@2x</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-323.000000, -1349.000000)" fill="#E83944" fill-rule="nonzero">
-            <g id="考核图标/已完成备份" transform="translate(323.000000, 1349.000000)">
-                <g id="close-circle-fill" transform="translate(0.000217, 0.000000)">
-                    <path d="M10,20 C4.47715,20 0,15.5228 0,10 C0,4.47715 4.47715,0 10,0 C15.5228,0 20,4.47715 20,10 C20,15.5228 15.5228,20 10,20 Z M10,8.5858 L7.17157,5.75736 L5.75736,7.17157 L8.5858,10 L5.75736,12.8284 L7.17157,14.2426 L10,11.4142 L12.8284,14.2426 L14.2426,12.8284 L11.4142,10 L14.2426,7.17157 L12.8284,5.75736 L10,8.5858 Z" id="形状"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/newExamine/fixedIcon.svg b/static/images/newExamine/fixedIcon.svg
deleted file mode 100644
index 6c43f82..0000000
--- a/static/images/newExamine/fixedIcon.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>考核图标/地点@2x</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-291.000000, -1351.000000)" fill="#A69E9F" fill-rule="nonzero">
-            <g id="考核图标/地点" transform="translate(279.000000, 1335.000000)">
-                <g id="考核图标/地点" transform="translate(12.000217, 16.000000)">
-                    <path d="M8,0 C11.6818983,0 14.6666667,2.98476833 14.6666667,6.66666667 C14.6666667,9.12126555 12.4444444,12.2323767 8,16 C3.55555556,12.2323767 1.33333333,9.12126555 1.33333333,6.66666667 C1.33333333,2.98476833 4.31810167,0 8,0 Z M8,4 C6.52724067,4 5.33333333,5.19390733 5.33333333,6.66666667 C5.33333333,8.139426 6.52724067,9.33333333 8,9.33333333 C9.47275933,9.33333333 10.6666667,8.139426 10.6666667,6.66666667 C10.6666667,5.19390733 9.47275933,4 8,4 Z" id="形状结合"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/newExamine/rightIcon.svg b/static/images/newExamine/rightIcon.svg
deleted file mode 100644
index 70bf60b..0000000
--- a/static/images/newExamine/rightIcon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/查看更多@2x</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-199.000000, -1353.000000)" fill="#CDBCAB">
-            <g id="收支预测/查看更多" transform="translate(199.000000, 1353.000000)">
-                <g id="编组" transform="translate(0.000217, 0.000000)">
-                    <g id="计划图标/更多-白色" transform="translate(3.000000, 1.000000)">
-                        <path d="M1.58058262,0.580582618 L5.46966991,4.46966991 L5.46966991,4.46966991 C5.76256313,4.76256313 5.76256313,5.23743687 5.46966991,5.53033009 L1.58058262,9.41941738 C1.2876894,9.7123106 0.812815665,9.7123106 0.519922446,9.41941738 C0.227029227,9.12652416 0.227029227,8.65165043 0.519922446,8.35875721 L3.87825253,4.9999127 L0.519922446,1.64124279 C0.227029227,1.34834957 0.227029227,0.873475836 0.519922446,0.580582618 C0.812815665,0.287689399 1.2876894,0.287689399 1.58058262,0.580582618 Z" id="形状结合"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/newExamine/sort.svg b/static/images/newExamine/sort.svg
deleted file mode 100644
index ba2d983..0000000
--- a/static/images/newExamine/sort.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>筛选@2x</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-127.000000, -1353.000000)">
-            <g id="编组" transform="translate(127.000000, 1353.000000)">
-                <rect id="矩形" x="0" y="0" width="12" height="12"></rect>
-                <g transform="translate(1.000000, 0.000000)">
-                    <path d="M5.56568542,0.565685425 L8.63431458,3.63431458 C8.94673401,3.94673401 8.94673401,4.45326599 8.63431458,4.76568542 C8.48428547,4.91571453 8.28080234,5 8.06862915,5 L1.93137085,5 C1.48954305,5 1.13137085,4.6418278 1.13137085,4.2 C1.13137085,3.98782681 1.21565632,3.78434368 1.36568542,3.63431458 L4.43431458,0.565685425 C4.74673401,0.253265992 5.25326599,0.253265992 5.56568542,0.565685425 Z" id="三角形" fill="#EC6C00"></path>
-                    <path d="M5.56568542,7.56568542 L8.63431458,10.6343146 C8.94673401,10.946734 8.94673401,11.453266 8.63431458,11.7656854 C8.48428547,11.9157145 8.28080234,12 8.06862915,12 L1.93137085,12 C1.48954305,12 1.13137085,11.6418278 1.13137085,11.2 C1.13137085,10.9878268 1.21565632,10.7843437 1.36568542,10.6343146 L4.43431458,7.56568542 C4.74673401,7.25326599 5.25326599,7.25326599 5.56568542,7.56568542 Z" id="三角形备份" fill="#DDDAD7" transform="translate(5.000000, 9.500000) scale(1, -1) translate(-5.000000, -9.500000) "></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/newExamine/tabIcon.svg b/static/images/newExamine/tabIcon.svg
deleted file mode 100644
index 4560fbc..0000000
--- a/static/images/newExamine/tabIcon.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="29px" height="9px" viewBox="0 0 29 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>路径@2x</title>
-    <defs>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#FF7300" offset="0%"></stop>
-            <stop stop-color="#FC4E00" stop-opacity="0" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-155.000000, -1355.000000)" fill="url(#linearGradient-1)" fill-rule="nonzero">
-            <g id="路径" transform="translate(155.000000, 1355.000000)">
-                <path d="M0.408517176,0.788974914 C1.07740705,-0.0900359625 2.33222853,-0.260372694 3.21123941,0.408517176 C6.24646252,2.7181928 10.0226201,4.00010716 14.0156068,4.00010716 C17.9961974,4.00010716 21.7614246,2.72617962 24.7922146,0.429596419 C25.6725842,-0.237504199 26.9270566,-0.0646155693 27.5941572,0.815753981 C28.2612579,1.69612353 28.0883692,2.95059596 27.2079997,3.61769658 C23.4842655,6.43935869 18.8713088,8.00010716 14.0156068,8.00010716 C9.14472075,8.00010716 4.51828614,6.42954429 0.788974914,3.59169715 C-0.0900359625,2.92280728 -0.260372694,1.66798579 0.408517176,0.788974914 Z"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/newExamine/timeIcon.svg b/static/images/newExamine/timeIcon.svg
deleted file mode 100644
index 2a051b8..0000000
--- a/static/images/newExamine/timeIcon.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>考核图标/地点备份_2@2x</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-259.000000, -1351.000000)" fill="#A69E9F" fill-rule="nonzero">
-            <g id="考核图标/地点备份-2" transform="translate(251.000000, 1343.000000)">
-                <g id="形状结合" transform="translate(8.000217, 8.000000)">
-                    <path d="M8,0 C12.418278,0 16,3.581722 16,8 C16,12.418278 12.418278,16 8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 Z M8,1.25 C4.27207794,1.25 1.25,4.27207794 1.25,8 C1.25,11.7279221 4.27207794,14.75 8,14.75 C11.7279221,14.75 14.75,11.7279221 14.75,8 C14.75,4.27207794 11.7279221,1.25 8,1.25 Z M7.5,4 L8.75,4 L8.75,7.5 L12,7.5 L12,8.75 L7.5,8.75 L7.5,4 Z"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/newExamine/userIcon.svg b/static/images/newExamine/userIcon.svg
deleted file mode 100644
index e5026f7..0000000
--- a/static/images/newExamine/userIcon.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>考核图标/地点备份@2x</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="考核巡检0811" transform="translate(-227.000000, -1351.000000)" fill="#A69E9F" fill-rule="nonzero">
-            <g id="考核图标/地点备份" transform="translate(219.000000, 1335.000000)">
-                <g id="形状结合" transform="translate(8.000217, 16.000000)">
-                    <path d="M8,0 C12.418278,0 16,3.581722 16,8 C16,12.418278 12.418278,16 8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 Z M8,11.25 C6.28403874,11.25 4.74363766,12.0016625 3.6900947,13.1936897 C4.85915962,14.1661233 6.36139396,14.75 8,14.75 C9.63860604,14.75 11.1408404,14.1661233 12.3100025,13.1950706 C11.256618,12.0017873 9.71610365,11.25 8,11.25 Z M8,1.25 C4.27207794,1.25 1.25,4.27207794 1.25,8 C1.25,9.63860604 1.83387666,11.1408404 2.80492943,12.3100025 C4.08560898,10.8909096 5.93876295,10 8,10 C10.0613311,10 11.9145601,10.8909908 13.1955736,12.3088591 C14.1661233,11.1408404 14.75,9.63860604 14.75,8 C14.75,4.27207794 11.7279221,1.25 8,1.25 Z M8,3 C9.65685425,3 11,4.34314575 11,6 C11,7.65685425 9.65685425,9 8,9 C6.34314575,9 5,7.65685425 5,6 C5,4.34314575 6.34314575,3 8,3 Z M8,4.25 C7.03350169,4.25 6.25,5.03350169 6.25,6 C6.25,6.96649831 7.03350169,7.75 8,7.75 C8.96649831,7.75 9.75,6.96649831 9.75,6 C9.75,5.03350169 8.96649831,4.25 8,4.25 Z"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/allInCome.png b/static/images/revenueBox/allInCome.png
deleted file mode 100644
index a3451c0..0000000
Binary files a/static/images/revenueBox/allInCome.png and /dev/null differ
diff --git a/static/images/revenueBox/buySum.svg b/static/images/revenueBox/buySum.svg
deleted file mode 100644
index 909bb0a..0000000
--- a/static/images/revenueBox/buySum.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/其他费用小计@2x</title>
-    <defs>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#1679FF" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="9.97229917%" y1="0%" x2="87.0218035%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#B1D3FF" offset="0%"></stop>
-            <stop stop-color="#D6E8FF" offset="32.1893722%"></stop>
-            <stop stop-color="#D8E9FF" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-3" x="0" y="0" width="17" height="19" rx="2"></rect>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-5">
-            <stop stop-color="#0053DA" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <filter x="-60.0%" y="-40.0%" width="220.0%" height="180.0%" filterUnits="objectBoundingBox" id="filter-6">
-            <feGaussianBlur stdDeviation="2" in="SourceGraphic"></feGaussianBlur>
-        </filter>
-        <linearGradient x1="9.97229917%" y1="0%" x2="90.0277008%" y2="100%" id="linearGradient-7">
-            <stop stop-color="#73AEFF" offset="0%"></stop>
-            <stop stop-color="#E9F3FF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="收支预测0811" transform="translate(-2108.000000, -1824.000000)">
-            <g id="编组" transform="translate(2108.000000, 1824.000000)">
-                <rect id="矩形" fill="#1679FF" opacity="0.100000001" x="0" y="0" width="36" height="36" rx="4"></rect>
-                <g transform="translate(7.003058, 8.499374)">
-                    <rect id="矩形" fill="url(#linearGradient-1)" x="12" y="7" width="10" height="12" rx="2"></rect>
-                    <g id="矩形备份-85">
-                        <mask id="mask-4" fill="white">
-                            <use xlink:href="#path-3"></use>
-                        </mask>
-                        <use id="蒙版" fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
-                        <rect fill="url(#linearGradient-5)" opacity="0.699999988" filter="url(#filter-6)" mask="url(#mask-4)" x="13" y="7" width="10" height="15" rx="1"></rect>
-                    </g>
-                    <rect id="矩形" stroke="url(#linearGradient-7)" stroke-width="0.5" x="0.25" y="0.25" width="16.5" height="18.5" rx="2"></rect>
-                    <path d="M8.49694183,5.00062638 C9.82242522,5.00062638 10.8969418,6.28272005 10.8969418,7.86426275 C10.8969418,8.92385711 10.4146271,9.84903876 9.69766329,10.3442974 L9.69821086,10.8029754 C10.7781009,10.941891 11.660501,11.2631306 12.129789,11.678485 C12.3506737,11.8220328 12.4969418,12.0719755 12.4969418,12.3560809 L12.4969418,13.1906264 C12.4969418,13.637977 12.1342925,14.0006264 11.6869418,14.0006264 L5.30694183,14.0006264 C4.85959118,14.0006264 4.49694183,13.637977 4.49694183,13.1906264 L4.49694183,12.3560809 C4.49694183,12.0719755 4.64321,11.8220328 4.86454994,11.6774493 C5.33356164,11.2628078 6.21604165,10.9417381 7.29609954,10.8029033 L7.29721629,10.344985 C6.57970329,9.84989538 6.09694183,8.92434766 6.09694183,7.86426275 C6.09694183,6.28272005 7.17145843,5.00062638 8.49694183,5.00062638 Z" id="形状结合" fill="#FFFFFF" opacity="0.800000012"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/expenditure.png b/static/images/revenueBox/expenditure.png
deleted file mode 100644
index 82323c9..0000000
Binary files a/static/images/revenueBox/expenditure.png and /dev/null differ
diff --git a/static/images/revenueBox/fistBg.svg b/static/images/revenueBox/fistBg.svg
deleted file mode 100644
index 3658a6f..0000000
--- a/static/images/revenueBox/fistBg.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="16px" viewBox="0 0 18 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>排名</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="排名" transform="translate(-23, -23)" fill="#EE4B11">
-            <path d="M25,23 L38.2796182,23 C39.3841877,23 40.2796182,23.8954305 40.2796182,25 C40.2796182,25.2023101 40.2489222,25.4034491 40.1885781,25.59655 L36.4385781,37.59655 C36.1776561,38.4315004 35.4043881,39 34.5296182,39 L25,39 C23.8954305,39 23,38.1045695 23,37 L23,25 C23,23.8954305 23.8954305,23 25,23 Z" id="矩形备份"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/monthSum.png b/static/images/revenueBox/monthSum.png
deleted file mode 100644
index f2fedd5..0000000
Binary files a/static/images/revenueBox/monthSum.png and /dev/null differ
diff --git a/static/images/revenueBox/moreIcon.svg b/static/images/revenueBox/moreIcon.svg
deleted file mode 100644
index 0332e6b..0000000
--- a/static/images/revenueBox/moreIcon.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/查看更多@2x</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="收支预测0811" transform="translate(-1888.000000, -1798.000000)" fill="#D9DADC">
-            <g id="收支预测/查看更多" transform="translate(1888.000000, 1798.000000)">
-                <g id="计划图标/更多-白色" transform="translate(3.000000, 1.000000)">
-                    <path d="M1.58058262,0.580582618 L5.46966991,4.46966991 L5.46966991,4.46966991 C5.76256313,4.76256313 5.76256313,5.23743687 5.46966991,5.53033009 L1.58058262,9.41941738 C1.2876894,9.7123106 0.812815665,9.7123106 0.519922446,9.41941738 C0.227029227,9.12652416 0.227029227,8.65165043 0.519922446,8.35875721 L3.87825253,4.9999127 L0.519922446,1.64124279 C0.227029227,1.34834957 0.227029227,0.873475836 0.519922446,0.580582618 C0.812815665,0.287689399 1.2876894,0.287689399 1.58058262,0.580582618 Z" id="形状结合"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/operateManager.svg b/static/images/revenueBox/operateManager.svg
deleted file mode 100644
index 926e72c..0000000
--- a/static/images/revenueBox/operateManager.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/管理费用小计@2x</title>
-    <defs>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#1679FF" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="0%" y1="0%" x2="96.2452285%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#C0DCFF" offset="0%"></stop>
-            <stop stop-color="#D6E8FF" offset="32.1893722%"></stop>
-            <stop stop-color="#D8E9FF" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-3" points="21 9 29.660254 14 29.660254 24 21 29 12.339746 24 12.339746 14"></polygon>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-5">
-            <stop stop-color="#0053DA" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <filter x="-36.2%" y="-42.9%" width="172.3%" height="185.7%" filterUnits="objectBoundingBox" id="filter-6">
-            <feGaussianBlur stdDeviation="2" in="SourceGraphic"></feGaussianBlur>
-        </filter>
-        <linearGradient x1="0%" y1="2.71908438%" x2="94.7642944%" y2="100%" id="linearGradient-7">
-            <stop stop-color="#DCEBFF" offset="0%"></stop>
-            <stop stop-color="#5198FA" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-8" points="21 9 29.660254 14 29.660254 24 21 29 12.339746 24 12.339746 14"></polygon>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="收支预测0811" transform="translate(-2052.000000, -1824.000000)">
-            <g id="编组" transform="translate(2052.000000, 1824.000000)">
-                <rect id="矩形" fill="#1679FF" opacity="0.100000001" x="0" y="0" width="36" height="36" rx="4"></rect>
-                <polygon id="多边形备份" fill="url(#linearGradient-1)" transform="translate(13.535898, 13.535898) rotate(-330.000000) translate(-13.535898, -13.535898) " points="13.5358984 6.53589838 19.5980762 10.0358984 19.5980762 17.0358984 13.5358984 20.5358984 7.47372056 17.0358984 7.47372056 10.0358984"></polygon>
-                <mask id="mask-4" fill="white">
-                    <use xlink:href="#path-3"></use>
-                </mask>
-                <use id="蒙版" fill="url(#linearGradient-2)" transform="translate(21.000000, 19.000000) rotate(-330.000000) translate(-21.000000, -19.000000) " xlink:href="#path-3"></use>
-                <polygon id="多边形备份-2" fill="url(#linearGradient-5)" opacity="0.699999988" filter="url(#filter-6)" mask="url(#mask-4)" transform="translate(12.535898, 13.535898) rotate(-330.000000) translate(-12.535898, -13.535898) " points="12.5358984 6.53589838 18.5980762 10.0358984 18.5980762 17.0358984 12.5358984 20.5358984 6.47372056 17.0358984 6.47372056 10.0358984"></polygon>
-                <path d="M21,16.5 C21.6903559,16.5 22.3153559,16.779822 22.767767,17.232233 C23.220178,17.6846441 23.5,18.3096441 23.5,19 C23.5,19.6903559 23.220178,20.3153559 22.767767,20.767767 C22.3153559,21.220178 21.6903559,21.5 21,21.5 C20.3096441,21.5 19.6846441,21.220178 19.232233,20.767767 C18.779822,20.3153559 18.5,19.6903559 18.5,19 C18.5,18.3096441 18.779822,17.6846441 19.232233,17.232233 C19.6846441,16.779822 20.3096441,16.5 21,16.5 Z" id="椭圆形" stroke="#F6FAFF" stroke-width="2" mask="url(#mask-4)"></path>
-                <mask id="mask-9" fill="white">
-                    <use xlink:href="#path-8"></use>
-                </mask>
-                <path stroke="url(#linearGradient-7)" stroke-width="0.5" d="M21,9.28867513 L29.410254,14.1443376 L29.410254,23.8556624 L21,28.7113249 L12.589746,23.8556624 L12.589746,14.1443376 L21,9.28867513 Z"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/operateSum.svg b/static/images/revenueBox/operateSum.svg
deleted file mode 100644
index dd3a22c..0000000
--- a/static/images/revenueBox/operateSum.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/管理费用小计@2x</title>
-    <defs>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#1679FF" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="14.5429363%" y1="0%" x2="82.7944003%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#C0DCFF" offset="0%"></stop>
-            <stop stop-color="#D6E8FF" offset="32.1893722%"></stop>
-            <stop stop-color="#D8E9FF" offset="100%"></stop>
-        </linearGradient>
-        <path d="M1,0 L15,0 C15.5522847,-1.01453063e-16 16,0.44771525 16,1 L16,9.94721362 C16,12.7764949 14.4698026,15.3845221 12,16.7647059 L8.48782136,18.7273939 C8.18466896,18.8968026 7.81533104,18.8968026 7.51217864,18.7273939 L4,16.7647059 C1.53019739,15.3845221 3.4648702e-16,12.7764949 0,9.94721362 L0,1 C-6.76353751e-17,0.44771525 0.44771525,1.01453063e-16 1,0 Z" id="path-3"></path>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-5">
-            <stop stop-color="#0053DA" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <filter x="-60.0%" y="-54.5%" width="220.0%" height="208.4%" filterUnits="objectBoundingBox" id="filter-6">
-            <feGaussianBlur stdDeviation="2" in="SourceGraphic"></feGaussianBlur>
-        </filter>
-        <linearGradient x1="14.5429363%" y1="2.71908438%" x2="81.7442087%" y2="100%" id="linearGradient-7">
-            <stop stop-color="#DCEBFF" offset="0%"></stop>
-            <stop stop-color="#5198FA" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="收支预测0811" transform="translate(-1996.000000, -1824.000000)">
-            <g id="编组" transform="translate(1996.000000, 1824.000000)">
-                <rect id="矩形" fill="#1679FF" opacity="0.100000001" x="0" y="0" width="36" height="36" rx="4"></rect>
-                <path d="M9,7 L17,7 C17.5522847,7 18,7.44771525 18,8 L18,13.3770253 C18,14.9936686 17.0070515,16.4443212 15.5,17.0294118 L13.361917,17.8594911 C13.129104,17.9498773 12.870896,17.9498773 12.638083,17.8594911 L10.5,17.0294118 C8.99294846,16.4443212 8,14.9936686 8,13.3770253 L8,8 C8,7.44771525 8.44771525,7 9,7 Z" id="矩形备份-2" fill="url(#linearGradient-1)"></path>
-                <g id="矩形备份-3" transform="translate(12.000000, 10.000000)">
-                    <mask id="mask-4" fill="white">
-                        <use xlink:href="#path-3"></use>
-                    </mask>
-                    <use id="蒙版" fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
-                    <path d="M-4,-3 L4,-3 C4.55228475,-3 5,-2.55228475 5,-2 L5,3.37702534 C5,4.99366858 4.00705154,6.44432117 2.5,7.02941176 L0.361916955,7.85949106 C0.129103981,7.94987728 -0.129103981,7.94987728 -0.361916955,7.85949106 L-2.5,7.02941176 C-4.00705154,6.44432117 -5,4.99366858 -5,3.37702534 L-5,-2 C-5,-2.55228475 -4.55228475,-3 -4,-3 Z" fill="url(#linearGradient-5)" opacity="0.699999988" filter="url(#filter-6)" mask="url(#mask-4)"></path>
-                </g>
-                <path d="M27,10.25 C27.2071068,10.25 27.3946068,10.3339466 27.5303301,10.4696699 C27.6660534,10.6053932 27.75,10.7928932 27.75,11 L27.75,11 L27.75,19.9472136 C27.75,21.3165699 27.3796965,22.6323834 26.7105503,23.7728581 C26.0414042,24.9133328 25.0734153,25.8784688 23.8780447,26.54647 L23.8780447,26.54647 L20.365866,28.5091581 C20.1385017,28.6362146 19.8614983,28.6362146 19.634134,28.5091581 L19.634134,28.5091581 L16.1219553,26.54647 C14.9265847,25.8784688 13.9585958,24.9133328 13.2894497,23.7728581 C12.6203035,22.6323834 12.25,21.3165699 12.25,19.9472136 L12.25,19.9472136 L12.25,11 C12.25,10.7928932 12.3339466,10.6053932 12.4696699,10.4696699 C12.6053932,10.3339466 12.7928932,10.25 13,10.25 L13,10.25 Z" id="矩形备份" stroke="url(#linearGradient-7)" stroke-width="0.5"></path>
-                <path d="M22.1401765,15.6922305 L23.5543901,17.106444 L19.3117494,21.3490847 L16.4833223,18.5206576 L17.8975358,17.106444 L19.3113223,18.5202305 L22.1401765,15.6922305 Z" id="形状结合" fill="#F6FAFF"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/otherBg.svg b/static/images/revenueBox/otherBg.svg
deleted file mode 100644
index d3fbce5..0000000
--- a/static/images/revenueBox/otherBg.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="16px" viewBox="0 0 18 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>排名</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="排名" transform="translate(-125, -23)" fill="#C5B8AE">
-            <path d="M127,23 L140.279618,23 C141.384188,23 142.279618,23.8954305 142.279618,25 C142.279618,25.2023101 142.248922,25.4034491 142.188578,25.59655 L138.438578,37.59655 C138.177656,38.4315004 137.404388,39 136.529618,39 L127,39 C125.895431,39 125,38.1045695 125,37 L125,25 C125,23.8954305 125.895431,23 127,23 Z" id="矩形"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/otherBuy.svg b/static/images/revenueBox/otherBuy.svg
deleted file mode 100644
index 45d9bc8..0000000
--- a/static/images/revenueBox/otherBuy.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/其他费用小计@2x</title>
-    <defs>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#1679FF" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="0%" y1="18.8365651%" x2="96.2452285%" y2="81.1634349%" id="linearGradient-2">
-            <stop stop-color="#C0DCFF" offset="0%"></stop>
-            <stop stop-color="#D6E8FF" offset="32.1893722%"></stop>
-            <stop stop-color="#D8E9FF" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-3" x="0" y="0" width="19" height="15" rx="2"></rect>
-        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-5">
-            <stop stop-color="#0053DA" offset="0%"></stop>
-            <stop stop-color="#0C6DFF" offset="100%"></stop>
-        </linearGradient>
-        <filter x="-40.0%" y="-50.0%" width="180.0%" height="200.0%" filterUnits="objectBoundingBox" id="filter-6">
-            <feGaussianBlur stdDeviation="2" in="SourceGraphic"></feGaussianBlur>
-        </filter>
-        <linearGradient x1="0%" y1="20.5312853%" x2="94.7642944%" y2="81.1634349%" id="linearGradient-7">
-            <stop stop-color="#DCEBFF" offset="0%"></stop>
-            <stop stop-color="#5198FA" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="收支预测0811" transform="translate(-2164.000000, -1824.000000)">
-            <g id="编组-2" transform="translate(2164.000000, 1824.000000)">
-                <rect id="矩形" fill="#1679FF" opacity="0.100000001" x="0" y="0" width="36" height="36" rx="4"></rect>
-                <g id="编组" transform="translate(7.004242, 8.492352)">
-                    <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="14" height="12" rx="2"></rect>
-                    <g id="矩形备份-84" transform="translate(3.000000, 4.000000)">
-                        <mask id="mask-4" fill="white">
-                            <use xlink:href="#path-3"></use>
-                        </mask>
-                        <use id="蒙版" fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
-                        <rect fill="url(#linearGradient-5)" opacity="0.600000024" filter="url(#filter-6)" mask="url(#mask-4)" x="-4" y="-4" width="15" height="12" rx="1"></rect>
-                    </g>
-                    <rect id="矩形" stroke="url(#linearGradient-7)" stroke-width="0.5" x="3.25" y="4.25" width="18.5" height="14.5" rx="2"></rect>
-                    <rect id="矩形" fill="#FFFFFF" x="11" y="8" width="5" height="2"></rect>
-                    <rect id="矩形备份-2" fill="#FFFFFF" x="7" y="8" width="2" height="2"></rect>
-                    <rect id="矩形备份-3" fill="#FFFFFF" x="7" y="12" width="2" height="2"></rect>
-                    <rect id="矩形备份" fill="#FFFFFF" x="11" y="12" width="7" height="2"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/otherSum.svg b/static/images/revenueBox/otherSum.svg
deleted file mode 100644
index 9b72e72..0000000
--- a/static/images/revenueBox/otherSum.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/管理费用小计@2x</title>
-    <defs>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#EF7A16" offset="0%"></stop>
-            <stop stop-color="#EF7A16" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="0%" y1="18.8365651%" x2="96.2452285%" y2="81.1634349%" id="linearGradient-2">
-            <stop stop-color="#FFD8B7" offset="0%"></stop>
-            <stop stop-color="#FFE5CF" offset="32.1893722%"></stop>
-            <stop stop-color="#FFEAD8" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-3" x="0" y="0" width="19" height="15" rx="2"></rect>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-5">
-            <stop stop-color="#EF7A16" offset="0%"></stop>
-            <stop stop-color="#EF7A16" offset="100%"></stop>
-        </linearGradient>
-        <filter x="-60.0%" y="-75.0%" width="220.0%" height="250.0%" filterUnits="objectBoundingBox" id="filter-6">
-            <feGaussianBlur stdDeviation="3" in="SourceGraphic"></feGaussianBlur>
-        </filter>
-        <linearGradient x1="13.2177399%" y1="26.6757503%" x2="83.2501634%" y2="74.4543847%" id="linearGradient-7">
-            <stop stop-color="#FFE0C5" offset="0%"></stop>
-            <stop stop-color="#FFC38F" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="收支预测0811" transform="translate(-1940.000000, -1824.000000)">
-            <g id="编组-2" transform="translate(1940.000000, 1824.000000)">
-                <rect id="矩形" fill="#F2750B" opacity="0.100000001" x="0" y="0" width="36" height="36" rx="4"></rect>
-                <g id="编组" transform="translate(7.004242, 8.492352)">
-                    <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="14" height="12" rx="2"></rect>
-                    <g id="矩形备份-84" transform="translate(3.000000, 4.000000)">
-                        <mask id="mask-4" fill="white">
-                            <use xlink:href="#path-3"></use>
-                        </mask>
-                        <use id="蒙版" fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
-                        <rect fill="url(#linearGradient-5)" filter="url(#filter-6)" mask="url(#mask-4)" x="-4" y="-4" width="15" height="12" rx="1"></rect>
-                    </g>
-                    <rect id="矩形" stroke="url(#linearGradient-7)" stroke-width="0.5" x="3.25" y="4.25" width="18.5" height="14.5" rx="2"></rect>
-                    <rect id="矩形" fill="#FFFFFF" x="11" y="8" width="5" height="2"></rect>
-                    <rect id="矩形备份-2" fill="#FFFFFF" x="7" y="8" width="2" height="2"></rect>
-                    <rect id="矩形备份-3" fill="#FFFFFF" x="7" y="12" width="2" height="2"></rect>
-                    <rect id="矩形备份" fill="#FFFFFF" x="11" y="12" width="7" height="2"></rect>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/secondBg.svg b/static/images/revenueBox/secondBg.svg
deleted file mode 100644
index b626543..0000000
--- a/static/images/revenueBox/secondBg.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="16px" viewBox="0 0 18 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>排名</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="排名" transform="translate(-57, -23)" fill="#FF7831">
-            <path d="M59,23 L72.2796182,23 C73.3841877,23 74.2796182,23.8954305 74.2796182,25 C74.2796182,25.2023101 74.2489222,25.4034491 74.1885781,25.59655 L70.4385781,37.59655 C70.1776561,38.4315004 69.4043881,39 68.5296182,39 L59,39 C57.8954305,39 57,38.1045695 57,37 L57,25 C57,23.8954305 57.8954305,23 59,23 Z" id="矩形"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/selfOperat.svg b/static/images/revenueBox/selfOperat.svg
deleted file mode 100644
index 7b671a6..0000000
--- a/static/images/revenueBox/selfOperat.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>收支预测/管理费用小计@2x</title>
-    <defs>
-        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
-            <stop stop-color="#EF7A16" offset="0%"></stop>
-            <stop stop-color="#EF7A16" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="0%" y1="0%" x2="96.2452285%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#FFD8B7" offset="0%"></stop>
-            <stop stop-color="#FFE5CF" offset="32.1893722%"></stop>
-            <stop stop-color="#FFEAD8" offset="100%"></stop>
-        </linearGradient>
-        <circle id="path-3" cx="9.5" cy="9.5" r="9.5"></circle>
-        <filter x="-64.3%" y="-64.3%" width="228.6%" height="228.6%" filterUnits="objectBoundingBox" id="filter-5">
-            <feGaussianBlur stdDeviation="3" in="SourceGraphic"></feGaussianBlur>
-        </filter>
-        <linearGradient x1="13.2177399%" y1="12.5775372%" x2="83.2501634%" y2="89.2357017%" id="linearGradient-6">
-            <stop stop-color="#FFE0C5" offset="0%"></stop>
-            <stop stop-color="#FFC38F" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="收支预测0811" transform="translate(-1884.000000, -1824.000000)">
-            <g id="编组" transform="translate(1884.000000, 1824.000000)">
-                <rect id="矩形" fill="#F2750B" opacity="0.100000001" x="0" y="0" width="36" height="36" rx="4"></rect>
-                <g transform="translate(7.000000, 7.000000)">
-                    <circle id="椭圆形" fill="url(#linearGradient-1)" cx="7" cy="7" r="7"></circle>
-                    <g id="椭圆形备份-2" transform="translate(3.000000, 3.000000)">
-                        <mask id="mask-4" fill="white">
-                            <use xlink:href="#path-3"></use>
-                        </mask>
-                        <use id="蒙版" fill="url(#linearGradient-2)" xlink:href="#path-3"></use>
-                        <circle fill="url(#linearGradient-1)" filter="url(#filter-5)" mask="url(#mask-4)" cx="4" cy="4" r="7"></circle>
-                    </g>
-                    <circle id="椭圆形备份" stroke="url(#linearGradient-6)" stroke-width="0.5" cx="12.5" cy="12.5" r="9.25"></circle>
-                    <path d="M11.0857864,7.58578644 L12.5,8.99989322 L13.9142136,7.58578644 C14.3047379,7.19526215 14.9379028,7.19526215 15.3284271,7.58578644 C15.7189514,7.97631073 15.7189514,8.60947571 15.3284271,9 L14.328,9.99989322 L15,10 C15.5522847,10 16,10.4477153 16,11 C16,11.5522847 15.5522847,12 15,12 L13.5,11.9998932 L13.5,12.9998932 L15,13 C15.5522847,13 16,13.4477153 16,14 C16,14.5522847 15.5522847,15 15,15 L13.5,14.9998932 L13.5,16.5 C13.5,17.0522847 13.0522847,17.5 12.5,17.5 C11.9477153,17.5 11.5,17.0522847 11.5,16.5 L11.5,14.9998932 L10,15 C9.44771525,15 9,14.5522847 9,14 C9,13.4477153 9.44771525,13 10,13 L11.5,12.9998932 L11.5,11.9998932 L10,12 C9.44771525,12 9,11.5522847 9,11 C9,10.4477153 9.44771525,10 10,10 L10.671,9.99989322 L9.67157288,9 C9.28104858,8.60947571 9.28104858,7.97631073 9.67157288,7.58578644 C10.0620972,7.19526215 10.6952621,7.19526215 11.0857864,7.58578644 Z" id="形状结合" fill="#FFFFFF"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/thirdBg.svg b/static/images/revenueBox/thirdBg.svg
deleted file mode 100644
index 2a47641..0000000
--- a/static/images/revenueBox/thirdBg.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="16px" viewBox="0 0 18 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>排名</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="排名" transform="translate(-91, -23)" fill="#FE9F17">
-            <path d="M93,23 L106.279618,23 C107.384188,23 108.279618,23.8954305 108.279618,25 C108.279618,25.2023101 108.248922,25.4034491 108.188578,25.59655 L104.438578,37.59655 C104.177656,38.4315004 103.404388,39 102.529618,39 L93,39 C91.8954305,39 91,38.1045695 91,37 L91,25 C91,23.8954305 91.8954305,23 93,23 Z" id="矩形"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/static/images/revenueBox/yearRevenue.png b/static/images/revenueBox/yearRevenue.png
deleted file mode 100644
index 875a4c4..0000000
Binary files a/static/images/revenueBox/yearRevenue.png and /dev/null differ
diff --git a/static/images/revenueBox/yearSum.png b/static/images/revenueBox/yearSum.png
deleted file mode 100644
index a71f930..0000000
Binary files a/static/images/revenueBox/yearSum.png and /dev/null differ
diff --git a/static/public/dataAll/FcbUFKvFxAXe.woff b/static/public/dataAll/FcbUFKvFxAXe.woff
new file mode 100644
index 0000000..1438973
Binary files /dev/null and b/static/public/dataAll/FcbUFKvFxAXe.woff differ
diff --git a/static/public/dataAll/stylesheet.css b/static/public/dataAll/stylesheet.css
new file mode 100644
index 0000000..4a1a815
--- /dev/null
+++ b/static/public/dataAll/stylesheet.css
@@ -0,0 +1,8 @@
+@font-face {
+    font-family: 'Alimama ShuHeiTi';
+    src:url("/static/public/dataAll/FcbUFKvFxAXe.woff");
+    font-weight: bold;
+    font-style: normal;
+    font-display: swap;
+}
+