Merge branch 'refs/heads/master' into sso

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

@@ -1142,3 +1142,86 @@ border-radius: 2px;
 	width: 100%;
 	height: 200px;
 }
+
+
+/* yshj_new */
+.txt_t{
+	padding-left: 35px;
+}
+#qkq_zwhj1,#qkq_zwhj2{
+	width: 100%;
+	height: 220px;
+	margin-bottom: 20px;
+}
+.qkq_yshj_div .qkq_txt{
+	width: 50%;
+	height: 80px;
+	float: left;
+	text-align: center;
+	padding-top: 15px;
+	padding-bottom: 10px;
+	border: 1px solid #074f7a;
+	box-shadow: inset 0 0 10px rgba(8, 135, 214, 0.5);
+}
+.qkq_yshj_div .qkq_txt p{
+	color: #fff;
+	font-size: 14px;
+}
+.qkq_yshj_div .qkq_txt p b{
+	color: #00aaff;
+	font-size: 18px;
+	padding-right: 6px;
+}
+.qkq_yshj_div .qkq_txt p i{
+	font-size: 12px;
+}
+.qkq_yshj_txt{
+	padding-left: 160px;
+	margin-top: 20px;
+}
+.qkq_yshj_txtbg1{
+	background: url("../images/qkq_icon18_1.png") no-repeat 15px 0px;
+	background-size:contain;
+}
+.qkq_yshj_txtbg2{
+	background: url("../images/qkq_icon18_2.png") no-repeat 15px 0px;
+	background-size:contain;
+}
+.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;
+}
+.qkq_yshj_txt .qkq_yshjnew{
+	width: 50%;
+	height: 80px;
+	float: left;
+	text-align: center;
+	padding-top: 15px;
+	padding-bottom: 10px;
+}
+.qkq_yshj_txt .qkq_yshjnew p{
+	color: #fff;
+	font-size: 14px;
+	line-height: 30px;
+}
+.qkq_yshj_txt .qkq_yshjnew p b{
+	color: #00aaff;
+	font-size: 18px;
+	padding-right: 6px;
+}
+.qkq_yshj_txt .qkq_yshjnew p i{
+	font-size: 12px;
+}
+#qkq_yhhj1{
+	width: 100%;
+	height: 350px;
+	margin-bottom: 20px;
+}
+#qkq_yhhj2{
+	width: 100%;
+	height: 350px;
+}

zhsq_qk-ui/src/router/index.js

@@ -61,6 +61,11 @@ export const constantRoutes = [
     hidden: true
   },
   {
+    path: '/yshj_new',
+    component: () => import('@/views/fusion/yshj_new'),
+    hidden: true
+  },
+  {
     path: '/csgl',
     component: () => import('@/views/fusion/csgl'),
     hidden: true
@@ -118,6 +123,11 @@ export const constantRoutes = [
     path: '/yshj',
     component: () => import('@/views/fusion/yshj'),
     hidden: true
+  },
+  {
+    path: '/yshj_new',
+    component: () => import('@/views/fusion/yshj_new'),
+    hidden: true
   },{
     path: '/fwyq',
     component: () => import('@/views/fusion/fwyq'),

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

@@ -163,7 +163,7 @@
           <a>返回首页</a>
         </div>
         <div class="nav-bottom-right">
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('yshj')">

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

@@ -163,7 +163,7 @@
           <a>返回首页</a>
         </div>
         <div class="nav-bottom-right">
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('yshj')">

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

@@ -24,6 +24,9 @@ export default {
       path:'/yshj1',
       redirect:'/yshj'
     },{
+      path:'/yshj_new1',
+      redirect:'/yshj_new'
+    },{
       path:'/weather1',
       redirect:'/weather'
     },{

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

@@ -378,7 +378,7 @@
           <a>返回首页</a>
         </div>
         <div class="nav-bottom-right">
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('yshj')">

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

@@ -176,7 +176,7 @@
         <a @click="handleNavigation('csgl')"><i><img src="@/assets/images/qkq_icon2.png"/></i><span>城市管理</span></a>
         <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><i><img src="@/assets/images/qkq_icon5.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('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>

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

@@ -231,7 +231,7 @@
           <a>返回首页</a>
         </div>
         <div class="nav-bottom-right">
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="serviceFAW('yshj_new')">
             <span>营商环境</span>
           </div>
           <div class="nav-li-right" @click="serviceFAW('yshj')">

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

@@ -158,7 +158,7 @@
           <a>返回首页</a>
         </div>
         <div class="nav-bottom-right">
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('yshj')">

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

@@ -155,7 +155,7 @@
           <a>返回首页</a>
         </div>
         <div class="nav-bottom-right">
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('yshj_new')">
             <span>营商环境</span>
           </div>
           <div class="nav-li-right" @click="handleNavigation('yshj')">

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

@@ -158,7 +158,7 @@
           <a>返回首页</a>
         </div>
         <div class="nav-bottom-right">
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="serviceFAW('yshj_new')">
             <span>营商环境</span>
           </div>
           <div class="nav-li-right on" @click="serviceFAW('yshj')">
@@ -506,21 +506,21 @@ export default {
           },
           data: XName,
         },],
-        series: [{
-          symbolSize: 150,
-          symbol: img[2],
-          name: '办件数量',
-          type: "line",
-          data: data1,
-          itemStyle: {
-            normal: {
-              borderWidth: 5,
-              color: '#0696f9',
-              borderColor: '#FE7B00',
+        series: [
+          {
+            symbolSize: 150,
+            symbol: img[2],
+            name: '办件数量',
+            type: "line",
+            data: data1,
+            itemStyle: {
+              normal: {
+                borderWidth: 5,
+                color: '#0696f9',
+                borderColor: '#FE7B00',
+              }
             }
-          }
-        },
-
+          },
           {
             name: '滑行的光点',
             type: 'lines',
@@ -935,7 +935,7 @@ export default {
               return {
                 coords: [
                   [0, index],
-                  [item.value , index],
+                  [item.value, index],
                 ]
               };
             }),
@@ -943,8 +943,8 @@ export default {
               show: true,
               period: 2.5,
               trailLength: 0.5, //控制拖尾长度
-              symbolSize: [15,2],
-              symbol:this.$store.state.common.echarts_baseStreamer,
+              symbolSize: [15, 2],
+              symbol: this.$store.state.common.echarts_baseStreamer,
               loop: true,
               color: '#fff' //流光颜色
             },
@@ -1147,7 +1147,7 @@ export default {
               return {
                 coords: [
                   [0, index],
-                  [item.value , index],
+                  [item.value, index],
                 ]
               };
             }),
@@ -1155,8 +1155,8 @@ export default {
               show: true,
               period: 2.5,
               trailLength: 0.5, //控制拖尾长度
-              symbolSize: [15,2],
-              symbol:this.$store.state.common.echarts_baseStreamer,
+              symbolSize: [15, 2],
+              symbol: this.$store.state.common.echarts_baseStreamer,
               loop: true,
               color: '#fff' //流光颜色
             },