Merge branch 'sl' of http://61.161.152.110:10101/r/electronic-map into yx

src/router/index.js

@@ -67,201 +67,13 @@ const routes = [{
 	}, {
 		path: 'info/:wpId/:wtId', // 单机状态监视
 		component: () =>
-			import( /* webpackChunkName: "windsite" */ '../views/WindSite/WindSite.vue'),
-		children: [{
-			path: 'home/:wpId', // 场站监视
-			component: () =>
-				import( /* webpackChunkName: "windsitehome" */ '../views/WindSite/pages/Home/Home.vue'),
-		}, {
-			path: 'draughtfanlist/:wpId', // 风机列表
-			component: () =>
-				import( /* webpackChunkName: "windsitedraughtfanlist" */
-					'../views/WindSite/pages/DraughtFanList.vue'),
-		}, {
-			path: 'matrix/:wpId', // 风场矩阵
-			component: () =>
-				import( /* webpackChunkName: "windsitematrix" */ '../views/WindSite/pages/Matrix.vue'),
-		}, {
-			path: 'lightmatrix/:wpId',
-			component: () =>
-				import( /* webpackChunkName: "windsitelightmatrix" */
-					'../views/WindSite/pages/LightMatrix.vue'),
-		}, {
-			path: 'box/:wpId',
-			component: () =>
-				import( /* webpackChunkName: "windsitebox" */ '../views/WindSite/pages/Box.vue'),
-		}, {
-			path: 'tower/:wpId', // 测风塔
-			component: () =>
-				import( /* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Tower.vue'),
-		}, {
-			path: 'inverter-info/:wpId/:wtId',
-			component: () =>
-				import( /* webpackChunkName: "inverter-info" */
-					'../views/WindSite/pages/Inverter-Info.vue'),
-		}, {
-			path: 'map/:wpId',
-			component: () =>
-				import( /* webpackChunkName: "windsitemap" */ '../views/WindSite/pages/Map.vue'),
-		}, {
-			path: 'map1/:wpId',
-			component: () =>
-				import( /* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
-		}, {
-			path: '/decision/decision1', //风机绩效榜
-			name: 'decision1',
-			component: () => import( /* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
-		},
-		{
-			path: '/decision/decision1Mx', //风机绩效榜明细
-			name: 'decision1Mx',
-			component: () => import( /* webpackChunkName: "decision1Mx" */
-				'../views/Decision/Decision1Mx.vue'),
-		},
-
-		{
-			path: '/decision/decision2', //五项损失率
-			name: 'decision2',
-			component: () => import( /* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
-		},
-		{
-			path: '/decision/decision2Cndb', //场内对标
-			name: 'decision2Cndb',
-			component: () => import( /* webpackChunkName: "decision2Cndb" */
-				'../views/Decision/Decision2Cndb.vue'),
-		},
-		{
-			path: '/decision/decision2Cjdb', //场际对标
-			name: 'decision2Cjdb',
-			component: () => import( /* webpackChunkName: "decision2Cjdb" */
-				'../views/Decision/Decision2Cjdb.vue'),
-		},
-		{
-			path: '/decision/decision2Xmdb', //项目对标
-			name: 'decision2Xmdb',
-			component: () => import( /* webpackChunkName: "decision2Xmdb" */
-				'../views/Decision/Decision2Xmdb.vue'),
-		},
-		{
-			path: '/decision/decision2Xldb', //线路对标
-			name: 'decision2Xldb',
-			component: () => import( /* webpackChunkName: "decision2Xldb" */
-				'../views/Decision/Decision2Xldb.vue'),
-		},
-		{
-			path: '/decision/decision3', //性能对标
-			name: 'decision3',
-			component: () => import( /* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
-		},
-		{
-			path: '/decision/decision3db', //单机横向对比
-			name: 'decision3db',
-			component: () => import( /* webpackChunkName: "decision3db" */
-				'../views/Decision/Decision3Db.vue'),
-		},
-		{
-			path: '/decision/decision4', //值际对标
-			name: 'decision4',
-			component: () => import( /* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
-		},
-		{
-			path: '/decision/decision4czzl', //操作指令统计
-			name: 'decision4czzl',
-			component: () => import( /* webpackChunkName: "decision4czzl" */
-				'../views/Decision/Decision4Czzl.vue'),
-		},
-		{
-			path: '/health',
-			name: 'health',
-			component: () => import('../views/HealthControl/Health.vue'),
-		},
-		{
-			path: '/health/health1',
-			name: 'health1',
-			component: () => import('../views/HealthControl/Health1.vue'),
-		},
-		{
-			path: '/health/health2', // 健康管理首页
-			name: 'health2',
-			component: () => import('../views/HealthControl/Health2.vue'),
-		},
-		{
-			path: '/health/health3/:wpId', // 场站健康管理
-			name: 'health3',
-			component: () => import('../views/HealthControl/Health3.vue'),
-		},
-		{
-			path: '/health/health4',
-			name: 'health4',
-			children: [{
-				path: 'healthLineChart/:wtId', // 风机健康趋势
-				component: () => import( /* webpackChunkName: "healthLineChart" */
-					'../views/HealthControl/healthLineChart.vue'),
-			},
-			{
-				path: 'healthLineChart2/:wtId', // 健康趋势
-				component: () => import( /* webpackChunkName: "healthLineChart2" */
-					'../views/HealthControl/healthLineChart2.vue'),
-			}
-			],
-			component: () => import('../views/HealthControl/Health4.vue'),
-		},
-		{
-			path: '/health/health5/',
-			name: 'health5',
-			component: () => import('../views/HealthControl/Health5.vue'),
-		},
-		{
-			path: '/health/health6', // 健康总览
-			name: 'health6',
-			component: () => import('../views/HealthControl/Health6.vue'),
-		},
-		{
-			path: '/cutAnalyse', // 切入切出分析
-			name: 'cutAnalyse',
-			component: () => import('../views/cutAnalyse/index.vue'),
-		},
-		{
-			path: '/cutAnalyse', // 切入切出分析
-			name: 'cutAnalyse',
-			component: () => import('../views/cutAnalyse/index.vue'),
-		},
-		{
-			path: '/wtSaturability', // 单机饱和度
-			name: 'wtSaturability',
-			component: () => import('../views/wtSaturability/index.vue'),
-		},
-		{
-			path: '/windAnalysis', // 风资源分析
-			name: 'windAnalysis',
-			component: () => import('../views/windAnalysis/index.vue'),
-		},
-		{
-			path: '/windAnalysis/fx', // 风向
-			name: 'fxzstmain',
-			component: () => import('../views/windAnalysis/fxzstmain.vue'),
-		},
-		{
-			path: 'boosterstation/:wpId', // 升压站
-			component: () =>
-				import( /* webpackChunkName: "boosterstation" */
-					'../views/WindSite/pages/BoosterStation.vue'),
-		},
-		{
-			path: "generalappearance/:wpId", // 总样貌
-			component: () =>
-				import( /* webpackChunkName: "generalappearance" */
-					"../views/WindSite/pages/GeneralAppearance.vue"),
-		},
-		]
-	},
-	{
-		path: '/monitor/lightmatrix', // 光伏明细矩阵
-		name: 'LightMatrix',
+			import( /* webpackChunkName: "info" */ '../views/WindSite/pages/Info/Info.vue'),
+	}, {
+		path: 'tower/:wpId', // 测风塔
 		component: () =>
 			import( /* webpackChunkName: "windsitetower" */ '../views/WindSite/pages/Tower.vue'),
 	}, {
-		path: 'inverter-info/:wpId',
+		path: 'inverter-info/:wpId/:wtId',
 		component: () =>
 			import( /* webpackChunkName: "inverter-info" */
 				'../views/WindSite/pages/Inverter-Info.vue'),
@@ -273,51 +85,6 @@ const routes = [{
 		path: 'map1/:wpId',
 		component: () =>
 			import( /* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
-	}, {
-		path: '/decision/decision1', //风机绩效榜
-		name: 'decision1',
-		component: () => import( /* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
-	},
-	{
-		path: '/decision/decision1Mx', //风机绩效榜明细
-		name: 'decision1Mx',
-		component: () => import( /* webpackChunkName: "decision1Mx" */
-			'../views/Decision/Decision1Mx.vue'),
-	},
-
-	{
-		path: '/decision/decision2', //五项损失率
-		name: 'decision2',
-		component: () => import( /* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
-	},
-	{
-		path: '/decision/decision2Cndb', //场内对标
-		name: 'decision2Cndb',
-		component: () => import( /* webpackChunkName: "decision2Cndb" */
-			'../views/Decision/Decision2Cndb.vue'),
-	},
-	{
-		path: '/decision/decision2Cjdb', //场际对标
-		name: 'decision2Cjdb',
-		component: () => import( /* webpackChunkName: "decision2Cjdb" */
-			'../views/Decision/Decision2Cjdb.vue'),
-	},
-	{
-		path: '/decision/decision2Xmdb', //项目对标
-		name: 'decision2Xmdb',
-		component: () => import( /* webpackChunkName: "decision2Xmdb" */
-			'../views/Decision/Decision2Xmdb.vue'),
-	},
-	{
-		path: '/decision/decision2Xldb', //线路对标
-		name: 'decision2Xldb',
-		component: () => import( /* webpackChunkName: "decision2Xldb" */
-			'../views/Decision/Decision2Xldb.vue'),
-	},
-	{
-		path: '/decision/decision3', //性能对标
-		name: 'decision3',
-		component: () => import( /* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
 	},
 	{
 		path: '/decision/decision3db', //单机横向对比
@@ -326,83 +93,6 @@ const routes = [{
 			'../views/Decision/Decision3Db.vue'),
 	},
 	{
-		path: '/decision/decision4', //值际对标
-		name: 'decision4',
-		component: () => import( /* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
-	},
-	{
-		path: '/decision/decision4czzl', //操作指令统计
-		name: 'decision4czzl',
-		component: () => import( /* webpackChunkName: "decision4czzl" */
-			'../views/Decision/Decision4Czzl.vue'),
-	},
-	{
-		path: '/health',
-		name: 'health',
-		component: () => import('../views/HealthControl/Health.vue'),
-	},
-	{
-		path: '/health/health1',
-		name: 'health1',
-		component: () => import('../views/HealthControl/Health1.vue'),
-	},
-	{
-		path: '/health/health2', // 健康管理首页
-		name: 'health2',
-		component: () => import('../views/HealthControl/Health2.vue'),
-	},
-	{
-		path: '/health/health3/:wpId', // 场站健康管理
-		name: 'health3',
-		component: () => import('../views/HealthControl/Health3.vue'),
-	},
-	{
-		path: '/health/health4',
-		name: 'health4',
-		children: [{
-			path: 'healthLineChart/:wtId', // 风机健康趋势
-			component: () => import( /* webpackChunkName: "healthLineChart" */
-				'../views/HealthControl/healthLineChart.vue'),
-		},
-		{
-			path: 'healthLineChart2/:wtId', // 健康趋势
-			component: () => import( /* webpackChunkName: "healthLineChart2" */
-				'../views/HealthControl/healthLineChart2.vue'),
-		}
-		],
-		component: () => import('../views/HealthControl/Health4.vue'),
-	},
-	{
-		path: '/health/health5/',
-		name: 'health5',
-		component: () => import('../views/HealthControl/Health5.vue'),
-	},
-	{
-		path: '/health/health6', // 健康总览
-		name: 'health6',
-		component: () => import('../views/HealthControl/Health6.vue'),
-	},
-	{
-		path: '/cutAnalyse', // 切入切出分析
-		name: 'cutAnalyse',
-		component: () => import('../views/cutAnalyse/index.vue'),
-	},
-	{
-		path: '/cutAnalyse', // 切入切出分析
-		name: 'cutAnalyse',
-		component: () => import('../views/cutAnalyse/index.vue'),
-	},
-	{
-		path: '/wtSaturability', // 单机饱和度
-		name: 'wtSaturability',
-		component: () => import('../views/wtSaturability/index.vue'),
-	},
-	{
-		path: '/windAnalysis', // 风资源分析
-		name: 'windAnalysis',
-		component: () => import('../views/windAnalysis/index.vue'),
-	},
-	{
 		path: '/windAnalysis/fx', // 风向
 		name: 'fxzstmain',
 		component: () => import('../views/windAnalysis/fxzstmain.vue'),
@@ -932,11 +622,143 @@ const routes = [{
 	path: "/powerCurve", // 功率曲线拟合
 	name: "powerCurve",
 	component: () => import(/* webpackChunkName: "powerCurve" */ "../views/powerCurve/index.vue"),
+},{
+	path: "/tjfx",
+	name: "tjfx",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/tjfx.vue"),
+},
+{
+	path: "/bdzcx",
+	name: "bdzcx",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/bdzcx.vue"),
 },
 {
-	path: "/malfunctionRecall", // 故障回溯
-	name: "malfunctionRecall",
-	component: () => import(/* webpackChunkName: "powerCurve" */ "../views/malfunctionRecall/index.vue"),
+	path: "/oafd",
+	name: "oafd",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/oafd.vue"),
+},
+{
+	path: "/oagf",
+	name: "oagf",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/oagf.vue"),
+},
+{
+	path: "/missfdrb",
+	name: "missfdrb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/missfdrb.vue"),
+},
+{
+	path: "/missgfrb",
+	name: "missgfrb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/missgfrb.vue"),
+},
+{
+	path: "/xnyfdscyb",
+	name: "xnyfdscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/xnyfdscyb.vue"),
+},
+{
+	path: "/mhsscyb",
+	name: "mhsscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/mhsscyb.vue"),
+},
+{
+	path: "/nssscyb",
+	name: "nssscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/nssscyb.vue"),
+},
+{
+	path: "/qsscyb",
+	name: "qsscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/qsscyb.vue"),
+},
+{
+	path: "/sbqscyb",
+	name: "sbqscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/sbqscyb.vue"),
+},
+{
+	path: "/xsscyb",
+	name: "xsscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/xsscyb.vue"),
+},
+{
+	path: "/xnygfscyb",
+	name: "xnygfscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/xnygfscyb.vue"),
+},
+{
+	path: "/dwkscyb",
+	name: "dwkscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/dwkscyb.vue"),
+},
+{
+	path: "/plscyb",
+	name: "plscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/plscyb.vue"),
+},
+{
+	path: "/xhscyb",
+	name: "xhscyb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/xhscyb.vue"),
+},
+{
+	path: "/fdczzdy",
+	name: "fdczzdy",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/fdczzdy.vue"),
+},
+{
+	path: "/fdxmzdy",
+	name: "fdxmzdy",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/fdxmzdy.vue"),
+},
+{
+	path: "/gfczzdy",
+	name: "gfczzdy",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/gfczzdy.vue"),
+},
+{
+	path: "/gfxmzdy",
+	name: "gfxmzdy",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/gfxmzdy.vue"),
+},
+{
+	path: "/xnyrb",
+	name: "xnyrb",
+	component: () =>
+			import ( /* webpackChunkName: "historysearch" */ "../views/report/xnyrb.vue"),
+},
+{
+		path: "/warnStatistics", // 预警评判分析
+		name: "warnStatistics",
+		component: () =>
+				import ( /* webpackChunkName: "warnStatistics" */ "../views/warnStatistics/index.vue"),
+},
+{
+		path: "/malfunctionStatistics", // 故障评判分析
+		name: "malfunctionStatistics",
+		component: () =>
+				import ( /* webpackChunkName: "malfunctionStatistics" */ "../views/malfunctionStatistics/index.vue"),
 },
 ]
 const router = createRouter({

src/views/HealthControl/Health0.vue

@@ -268,7 +268,7 @@ export default {
           },
           {
             name: "时间",
-            field: "time",
+            field: "name",
             width: "130px",
             is_num: false,
             is_light: false,
@@ -324,7 +324,7 @@ export default {
           },
           {
             name: "时间",
-            field: "time",
+            field: "name",
             width: "130px",
             is_num: false,
             is_light: false,
@@ -511,7 +511,7 @@ export default {
             is_light: false,
           },
           {
-            name: "时间",
+            name: "温度范围",
             field: "name",
             width: "130px",
             is_num: false,

src/views/Home/Home.vue

@@ -161,12 +161,12 @@
             <tr class="">
               <td class="text gray">MTBF(日)</td>
               <td class="value green">{{jczbmap.mtbf}}</td>
-              <td class="unit gray"></td>
+              <td class="unit gray">小时</td>
             </tr>
             <tr class="">
               <td class="text gray">MTTR(日)</td>
               <td class="value green">{{jczbmap.mttr}}</td>
-              <td class="unit gray"></td>
+              <td class="unit gray">小时</td>
             </tr>
           </table>
         </com-panel>

src/views/WindSite/components/boosterstation/nss.vue

@@ -5,6 +5,7 @@
         <previewPicture>
           <template v-slot:svg>
             <svg
+			  class="svg"
               xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
               version="1.1"

src/views/WindSite/components/boosterstation/previewPicture.vue

@@ -95,8 +95,8 @@ export default {
       imgIndex: 0,
       isChange: true,
       // 图片显示默认大小
-      width: "1400px",
-      height: "800px",
+      width: "1600px",
+      height: "1000px",
       // 可缩小倍数,为空则可无限缩小
       minification: 3,
       // 可放大倍数 为空则可无限放大
@@ -365,7 +365,7 @@ export default {
           let height = e.path[2].offsetHeight;
           // 这里判断第一次获取不到style 样式 默认为 居中50%
           if (oDragObj.style.top == "") {
-            nTY = parseInt((50 * height) / 100 + 0);
+            nTY = 0;
             nTX = parseInt((50 * width) / 100 + 0);
           } else {
             nTY = parseInt(oDragObj.style.top + 0);
@@ -642,7 +642,7 @@ export default {
 <style lang="less" scoped>
 .pop-up-main {
   width: 100%;
-  height: calc(100vh - 32vh);
+  height: calc(100vh - 12vh);
   overflow-y: hidden;
 
   .paln-box {
@@ -654,7 +654,7 @@ export default {
       position: absolute;
       // top: 75%;
       left: 50%;
-      transform: translate(-50%, -10%);
+      transform: translate(-50%, 0%);
 
       img,
       .svg {

src/views/WindSite/pages/DraughtFanList.vue

@@ -342,7 +342,6 @@ export default {
     async requestDataGDC(showLoading){
       let res = await  this.API.requestData({
         showLoading,
-        baseURL: "http://127.0.0.1:8082/",
         method: "POST",
         subUrl: "monitorinverter/findInverterInfoList",
         data: {

src/views/layout/Menu.vue

@@ -165,7 +165,7 @@ export default {
                 {
                   text: "功率曲线拟合",
                   icon: "svg-wind-site",
-                  path: "/nxfx1",
+                  path: "/powerCurve",
                 },
                 {
                   text: "偏航对风分析",

src/views/warn/xdgl.vue

@@ -58,42 +58,49 @@ export default {
           {
             name: "编号",
             field: "id",
+             width: "50px",
             is_num: true,
             is_light: false,
           },
           {
             name: "限电时刻",
             field: "stopTime",
+              width: "150px",
             is_num: false,
             is_light: false,
           },
           {
             name: "恢复时刻",
             field: "startTime",
+             width: "150px",
             is_num: false,
             is_light: false,
           },
           {
             name: "停机类型",
             field: "stopTypeId",
+             width: "150px",
             is_num: false,
             is_light: false,
           },
           {
             name: "限电时间",
             field: "stopHours",
+             width: "150px",
             is_num: false,
             is_light: false,
           },
           {
             name: "损失电量(kWh)",
             field: "lossPower",
+             width: "150px",
             is_num: false,
             is_light: false,
           },
           {
             name: "限电原因",
             field: "description",
+             width: "200px",
             is_num: false,
             is_light: false,
           },