bihuisong 11 tháng trước cách đây
mục cha
commit
ddaea0be02

+ 36 - 1
zhsq_qk-ui/src/router/index.js

@@ -51,7 +51,27 @@ export const constantRoutes = [
   // },
   {
     path: '/qkmap',
-    component: () => import('@/views/supermap/qkmap.vue'),
+    component: () => import('@/views/supermap/qkmap'),
+    hidden: true
+  },
+  {
+    path: '/csgl',
+    component: () => import('@/views/fusion/csgl'),
+    hidden: true
+  },
+  {
+    path: '/aqyj',
+    component: () => import('@/views/fusion/aqyj'),
+    hidden: true
+  },
+  {
+    path: '/fwyq',
+    component: () => import('@/views/fusion/fwyq'),
+    hidden: true
+  },
+  {
+    path: '/jjyx',
+    component: () => import('@/views/fusion/jjyx'),
     hidden: true
   },
   {
@@ -60,6 +80,21 @@ export const constantRoutes = [
     hidden: true
   },
   {
+    path: '/fwyq',
+    component: () => import('@/views/fusion/fwyq'),
+    hidden: true
+  },
+  {
+    path: '/csgl',
+    component: () => import('@/views/fusion/csgl'),
+    hidden: true
+  },
+  {
+    path: '/jjyx',
+    component: () => import('@/views/fusion/jjyx'),
+    hidden: true
+  },
+  {
     path: '/sprh',
     component: () => import('@/views/fusion/sprh'),
     hidden: true

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

@@ -26,7 +26,7 @@
       </div>
       <!-- 设备tab开始-->
       <div class="facility_tab facility_tab2">
-      
+
           <div class="qkq_tdzy">
             <div class="qkq_tit ">应急场所</div>
          <div class="scrollbar" style="height: 300px;">
@@ -46,7 +46,7 @@
             </li>
            </ul>
          </div>
-           
+
         </div>
 		  <div class="qkq_tdzy">
 		    <div class="qkq_tit">城市内涝点</div>
@@ -66,8 +66,8 @@
 		    </li>
 		   </ul>
 		 </div>
-		  </div>         
-	
+		  </div>
+
       </div>
       <!-- 设备tab结束-->
     </div>
@@ -80,7 +80,7 @@
         <!--        <b>11:16:58</b>-->
       </div>
     <div class="facility_tab facility_tab2">
-    
+
         <div class="qkq_tdzy">
           <div class="qkq_tit ">内涝设备</div>
        <div class="scrollbar" style="height: 300px;">
@@ -100,7 +100,7 @@
 		   </li>
          </ul>
        </div>
-         
+
       </div>
     		  <div class="qkq_tdzy">
     		    <div class="qkq_tit">应急场所设备</div>
@@ -120,10 +120,10 @@
     		    </li>
     		   </ul>
     		 </div>
-    		  </div>         
-    	
+    		  </div>
+
     </div>
-    
+
     </div>
     <!--右侧结束-->
 	<!-- 多选按钮  开始 -->
@@ -133,22 +133,22 @@
 	  <label><input type="checkbox"/>摄像头</label>
 	</form>
 	<!-- 多选按钮  结束 -->
-	
-    <!-- 点位图例 开始 
+
+    <!-- 点位图例 开始
     <div class="dwtl">
       <p><span class="xqnb"></span>街道路面(在线50个/离线10个)</p>
       <p><span class="jdlm"></span>小区内部(在线50个/离线10个)</p>
     </div>
      点位图例 结束 -->
     <!--底部开始-->
-	
+
     <div class="footer">
       <div class="nav-bottom">
         <div class="nav-bottom-left">
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="handleNavigation('jjyx')">
             <span>经济运行</span>
           </div>
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="handleNavigation('csgl')">
             <span>城市管理</span>
           </div>
           <div class="nav-li-left" @click="handleNavigation('jtzl')">
@@ -169,10 +169,10 @@
           <div class="nav-li-right" @click="handleNavigation('yshj')">
             <span>政务运行</span>
           </div>
-          <div class="nav-li-right on" @click="handleNavigation('sprh')">
+          <div class="nav-li-right on" @click="handleNavigation('aqyj')">
             <span>安全应急</span>
           </div>
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('fwyq')">
             <span>服务一汽</span>
           </div>
         </div>

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

@@ -26,7 +26,7 @@
       </div>
       <!-- 设备tab开始-->
       <div class="facility_tab facility_tab2">
-      
+
           <div class="qkq_tdzy">
             <div class="qkq_tit ">垃圾处理中心</div>
          <div class="scrollbar" style="height: 300px;">
@@ -46,7 +46,7 @@
             </li>
            </ul>
          </div>
-           
+
         </div>
 		  <div class="qkq_tdzy">
 		    <div class="qkq_tit">公共厕所</div>
@@ -66,8 +66,8 @@
 		    </li>
 		   </ul>
 		 </div>
-		  </div>         
-	
+		  </div>
+
       </div>
       <!-- 设备tab结束-->
     </div>
@@ -80,7 +80,7 @@
         <!--        <b>11:16:58</b>-->
       </div>
     <div class="facility_tab facility_tab2">
-    
+
         <div class="qkq_tdzy">
           <div class="qkq_tit ">城管110</div>
        <div class="scrollbar" style="height: 300px;">
@@ -100,7 +100,7 @@
 		   </li>
          </ul>
        </div>
-         
+
       </div>
     		  <div class="qkq_tdzy">
     		    <div class="qkq_tit">施工区域</div>
@@ -120,10 +120,10 @@
     		    </li>
     		   </ul>
     		 </div>
-    		  </div>         
-    	
+    		  </div>
+
     </div>
-    
+
     </div>
     <!--右侧结束-->
 	<!-- 多选按钮  开始 -->
@@ -133,8 +133,8 @@
 	  <label><input type="checkbox"/>摄像头</label>
 	</form>
 	<!-- 多选按钮  结束 -->
-	
-    <!-- 点位图例 开始 
+
+    <!-- 点位图例 开始
     <div class="dwtl">
       <p><span class="xqnb"></span>街道路面(在线50个/离线10个)</p>
       <p><span class="jdlm"></span>小区内部(在线50个/离线10个)</p>
@@ -144,10 +144,10 @@
     <div class="footer">
       <div class="nav-bottom">
         <div class="nav-bottom-left">
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="handleNavigation('jjyx')">
             <span>经济运行</span>
           </div>
-          <div class="nav-li-left">
+          <div class="nav-li-left on" @click="handleNavigation('csgl')">
             <span>城市管理</span>
           </div>
           <div class="nav-li-left" @click="handleNavigation('jtzl')">
@@ -168,7 +168,7 @@
           <div class="nav-li-right" @click="handleNavigation('yshj')">
             <span>政务运行</span>
           </div>
-          <div class="nav-li-right on" @click="handleNavigation('sprh')">
+          <div class="nav-li-right" @click="handleNavigation('sprh')">
             <span>安全应急</span>
           </div>
           <div class="nav-li-right">

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1811 - 1825
zhsq_qk-ui/src/views/fusion/fwyq.vue


+ 5 - 11
zhsq_qk-ui/src/views/fusion/index.vue

@@ -172,20 +172,14 @@
       <!-- <img src="@/assets/images/qkq_mapconbg.png"/> -->
       <img src="@/assets/images/qkq_mapcon.png">
       <div class="qkq_map" style="height: 0;top:-227px">
-        <a>
-          <i><img src="@/assets/images/qkq_icon1.png"/></i>
-          <span>服务一汽</span>
-        </a>
-        <a><i><img src="@/assets/images/qkq_icon2.png"/></i><span>城市管理</span></a>
+        <a @click="handleNavigation('fwyq')"><i><img src="@/assets/images/qkq_icon1.png"/></i><span>服务一汽</span></a>
+        <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><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('sprh')"><i><img src="@/assets/images/qkq_icon7.png"/></i><span>安全应急</span></a>
-        <a><i><img src="@/assets/images/qkq_icon8.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>
     </div>
     <!--中间地图 结束-->

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

@@ -213,10 +213,10 @@
     <div class="footer">
       <div class="nav-bottom">
         <div class="nav-bottom-left">
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="serviceFAW('jjyx')">
             <span>经济运行</span>
           </div>
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="serviceFAW('csgl')">
             <span>城市管理</span>
           </div>
           <div class="nav-li-left" @click="serviceFAW('jtzl')">
@@ -237,10 +237,10 @@
           <div class="nav-li-right" @click="serviceFAW('yshj')">
             <span>政务运行</span>
           </div>
-          <div class="nav-li-right" @click="serviceFAW('sprh')">
+          <div class="nav-li-right" @click="serviceFAW('aqyj')">
             <span>安全应急</span>
           </div>
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="serviceFAW('fwyq')">
             <span>服务一汽</span>
           </div>
         </div>

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

@@ -1,7 +1,7 @@
 <template>
 	<div>
 
-		<!-- 阴影背景 
+		<!-- 阴影背景
     <div class="bj_left"><img src="@/assets/images/sprhbj-left.png"/></div>
     <div class="bj_right"><img src="@/assets/images/sprhbj-right.png"/></div>-->
 		<div class="bj_bottom"><img src="@/assets/images/sprhbj-bottom.png" /></div>
@@ -124,7 +124,7 @@
 					</div>
 				</div>
 			</div>
-		
+
 
 			<!--左侧结束-->
 		</div>
@@ -135,10 +135,10 @@
 		<div class="footer">
 			<div class="nav-bottom">
 				<div class="nav-bottom-left">
-					<div class="nav-li-left">
+					<div class="nav-li-left on" @click="handleNavigation('jjyx')">
 						<span>经济运行</span>
 					</div>
-					<div class="nav-li-left">
+					<div class="nav-li-left" @click="handleNavigation('csgl')">
 						<span>城市管理</span>
 					</div>
 					<div class="nav-li-left" @click="handleNavigation('jtzl')">
@@ -159,10 +159,10 @@
 					<div class="nav-li-right" @click="handleNavigation('yshj')">
 						<span>政务运行</span>
 					</div>
-					<div class="nav-li-right on" @click="handleNavigation('sprh')">
+					<div class="nav-li-right" @click="handleNavigation('aqyj')">
 						<span>安全应急</span>
 					</div>
-					<div class="nav-li-right">
+					<div class="nav-li-right" @click="handleNavigation('fwyq')">
 						<span>服务一汽</span>
 					</div>
 				</div>
@@ -367,9 +367,9 @@
 						})
 					})
 					let maxint = Math.ceil(max / 9.5);
-					//不让最高的值超过最上面的刻度    
+					//不让最高的值超过最上面的刻度
 					let maxval = maxint * 10;
-					//让显示的刻度是整数    
+					//让显示的刻度是整数
 					return maxval;
 				}
 
@@ -634,9 +634,9 @@
 						})
 					})
 					let maxint = Math.ceil(max / 9.5);
-					//不让最高的值超过最上面的刻度    
+					//不让最高的值超过最上面的刻度
 					let maxval = maxint * 10;
-					//让显示的刻度是整数    
+					//让显示的刻度是整数
 					return maxval;
 				}
 
@@ -884,7 +884,7 @@
 			},
 
 			qkq_zjz2_3() {
-				
+
 				var myChart = echarts.init(document.getElementById('qkq_zjz2_3'));
 				let xData = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 				let yData = [25, 100, 50, 45, 75, 25, 100, 50, 45, 75, 25, 100, 50, 45, 75]
@@ -902,9 +902,9 @@
 						})
 					})
 					let maxint = Math.ceil(max / 9.5);
-					//不让最高的值超过最上面的刻度    
+					//不让最高的值超过最上面的刻度
 					let maxval = maxint * 10;
-					//让显示的刻度是整数    
+					//让显示的刻度是整数
 					return maxval;
 				}
 
@@ -1055,7 +1055,7 @@
 					myChart.setOption(option);
 				}
 			},
-			
+
 			qkq_zjz1_4() {
 				//一汽红旗项目服务局
 				var myChart = echarts.init(document.getElementById('qkq_zjz1_4'));
@@ -1069,7 +1069,7 @@
 						value: "100",
 						itemStyle: {
 							color: "#fc465"
-			
+
 						}
 					}
 				];
@@ -1091,7 +1091,7 @@
 						}
 					}
 				}]
-			
+
 				var option = {
 					title: [{
 						text: '工业增加值',
@@ -1146,19 +1146,19 @@
 					}]
 				};
 				myChart.setOption(option, true);
-			
+
 				if (option) {
 					myChart.setOption(option);
 				}
 			},
-			
+
 			qkq_zjz2_4() {
-				
+
 				var myChart = echarts.init(document.getElementById('qkq_zjz2_4'));
 				let xData = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 				let yData = [25, 100, 50, 45, 75, 25, 100, 50, 45, 75, 25, 100, 50, 45, 75]
 				let barData = [25, 60, 50, 45, 75, 25, 60, 50, 45, 75, 25, 60, 50, 45, 75]
-			
+
 				function calMax(arr) {
 					let max = 0;
 					arr.forEach((el) => {
@@ -1171,16 +1171,16 @@
 						})
 					})
 					let maxint = Math.ceil(max / 9.5);
-					//不让最高的值超过最上面的刻度    
+					//不让最高的值超过最上面的刻度
 					let maxval = maxint * 10;
-					//让显示的刻度是整数    
+					//让显示的刻度是整数
 					return maxval;
 				}
-			
-			
+
+
 				var max = Math.ceil(calMax([yData]) / 50) * 50;
 				var max1 = Math.ceil(calMax([barData]) / 50) * 50;
-			
+
 				var option = {
 					legend: {
 						left: '1%',
@@ -1337,7 +1337,7 @@
 						value: "100",
 						itemStyle: {
 							color: "#fc465"
-			
+
 						}
 					}
 				];
@@ -1359,7 +1359,7 @@
 						}
 					}
 				}]
-			
+
 				var option = {
 					title: [{
 						text: '工业增加值',
@@ -1414,19 +1414,19 @@
 					}]
 				};
 				myChart.setOption(option, true);
-			
+
 				if (option) {
 					myChart.setOption(option);
 				}
 			},
-			
+
 			qkq_zjz2_5() {
-				
+
 				var myChart = echarts.init(document.getElementById('qkq_zjz2_5'));
 				let xData = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 				let yData = [25, 100, 50, 45, 75, 25, 100, 50, 45, 75, 25, 100, 50, 45, 75]
 				let barData = [25, 60, 50, 45, 75, 25, 60, 50, 45, 75, 25, 60, 50, 45, 75]
-			
+
 				function calMax(arr) {
 					let max = 0;
 					arr.forEach((el) => {
@@ -1439,16 +1439,16 @@
 						})
 					})
 					let maxint = Math.ceil(max / 9.5);
-					//不让最高的值超过最上面的刻度    
+					//不让最高的值超过最上面的刻度
 					let maxval = maxint * 10;
-					//让显示的刻度是整数    
+					//让显示的刻度是整数
 					return maxval;
 				}
-			
-			
+
+
 				var max = Math.ceil(calMax([yData]) / 50) * 50;
 				var max1 = Math.ceil(calMax([barData]) / 50) * 50;
-			
+
 				var option = {
 					legend: {
 						left: '1%',
@@ -1605,7 +1605,7 @@
 						value: "100",
 						itemStyle: {
 							color: "#fc465"
-			
+
 						}
 					}
 				];
@@ -1627,7 +1627,7 @@
 						}
 					}
 				}]
-			
+
 				var option = {
 					title: [{
 						text: '工业增加值',
@@ -1682,19 +1682,19 @@
 					}]
 				};
 				myChart.setOption(option, true);
-			
+
 				if (option) {
 					myChart.setOption(option);
 				}
 			},
-			
+
 			qkq_zjz2_6() {
-				
+
 				var myChart = echarts.init(document.getElementById('qkq_zjz2_6'));
 				let xData = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 				let yData = [25, 100, 50, 45, 75, 25, 100, 50, 45, 75, 25, 100, 50, 45, 75]
 				let barData = [25, 60, 50, 45, 75, 25, 60, 50, 45, 75, 25, 60, 50, 45, 75]
-			
+
 				function calMax(arr) {
 					let max = 0;
 					arr.forEach((el) => {
@@ -1707,16 +1707,16 @@
 						})
 					})
 					let maxint = Math.ceil(max / 9.5);
-					//不让最高的值超过最上面的刻度    
+					//不让最高的值超过最上面的刻度
 					let maxval = maxint * 10;
-					//让显示的刻度是整数    
+					//让显示的刻度是整数
 					return maxval;
 				}
-			
-			
+
+
 				var max = Math.ceil(calMax([yData]) / 50) * 50;
 				var max1 = Math.ceil(calMax([barData]) / 50) * 50;
-			
+
 				var option = {
 					legend: {
 						left: '1%',
@@ -1963,7 +1963,7 @@
 			            axisTick: {
 			                show: false,
 			            },
-			
+
 			            axisLabel: {
 			                interval: 0,
 			                shadowOffsetX: '-20px',
@@ -2064,7 +2064,7 @@
 				myChart.setOption(option);
 				}
 			},
-			
+
 			getCurrentTime() {
 				const now = new Date();
 				const year = now.getFullYear();
@@ -2088,7 +2088,7 @@
 
 
 
-		
+
 		}
 	};
 
@@ -2132,4 +2132,4 @@
 
 <style>
 	/* 添加你的CSS样式 */
-</style>
+</style>

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

@@ -137,10 +137,10 @@
     <div class="footer">
       <div class="nav-bottom">
         <div class="nav-bottom-left">
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="handleNavigation('jjyx')">
             <span>经济运行</span>
           </div>
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="handleNavigation('csgl')">
             <span>城市管理</span>
           </div>
           <div class="nav-li-left on" @click="handleNavigation('jtzl')">
@@ -161,10 +161,10 @@
           <div class="nav-li-right" @click="handleNavigation('yshj')">
             <span>政务运行</span>
           </div>
-          <div class="nav-li-right" @click="handleNavigation('sprh')">
+          <div class="nav-li-right" @click="handleNavigation('aqyj')">
             <span>安全应急</span>
           </div>
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('fwyq')">
             <span>服务一汽</span>
           </div>
         </div>

+ 4 - 4
zhsq_qk-ui/src/views/fusion/sprh.vue

@@ -136,10 +136,10 @@
     <div class="footer">
       <div class="nav-bottom">
         <div class="nav-bottom-left">
-          <div class="nav-li-left">
+          <div class="nav-li-left"  @click="handleNavigation('jjyx')">
             <span>经济运行</span>
           </div>
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="handleNavigation('csgl')">
             <span>城市管理</span>
           </div>
           <div class="nav-li-left" @click="handleNavigation('jtzl')">
@@ -160,10 +160,10 @@
           <div class="nav-li-right" @click="handleNavigation('yshj')">
             <span>政务运行</span>
           </div>
-          <div class="nav-li-right on" @click="handleNavigation('sprh')">
+          <div class="nav-li-right on" @click="handleNavigation('aqyj')">
             <span>安全应急</span>
           </div>
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="handleNavigation('fwyq')">
             <span>服务一汽</span>
           </div>
         </div>

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

@@ -140,10 +140,10 @@
     <div class="footer">
       <div class="nav-bottom">
         <div class="nav-bottom-left">
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="serviceFAW('jjyx')">
             <span>经济运行</span>
           </div>
-          <div class="nav-li-left">
+          <div class="nav-li-left" @click="serviceFAW('csgl')">
             <span>城市管理</span>
           </div>
           <div class="nav-li-left" @click="serviceFAW('jtzl')">
@@ -161,13 +161,13 @@
           <div class="nav-li-right">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right on">
+          <div class="nav-li-right on" @click="serviceFAW('yshj')">
             <span>政务运行</span>
           </div>
-          <div class="nav-li-right " @click="serviceFAW('sprh')">
+          <div class="nav-li-right" @click="serviceFAW('aqyj')">
             <span>安全应急</span>
           </div>
-          <div class="nav-li-right">
+          <div class="nav-li-right" @click="serviceFAW('fwyq')">
             <span>服务一汽</span>
           </div>
         </div>