Merge branch 'refs/heads/master' into sso

zhsq_qk-ui/src/assets/images/qkq_sprh.css

@@ -1180,20 +1180,20 @@ border-radius: 2px;
 	margin-top: 20px;
 }
 .qkq_yshj_txtbg1{
-	background: url("../images/qkq_icon18_1.png") no-repeat 15px 0px;
+	background: url("../images/qkq_icon18_1.png") no-repeat 15px 1px;
 	background-size:contain;
 }
 .qkq_yshj_txtbg2{
-	background: url("../images/qkq_icon18_2.png") no-repeat 15px 0px;
-	background-size:contain;
+	background: url("../images/qkq_icon18_2.png") no-repeat 15px 56px;
+	background-size:32%;
 }
 .qkq_yshj_txtbg3{
 	background: url("../images/qkq_icon18_3.png") no-repeat 15px 0px;
 	background-size:contain;
 }
 .qkq_yshj_txtbg4{
-	background: url("../images/qkq_icon18_4.png") no-repeat 15px 0px;
-	background-size:contain;
+	background: url("../images/qkq_icon18_4.png") no-repeat 15px 56px;
+	background-size:32%;
 }
 .qkq_yshj_txt .qkq_yshjnew{
 	width: 50%;
@@ -1203,6 +1203,12 @@ border-radius: 2px;
 	padding-top: 15px;
 	padding-bottom: 10px;
 }
+.qkq_yshj_txt .qkq_yshjnew2{
+    height: 150px;
+    padding-top: 50px;
+}
+
+
 .qkq_yshj_txt .qkq_yshjnew p{
 	color: #fff;
 	font-size: 14px;
@@ -1225,3 +1231,189 @@ border-radius: 2px;
 	width: 100%;
 	height: 350px;
 }
+
+/* bjzshz */
+#qkq_bj1{
+	width: 100%;
+	height: 200px;
+}
+#qkq_bj2{
+	width: 55%;
+	height: 200px;
+}
+.qkq_hz{
+	padding-top: 40px;
+	width: 45%;
+	padding-left: 10%;
+}
+.qkq_hz p{
+	background: url(../images/qkq_hzbg.png) no-repeat left center;
+	color: #fff;
+	height: 50px;
+	line-height: 50px;
+	padding-left: 20px;
+	background-size: 100% 100%;
+	margin: 10px 0px 20px 0px;
+}
+.qkq_hz p b{
+	font-size: 20px;
+	color: #faea12;
+
+}
+#qkq_bj3{
+	width: 100%;
+	height: 200px;
+}
+.qkq_bjzs{
+	height: 495px;
+}
+.qkq_bjzs_con{
+	position: relative;
+	background: url(../images/qkq_top.png) no-repeat center;
+	width: 100%;
+	height: 100%;
+	background-size: 40%;
+}
+.qkq_bjzs_bg{
+	background: url(../images/qkq_btm.png) no-repeat center;
+	background-size: 47%;
+	 content: " ";
+	 width: 100%;
+	 height: 100%;
+	    display: block;
+	    position: absolute;
+	    top: 0px;
+	    left: 0px;
+		z-index: -1;
+		animation:changDeg 6s linear 0.5s infinite;
+
+}
+.qkq_bjzs_con h4{
+	text-align: center;
+	font-size: 30px;
+	color: #faea12;
+	font-weight: 900;
+	padding-top: 235px;
+}
+.qkq_bjzs_con p{
+	text-align: center;
+	font-size: 18px;
+	color: #fff;
+	padding-top: 50px;
+}
+@keyframes changDeg{
+			0%{
+				transform: rotate(0deg);
+			}
+			100%{
+				transform: rotate(360deg);
+			}
+		}
+
+.qkq_bjzs_txt{
+	position: absolute;
+	top:80px;
+	left: 2%;
+	width: 96%;
+	height: 100%;
+}
+.qkq_bjzs_txt .bjzs_txt{
+	margin-bottom: 45px;
+}
+.qkq_bjzs_txt .bjzs_txt p{
+	height: 25px;
+	line-height: 25px;
+	text-align: left;
+padding: 0px;
+}
+.qkq_bjzs_txt .bjzs_txt p b{
+	height: 40px;
+	line-height: 40px;
+	text-align: left;
+padding: 0px;
+color: #00ffff;
+padding-right: 10px;
+}
+.qkq_bjzs_txt_fr p{
+	text-align: right!important;
+}
+.qkq_bjs_con{
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+.qkq_bjs_con .qkq_bjs{
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	margin-top: 50px;
+}
+.qkq_bjs_con .qkq_bjs p{
+	color: #fff;
+	line-height: 30px;
+}
+.qkq_bjs_con .qkq_bjs p b{
+	color: #fff;
+	font-size: 24px;
+	padding-right: 10px;
+	color: #bceaf7;
+}
+#qkq_bj4{
+	width: 100%;
+	height: 200px;
+}
+#qkq_bj5{
+	width: 50%;
+	height: 200px;
+}
+.qkq_hz2{
+	padding-left: 5%;
+}
+.qkq_sxtop{
+	height: 200px;
+	overflow-y: scroll;
+	padding-left: 20px;
+}
+.qkq_sxtop::-webkit-scrollbar{
+	width: 0px;
+	height: 0px;
+}
+.qkq_sxtop p{
+	height: 35px;
+	line-height: 35px;
+	display: flex;
+	flex-direction: row;
+	color: #fff;
+	justify-content: space-between;
+}
+.qkq_sxtop p i{
+	width: 16px;
+	height: 16px;
+	line-height: 16px;
+	display: inline-block;
+	background: #00aaff;
+	font-size: 14px;
+	color: #fff;
+	text-align: center;
+	margin: 9px 8px;
+}
+.qkq_sxtop p a{
+	color: #fff;
+	font-size: 16px;
+	display: inline-block;
+}
+.qkq_sxtop p span{
+
+	color: #e70000;
+float: right;
+display: block;
+}
+.qkq_sxtop p:nth-child(1) i{
+	background: #ff0000;
+}
+.qkq_sxtop p:nth-child(2) i{
+	background: #ff8102;
+}
+.qkq_sxtop p:nth-child(3) i{
+	background: #ffca5e;
+}

zhsq_qk-ui/src/router/index.js

@@ -165,6 +165,11 @@ export const constantRoutes = [
     path: '/401',
     component: () => import('@/views/error/401'),
     hidden: true
+  },
+  {
+    path: '/bjzshz',
+    component: () => import('@/views/fusion/bjzshz'),
+    hidden: true
   },
 
   {

zhsq_qk-ui/src/views/fusion/aqyj.vue

@@ -21,8 +21,8 @@
     <div class="left_con sprh-left">
       <div class="top_txt">
         <b>汽开区</b>
-        <span>小雨</span>
-        <span>9~16℃</span>
+<!--        <span>小雨</span>-->
+<!--        <span>9~16℃</span>-->
       </div>
       <!-- 设备tab开始-->
       <div class="facility_tab facility_tab2">
@@ -166,7 +166,7 @@
           <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right" @click="handleNavigation('yshj')">
+          <div class="nav-li-right" @click="handleNavigation('bjzshz')">
             <span>政务运行</span>
           </div>
           <div class="nav-li-right on" @click="handleNavigation('aqyj')">

zhsq_qk-ui/src/views/fusion/csgl.vue

@@ -21,8 +21,8 @@
     <div class="left_con sprh-left">
       <div class="top_txt">
         <b>汽开区</b>
-        <span>小雨</span>
-        <span>9~16℃</span>
+<!--        <span>小雨</span>-->
+<!--        <span>9~16℃</span>-->
       </div>
       <!-- 设备tab开始-->
       <div class="facility_tab facility_tab2">
@@ -166,7 +166,7 @@
           <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right" @click="handleNavigation('yshj')">
+          <div class="nav-li-right" @click="handleNavigation('bjzshz')">
             <span>政务运行</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('aqyj')">

zhsq_qk-ui/src/views/fusion/demo.vue

@@ -41,6 +41,9 @@ export default {
     },{
       path:'/csgl1',
       redirect:'/csgl'
+    },{
+      path:'/bjzshz1',
+      redirect:'/bjzshz'
     }];
     let redirect = '';
     for (let i = 0; i < paths.length; i++) {

zhsq_qk-ui/src/views/fusion/fwyq.vue

@@ -15,8 +15,8 @@
     <div class="nav_min">
       <div class="top_txt">
         <b>汽开区</b>
-        <span>小雨</span>
-        <span>9~16℃</span>
+<!--        <span>小雨</span>-->
+<!--        <span>9~16℃</span>-->
       </div>
       <div class="top_txt top_txt2">
         <span>{{ currentTime }}</span>
@@ -172,7 +172,7 @@
           </div>
           <div id="qkq_zxt"></div>
         </div>
-        <div class="con_div">
+        <div class="con_div" style="margin-top: 56px;">
           <div class="qkq_tit ">万人助万企</div>
           <div class="qkq_wrzwq qkq_wr clearfix">
             <div class="qkq_si_div">
@@ -381,7 +381,7 @@
           <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right" @click="handleNavigation('yshj')">
+          <div class="nav-li-right" @click="handleNavigation('bjzshz')">
             <span>政务运行</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('aqyj')">
@@ -575,7 +575,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,
@@ -747,7 +747,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,
@@ -919,7 +919,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,
@@ -1111,7 +1111,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,
@@ -1282,7 +1282,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,
@@ -1453,7 +1453,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,
@@ -1532,7 +1532,7 @@ export default {
       };
       var json2 = {
         chart0: {
-          xcategory: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+          xcategory: ['2011', '2012', '2013', '2014', '2015', '2016', '2017'],
           low: data2,
           lowLine: [],
         }
@@ -3308,7 +3308,7 @@ export default {
           //   }),
           //   effect: {
           //     show: true,
-          //     period: 2.5,
+          //     period: 5,
           //     trailLength: 0.5, //控制拖尾长度
           //     symbolSize: [15, 2],
           //     symbol: this.$store.state.common.echarts_baseStreamer,
@@ -3376,7 +3376,7 @@ export default {
           //   }),
           //   effect: {
           //     show: true,
-          //     period: 2.5,
+          //     period: 5,
           //     trailLength: 0.5, //控制拖尾长度
           //     symbolSize: [15, 2],
           //     symbol: this.$store.state.common.echarts_baseStreamer,

zhsq_qk-ui/src/views/fusion/index.vue

@@ -14,8 +14,8 @@
     <div class="left_con">
       <div class="top_txt">
         <b>汽开区</b>
-        <span>小雨</span>
-        <span>9~16℃</span>
+<!--        <span>小雨</span>-->
+<!--        <span>9~16℃</span>-->
       </div>
       <!--土地资源-->
       <div class="qkq_tdzy">
@@ -177,7 +177,7 @@
         <a @click="handleNavigation('jtzl')"><i><img src="@/assets/images/qkq_icon3.png"/></i><span>交通治理</span></a>
         <a @click="handleNavigation('jczl')"><i><img src="@/assets/images/qkq_icon4.png"/></i><span>基层治理</span></a>
         <a @click="handleNavigation('yshj_new')"><i><img src="@/assets/images/qkq_icon5.png"/></i><span>营商环境</span></a>
-        <a @click="handleNavigation('yshj')"><i><img src="@/assets/images/qkq_icon6.png"/></i><span>政务运行</span></a>
+        <a @click="handleNavigation('bjzshz')"><i><img src="@/assets/images/qkq_icon6.png"/></i><span>政务运行</span></a>
         <a @click="handleNavigation('aqyj')"><i><img src="@/assets/images/qkq_icon7.png"/></i><span>安全应急</span></a>
         <a @click="handleNavigation('jjyx')"><i><img src="@/assets/images/qkq_icon8.png"/></i><span>经济运行</span></a>
       </div>

zhsq_qk-ui/src/views/fusion/jczl.vue

@@ -25,8 +25,8 @@
     <div class="left_con">
       <div class="top_txt">
         <b>汽开区</b>
-        <span>小雨</span>
-        <span>9~16℃</span>
+<!--        <span>小雨</span>-->
+<!--        <span>9~16℃</span>-->
       </div>
       <!-- 便民服务 -->
       <div class="qkq_bmfw">
@@ -234,7 +234,7 @@
           <div class="nav-li-right" @click="serviceFAW('yshj_new')">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right" @click="serviceFAW('yshj')">
+          <div class="nav-li-right" @click="serviceFAW('bjzshz')">
             <span>政务运行</span>
           </div>
           <div class="nav-li-right" @click="serviceFAW('aqyj')">
@@ -925,7 +925,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,
@@ -1034,7 +1034,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 2],
               symbol: this.$store.state.common.echarts_baseStreamer,

zhsq_qk-ui/src/views/fusion/jjyx.vue

@@ -15,8 +15,8 @@
     <div class="nav_min">
       <div class="top_txt">
         <b>汽开区</b>
-        <span>小雨</span>
-        <span>9~16℃</span>
+<!--        <span>小雨</span>-->
+<!--        <span>9~16℃</span>-->
       </div>
       <div class="top_txt top_txt2">
         <span>{{ currentTime }}</span>
@@ -161,7 +161,7 @@
           <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right" @click="handleNavigation('yshj')">
+          <div class="nav-li-right" @click="handleNavigation('bjzshz')">
             <span>政务运行</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('aqyj')">
@@ -3218,7 +3218,7 @@ export default {
             }),
             effect: {
               show: true,
-              period: 2.5,
+              period: 5,
               trailLength: 0.5, //控制拖尾长度
               symbolSize: [15, 8],
               symbol: this.$store.state.common.echarts_baseStreamer,

zhsq_qk-ui/src/views/fusion/jtzl.vue

@@ -21,8 +21,8 @@
     <div class="left_con sprh-left">
       <div class="top_txt">
         <b>汽开区</b>
-        <span>小雨</span>
-        <span>9~16℃</span>
+<!--        <span>小雨</span>-->
+<!--        <span>9~16℃</span>-->
       </div>
       <!-- 设备tab开始-->
       <div class="facility_tab">
@@ -158,7 +158,7 @@
           <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right" @click="handleNavigation('yshj')">
+          <div class="nav-li-right" @click="handleNavigation('bjzshz')">
             <span>政务运行</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('aqyj')">