调整数据筛选

cokingCoal/index.html

@@ -29,12 +29,13 @@
     <div class="app_box" id="app">
         <!-- <div class="box_item_title" @click="fullScreen()"> -->
         <div class="box_item_title">
-            <span>集 团 管 控 &nbsp;&nbsp;&nbsp;  数 智 赋 能</span>
+            <span>集 团 管 控 &nbsp;&nbsp;&nbsp; 数 智 赋 能</span>
         </div>
         <div class="box_item_main" v-if="isShowPage">
             <div class="box_left">
                 <div class="left_item" style="padding: 0;">
-                    <dv-border-box-12 :color="['#2169a3','#277099']" style="padding: 10px 40px 30px;box-sizing: border-box;">
+                    <dv-border-box-12 :color="['#2169a3','#277099']"
+                        style="padding: 10px 40px 30px;box-sizing: border-box;">
                         <div class="title_else flex_sb" style="margin-bottom: 0;"><span>组织架构</span></div>
                         <div class="left_main">
                             <div class="left_main_top">
@@ -48,14 +49,17 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="8" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="8" />
 
                                         </div>
                                     </div>
                                     <div class="echarts_6">
                                         <div class="echarts_top" @click="handleORG()">
-                                            <div class="top_image" v-for="(item,index) in organizationList" :key="index">
-                                                <img :src="item.flag==true?'./images/newImage/onBlue.png':'./images/newImage/blue.png'" alt="">
+                                            <div class="top_image" v-for="(item,index) in organizationList"
+                                                :key="index">
+                                                <img :src="item.flag==true?'./images/newImage/onBlue.png':'./images/newImage/blue.png'"
+                                                    alt="">
                                                 <div :class="item.flag==true?'top_text_on':'top_text'">{{ item.value }}
                                                     <span>个</span>
                                                 </div>
@@ -63,7 +67,8 @@
                                         </div>
                                         <div class="echarts_btm">
                                             <div class="btm_text">
-                                                <span :class="item.flag==true?'btm_text_span_on':'btm_text_span'" v-for="(item,index) in organizationList" :key="index">{{ item.name
+                                                <span :class="item.flag==true?'btm_text_span_on':'btm_text_span'"
+                                                    v-for="(item,index) in organizationList" :key="index">{{ item.name
                                                     }}</span>
                                             </div>
                                         </div>
@@ -80,7 +85,8 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="6" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="6" />
 
                                         </div>
                                     </div>
@@ -88,20 +94,23 @@
                                 </div>
                             </div>
                             <div class="left_main_btm">
-                                <dv-scroll-board v-if="orgChange" :config="configOrg" style="width: 100%; height: 100%" />
+                                <dv-scroll-board v-if="orgChange" :config="configOrg"
+                                    style="width: 100%; height: 100%" />
                             </div>
                         </div>
                     </dv-border-box-12>
                 </div>
                 <div class="left_item" style="height: calc(50% - 15px);">
-                    <dv-border-box-12 :color="['#2169a3','#277099']" style="padding: 10px 40px 30px;box-sizing: border-box;">
+                    <dv-border-box-12 :color="['#2169a3','#277099']"
+                        style="padding: 10px 40px 30px;box-sizing: border-box;">
                         <div class="title_else"><span>人员结构</span></div>
                         <div class="left_main_else">
                             <div class="left_user_top">
                                 <div class="left_user_number" v-for="(item,index) in PersonnelResource" :key="index">
                                     <div class="text_box">
                                         <img :src="item.src" alt="">
-                                        <span class="text_num" :style="{color: item.color}">{{ item.value }} <span>人</span></span>
+                                        <span class="text_num" :style="{color: item.color}">{{ item.value }}
+                                            <span>人</span></span>
                                         <span class="text_title">{{ item.name }}</span>
                                     </div>
                                 </div>
@@ -131,13 +140,15 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="5" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="5" />
 
                                         </div>
                                     </div>
                                     <div class="echarts_else flex_column">
                                         <div class="echarts_else_top">
-                                            <div :class="twoIndex==1?'echarts_else_top_item_on':'echarts_else_top_item'" @click="handleTap2(1)">
+                                            <div :class="twoIndex==1?'echarts_else_top_item_on':'echarts_else_top_item'"
+                                                @click="handleTap2(1)">
                                                 <div class="item_left_t">
                                                     <img src="./images/right-top1.png" alt="">
                                                 </div>
@@ -146,7 +157,8 @@
                                                     <div>{{ staffList.coal }} <span>人</span> </div>
                                                 </div>
                                             </div>
-                                            <div :class="twoIndex!=1?'echarts_else_top_item_on':'echarts_else_top_item'" @click="handleTap2(2)">
+                                            <div :class="twoIndex!=1?'echarts_else_top_item_on':'echarts_else_top_item'"
+                                                @click="handleTap2(2)">
                                                 <div class="item_left_t">
                                                     <img src="./images/right-top2.png" alt="">
                                                 </div>
@@ -171,7 +183,8 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="7" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="7" />
 
                                         </div>
                                     </div>
@@ -187,22 +200,25 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="5" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="5" />
 
                                         </div>
                                     </div>
                                     <div class="echarts_else flex_column" style="position: relative;">
                                         <div class="echarts_else_top">
-                                            <div :class="saIndex==1?'echarts_else_top_item_on':'echarts_else_top_item'" style="z-index: 9999999;" @click="handleTap1(1)">
+                                            <div :class="saIndex==1?'echarts_else_top_item_on':'echarts_else_top_item'"
+                                                style="z-index: 9999999;" @click="handleTap1(1)">
                                                 <div class="item_right_t">
                                                     <div>年龄结构</div>
-                                                    <div><span>平均年龄</span> 42 岁</div>
+                                                    <div><span>平均年龄</span> {{staffAge}} 岁</div>
                                                 </div>
                                             </div>
-                                            <div :class="saIndex!=1?'echarts_else_top_item_on':'echarts_else_top_item'" style="z-index: 9999999;" @click="handleTap1(2)">
+                                            <div :class="saIndex!=1?'echarts_else_top_item_on':'echarts_else_top_item'"
+                                                style="z-index: 9999999;" @click="handleTap1(2)">
                                                 <div class="item_right_t">
                                                     <div>工龄结构</div>
-                                                    <div><span>平均工龄</span> 19.7 年</div>
+                                                    <div><span>平均工龄</span> {{staffSeniority}} 年</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -225,7 +241,8 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="7" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="7" />
 
                                         </div>
                                     </div>
@@ -241,7 +258,8 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="8" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="8" />
 
                                         </div>
                                     </div>
@@ -260,7 +278,8 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="6" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="6" />
 
                                         </div>
                                     </div>
@@ -273,12 +292,14 @@
                     </dv-border-box-12>
                 </div>
                 <div class="flex_column right_user_box">
-                    <dv-border-box-12 :color="['#2169a3','#277099']" style="padding: 10px 40px 15px;box-sizing: border-box;">
+                    <dv-border-box-12 :color="['#2169a3','#277099']"
+                        style="padding: 10px 40px 15px;box-sizing: border-box;">
                         <div class="right_item_else flex_column">
                             <div class="title_else"><span>人才市场</span></div>
                             <div class="w_100_right flex_column">
                                 <div class="top flex justify-between">
-                                    <div class="flex items-center justify-center" v-for="(item,index) in HumanResourcesList" :key="index">
+                                    <div class="flex items-center justify-center"
+                                        v-for="(item,index) in HumanResourcesList" :key="index">
                                         <img class="top-img" :src="item.image" alt="">
                                         <div>{{ item.key }}<span class="top-text">{{ item.value }}</span>人</div>
                                     </div>
@@ -314,8 +335,10 @@
                                             </div>
                                             <div class="image_box">
                                                 <div class="box_item" v-for="(item,index) in optimize" :key="index">
-                                                    <img :src="index==0?'./images/center-left1.png':'./images/center-left3.png'" alt="">
-                                                    <div>{{ item.key }}<span>{{ item.value }}</span>{{ item.unit }}</div>
+                                                    <img :src="index==0?'./images/center-left1.png':'./images/center-left3.png'"
+                                                        alt="">
+                                                    <div>{{ item.key }}<span>{{ item.value }}</span>{{ item.unit }}
+                                                    </div>
                                                 </div>
                                             </div>
                                             <div class="po_title">优化池</div>
@@ -401,8 +424,9 @@
                         <div class="main_info_item" @click="handleChangeData()">
                             <div class="main_info_item_img">
                             </div>
-                            <div class="main_info_item_title" >
-                                <div :class="userColor?'color-yellow':''">{{ loginInfo.num }} <span :class="userColor?'color-yellow':''">{{ loginInfo.unit + " / 次" }}</span></div>
+                            <div class="main_info_item_title">
+                                <div :class="userColor?'color-yellow':''">{{ loginInfo.num }} <span
+                                        :class="userColor?'color-yellow':''">{{ loginInfo.unit + " / 次" }}</span></div>
                                 <div :class="userColor?'color-yellow':''">累计登陆</div>
                             </div>
                         </div>
@@ -410,7 +434,8 @@
                             <div class="main_info_item_img">
                             </div>
                             <div class="main_info_item_title">
-                                <div :class="monthColor?'color-yellow':''">{{ mauInfo.mau }} <span :class="monthColor?'color-yellow':''">{{ mauInfo.unit + " / 次" }}</span></div>
+                                <div :class="monthColor?'color-yellow':''">{{ mauInfo.mau }} <span
+                                        :class="monthColor?'color-yellow':''">{{ mauInfo.unit + " / 次" }}</span></div>
                                 <div :class="monthColor?'color-yellow':''">月度活跃</div>
                             </div>
                         </div>
@@ -472,7 +497,8 @@
                 </div>
 
                 <div class="main_item flex_column">
-                    <dv-border-box-12 :color="['#2169a3','#277099']" style="padding: 10px 40px 30px;box-sizing: border-box;">
+                    <dv-border-box-12 :color="['#2169a3','#277099']"
+                        style="padding: 10px 40px 30px;box-sizing: border-box;">
                         <div class="title_else_s">
                             <span>人员流动</span>
                             <span class="icon_box" style="top: -5px;right: 40px;" @click="handleUserChange()">
@@ -486,7 +512,8 @@
             </div>
             <div class="box_right">
                 <div class="left_item" style="height: calc(40% - 10px);padding: 0;">
-                    <dv-border-box-12 :color="['#2169a3','#277099']" style="padding: 10px 40px 30px;box-sizing: border-box;">
+                    <dv-border-box-12 :color="['#2169a3','#277099']"
+                        style="padding: 10px 40px 30px;box-sizing: border-box;">
                         <div class="title_else flex_sb">
                             <span>薪酬分配</span>
                             <span class="icon_tit">
@@ -503,22 +530,33 @@
                                             </div>
                                             <div class="title flex_sb">
                                                 <div>工资总额均衡预算使用</div>
-                                                <div class="tit_icon" style="height: 45px;" @click="handleSelect('total')">
-                                                    <span>{{ selectInfo.total }}月</span>
-                                                    <img style="margin-left:10px" src="./images/down.png" alt="">
+                                                <div style="display: flex;justify-content: center;align-items: center;">
+                                                    <div class="tit_icon" style="height: 45px;"
+                                                        @click="handleYearSelect('total')">
+                                                        <span>{{ selectYearInfo.total }}年</span>
+                                                        <!-- <img style="margin-left:10px" src="./images/down.png" alt=""> -->
+                                                    </div>
+                                                    <div class="tit_icon" style="height: 45px;"
+                                                        @click="handleSelect('total')">
+                                                        <span>{{ selectInfo.total }}月</span>
+                                                        <img style="margin-left:10px" src="./images/down.png" alt="">
+                                                    </div>
                                                 </div>
+
                                             </div>
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="11" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="11" />
 
                                         </div>
                                     </div>
                                     <div class="w_100" style="position: relative; pointer-events: none;">
                                         <div class="right_item_item_else_title">
                                             <img style="height: 100%;" src="./images/title.png" alt="">
-                                            <div class="title_right">集团公司<span class="big_color">{{ gtTotle }}</span><span>%</span>
+                                            <div class="title_right">集团公司<span class="big_color">{{ gtTotle
+                                                    }}</span><span>%</span>
                                             </div>
                                         </div>
                                         <div class="echarts_90" ref="echarts90"></div>
@@ -535,13 +573,15 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="6" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                :color="['#1275ba','green']" :dur="6" />
 
                                         </div>
                                     </div>
                                     <div class="w_100">
 
-                                        <dv-scroll-board :config="config2" v-if="SalaryCalProgDetail" style="width: 100%; height: 95%;margin-top: 1%;" />
+                                        <dv-scroll-board :config="config2" v-if="SalaryCalProgDetail"
+                                            style="width: 100%; height: 95%;margin-top: 1%;" />
                                     </div>
                                     <div class="title_box">预警</div>
                                 </div>
@@ -554,15 +594,24 @@
                                         </div>
                                         <div class="title_else_sb flex_sb">
                                             <div class="tit_text">累计月平均工资</div>
-                                            <div class="tit_icon" @click="handleSelect('average')">
-                                                <span>{{ selectInfo.average }}月</span>
-                                                <img style="margin-left:10px" src="./images/down.png" alt="">
+                                            <div style="display: flex;justify-content: center;align-items: center;">
+                                                <div class="tit_icon" style="height: 45px;"
+                                                    @click="handleYearSelect('average')">
+                                                    <span>{{ selectYearInfo.average }}年</span>
+                                                    <!-- <img style="margin-left:10px" src="./images/down.png" alt=""> -->
+                                                </div>
+                                                <div class="tit_icon" style="height: 45px;"
+                                                    @click="handleSelect('average')">
+                                                    <span>{{ selectInfo.average }}月</span>
+                                                    <img style="margin-left:10px" src="./images/down.png" alt="">
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="line">
                                         <!-- <img src="./images/line.png" alt=""> -->
-                                        <dv-decoration-2 style="width:100%;height:10px;margin-top: 13px;" :color="['#1275ba','green']" :dur="13" />
+                                        <dv-decoration-2 style="width:100%;height:10px;margin-top: 13px;"
+                                            :color="['#1275ba','green']" :dur="13" />
 
                                     </div>
                                 </div>
@@ -574,7 +623,8 @@
                     </dv-border-box-12>
                 </div>
                 <div class="right_item flex_column" style="height: calc(60% - 10px);padding: 0;">
-                    <dv-border-box-12 :color="['#2169a3','#277099']" style="padding: 10px 40px 30px;box-sizing: border-box;">
+                    <dv-border-box-12 :color="['#2169a3','#277099']"
+                        style="padding: 10px 40px 30px;box-sizing: border-box;">
                         <!-- <div class="title_else"><span>人才管理区块</span></div> -->
                         <div class="title_else"><span>人才管理</span></div>
                         <div class="w_100_right_box flex_column" style="height: calc(100% - 80px);">
@@ -655,16 +705,20 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 5px;" :color="['#1275ba','green']" :dur="10" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 5px;"
+                                                :color="['#1275ba','green']" :dur="10" />
 
                                         </div>
                                     </div>
-                                    <div class="right_item_main flex_center" style="height: calc(100% - 100px);flex-wrap: wrap;">
-                                        <div class="item-tl-item" v-for="(item,key) in skillList" :key="key" @click="handleStudio(item,key)">
+                                    <div class="right_item_main flex_center"
+                                        style="height: calc(100% - 100px);flex-wrap: wrap;">
+                                        <div class="item-tl-item" v-for="(item,key) in skillList" :key="key"
+                                            @click="handleStudio(item,key)">
                                             <div class="item_title">{{ item.name }}</div>
                                             <div class="item_main">
                                                 <div class="item_main_top">
-                                                    <img :src="item.flag?'./images/newImage/213e2a5d-b895-4123-8615-a04f4e093b0c.png':'./images/flying.png'" alt="">
+                                                    <img :src="item.flag?'./images/newImage/213e2a5d-b895-4123-8615-a04f4e093b0c.png':'./images/flying.png'"
+                                                        alt="">
                                                 </div>
                                                 <div class="item_main_main">
                                                     <div class="item_main_text flex_sb">
@@ -693,14 +747,16 @@
                                         </div>
                                         <div class="line">
                                             <!-- <img src="./images/line.png" alt=""> -->
-                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 5px;" :color="['#1275ba','green']" :dur="6" />
+                                            <dv-decoration-2 style="width:100%;height:10px;margin-top: 5px;"
+                                                :color="['#1275ba','green']" :dur="6" />
 
                                         </div>
                                     </div>
                                     <div class="right_item_main" style="height: calc(100% - 100px);">
                                         <div class="right_item_main_header">
                                             <img src="./images/newImage/asdasdbg.png" alt="">
-                                            <span class="right_text">{{ downholeObj.key }} <span> {{ downholeObj.value }} </span>人</span>
+                                            <span class="right_text">{{ downholeObj.key }} <span> {{ downholeObj.value
+                                                    }} </span>人</span>
                                         </div>
                                         <div style="width: 100%; height: calc(100% - 80px);" ref="efficiency"></div>
                                     </div>
@@ -710,7 +766,8 @@
                                 <div class="right_item_item_else flex_column">
                                     <div class="right_item_item_else_top">
                                         <div class="left_user_top" style="height: 100%;">
-                                            <div class="left_user_number" style="width: 60%;" v-for="(item,index) in schoolList1" :key="index">
+                                            <div class="left_user_number" style="width: 60%;"
+                                                v-for="(item,index) in schoolList1" :key="index">
                                                 <div class="text_box" style="padding-left: 280px;">
                                                     <img style="width: 20%;" :src="item.image" alt="">
                                                     <span class="text_num" :style="item.style">{{ item.value }}
@@ -735,12 +792,14 @@
                                                     <img src="./images/icon_title.png" alt="">
                                                 </div>
                                                 <div class="title flex_sb">
-                                                    <span v-for="(item,index) in titleList" :key="index" @click="handleChangeTitle(item,index)">{{ item }}</span>
+                                                    <span v-for="(item,index) in titleList" :key="index"
+                                                        @click="handleChangeTitle(item,index)">{{ item }}</span>
                                                 </div>
                                             </div>
                                             <div class="line">
                                                 <!-- <img src="./images/line.png" alt=""> -->
-                                                <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="10" />
+                                                <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                    :color="['#1275ba','green']" :dur="10" />
 
                                             </div>
                                         </div>
@@ -751,10 +810,12 @@
                                     <div class="right_item_item_else_top">
                                         <div class="left_user_top" style="height: 100%;">
 
-                                            <div class="left_user_number" style="width: 50%;" v-for="(item,index) in schoolList2" :key="index">
+                                            <div class="left_user_number" style="width: 50%;"
+                                                v-for="(item,index) in schoolList2" :key="index">
                                                 <div class="text_box" style="padding-left: 280px;">
                                                     <img style="width: 20%;" :src="item.image" alt="">
-                                                    <span class="text_num" :style="item.style">{{ item.value }}<span>{{ item.unit }}</span></span>
+                                                    <span class="text_num" :style="item.style">{{ item.value }}<span>{{
+                                                            item.unit }}</span></span>
                                                     <span class="text_title">{{ item.name }}</span>
                                                 </div>
                                             </div>
@@ -778,7 +839,8 @@
                                             </div>
                                             <div class="line">
                                                 <!-- <img src="./images/line.png" alt=""> -->
-                                                <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;" :color="['#1275ba','green']" :dur="8" />
+                                                <dv-decoration-2 style="width:100%;height:10px;margin-top: 10px;"
+                                                    :color="['#1275ba','green']" :dur="8" />
 
                                             </div>
                                         </div>
@@ -853,7 +915,8 @@
                             </div>
                             <div class="line">
                                 <!-- <img src="./images/line.png" alt=""> -->
-                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;" :color="['#1275ba','green']" :dur="10" />
+                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;"
+                                    :color="['#1275ba','green']" :dur="10" />
 
                             </div>
                         </div>
@@ -869,7 +932,8 @@
                             </div>
                             <div class="line">
                                 <!-- <img src="./images/line.png" alt=""> -->
-                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;" :color="['#1275ba','green']" :dur="8" />
+                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;"
+                                    :color="['#1275ba','green']" :dur="8" />
 
                             </div>
                         </div>
@@ -885,7 +949,8 @@
                             </div>
                             <div class="line">
                                 <!-- <img src="./images/line.png" alt=""> -->
-                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;" :color="['#1275ba','green']" :dur="7" />
+                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;"
+                                    :color="['#1275ba','green']" :dur="7" />
 
                             </div>
                         </div>
@@ -907,12 +972,14 @@
                             </div>
                             <div class="line">
                                 <!-- <img src="./images/line.png" alt=""> -->
-                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;" :color="['#1275ba','green']" :dur="8" />
+                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;"
+                                    :color="['#1275ba','green']" :dur="8" />
 
                             </div>
                         </div>
                         <div :class="listFlag?'echarts_main item_content_6':'echarts_main item_content'">
-                            <dv-scroll-board :config="studioInformation" style="width:100%;height:98%" @scroll-change="scrollChange" />
+                            <dv-scroll-board :config="studioInformation" style="width:100%;height:98%"
+                                @scroll-change="scrollChange" />
                         </div>
                     </div>
                     <div class="mark_view flex_column" style="width: calc(15% - 10px);">
@@ -925,7 +992,8 @@
                             </div>
                             <div class="line">
                                 <!-- <img src="./images/line.png" alt=""> -->
-                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;" :color="['#1275ba','green']" :dur="4" />
+                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;"
+                                    :color="['#1275ba','green']" :dur="4" />
 
                             </div>
                         </div>
@@ -943,7 +1011,8 @@
                             </div>
                             <div class="line">
                                 <!-- <img src="./images/line.png" alt=""> -->
-                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;" :color="['#1275ba','green']" :dur="12" />
+                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;"
+                                    :color="['#1275ba','green']" :dur="12" />
 
                             </div>
                         </div>
@@ -963,7 +1032,8 @@
                             </div>
                             <div class="line">
                                 <!-- <img src="./images/line.png" alt=""> -->
-                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;" :color="['#1275ba','green']" :dur="6" />
+                                <dv-decoration-2 style="width:100%;height:10px;margin-top: -1px;"
+                                    :color="['#1275ba','green']" :dur="6" />
 
                             </div>
                         </div>
@@ -977,7 +1047,13 @@
             </div>
 
             <div class="mark_select" :style="markStyle" v-if="selectFlag">
-                <div class="select_option" v-for="(item,index) in monthList" :key="index" @click="selectOption(item)">{{ item }}月</div>
+                <div class="select_option" v-for="(item,index) in monthList" :key="index" @click="selectOption(item)">{{
+                    item }}月</div>
+            </div>
+
+            <div class="mark_select" :style="markYearStyle" v-if="selectYearFlag">
+                <div class="select_option" v-for="(item,index) in yearList" :key="index" @click="selectYearOption(item)">{{
+                    item }}年</div>
             </div>
 
         </div>

cokingCoal/js/dataA.js

@@ -296,8 +296,9 @@ let employmentList = [
 ]
 
 let monthList = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12']
+// let yearList = ['2021','2022','2023','2024']
 let year = new Date().getFullYear()
-let yearList = [year, year - 1]
+let yearList = [year, year - 1, year - 2]
 
 function listToChange(list1, list2) {
     let list = []

cokingCoal/js/humanResources.js

@@ -3013,7 +3013,6 @@ let app = new Vue({
             that.noticList = []
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNotice", data).then(res => {
                 if (res && res.length != 0) {
-
                     res.forEach((item, index) => {
                         if (item.noticeUserList.length % 2 != 0) {
                             item.noticeUserList.push([])
@@ -3037,7 +3036,6 @@ let app = new Vue({
                     }
                     if (res.length != 1) {
                         // that.noticIndex += 1
-
                         if (that.employmentList2.data.length <= that.employmentList2.rowNum) {
                             that.noticTime = setInterval(() => {
                                 that.employmentList1.data = []
@@ -3068,7 +3066,6 @@ let app = new Vue({
                             }, that.employmentList2.data.length * 2000)
                         }
                     }
-
                     setTimeout(() => {
                         that.isShowList = true
                     })

cokingCoal/js/newIndex.js

@@ -463,17 +463,30 @@ let app = new Vue({
                 noCoal: 81766
             },
             selectFlag: false,
+            selectYearFlag: false,
             selectInfo: {
                 total: "08",
                 average: "08"
-
+            },
+            selectYearInfo: {
+                total: "2024",
+                average: "2024"
             },
             selectType: "total",
+            selectYearType: "total",
+
             markStyle: {
                 position: "absolute",
                 top: "13%",
                 right: "21%",
             },
+
+            markYearStyle: {
+                position: "absolute",
+                top: "13%",
+                right: "21%",
+            },
+
             newSkillList: [],
             dataFlag: true,
 
@@ -509,6 +522,9 @@ let app = new Vue({
             userColor: false,
             monthColor: false,
 
+            staffSeniority: "",
+            staffAge: "",
+
         }
     },
     beforeCreate() {
@@ -588,7 +604,11 @@ let app = new Vue({
     mounted() {
         let data
         if (new Date().getMonth() <= 9) {
-            data = "0" + new Date().getMonth()
+            if(new Date().getMonth() == 0){
+                data = "12"
+            } else {
+                data = "0" + new Date().getMonth()
+            }
         } else {
             data = new Date().getMonth()
         }
@@ -596,6 +616,10 @@ let app = new Vue({
             total: data,
             average: data
         }
+        this.selectYearInfo = {
+            total: new Date().getFullYear(),
+            average: new Date().getFullYear()
+        }
         this.$nextTick(() => {
             this.keyDown()
             // document.documentElement.webitRequestFullScreen()
@@ -989,14 +1013,46 @@ let app = new Vue({
             this.selectFlag = true;
             this.selectType = flag
         },
+
+        handleYearSelect(flag = 'total') {
+            if (flag == 'total') {
+                this.markYearStyle = {
+                    position: "absolute",
+                    top: "13%",
+                    right: "23%",
+                }
+            } else if (flag == 'average') {
+                this.markYearStyle = {
+                    position: "absolute",
+                    top: "25.5%",
+                    right: "3.5%",
+                }
+            }
+            this.handleMark()
+            this.isShowMark = true;
+            this.selectYearFlag = true;
+            this.selectYearType = flag
+        },
+
+
         selectOption(item) {
             this.selectInfo[this.selectType] = item
             console.log(this.selectType);
             if (this.selectType == "average") {
-                this.getCalSalary()
+                this.getCalSalary(2)
             }
             if (this.selectType == "total") {
-                this.getCalSalary1()
+                this.getCalSalary1(2)
+            }
+        },
+
+        selectYearOption(item) {
+            this.selectYearInfo[this.selectYearType] = item
+            if (this.selectYearType == "average") {
+                this.getCalSalary(2)
+            }
+            if (this.selectYearType == "total") {
+                this.getCalSalary1(2)
             }
         },
         SAtimeFun() {
@@ -5610,6 +5666,7 @@ let app = new Vue({
             this.echartsMark = false
             this.studioMark = false
             this.listFlag = false
+            this.selectYearFlag = false
             this.listInterval && clearInterval(this.listInterval)
             this.honorIndex = 0
             this.achievementIndex = 0
@@ -6727,8 +6784,12 @@ let app = new Vue({
                         y: []
                     }
                     res.data.forEach(item => {
-                        dataObj.x.push(item.key)
-                        dataObj.y.push(item.value)
+                        if(item.key == "平均年龄"){
+                            that.staffAge = item.value
+                        } else {
+                            dataObj.x.push(item.key)
+                            dataObj.y.push(item.value)
+                        }
                     })
                     that.echartsTwoBar1 = JSON.parse(JSON.stringify(dataObj))
                 }
@@ -6754,8 +6815,12 @@ let app = new Vue({
                         y: []
                     }
                     res.data.forEach(item => {
-                        obj.x.push(item.key)
-                        obj.y.push(item.value)
+                        if(item.key == "平均工龄"){
+                            that.staffSeniority = item.value
+                        } else {
+                            obj.x.push(item.key)
+                            obj.y.push(item.value)
+                        }
                     })
                     that.echartsTwoBar2 = JSON.parse(JSON.stringify(obj))
                     that.seniorityListX = spArr(that.echartsTwoBar2.x, 4)
@@ -6764,12 +6829,23 @@ let app = new Vue({
             })
 
         },
-        getCalSalary() {
+        getCalSalary(type=1) {
             let that = this;
-            let data = {
-                flag: that.dataFlag,
-                month: parseInt(that.selectInfo.average)
-            };
+            let data;
+            if(type == 1){
+                data = {
+                    flag: that.dataFlag,
+                    year: 0,
+                    month: parseInt(that.selectInfo.average)
+                }
+            } else {
+                data = {
+                    flag: that.dataFlag,
+                    year: parseInt(that.selectYearInfo.average),
+                    month: parseInt(that.selectInfo.average)
+                }
+            }
+            
             let leftEnd = that.$refs.leftEnd
             let x = []
             let y1 = []
@@ -6801,11 +6877,21 @@ let app = new Vue({
 
             })
         },
-        getCalSalary1() {
+        getCalSalary1(type = 1) {
             let that = this;
-            let data = {
-                flag: that.dataFlag,
-                month: parseInt(that.selectInfo.total)
+            let data 
+            if(type == 1){
+                data = {
+                    flag: that.dataFlag,
+                    year: 0,
+                    month: parseInt(that.selectInfo.total)
+                }
+            } else {
+                data = {
+                    flag: that.dataFlag,
+                    year: parseInt(that.selectYearInfo.total),
+                    month: parseInt(that.selectInfo.total)
+                }
             }
             let echarts90 = that.$refs.echarts90
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary1", data).then(res => {

cokingCoal/js/request.js

@@ -13,7 +13,7 @@ function isLocalEnv() {
 }
 
 
-window.apiType = "prod"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
+window.apiType = "uat"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
 // if(window.location.search){
 //   apiType = window.location.search.split("=")[1]
 // }

cokingCoal/styles/newIndex.css

@@ -1265,7 +1265,7 @@ img {
 }
 
 .tit_icon {
-    width: 200px;
+    /* width: 200px; */
     height: 65px;
     display: flex;
     justify-content: center;