修改焦煤大屏数据，页面

.idea/workspace.xml

@@ -4,7 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9e5771b4-ce8c-4005-a15b-30e162f89ae8" name="Changes" comment="修改焦煤大屏前端页面，组件，布局" />
+    <list default="true" id="9e5771b4-ce8c-4005-a15b-30e162f89ae8" name="Changes" comment="修改焦煤大屏前端页面，组件，布局">
+      <change beforePath="$PROJECT_DIR$/cokingCoal/js/newIndex.js" beforeDir="false" afterPath="$PROJECT_DIR$/cokingCoal/js/newIndex.js" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -21,12 +23,12 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -44,7 +46,15 @@
       <option name="project" value="LOCAL" />
       <updated>1689590454633</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="修改焦煤大屏前端页面，组件，布局">
+      <option name="closed" value="true" />
+      <created>1689731229517</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1689731229517</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="VcsManagerConfiguration">

cokingCoal/index.html

@@ -37,13 +37,25 @@
                                         <div class="icon">
                                             <img src="./images/icon_title.png" alt="">
                                         </div>
-                                        <div class="title"  style="line-height: 57px;">组织分布</div>
+                                        <div class="title" style="line-height: 57px;">组织分布</div>
                                     </div>
                                     <div class="line">
                                         <img src="./images/line.png" alt="">
                                     </div>
                                 </div>
-                                <div class="echarts" style="height: calc(100% - 65px);" ref="organization"></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="item.flag==true?'top_text_on':'top_text'">{{ item.value }} <span>个</span> </div>
+                                        </div>
+                                    </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>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
 
                             <div class="left_main_top_right flex_column">
@@ -66,7 +78,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="left_item" style="height: calc(45% - 15px);">
+                <div class="left_item" style="height: calc(50% - 15px);">
                     <div class="title_else">人员结构</div>
                     <div class="left_main_else">
                         <div class="left_user_top">
@@ -205,7 +217,10 @@
                                         <img src="./images/line.png" alt="">
                                     </div>
                                 </div>
-                                <div class="echarts_else" ref="initChartR1"></div>
+                                <div class="echarts_else">
+                                    <div class="echarts_else" style="height: 100%;"  ref="initChartR1"></div>
+                                    <img class="img" src="./images/newImage/cycleBg.png" alt="">
+                                </div>
                             </div>
                             <div class="left_user_main_item">
                                 <div class="left_user_title">
@@ -224,73 +239,128 @@
                         </div>
                     </div>
                 </div>
-                <div class="left_item" style="height: calc(35% - 15px);">
-                    <div class="title_else flex_sb">
-                        <span>薪酬分配</span>
-                        <span class="icon_tit">
-                            <img @click="handleWarning()" src="./images/wrmingicon.png" alt="">
-                        </span>
-                    </div>
-                    <div class="left_main_else">
-                        <div class="left_salary_box_else">
-                            <div class="left_salary_item flex_column">
-                                <div class="left_user_title">
-                                    <div class="icon_title">
-                                        <div class="icon">
-                                            <img src="./images/icon_title.png" alt="">
+                <div class="flex_column right_user_box">
+                    <div class="right_item_else flex_column">
+                        <div class="title_else">人才市场</div>
+                        <div class="w_100_right flex_column">
+                            <div class="top flex justify-between">
+                                <div class="flex items-center justify-center">
+                                    <img class="top-img" src="./images/top-1.png" alt="">
+                                    <div>优化池<span class="top-text">3068</span>人</div>
+                                </div>
+                                <div class="flex items-center justify-center">
+                                    <img class="top-img" src="./images/top-3.png" alt="">
+                                    <div>缓冲池<span class="top-text">206</span>人</div>
+                                </div>
+                                <div class="flex items-center justify-center">
+                                    <img class="top-img" src="./images/top-4.png" alt="">
+                                    <div>待岗池<span class="top-text">5708</span>人</div>
+                                </div>
+                                <div class="flex items-center justify-center">
+                                    <img class="top-img" src="./images/top-2.png" alt="">
+                                    <div>共享池<span class="top-text">326</span>人</div>
+                                </div>
+                            </div>
+                            <div class="right_item_item_btm">
+                                <div class="right_item_btm_box">
+                                    <div class="left_user_title">
+                                        <div class="icon_title">
+                                            <div class="icon">
+                                                <img src="./images/icon_title.png" alt="">
+                                            </div>
+                                            <div class="title">优化池</div>
+                                        </div>
+                                        <div class="line">
+                                            <img src="./images/line.png" alt="">
                                         </div>
-                                        <div class="title">工资总额均衡预算使用情况</div>
                                     </div>
-                                    <div class="line">
-                                        <img src="./images/line.png" alt="">
+                                    <div class="right_btm_item_else">
+                                        <div class="image_box_else"><span>50.3%</span>
+                                            <img src="./images/annular.png" style="width: 100%;height:100%;" alt="">
+                                        </div>
+                                        <div class="image_box">
+                                            <div class="box_item" style="margin-top: 30px;">
+                                                <img src="./images/center-left1.png" alt="">
+                                                <div>双选人数<span>3068</span>人</div>
+                                            </div>
+                                            <div class="box_item">
+                                                <img src="./images/center-left3.png" alt="">
+                                                <div>优化人数<span>3116</span>人</div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="w_100">
-                                    <div class="right_item_item_else_title">
-                                        <img style="height: 100%;" src="./images/title.png" alt="">
-                                        <div class="title_right">集团公司<span class="big_color">90</span><span>%</span>
+                                <div class="right_btm_item_box">
+                                    <div class="left_user_title">
+                                        <div class="icon_title">
+                                            <div class="icon">
+                                                <img src="./images/icon_title.png" alt="">
+                                            </div>
+                                            <div class="title">缓冲池</div>
+                                        </div>
+                                        <div class="line">
+                                            <img src="./images/line.png" alt="">
                                         </div>
                                     </div>
-                                    <div class="echarts_90" ref="echarts90"></div>
+                                    <div class="right_btm_item" ref="buffer"></div>
                                 </div>
                             </div>
-                            <div class="left_salary_item flex_column">
-                                <div class="left_user_title">
-                                    <div class="icon_title">
-                                        <div class="icon">
-                                            <img src="./images/icon_title.png" alt="">
-                                        </div>
-                                        <div class="title">算薪进度</div>
+                        </div>
+                    </div>
+                    <!-- <div class="right_item_else flex_sb" style="height: calc(50% - 20px);">
+                        <div class="right_echarts_else_bg flex_column">
+                            <div class="left_user_title">
+                                <div class="icon_title">
+                                    <div class="icon">
+                                        <img src="./images/icon_title.png" alt="">
                                     </div>
-                                    <div class="line">
-                                        <img src="./images/line.png" alt="">
+                                    <div class="title">待岗池</div>
+                                </div>
+                                <div class="line">
+                                    <img src="./images/line.png" alt="">
+                                </div>
+                            </div>
+                            <div class="three_box">
+                                <div class="right_bg_item">
+                                    <div class="bg_item_num" style="color: rgb(102, 130, 245);">2800</div>
+                                    <div class="bg_item_gif">
+                                        <img src="./images/bottom-right1.gif" alt="">
                                     </div>
+                                    <div class="bg_item_title">终止合同人员</div>
                                 </div>
-                                <div class="w_100">
-      
-                                    <dv-scroll-board :config="config2" style="width: 100%; height: 95%;margin-top: 1%;" />
+                                <div class="right_bg_item">
+                                    <div class="bg_item_num" style="color: rgb(64, 169, 255);">1308</div>
+                                    <div class="bg_item_gif">
+                                        <img src="./images/bottom-right2.gif" alt="">
+                                    </div>
+                                    <div class="bg_item_title">双创人员</div>
+                                </div>
+                                <div class="right_bg_item">
+                                    <div class="bg_item_num" style="color: rgb(69, 218, 209);">1600</div>
+                                    <div class="bg_item_gif">
+                                        <img src="./images/bottom-right3.gif" alt="">
+                                    </div>
+                                    <div class="bg_item_title">绩效考核末位调整人员</div>
                                 </div>
-                                <div class="title_box" @click="handleChange()">预警</div>
                             </div>
                         </div>
-                        <div class="left_salary_box flex_column">
+                        <div class="right_echarts_else_bg flex_column">
                             <div class="left_user_title">
                                 <div class="icon_title">
                                     <div class="icon">
                                         <img src="./images/icon_title.png" alt="">
                                     </div>
-                                    <div class="title">月度平均工资</div>
+                                    <div class="title">共享池</div>
                                 </div>
                                 <div class="line">
                                     <img src="./images/line.png" alt="">
                                 </div>
                             </div>
-                            <div class="w_100">
-                                <div class="echarts" ref="leftEnd"></div>
-                            </div>
+                            <div class="right_echarts_item" ref="share"></div>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
+                
             </div>
             <div class="box_main">
                 <div class="main_item_one">
@@ -352,36 +422,105 @@
                     </div>
                     <div ref="container" class="echarts_map"></div>
                 </div>
-                <div class="main_item flex_column" style="height: calc(15% - 10px);">
-                    <div class="left_user_title" style="height: 50px;">
+                
+                <div class="main_item flex_column">
+                    <div class="left_user_title" style="height: 65px;">
                         <div class="icon_title">
                             <div class="icon">
                                 <img src="./images/icon_title.png" alt="">
                             </div>
-                            <div class="title">变动人员数量</div>
+                            <div class="title">调动统计</div>
                         </div>
                         <div class="line">
                             <img src="./images/line.png" alt="">
                         </div>
                     </div>
-                    <dv-scroll-board :config="configChange" style="width: 100%; height: calc(100% - 75px)" />
+                    <div class="main_item_echarts" ref="mobilize"></div>
                 </div>
-                <div class="main_item flex_column">
-                    <div class="left_user_title" style="height: 65px;">
+                <div class="main_item flex_column" style="height: calc(15% - 10px);">
+                    <div class="left_user_title" style="height: 50px;">
                         <div class="icon_title">
                             <div class="icon">
                                 <img src="./images/icon_title.png" alt="">
                             </div>
-                            <div class="title">调动情况</div>
+                            <div class="title">调动明细</div>
                         </div>
                         <div class="line">
                             <img src="./images/line.png" alt="">
                         </div>
                     </div>
-                    <div class="main_item_echarts" ref="mobilize"></div>
+                    <dv-scroll-board :config="configChange" style="width: 100%; height: calc(100% - 75px)" />
                 </div>
             </div>
             <div class="box_right">
+                <div class="left_item" style="height: calc(50% - 20px);padding: 10px 40px 40px;">
+                    <div class="title_else flex_sb">
+                        <span>薪酬分配</span>
+                        <span class="icon_tit">
+                            <img @click="handleWarning()" src="./images/wrmingicon.png" alt="">
+                        </span>
+                    </div>
+                    <div class="left_main_else">
+                        <div class="left_salary_box_else">
+                            <div class="left_salary_item flex_column">
+                                <div class="left_user_title">
+                                    <div class="icon_title">
+                                        <div class="icon">
+                                            <img src="./images/icon_title.png" alt="">
+                                        </div>
+                                        <div class="title">工资总额均衡预算使用情况</div>
+                                    </div>
+                                    <div class="line">
+                                        <img src="./images/line.png" alt="">
+                                    </div>
+                                </div>
+                                <div class="w_100">
+                                    <div class="right_item_item_else_title">
+                                        <img style="height: 100%;" src="./images/title.png" alt="">
+                                        <div class="title_right">集团公司<span class="big_color">90</span><span>%</span>
+                                        </div>
+                                    </div>
+                                    <div class="echarts_90" ref="echarts90"></div>
+                                </div>
+                            </div>
+                            <div class="left_salary_item flex_column" @click="handleChange()">
+                                <div class="left_user_title">
+                                    <div class="icon_title">
+                                        <div class="icon">
+                                            <img src="./images/icon_title.png" alt="">
+                                        </div>
+                                        <div class="title">算薪进度</div>
+                                    </div>
+                                    <div class="line">
+                                        <img src="./images/line.png" alt="">
+                                    </div>
+                                </div>
+                                <div class="w_100">
+
+                                    <dv-scroll-board :config="config2"
+                                        style="width: 100%; height: 95%;margin-top: 1%;" />
+                                </div>
+                                <div class="title_box" >预警</div>
+                            </div>
+                        </div>
+                        <div class="left_salary_box flex_column" style="height: calc(60% - 10px);">
+                            <div class="left_user_title">
+                                <div class="icon_title">
+                                    <div class="icon">
+                                        <img src="./images/icon_title.png" alt="">
+                                    </div>
+                                    <div class="title">月度平均工资</div>
+                                </div>
+                                <div class="line">
+                                    <img src="./images/line.png" alt="">
+                                </div>
+                            </div>
+                            <div class="w_100">
+                                <div class="echarts" ref="leftEnd"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="right_item flex_column">
                     <div class="title_else">员工效率</div>
                     <div class="w_100_right ">
@@ -432,18 +571,18 @@
                 <div class="right_item flex_column">
                     <div class="title_else">校企合作</div>
                     <div class="w_100_right">
-                        <div class="right_item_item_else flex_column" style="width: calc(60% - 10px);">
+                        <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: 50%;">
-                                        <div class="text_box" style="padding-left: 360px;">
+                                        <div class="text_box" style="padding-left: 280px;">
                                             <img style="width: 20%;" src="./images/newImage/school.png" alt="">
                                             <span class="text_num" style="color: #65FAFF;">9 <span>所</span></span>
-                                            <span class="text_title">合作高校</span>
+                                            <span class="text_title">实习实训高校</span>
                                         </div>
                                     </div>
                                     <div class="left_user_number" style="width: 50%;">
-                                        <div class="text_box" style="padding-left: 360px;">
+                                        <div class="text_box" style="padding-left: 280px;">
                                             <img style="width: 20%;" src="./images/newImage/pink.png" alt="">
                                             <span class="text_num" style="color: #EC8AED;">213<span>人</span></span>
                                             <span class="text_title">实习实训</span>
@@ -466,13 +605,23 @@
                                 <div class="echarts" style="height: calc(100% - 65px);" ref="student"></div>
                             </div>
                         </div>
-                        <div class="right_item_item_else" style="width: calc(40% - 10px);">
-                            <div class="right_item_item_else_title">
-                                <div class="left_user_number" style="width: 50%;">
-                                    <div class="text_box" style="padding-left: 280px;" >
-                                        <img style="width: 30%;" src="./images/newImage/green.png" alt="">
-                                        <span class="text_num" style="color: #39F656;">20 <span>个</span></span>
-                                        <span class="text_title">项目研究成果</span>
+                        <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: 50%;">
+                                        <div class="text_box" style="padding-left: 280px;">
+                                            <img style="width: 20%;" src="./images/newImage/yellow.png" alt="">
+                                            <span class="text_num" style="color: #FF9915;">12<span>所</span></span>
+                                            <span class="text_title">产学研合作高校</span>
+                                        </div>
+                                    </div>
+                                    <div class="left_user_number" style="width: 50%;">
+                                        <div class="text_box" style="padding-left: 280px;">
+                                            <img style="width: 20%;" src="./images/newImage/green.png" alt="">
+                                            <span class="text_num" style="color: #39F656;">20 <span>个</span></span>
+                                            <span class="text_title">产学研成果</span>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -482,138 +631,35 @@
                                         <div class="icon">
                                             <img src="./images/icon_title.png" alt="">
                                         </div>
-                                        <div class="title">项目研究成果</div>
+                                        <div class="title">产学研成果</div>
                                     </div>
                                     <div class="line">
                                         <img src="./images/line.png" alt="">
                                     </div>
                                 </div>
-                                <dv-scroll-board :config="configLast" style="width: 100%; height: calc(100% - 65px)" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="flex_column right_user_box">
-                    <div class="right_item_else flex_column">
-                        <div class="title_else" >人才市场</div>
-                        <div class="w_100_right flex_column">
-                            <div class="top flex justify-between">
-                                <div class="flex items-center justify-center">
-                                    <img class="top-img" src="./images/top-1.png" alt="">
-                                    <div>优化池<span class="top-text">3068</span>人</div>
-                                </div>
-                                <div class="flex items-center justify-center">
-                                    <img class="top-img" src="./images/top-3.png" alt="">
-                                    <div>缓冲池<span class="top-text">206</span>人</div>
-                                </div>
-                                <div class="flex items-center justify-center">
-                                    <img class="top-img" src="./images/top-4.png" alt="">
-                                    <div>待岗池<span class="top-text">5708</span>人</div>
-                                </div>
-                                <div class="flex items-center justify-center">
-                                    <img class="top-img" src="./images/top-2.png" alt="">
-                                    <div>共享池<span class="top-text">326</span>人</div>
-                                </div>
-                            </div>
-                            <div class="right_item_item_btm">
-                                <div class="right_item_btm_box">
-                                    <div class="left_user_title">
-                                        <div class="icon_title">
-                                            <div class="icon">
-                                                <img src="./images/icon_title.png" alt="">
-                                            </div>
-                                            <div class="title">优化池</div>
-                                        </div>
-                                        <div class="line">
-                                            <img src="./images/line.png" alt="">
-                                        </div>
-                                    </div>
-                                    <div class="right_btm_item_else">
-                                        <div class="image_box_else"><span>50.3%</span>
-                                            <img src="./images/annular.png" style="width: 100%;height:100%;" alt="">
-                                        </div>
-                                        <div class="image_box">
-                                            <div class="box_item" style="margin-top: 30px;">
-                                                <img src="./images/center-left1.png" alt="">
-                                                <div>双选人数<span>3068</span>人</div>
-                                            </div>
-                                            <div class="box_item">
-                                                <img src="./images/center-left3.png" alt="">
-                                                <div>优化人数<span>3116</span>人</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="right_btm_item_box">
-                                    <div class="left_user_title">
-                                        <div class="icon_title">
-                                            <div class="icon">
-                                                <img src="./images/icon_title.png" alt="">
-                                            </div>
-                                            <div class="title">缓冲池</div>
-                                        </div>
-                                        <div class="line">
-                                            <img src="./images/line.png" alt="">
-                                        </div>
-                                    </div>
-                                    <div class="right_btm_item" ref="buffer"></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="right_item_else flex_sb" style="height: calc(50% - 20px);">
-                        <div class="right_echarts_else_bg flex_column">
-                            <div class="left_user_title">
-                                <div class="icon_title">
-                                    <div class="icon">
-                                        <img src="./images/icon_title.png" alt="">
+                                <div class="f_box">
+                                    <div class="f_item">
+                                        <span>项目名称</span>
+                                        <span>{{ fList[fIndex].project }}</span>
                                     </div>
-                                    <div class="title">待岗池</div>
-                                </div>
-                                <div class="line">
-                                    <img src="./images/line.png" alt="">
-                                </div>
-                            </div>
-                            <div class="three_box">
-                                <div class="right_bg_item">
-                                    <div class="bg_item_num" style="color: rgb(102, 130, 245);">2800</div>
-                                    <div class="bg_item_gif">
-                                        <img src="./images/bottom-right1.gif" alt="">
+                                    <div class="f_item">
+                                        <span>合作高校</span>
+                                        <span>{{ fList[fIndex].school }}</span>
                                     </div>
-                                    <div class="bg_item_title">终止合同人员</div>
-                                </div>
-                                <div class="right_bg_item">
-                                    <div class="bg_item_num" style="color: rgb(64, 169, 255);">1308</div>
-                                    <div class="bg_item_gif">
-                                        <img src="./images/bottom-right2.gif" alt="">
+                                    <div class="f_item">
+                                        <span>合作类型</span>
+                                        <span>{{ fList[fIndex].type }}</span>
                                     </div>
-                                    <div class="bg_item_title">双创人员</div>
-                                </div>
-                                <div class="right_bg_item">
-                                    <div class="bg_item_num" style="color: rgb(69, 218, 209);">1600</div>
-                                    <div class="bg_item_gif">
-                                        <img src="./images/bottom-right3.gif" alt="">
-                                    </div>
-                                    <div class="bg_item_title">绩效考核末位调整人员</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="right_echarts_else_bg flex_column">
-                            <div class="left_user_title">
-                                <div class="icon_title">
-                                    <div class="icon">
-                                        <img src="./images/icon_title.png" alt="">
+                                    <div class="f_item">
+                                        <span>主要成效</span>
+                                        <span>{{ fList[fIndex].merits }}</span>
                                     </div>
-                                    <div class="title">共享池</div>
-                                </div>
-                                <div class="line">
-                                    <img src="./images/line.png" alt="">
                                 </div>
                             </div>
-                            <div class="right_echarts_item" ref="share"></div>
                         </div>
                     </div>
                 </div>
+                
             </div>
         </div>
         <div class="mark_box" v-if="isShowMark" @click="handleMark()">

cokingCoal/js/dataA.js

@@ -29,14 +29,20 @@ let levelList = {
   y: [903, 5086, 34826, 50610, 14227, 13],
 }
 let salaryList = {
-  x: ["山焦股份", "山焦西山", "山焦汾西", "山焦霍州", "山焦山煤", "山焦华晋", "山焦焦化", "山焦机电", "山焦金土地", "山焦销售", "山焦投资", "山焦人力", "山焦资本", "山西民爆", "山焦云数据", "山焦新能源", "山焦油品", "山焦低碳(重点实验室)", "山焦置业", "焦煤教育基地", "山焦交易中心", "山焦国发", "山焦盐化"],
-  y: [95, 90, 96, 97, 80, 99, 96, 97, 93, 94, 99, 98, 100, 100, 95, 99, 98, 99, 93, 99, 100, 97, 99],
+  x: ["西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备公司", "金土地公司", "销售公司", "国发公司", "投资公司", "人力资源公司", "金融资本公司", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心", "招标公司"],
+  y: [94, 90, 93, 80, 85, 95, 98, 99, 93, 91, 95, 83, 98, 94, 99, 92, 90, 93, 87, 89, 97],
 }
 
+// let leftEndList = {
+//   x: ["集团公司", "山焦股份", "山焦西山", "山焦汾西", "山焦霍州", "山焦山煤", "山焦华晋", "山焦焦化", "山焦机电", "山焦金土地", "山焦销售", "山焦投资", "山焦人力", "山焦资本", "山西民爆", "山焦云数据", "山焦新能源", "山焦油品", "山焦低碳(重点实验室)", "山焦置业", "焦煤教育基地", "山焦交易中心", "山焦国发", "山焦盐化"],
+//   y1: [11708, 23959.2, 7611.2, 9818.8, 8530.8, 9409.4, 9777.4, 4882.8, 12574.4, 17091.8, 23969.2, 10175, 18170.6, 14901.8, 7572.4, 15567, 11090.6, 11957.2, 4578.4, 11993.6, 17391.2, 7566, 7321, 3387.8],
+//   y2: [10525, 19735.8, 6856.6, 7729.8, 7320.2, 8711, 8908.4, 4784.4, 11697.8, 14724.2, 15173.2, 8016.6, 0, 14323.8, 5423.8, 11432.8, 10882.2, 13060, 0, 13103.6, 15612, 0, 9911, 3106.2],
+// }
+
 let leftEndList = {
-  x: ["集团公司", "山焦股份", "山焦西山", "山焦汾西", "山焦霍州", "山焦山煤", "山焦华晋", "山焦焦化", "山焦机电", "山焦金土地", "山焦销售", "山焦投资", "山焦人力", "山焦资本", "山西民爆", "山焦云数据", "山焦新能源", "山焦油品", "山焦低碳(重点实验室)", "山焦置业", "焦煤教育基地", "山焦交易中心", "山焦国发", "山焦盐化"],
-  y1: [11708, 23959.2, 7611.2, 9818.8, 8530.8, 9409.4, 9777.4, 4882.8, 12574.4, 17091.8, 23969.2, 10175, 18170.6, 14901.8, 7572.4, 15567, 11090.6, 11957.2, 4578.4, 11993.6, 17391.2, 7566, 7321, 3387.8],
-  y2: [10525, 19735.8, 6856.6, 7729.8, 7320.2, 8711, 8908.4, 4784.4, 11697.8, 14724.2, 15173.2, 8016.6, 0, 14323.8, 5423.8, 11432.8, 10882.2, 13060, 0, 13103.6, 15612, 0, 9911, 3106.2],
+  x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备公司", "金土地公司", "销售公司", "国发公司", "投资公司", "人力资源公司", "金融资本公司", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心"],
+  y1: [11708, 7611.2, 9818.8, 8530.8, 9409.4, 9777.4, 4882.8, 12574.4, 17091.8, 23969.2, 7321, 10175, 18170.6, 14901.8, 7572.4, 15567, 11993.6, 11090.6, 11957.2, 4578.4, 7566,],
+  y2: [10525, 6856.6, 7729.8, 7320.2, 8711, 8908.4, 4784.4, 11697.8, 14724.2, 9911, 15173.2, 8016.6, 0, 14323.8, 5423.8, 11432.8, 13103.6, 10882.2, 13060, 0, 0,],
 }
 
 let worksList = {
@@ -62,12 +68,22 @@ let schoolList = {
 }
 
 let mobilizeList = {
-  x: ["山焦股份", "山焦西山", "山焦汾西", "山焦霍州", "山焦山煤", "山焦华晋", "山焦焦化", "山焦机电", "山焦金土地", "山焦销售", "山焦投资", "山焦人力", "山焦资本", "山西民爆", "山焦云数据", "山焦新能源", "山焦油品", "山焦低碳(重点实验室)", "山焦招标", "山焦置业", "焦煤教育基地", "山焦交易中心", "山焦国发", "山焦盐化"],
-  y1: [0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0],
-  y2: [2, 38, 35, 32, 21, 25, 20, 19, 7, 27, 28, 8, 1, 18, 0, 1, 2, 12, 67, 29, 0, 3, 6, 0],
-  y3: [2, 59, 13, 16, 20, 7, 12, 6, 2, 1, 7, 1, 2, 0, 0, 1, 0, 0, 0, 16, 0, 0, 10, 0],
-  y4: [6, 13, 25, 15, 4, 9, 6, 22, 2, 11, 5, 18, 1, 3, 0, 0, 9, 10, 5, 11, 0, 0, 0, 0],
+  x: ["西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备公司", "金土地公司", "销售公司", "国发公司", "投资公司", "人力资源公司", "金融资本公司", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心", "招标公司"],
+  y1: [1, 1, 3, 1, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+  y2: [1736, 1658, 2365, 1321, 362, 389, 19, 7, 27, 6, 28, 8, 1, 18, 0, 29, 1, 2, 12, 3, 67],
+  y3: [59, 13, 16, 20, 7, 12, 6, 2, 1, 10, 7, 1, 2, 0, 0, 16, 1, 0, 0, 0, 0],
+  y4: [13, 25, 15, 4, 9, 6, 22, 2, 11, 0, 5, 18, 1, 3, 0, 11, 0, 9, 10, 0, 5],
+  y5: [265, 132, 68, 27, 46, 35, 0, 0, 5, 0, 1, 1, 0, 5, 0, 0, 0, 0, 0, 0, 0],
 }
+// let mobilizeList = {
+//   x: ["山焦股份", "山焦西山", "山焦汾西", "山焦霍州", "山焦山煤", "山焦华晋", "山焦焦化", "山焦机电", "山焦金土地", "山焦销售", "山焦投资", "山焦人力", "山焦资本", "山西民爆", "山焦云数据", "山焦新能源", "山焦油品", "山焦低碳(重点实验室)", "山焦招标", "山焦置业", "焦煤教育基地", "山焦交易中心", "山焦国发", "山焦盐化"],
+//   y1: [0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+//   y2: [2, 38, 35, 32, 21, 25, 20, 19, 7, 27, 28, 8, 1, 18, 0, 1, 2, 12, 67, 29, 0, 3, 6, 0],
+//   y3: [2, 59, 13, 16, 20, 7, 12, 6, 2, 1, 7, 1, 2, 0, 0, 1, 0, 0, 0, 16, 0, 0, 10, 0],
+//   y4: [6, 13, 25, 15, 4, 9, 6, 22, 2, 11, 5, 18, 1, 3, 0, 0, 9, 10, 5, 11, 0, 0, 0, 0],
+// }
+
+
 
 
 

cokingCoal/styles/newIndex.css

@@ -13,8 +13,8 @@ body {
 }
 
 :root {
-    --bg:#dcf0fc0c ;
-  }
+    --bg: #dcf0fc0c;
+}
 
 
 /* 强制去掉滚动条 */
@@ -102,7 +102,7 @@ a {
 
 .left_item {
     width: 100%;
-    height: calc(20% - 15px);
+    height: calc(25% - 15px);
     background: url("../images/lb-back.png") no-repeat;
     background-size: 100% 100%;
     padding: 10px 40px 30px;
@@ -154,6 +154,7 @@ a {
     background-size: 100% 100%;
     padding: 30px;
     box-sizing: border-box;
+    z-index: 999;
 }
 
 .title {
@@ -168,7 +169,7 @@ a {
     margin-bottom: 10px;
 }
 
-.title_else{
+.title_else {
     width: 102%;
     height: 65px;
     font-size: 35px;
@@ -181,8 +182,9 @@ a {
     position: relative;
     background: url("../images/newImage/tit_bg.png") no-repeat;
     background-size: 100% 100%;
-} 
-.icon_tit{
+}
+
+.icon_tit {
     width: 80px;
     height: 80px;
     z-index: 9999;
@@ -206,7 +208,7 @@ a {
 
 .left_main_top {
     width: 100%;
-    height: 87%;
+    height: 65%;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -231,7 +233,7 @@ a {
 
 .left_main_btm {
     width: 100%;
-    height: 13%;
+    height: 35%;
 }
 
 .left_user_top {
@@ -264,7 +266,7 @@ a {
     width: 30%;
     height: 100%;
     position: absolute;
-    top: 30%;
+    top: 50%;
     left: 30%;
     transform: translate(-50%, -50%);
 }
@@ -273,7 +275,7 @@ a {
     font-size: 40px;
     font-weight: bolder;
     font-style: italic;
-    margin-top: -15px;
+    margin-top: 10px;
     color: #69C0FF;
 }
 
@@ -282,7 +284,7 @@ a {
 }
 
 .text_title {
-    font-size: 24px;
+    font-size: 30px;
 }
 
 .left_user_main {
@@ -309,7 +311,7 @@ a {
 .left_salary_box,
 .left_salary_box_else {
     width: 100%;
-    height: calc(50% - 10px);
+    height: calc(40% - 10px);
 }
 
 .left_salary_box {
@@ -360,15 +362,15 @@ a {
 
 .right_item_else {
     width: 100%;
-    height: calc(50%);
+    height: calc(100%);
     /* display: flex;
     flex-direction: column;
     justify-content: space-between; */
 }
 
-.right_user_box{
+.right_user_box {
     width: 100%;
-    height: calc(50% - 10px);
+    height: calc(25% - 10px);
     background: url("../images/lb-back.png") no-repeat;
     background-size: 100% 100%;
     padding: 10px 45px 20px;
@@ -390,7 +392,7 @@ a {
 
 
 .right_item_item {
-    width: calc(33% - 10px);
+    width: calc(100% - 10px);
     height: 100%;
     background-color: var(--bg);
     /* background: url("../images/rt-back.png") no-repeat;
@@ -408,7 +410,7 @@ a {
     width: calc(50% - 10px);
     height: 100%;
     background-color: var(--bg);
-    padding: 30px;
+    padding: 5px 30px 10px;
     box-sizing: border-box;
 
 }
@@ -441,7 +443,7 @@ a {
     box-sizing: border-box;
 }
 
-.right_echarts_else_bg{
+.right_echarts_else_bg {
     width: calc(50% - 10px);
     height: 100%;
     background-color: var(--bg);
@@ -673,6 +675,7 @@ a {
     justify-content: center;
     align-items: center;
 }
+
 .echarts_else_top_item_on {
     width: calc(50% - 150px);
     height: 100%;
@@ -754,6 +757,7 @@ img {
 .icon_title {
     width: 100%;
     height: calc(100% - 10px);
+    z-index: 999;
     display: flex;
     justify-content: flex-start;
     align-items: center;
@@ -787,6 +791,7 @@ img {
 .right_item_item_else_top {
     width: 100%;
     height: calc(25% - 10px);
+    margin-bottom: 15px;
 
 }
 
@@ -845,6 +850,7 @@ img {
     margin: -15px;
     border: 1px solid #3699ff;
     border-radius: 0px;
+    font-size: 35px;
     padding: 10px 15px 10px;
     background-color: #0725558a !important;
 }
@@ -865,15 +871,25 @@ img {
     width: 5px;
     height: 5px;
     border-radius: 50%;
-    background-color: #40a9ff;
+    /* background-color: #40a9ff; */
 }
 
 .tooltip-cont span {
     color: #E6C50B;
     font-weight: bolder;
-}
 
 
+
+
+
+
+    color: #EAEA26;
+    color: #906BF9;
+    color: #01E17E;
+    color: #3DD1F9;
+    color: #FFAD05;
+}
+
 .dv-scroll-board div {
     font-size: 28px;
 }
@@ -928,7 +944,7 @@ img {
     color: #FFFFFF;
 }
 
-.mark_box{
+.mark_box {
     width: 7168px !important;
     min-height: 2576px;
     height: 100%;
@@ -938,19 +954,24 @@ img {
     left: 0;
     z-index: 999999999999999999;
 }
-.mark_centter{
+
+.mark_centter {
     width: 1300px;
     height: 600px;
-    margin: 1500px 1000px 0;
+    /* margin: 1500px 1000px 0; */
     z-index: 999999999999999999;
     background: url("../images/markBG.png") no-repeat;
     background-size: 100% 100%;
     padding: 20px 40px 30px;
     box-sizing: border-box;
     align-items: center !important;
-    
+    position: absolute;
+    top: 20%;
+    right: 10%;
+
 }
-.mark_title{
+
+.mark_title {
     width: 100%;
     height: 50px;
     text-align: center;
@@ -959,24 +980,166 @@ img {
     font-weight: bolder;
     margin-top: 5px;
 }
-.mark_main{
+
+.mark_main {
     width: 100%;
     height: calc(100% - 70px);
 }
 
-.mark_pdf{
+.mark_pdf {
     width: 2300px;
     height: 1500px;
     background: url("../images/markBG.png") no-repeat;
     background-size: 100% 100%;
-    padding:50px;
+    padding: 50px;
     box-sizing: border-box;
     position: absolute;
     top: 20%;
     left: 5%;
 }
-.red{
+
+.f_box {
+    width: 100%;
+    height: calc(100% - 65px);
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.f_item {
+    width: calc(50% - 10px);
+    height: calc(50% - 10px);
+
+    font-size: 32px;
+    overflow: hidden;
+}
+
+.f_item span:nth-child(1) {
+    color: #4BB2FF;
+    margin-bottom: 10px;
+    font-weight: bolder;
+    display: block;
+}
+
+.f_item span:nth-child(2) {
+    width: 95%;
+    height: 84px;
+    text-indent: 50px;
+    opacity: 0.7;
+    display: -webkit-box;
+    /* 将元素作为弹性伸缩盒子展示 */
+    -webkit-line-clamp: 2;
+    /* 限制显示的行数 */
+    -webkit-box-orient: vertical;
+    /* 设置垂直方向 */
+    overflow: hidden;
+    /* 隐藏超出部分 */
+}
+
+
+.echarts_6 {
+    width: 100%;
+    height: calc(100% - 65px);
+}
+
+.echarts_top {
+    width: 100%;
+    height: 70%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
+
+.top_image {
+    width: calc(100% / 6);
+    height: 90%;
+    margin-top: 20px;
+    position: relative;
+
+}
+
+
+
+.top_text {
+    font-size: 40px;
+    font-weight: bolder;
+    color: #5AC9FD;
+    position: absolute;
+    top: 25%;
+    left: 45%;
+    transform: translateY(-50%);
+}
+
+.top_text_on{
+    font-size: 40px;
+    font-weight: bolder;
+    color: #EBB829;
+    position: absolute;
+    top: 25%;
+    left: 45%;
+    transform: translateY(-50%);
+}
+
+.top_text span {
+    font-size: 30px;
+}
+.top_text_on span {
+    font-size: 30px;
+}
+
+.echarts_top img {
+    width: 80%;
+    height: 100%;
+}
+
+.echarts_btm {
+    width: 100%;
+    height: 30%;
+    position: relative;
+}
+
+
+.btm_text {
+    width: 100%;
+    height: 100%;
+    
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
+.btm_text_on{
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
+
+.btm_text_span{
+    font-size: 26px;
+    color: #5AC9FD;
+}
+.btm_text_span_on{
+    font-size: 26px;
+    color: #EBB829;
+}
+
+/* .red {
     color: red;
+} */
+
+.echarts_else{
+    position: relative;
+}
+.echarts_else .img{
+    width: 370px;
+    height: 370px;
+    z-index: 99999;
+    position: absolute;
+    left: 130px;
+    top: calc(50% - 183px);
+    animation: fadenum 8s infinite linear;
 }
 
 
@@ -1008,4 +1171,4 @@ img {
     100% {
         transform: rotate(360deg);
     }
-}
+}

investmentOld/investHomeGroup.html

@@ -203,7 +203,7 @@
                   </p>
                   <p>
                     <i style="width:100%;text-align: center;"><span class="num">{{numFormat(center1[2])}}</span><span
-                        style="font-size: 26px;">亿</span></i>
+                        style="font-size: 26px;">亿</span></i> 
                   </p>
                 </div>
                 <div class="pointer" @click.stop="showChartLTipSingle('股权投资')">
@@ -572,4 +572,11 @@
   <script src="./js/investHomeGroup.js"></script>
 </body>
 
-</html>
+</html>
+
+
+
+编写SQL 90个
+大屏页面  2个
+
+使用中的SQL 44个