Update - 隐患列表接口优化

src/api/tableInfo.js

@@ -67,7 +67,7 @@ export function getEnterpriseList(param) {
  */
 export function getHeatingList(param) {
   return request({
-    url: '/sooka-digital-construction/heatingView/getHeatingInspectionTaskList',
+    url: '/sooka-digital-construction/hiddenDanger/list',
     method: 'get',
     params:param
   })
@@ -472,4 +472,4 @@ export function getRiskRegisterList(industry) {
     url: `/sooka-digital-construction/api/platformRiskRegister/getRiskRegisterList?industry=${industry}`,
     method: 'get'
   })
-}
+}

src/components/DetailDialog/eventDetail.vue

@@ -360,7 +360,7 @@ export default {
       const chartDom = this.$refs.divOption
       const myChart = echarts.init(chartDom)
       var xData = resData.categories
-      var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+      var color = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#96CEB4', '#FFEAA7', '#DDA0DD', '#98D8C8', '#F7DC6F', '#BB8FCE', '#85C1E2', '#F8B739', '#52B788', '#FF6F61']
 
       var name = []
       var data = []
@@ -447,6 +447,69 @@ export default {
             let result = params[0].name + '<br/>'
             params.forEach(param => {
               switch (param.seriesName) {
+                case '倾角':
+                  result += param.seriesName + ': ' + param.value + 'rad<br/>'
+                  break
+                case '位移':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '裂缝宽度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '静应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '索力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '动应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '挠度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '支座反力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '交通流量':
+                  result += param.seriesName + ': ' + param.value + '辆/小时<br/>'
+                  break
+                case '车辆荷载':
+                  result += param.seriesName + ': ' + param.value + 'ton<br/>'
+                  break
+                case '湿度':
+                  result += param.seriesName + ': ' + param.value + '%<br/>'
+                  break
+                case '风速':
+                  result += param.seriesName + ': ' + param.value + 'km/h<br/>'
+                  break
+                case '水质':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
+                case '水位':
+                  result += param.seriesName + ': ' + param.value + 'cm<br/>'
+                  break
+                case '排放量':
+                  result += param.seriesName + ': ' + param.value + 'm³<br/>'
+                  break
+                case '压力':
+                  result += param.seriesName + ': ' + param.value + 'Pa<br/>'
+                  break
+                case '漏水声波':
+                  result += param.seriesName + ': ' + param.value + 'dB<br/>'
+                  break
+                case 'PH值':
+                  result += param.seriesName + ': ' + param.value + 'ph<br/>'
+                  break
+                case '温度':
+                  result += param.seriesName + ': ' + param.value + '℃<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'NTU<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
                 case '一次网供水压力':
                   result += param.seriesName + ': ' + param.value + 'MPa<br/>'
                   break
@@ -514,7 +577,6 @@ export default {
           data: xData
         }],
         yAxis: [{
-          name: '℃',
           type: 'value',
           axisTick: {
             show: false
@@ -540,7 +602,6 @@ export default {
           }
         },
           {
-            name: 'MPa',
             type: 'value',
             axisTick: {
               show: false
@@ -978,7 +1039,7 @@ export default {
 
           .div_Option {
             width: 96%;
-            height: 16vh;
+            height: 22vh;
           }
         }
 

src/components/DetailDialog/eventDetail_ThermalPower.vue

@@ -360,7 +360,7 @@ export default {
       const chartDom = this.$refs.divOption
       const myChart = echarts.init(chartDom)
       var xData = resData.categories
-      var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+      var color = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#96CEB4', '#FFEAA7', '#DDA0DD', '#98D8C8', '#F7DC6F', '#BB8FCE', '#85C1E2', '#F8B739', '#52B788', '#FF6F61']
 
       var name = []
       var data = []
@@ -447,6 +447,69 @@ export default {
             let result = params[0].name + '<br/>'
             params.forEach(param => {
               switch (param.seriesName) {
+                case '倾角':
+                  result += param.seriesName + ': ' + param.value + 'rad<br/>'
+                  break
+                case '位移':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '裂缝宽度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '静应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '索力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '动应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '挠度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '支座反力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '交通流量':
+                  result += param.seriesName + ': ' + param.value + '辆/小时<br/>'
+                  break
+                case '车辆荷载':
+                  result += param.seriesName + ': ' + param.value + 'ton<br/>'
+                  break
+                case '湿度':
+                  result += param.seriesName + ': ' + param.value + '%<br/>'
+                  break
+                case '风速':
+                  result += param.seriesName + ': ' + param.value + 'km/h<br/>'
+                  break
+                case '水质':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
+                case '水位':
+                  result += param.seriesName + ': ' + param.value + 'cm<br/>'
+                  break
+                case '排放量':
+                  result += param.seriesName + ': ' + param.value + 'm³<br/>'
+                  break
+                case '压力':
+                  result += param.seriesName + ': ' + param.value + 'Pa<br/>'
+                  break
+                case '漏水声波':
+                  result += param.seriesName + ': ' + param.value + 'dB<br/>'
+                  break
+                case 'PH值':
+                  result += param.seriesName + ': ' + param.value + 'ph<br/>'
+                  break
+                case '温度':
+                  result += param.seriesName + ': ' + param.value + '℃<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'NTU<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
                 case '一次网供水压力':
                   result += param.seriesName + ': ' + param.value + 'MPa<br/>'
                   break
@@ -514,7 +577,6 @@ export default {
           data: xData
         }],
         yAxis: [{
-          name: '℃',
           type: 'value',
           axisTick: {
             show: false
@@ -540,7 +602,6 @@ export default {
           }
         },
           {
-            name: 'MPa',
             type: 'value',
             axisTick: {
               show: false

src/components/DetailDialog/eventDetail_UtilityTunnel.vue

@@ -360,7 +360,7 @@ export default {
       const chartDom = this.$refs.divOption
       const myChart = echarts.init(chartDom)
       var xData = resData.categories
-      var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+      var color = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#96CEB4', '#FFEAA7', '#DDA0DD', '#98D8C8', '#F7DC6F', '#BB8FCE', '#85C1E2', '#F8B739', '#52B788', '#FF6F61']
 
       var name = []
       var data = []
@@ -447,6 +447,69 @@ export default {
             let result = params[0].name + '<br/>'
             params.forEach(param => {
               switch (param.seriesName) {
+                case '倾角':
+                  result += param.seriesName + ': ' + param.value + 'rad<br/>'
+                  break
+                case '位移':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '裂缝宽度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '静应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '索力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '动应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '挠度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '支座反力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '交通流量':
+                  result += param.seriesName + ': ' + param.value + '辆/小时<br/>'
+                  break
+                case '车辆荷载':
+                  result += param.seriesName + ': ' + param.value + 'ton<br/>'
+                  break
+                case '湿度':
+                  result += param.seriesName + ': ' + param.value + '%<br/>'
+                  break
+                case '风速':
+                  result += param.seriesName + ': ' + param.value + 'km/h<br/>'
+                  break
+                case '水质':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
+                case '水位':
+                  result += param.seriesName + ': ' + param.value + 'cm<br/>'
+                  break
+                case '排放量':
+                  result += param.seriesName + ': ' + param.value + 'm³<br/>'
+                  break
+                case '压力':
+                  result += param.seriesName + ': ' + param.value + 'Pa<br/>'
+                  break
+                case '漏水声波':
+                  result += param.seriesName + ': ' + param.value + 'dB<br/>'
+                  break
+                case 'PH值':
+                  result += param.seriesName + ': ' + param.value + 'ph<br/>'
+                  break
+                case '温度':
+                  result += param.seriesName + ': ' + param.value + '℃<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'NTU<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
                 case '一次网供水压力':
                   result += param.seriesName + ': ' + param.value + 'MPa<br/>'
                   break
@@ -514,7 +577,6 @@ export default {
           data: xData
         }],
         yAxis: [{
-          name: '℃',
           type: 'value',
           axisTick: {
             show: false
@@ -540,7 +602,6 @@ export default {
           }
         },
           {
-            name: 'MPa',
             type: 'value',
             axisTick: {
               show: false

src/components/DetailDialog/eventDetail_lookall.vue

@@ -360,7 +360,7 @@ export default {
       const chartDom = this.$refs.divOption
       const myChart = echarts.init(chartDom)
       var xData = resData.categories
-      var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+      var color = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#96CEB4', '#FFEAA7', '#DDA0DD', '#98D8C8', '#F7DC6F', '#BB8FCE', '#85C1E2', '#F8B739', '#52B788', '#FF6F61']
 
       var name = []
       var data = []
@@ -447,6 +447,69 @@ export default {
             let result = params[0].name + '<br/>'
             params.forEach(param => {
               switch (param.seriesName) {
+                case '倾角':
+                  result += param.seriesName + ': ' + param.value + 'rad<br/>'
+                  break
+                case '位移':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '裂缝宽度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '静应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '索力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '动应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '挠度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '支座反力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '交通流量':
+                  result += param.seriesName + ': ' + param.value + '辆/小时<br/>'
+                  break
+                case '车辆荷载':
+                  result += param.seriesName + ': ' + param.value + 'ton<br/>'
+                  break
+                case '湿度':
+                  result += param.seriesName + ': ' + param.value + '%<br/>'
+                  break
+                case '风速':
+                  result += param.seriesName + ': ' + param.value + 'km/h<br/>'
+                  break
+                case '水质':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
+                case '水位':
+                  result += param.seriesName + ': ' + param.value + 'cm<br/>'
+                  break
+                case '排放量':
+                  result += param.seriesName + ': ' + param.value + 'm³<br/>'
+                  break
+                case '压力':
+                  result += param.seriesName + ': ' + param.value + 'Pa<br/>'
+                  break
+                case '漏水声波':
+                  result += param.seriesName + ': ' + param.value + 'dB<br/>'
+                  break
+                case 'PH值':
+                  result += param.seriesName + ': ' + param.value + 'ph<br/>'
+                  break
+                case '温度':
+                  result += param.seriesName + ': ' + param.value + '℃<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'NTU<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
                 case '一次网供水压力':
                   result += param.seriesName + ': ' + param.value + 'MPa<br/>'
                   break
@@ -514,7 +577,6 @@ export default {
           data: xData
         }],
         yAxis: [{
-          name: '℃',
           type: 'value',
           axisTick: {
             show: false
@@ -540,7 +602,6 @@ export default {
           }
         },
           {
-            name: 'MPa',
             type: 'value',
             axisTick: {
               show: false

src/components/DetailDialog/eventDetail_paishui.vue

@@ -360,7 +360,7 @@ export default {
       const chartDom = this.$refs.divOption
       const myChart = echarts.init(chartDom)
       var xData = resData.categories
-      var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+      var color = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#96CEB4', '#FFEAA7', '#DDA0DD', '#98D8C8', '#F7DC6F', '#BB8FCE', '#85C1E2', '#F8B739', '#52B788', '#FF6F61']
 
       var name = []
       var data = []
@@ -447,6 +447,69 @@ export default {
             let result = params[0].name + '<br/>'
             params.forEach(param => {
               switch (param.seriesName) {
+                case '倾角':
+                  result += param.seriesName + ': ' + param.value + 'rad<br/>'
+                  break
+                case '位移':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '裂缝宽度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '静应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '索力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '动应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '挠度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '支座反力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '交通流量':
+                  result += param.seriesName + ': ' + param.value + '辆/小时<br/>'
+                  break
+                case '车辆荷载':
+                  result += param.seriesName + ': ' + param.value + 'ton<br/>'
+                  break
+                case '湿度':
+                  result += param.seriesName + ': ' + param.value + '%<br/>'
+                  break
+                case '风速':
+                  result += param.seriesName + ': ' + param.value + 'km/h<br/>'
+                  break
+                case '水质':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
+                case '水位':
+                  result += param.seriesName + ': ' + param.value + 'cm<br/>'
+                  break
+                case '排放量':
+                  result += param.seriesName + ': ' + param.value + 'm³<br/>'
+                  break
+                case '压力':
+                  result += param.seriesName + ': ' + param.value + 'Pa<br/>'
+                  break
+                case '漏水声波':
+                  result += param.seriesName + ': ' + param.value + 'dB<br/>'
+                  break
+                case 'PH值':
+                  result += param.seriesName + ': ' + param.value + 'ph<br/>'
+                  break
+                case '温度':
+                  result += param.seriesName + ': ' + param.value + '℃<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'NTU<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
                 case '一次网供水压力':
                   result += param.seriesName + ': ' + param.value + 'MPa<br/>'
                   break
@@ -514,7 +577,6 @@ export default {
           data: xData
         }],
         yAxis: [{
-          name: '℃',
           type: 'value',
           axisTick: {
             show: false
@@ -540,7 +602,6 @@ export default {
           }
         },
           {
-            name: 'MPa',
             type: 'value',
             axisTick: {
               show: false

src/components/DetailDialog/eventDetail_qiaoliang.vue

@@ -360,7 +360,7 @@ export default {
       const chartDom = this.$refs.divOption
       const myChart = echarts.init(chartDom)
       var xData = resData.categories
-      var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+      var color = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#96CEB4', '#FFEAA7', '#DDA0DD', '#98D8C8', '#F7DC6F', '#BB8FCE', '#85C1E2', '#F8B739', '#52B788', '#FF6F61']
 
       var name = []
       var data = []
@@ -447,6 +447,69 @@ export default {
             let result = params[0].name + '<br/>'
             params.forEach(param => {
               switch (param.seriesName) {
+                case '倾角':
+                  result += param.seriesName + ': ' + param.value + 'rad<br/>'
+                  break
+                case '位移':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '裂缝宽度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '静应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '索力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '动应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '挠度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '支座反力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '交通流量':
+                  result += param.seriesName + ': ' + param.value + '辆/小时<br/>'
+                  break
+                case '车辆荷载':
+                  result += param.seriesName + ': ' + param.value + 'ton<br/>'
+                  break
+                case '湿度':
+                  result += param.seriesName + ': ' + param.value + '%<br/>'
+                  break
+                case '风速':
+                  result += param.seriesName + ': ' + param.value + 'km/h<br/>'
+                  break
+                case '水质':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
+                case '水位':
+                  result += param.seriesName + ': ' + param.value + 'cm<br/>'
+                  break
+                case '排放量':
+                  result += param.seriesName + ': ' + param.value + 'm³<br/>'
+                  break
+                case '压力':
+                  result += param.seriesName + ': ' + param.value + 'Pa<br/>'
+                  break
+                case '漏水声波':
+                  result += param.seriesName + ': ' + param.value + 'dB<br/>'
+                  break
+                case 'PH值':
+                  result += param.seriesName + ': ' + param.value + 'ph<br/>'
+                  break
+                case '温度':
+                  result += param.seriesName + ': ' + param.value + '℃<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'NTU<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
                 case '一次网供水压力':
                   result += param.seriesName + ': ' + param.value + 'MPa<br/>'
                   break
@@ -514,7 +577,6 @@ export default {
           data: xData
         }],
         yAxis: [{
-          name: '℃',
           type: 'value',
           axisTick: {
             show: false
@@ -540,7 +602,6 @@ export default {
           }
         },
           {
-            name: 'MPa',
             type: 'value',
             axisTick: {
               show: false

src/components/DetailDialog/eventDetail_water.vue

@@ -360,7 +360,8 @@ export default {
       const chartDom = this.$refs.divOption
       const myChart = echarts.init(chartDom)
       var xData = resData.categories
-      var color = ['#fa704d', '#01babc', '#1a9bfc', '#99da69', '#e32f46', '#7049f0', '#fa704d', '#01babc', '#1a9bfc', '#99da69', '#7049f0', '#e32f46']
+      var color = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#96CEB4', '#FFEAA7', '#DDA0DD', '#98D8C8', '#F7DC6F', '#BB8FCE', '#85C1E2', '#F8B739', '#52B788', '#FF6F61']
+
 
       var name = []
       var data = []
@@ -447,6 +448,69 @@ export default {
             let result = params[0].name + '<br/>'
             params.forEach(param => {
               switch (param.seriesName) {
+                case '倾角':
+                  result += param.seriesName + ': ' + param.value + 'rad<br/>'
+                  break
+                case '位移':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '裂缝宽度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '静应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '索力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '动应变':
+                  result += param.seriesName + ': ' + param.value + 'με<br/>'
+                  break
+                case '挠度':
+                  result += param.seriesName + ': ' + param.value + 'mm<br/>'
+                  break
+                case '支座反力':
+                  result += param.seriesName + ': ' + param.value + 'N<br/>'
+                  break
+                case '交通流量':
+                  result += param.seriesName + ': ' + param.value + '辆/小时<br/>'
+                  break
+                case '车辆荷载':
+                  result += param.seriesName + ': ' + param.value + 'ton<br/>'
+                  break
+                case '湿度':
+                  result += param.seriesName + ': ' + param.value + '%<br/>'
+                  break
+                case '风速':
+                  result += param.seriesName + ': ' + param.value + 'km/h<br/>'
+                  break
+                case '水质':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
+                case '水位':
+                  result += param.seriesName + ': ' + param.value + 'cm<br/>'
+                  break
+                case '排放量':
+                  result += param.seriesName + ': ' + param.value + 'm³<br/>'
+                  break
+                case '压力':
+                  result += param.seriesName + ': ' + param.value + 'Pa<br/>'
+                  break
+                case '漏水声波':
+                  result += param.seriesName + ': ' + param.value + 'dB<br/>'
+                  break
+                case 'PH值':
+                  result += param.seriesName + ': ' + param.value + 'ph<br/>'
+                  break
+                case '温度':
+                  result += param.seriesName + ': ' + param.value + '℃<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'NTU<br/>'
+                  break
+                case '浊度':
+                  result += param.seriesName + ': ' + param.value + 'mg/L<br/>'
+                  break
                 case '一次网供水压力':
                   result += param.seriesName + ': ' + param.value + 'MPa<br/>'
                   break
@@ -514,7 +578,6 @@ export default {
           data: xData
         }],
         yAxis: [{
-          name: '℃',
           type: 'value',
           axisTick: {
             show: false
@@ -540,7 +603,6 @@ export default {
           }
         },
           {
-            name: 'MPa',
             type: 'value',
             axisTick: {
               show: false

src/router/index.js

@@ -88,12 +88,12 @@ export const constantRoutesNew = [{
 		}
 	},
 	{
-		//监管平台弹出列表页面
-		path: '/jgptList',
-		name: 'jgptList',
-		component: () => import('@/views/industry/jgptList'),
+		//弹出设备预警列表
+		path: '/shebeiYujingList',
+		name: 'shebeiYujingList',
+		component: () => import('@/views/industry/shebeiYujingList'),
 		meta: {
-			title: '监管平台列表'
+			title: '设备预警列表'
 		}
 	},
 	{
@@ -106,12 +106,12 @@ export const constantRoutesNew = [{
 		}
 	},
 	{
-		//监测系统弹出列表页面
-		path: '/jcxtList',
-		name: 'jcxtList',
-		component: () => import('@/views/industry/jcxtList'),
+		//弹出预警列表
+		path: '/yuJingList',
+		name: 'yuJingList',
+		component: () => import('@/views/industry/yuJingList'),
 		meta: {
-			title: '监测系统列表'
+			title: '预警列表'
 		}
 	},
 	{

src/views/Regulatory.vue

@@ -185,7 +185,7 @@
 					</div>
 				</div>
 				<div class="content-box h-530 p-15" style="height: 460px !important">
-					<div class="box-row flex-c" style="justify-content: flex-start;">
+					<div class="box-row flex-c h-530" style="justify-content: flex-start;">
 						<el-select v-model="industry" placeholder="请选择" clearable class="sj-select-100" popper-class="sj-s-pop">
 							<el-option v-for="item in industryList" :key="item.value" :label="item.label"
 								:value="item.value">

src/views/industry/ThermalPower.vue

@@ -400,22 +400,19 @@
         <div class="con_tit">
           <span>隐患列表</span>
           <div class="num_qh">
-            <b>{{riskList.length}}</b><i>件</i>
+            <b>{{heatingList.length}}</b><i>件</i>
           </div>
         </div>
         <div class="w_list2">
           <div class="scoll_li">
-            <div class="w_li" v-for="item in riskList" @click="openDetail(item,'隐患列表')">
-              <div class="img_div">
-                <img :src="item.rectificationUrl"/>
-              </div>
-              <p style="width:40%">
-                <span>{{item.address}}</span>
-                <u>{{item.title}}</u>
+            <div class="w_li" v-for="(e,idx) in heatingList" :key="idx" @click="previewDetail('隐患列表',e)">
+              <p>
+                <span :title="e.title">{{ e.title }}</span>
+                <u>{{e.reportTime}}</u>
               </p>
-
-              <b class="w_dcl" style="width:40%;overflow: hidden;" :title="item.description">{{item.description}}</b>
-              <div style="clear: both"></div>
+              <b class="w_dcl" v-if="e.statusLabel == '上报'">待处理</b>
+              <b class="w_ywc" v-else-if="e.statusLabel == '办结'">已完成</b>
+              <b class="w_clz" v-else>处理中</b>
             </div>
           </div>
         </div>
@@ -946,7 +943,7 @@ export default {
 
       taskList:[],
       eventList:[],
-      riskList:[],
+      heatingList:[],
       input1: '',
       input2: '',
       num:0,
@@ -1486,11 +1483,11 @@ export default {
           "上报时间": e.reportTime,
           "上报人": e.userName,
           "上报地点": e.address,
-          "立查立改": e.rectifiedName,
+          // "立查立改": e.rectifiedName,
           "状态": e.statusLabel,
           "描述": e.description,
           "整改信息": e.rectificationData,
-          "整改前图片": 'http://116.142.80.13:8081/group1/M00/00/2D/wKgKC2kAcBeAUz2IAAb_TSnIT-c466.png',
+          "整改前图片": e.scenePicture,
           "整改后图片": e.rectificationUrl
         }
         this.$refs.detailDialog.openDetail(tile,obj);
@@ -3337,11 +3334,11 @@ export default {
       })
     },
     /**
-     * 风险清单列表
+     * 隐患列表
      */
     getHeatingList(){
-      getHeatingList().then(res => {
-        this.riskList = res.rows
+      getHeatingList({industry:5}).then(res => {
+        this.heatingList = res.data
       })
     },
     initw_chart1(text){

src/views/industry/UtilityTunnel.vue

@@ -968,9 +968,9 @@ import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
        * 隐患列表
        */
       getHeatingList() {
-        getHeatingList({}).then(res => {
-          this.heatingList = res.rows
-          this.heatingListTotal = res.total
+        getHeatingList({industry:4}).then(res => {
+          this.heatingList = res.data
+          this.heatingListTotal = res.data.length
         })
       },
       //初始化地图数据
@@ -2978,7 +2978,7 @@ import { getEventDetail, selectEventList } from '@/api/eventLifeLine'
             "上报时间": row.reportTime,
             "上报人": row.userName,
             "上报地点": row.address,
-            "立查立改": row.rectifiedName,
+            // "立查立改": row.rectifiedName,
             "状态": row.statusName,
             "描述": row.description,
             "整改信息": row.rectificationData,

src/views/industry/jcxt.vue

@@ -605,7 +605,7 @@ export default {
 			},
 			//设备报警表单点击后跳转新页面
 			toSbList(){
-				this.$router.push('/jcxtList')
+				this.$router.push('/yuJingList')
 			},
 			//设备类型chart
 			sblx_chart(industry=1) {

src/views/industry/jgpt.vue

@@ -333,7 +333,7 @@
 				<div class="title-bar">
 					<span>巡检及隐患</span>
 				</div>
-				<div class="content-box xjjyh" style="cursor: pointer;"  @click="toSbList">
+				<div class="content-box xjjyh" style="cursor: pointer;">
 					<div class="xjjyh_div box-row">
 						<div class="xjjyh_div_con box-row">
 							<div class="xjjyh_img">
@@ -435,7 +435,7 @@
 			</div>
 			<!--预警列表-->
 			<div class="right-content">
-				<div class="title-bar" style="cursor: pointer;" @click="toSbList">
+				<div class="title-bar" style="cursor: pointer;" @click="toYJList">
 					<!--<el-popover placement="left-start" width="400" trigger="click" popper-class="sj-pop-con">-->
 						<!--<div class="title-bar-pop">-->
 							<!--<span>预警列表</span>-->
@@ -469,14 +469,22 @@
 						</el-tab-pane>
 					</el-tabs>
 				</div>
-				<div class="title-bar">
-					<el-popover placement="left-start" width="400" trigger="click" popper-class="sj-pop-con">
-						<div slot="reference" style="cursor: pointer;">年度计划</div>
-					</el-popover>
-					<div class="num">
-						{{ yearlyTaskStatisticsTotal || 0 }}个
-					</div>
-				</div>
+        <div class="title-bar">
+          <span >
+            年度计划
+          </span>
+          <div class="num">
+            {{ yearlyTaskStatisticsTotal || 0 }}个
+          </div>
+        </div>
+<!--				<div class="title-bar">-->
+<!--					<el-popover placement="left-start" width="400" trigger="click" popper-class="sj-pop-con">-->
+<!--						<div slot="reference" style="cursor: pointer;">年度计划</div>-->
+<!--					</el-popover>-->
+<!--					<div class="num">-->
+<!--						{{ yearlyTaskStatisticsTotal || 0 }}个-->
+<!--					</div>-->
+<!--				</div>-->
 				<div class="content-box ndrw">
 					<div class="chart-contaier">
 						<div class="chart-con2" id="ndChart" style="height: 120px !important;"></div>
@@ -1446,7 +1454,11 @@
 			},
 			//设备报警表单点击后跳转新页面
 			toSbList(){
-				this.$router.push('/jgptList')
+				this.$router.push('/shebeiYujingList')
+			},
+			//设备报警表单点击后跳转新页面
+      toYJList(){
+				this.$router.push('/yuJingList')
 			},
 			toRwList(){
 				this.$router.push('/RwList')

src/views/industry/lookall.vue

@@ -274,12 +274,6 @@
 							</div>
 						</div>
 					</div>
-
-
-
-
-
-
 				</div>
 			</div>
 		</div>
@@ -2064,11 +2058,11 @@
 						"上报时间": e.reportTime,
 						"上报人": e.userName,
 						"上报地点": e.address,
-						"立查立改": e.rectifiedName,
+						// "立查立改": e.rectifiedName,
 						"状态": e.statusLabel,
 						"描述": e.description,
 						"整改信息": e.rectificationData,
-						"整改前图片": 'http://116.142.80.13:8081/group1/M00/00/2D/wKgKC2kAcBeAUz2IAAb_TSnIT-c466.png',
+						"整改前图片": e.scenePicture,
 						"整改后图片": e.rectificationUrl
 					}
 					this.$refs.detailDialog.openDetail(type, obj);
@@ -3389,8 +3383,8 @@
 			 * 隐患列表
 			 */
 			getHeatingList() {
-				getHeatingList({}).then(res => {
-					this.heatingList = res.rows
+				getHeatingList({industry:1}).then(res => {
+					this.heatingList = res.data
 				})
 			},
 			/**

src/views/industry/paishui.vue

@@ -518,16 +518,16 @@
 			</div>
 			<div class="rw-list">
 				<div class="fxqh-list-title">
-					<span>风险/隐患名称</span>
+					<span>隐患名称</span>
 					<span>状态</span>
 				</div>
 				<div class="fldx-cont">
 					<ul class="fxyh-list">
-						<li v-for="(e,idx) in eventList" :key="idx" @click="openDetail(e,'隐患列表')">
-							<span :title="e.eventTitle">{{ e.eventTitle }}</span>
+						<li v-for="(e,idx) in heatingList" :key="idx" @click="openDetail(e,'隐患列表')">
+							<span :title="e.title">{{ e.title }}</span>
 							<div class="jindu">
 								<i class="yiZg"></i>
-								<em>{{ e.expediteStatus }}</em>
+								<em>{{ e.statusLabel }}</em>
 							</div>
 						</li>
 					</ul>
@@ -1026,6 +1026,7 @@
 					},
 				],
 				eventList: [],
+        heatingList: [],
 				gasTimePeriod: 'week', // 当前用气量分析选择时间段 默认为“周”
 				inspectionTimePeriod: 'week', // 巡检里程分析选择时间段 默认为“周”
 				layerVisible: false,
@@ -1190,8 +1191,9 @@
 				// this.initGasChart()
 				// this.pieChart()
 				this.selectTaskList();
-				this.selectEventList()
-        this.queryVectorTilesMapList()
+				this.selectEventList();
+        this.getHeatingList();
+        this.queryVectorTilesMapList();
 			},2000)
 		},
 		methods: {
@@ -1271,6 +1273,14 @@
           this.eventList = res.rows
         })
       },
+      /**
+       * 隐患列表
+       */
+      getHeatingList(){
+        getHeatingList({industry:2}).then(res => {
+          this.heatingList = res.data
+        })
+      },
 			/**
 			 * 任务列表
 			 */
@@ -2420,12 +2430,12 @@
 					"上报时间": e.reportTime,
 					"上报人": e.userName,
 					"上报地点": e.address,
-					"立查立改": e.rectifiedName,
+					// "立查立改": e.rectifiedName,
 					"状态": e.statusLabel,
 					"描述": e.description,
-					"整改信息": e.rectificationData,
-					"整改前图片": 'http://116.142.80.13:8081/group1/M00/00/2D/wKgKC2kAcBeAUz2IAAb_TSnIT-c466.png',
-					"整改后图片": e.rectificationUrl
+          "整改信息": e.rectificationData,
+          "整改前图片": e.scenePicture,
+          "整改后图片": e.rectificationUrl
 					}
 					this.$refs.detailDialog.openDetail(tile,obj);
 				} else if(tile == '任务列表') {
@@ -6119,7 +6129,7 @@
 	.el-dialog__header .el-dialog__title {
       color: #22bcf3;
     }
-	
+
     .eventDialog .d2 .progress_contain .line {
       background-color: #22bcf3;
     }

src/views/industry/qiaoliang.vue

@@ -594,7 +594,7 @@
           </div>
           <div class="fldx-cont">
             <ul class="fxyh-list">
-              <li v-for="item in riskList" @click="openDetail(item,'隐患列表')">
+              <li v-for="item in heatingList" @click="openDetail(item,'隐患列表')">
                 <span :title="item.address+'-'+item.title">{{item.address}}-{{item.title}}</span>
                 <div class="jindu">
                   <i class="yiZg"></i>
@@ -898,7 +898,6 @@ export default {
       ],
       taskList: [],
       eventList: [],
-      riskList: [],
       deptId: Cookies.get('deptId'),
       type: '',
       pagerCount: 1,
@@ -1208,11 +1207,11 @@ export default {
           "上报时间": e.reportTime,
           "上报人": e.userName,
           "上报地点": e.address,
-          "立查立改": e.rectifiedName,
+          // "立查立改": e.rectifiedName,
           "状态": e.statusLabel,
           "描述": e.description,
           "整改信息": e.rectificationData,
-          "整改前图片": 'http://116.142.80.13:8081/group1/M00/00/2D/wKgKC2kAcBeAUz2IAAb_TSnIT-c466.png',
+          "整改前图片": e.scenePicture,
           "整改后图片": e.rectificationUrl
         }
         this.showDetail(tile, obj);
@@ -3108,11 +3107,11 @@ export default {
       })
     },
     /**
-     * 风险清单列表
+     * 隐患列表
      */
-    getHeatingList() {
-      getHeatingList().then(res => {
-        this.riskList = res.rows
+    getHeatingList(){
+      getHeatingList({industry:3}).then(res => {
+        this.heatingList = res.data
       })
     },
     time() {

src/views/industry/rwList.vue

@@ -51,7 +51,7 @@
 			<!--左侧资产盘点 ps:资产盘点单元格内是竖向的流式布局，数据要竖向循环-->
 			<div class="left-content">
 				<div class="title-bar m-t-3">
-					<span>任务列表</span>
+					<span>计划列表</span>
 				</div>
 				<div class="content-box h-730 p-15">
 					<div class="box-row flex-c hy-tab-bar-style">

src/views/industry/jgptList.vue

@@ -51,7 +51,7 @@
 			<!--左侧资产盘点 ps:资产盘点单元格内是竖向的流式布局，数据要竖向循环-->
 			<div class="left-content">
 				<div class="title-bar m-t-3">
-					<span>预警列表</span>
+					<span>设备预警列表</span>
 				</div>
 				<div class="content-box h-730 p-15">
 					<div class="box-row flex-c">
@@ -61,27 +61,35 @@
 									:value="item.value">
 								</el-option>
 							</el-select>
-              <el-select v-model="eventType" placeholder="请选择" class="sj-select-50" popper-class="sj-s-pop">
+              <el-select v-model="eventType" placeholder="请选择事件类型" class="sj-select-50" popper-class="sj-s-pop">
                 <el-option v-for="item in eventTypeList" :key="item.value" :label="item.label"
                            :value="item.value">
                 </el-option>
               </el-select>
 						</div>
-						<el-input placeholder="请输入内容" suffix-icon="el-icon-search" v-model="eventName" class="sj-input-style ">
-						</el-input>
+						<div style="width: 100%;">
+              <el-input placeholder="请输入事件名称" suffix-icon="el-icon-search" v-model="eventName" class="sj-input-style "></el-input>
+              <el-select v-model="eventStatus" placeholder="请选择催办督办" class="sj-select-50" popper-class="sj-s-pop">
+                <el-option v-for="item in eventStatusList" :key="item.value" :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+						</div>
 						<div class="list-ul-style-tit list-ul-100-tit">
               <span style="width: 80%;">事件名称</span>
-              <span style="width: 70px;">催办情况</span>
-              <span style="width: 65px;">处理情况</span>
-              <span style="width: 30px;">定位</span>
+              <span style="width: 80px;">催办情况</span>
+              <span style="width: 80px;">督办情况</span>
+              <span style="width: 80px;">处理情况</span>
+              <span style="width: 55px;">定位</span>
 						</div>
 						<ul class="list-ul-style list-ul-100" style="height:580px!important; overflow-y:scroll ; ">
               <li v-for="item in eventList" :key="item.id"  @click="openEventDetail(item)">
                 <span style="width: 80%;">{{ item.eventTitle }}</span>
-                <span style="width: 70px;">{{ item.expediteStatusLabel}}</span>
-                <span style="width: 65px;"
+                <span style="width: 80px;">{{ item.expediteStatusLabel}}</span>
+                <span style="width: 80px;">{{ item.superviseStatusLabel}}</span>
+                <span style="width: 80px;"
                       :class=" item.eventStatusLabel == '已完成' ? 'green-txt' : 'blue-txt' ">{{ item.eventStatusLabel }}</span>
-                <span style="width: 30px;"><img src="../../assets/index_img/dw-icon.png" alt="" @click="flyTo(item.longitude,item.latitude)"></span>
+                <span style="width: 55px;"><img src="../../assets/index_img/dw-icon.png" alt="" @click="flyTo(item.longitude,item.latitude)"></span>
               </li>
 							<strong></strong>
 						</ul>
@@ -148,6 +156,9 @@
       eventType(newVal) {
         this.selectEventList()
       },
+      eventStatus(newVal) {
+        this.selectEventList()
+      },
     },
 		mounted() {
 			// 初始化地图数据
@@ -212,6 +223,19 @@
           }
         ],
         eventType: '',
+        eventStatusList: [
+          {
+            value: '1',
+            label: '催办'
+          }, {
+            value: '2',
+            label: '督办'
+          }, {
+            value: '3',
+            label: '催办且督办'
+          }
+        ],
+        eventStatus: '',
         eventName:'',
 
 			}
@@ -224,7 +248,27 @@
        * 预警列表
        */
       selectEventList() {
-        selectEventList({industry: this.industry,eventTitle: this.eventName,eventTypeDl:this.eventType}).then(res => {
+        const params = {
+          industry: this.industry,
+          eventTitle: this.eventName,
+          eventTypeDl: this.eventType,
+          eventTypeDl:400,
+          expediteStatus: null,
+          superviseStatus: null,
+        };
+        // 根据状态动态添加参数
+        if (this.eventStatus === '1') {
+          params.expediteStatus = '1';
+        }else if (this.eventStatus === '2') {
+          params.superviseStatus = '1';
+        }else if (this.eventStatus === '3') {
+          params.expediteStatus = '1';
+          params.superviseStatus = '1';
+        }else{
+          params.expediteStatus = null;
+          params.superviseStatus = null;
+        }
+        selectEventList(params).then(res => {
           this.eventList = res.rows
           this.setMakersHandler('longitude', 'latitude', res.rows)
         })
@@ -765,8 +809,8 @@
 	}
 
 	.sj-input-style {
-		margin-top: 5px !important;
-
+		margin-top: 10px !important;
+    width: 50% !important;
 		.el-input__inner {
 			height: 30px;
 			line-height: 30px;

src/views/industry/water.vue

@@ -2905,7 +2905,7 @@
             "上报时间": row.reportTime,
             "上报人": row.userName,
             "上报地点": row.address,
-            "立查立改": row.rectifiedName,
+            // "立查立改": row.rectifiedName,
             "状态": row.statusName,
             "描述": row.description,
             "整改信息": row.rectificationData,
@@ -3046,9 +3046,9 @@
        * 隐患列表
        */
       getHeatingList() {
-        getHeatingList({}).then(res => {
-          this.heatingList = res.rows
-          this.heatingListTotal = res.total
+        getHeatingList({industry:6}).then(res => {
+          this.heatingList = res.data
+          this.heatingListTotal = res.data.length
         })
       },
       preview(e) {

src/views/industry/jcxtList.vue

@@ -51,7 +51,7 @@
       <!--左侧资产盘点 ps:资产盘点单元格内是竖向的流式布局，数据要竖向循环-->
       <div class="left-content">
         <div class="title-bar m-t-3">
-          <span>设备预警列表</span>
+          <span>预警列表</span>
         </div>
         <div class="content-box h-730 p-15">
           <div class="box-row flex-c">
@@ -61,27 +61,35 @@
                            :value="item.value">
                 </el-option>
               </el-select>
-              <el-select v-model="eventType" placeholder="请选择" class="sj-select-50" popper-class="sj-s-pop">
+              <el-select v-model="eventType" placeholder="请选择事件类型" class="sj-select-50" popper-class="sj-s-pop">
                 <el-option v-for="item in eventTypeList" :key="item.value" :label="item.label"
                            :value="item.value">
                 </el-option>
               </el-select>
             </div>
-            <el-input placeholder="请输入内容" suffix-icon="el-icon-search" v-model="eventName" class="sj-input-style ">
-            </el-input>
+            <div style="width: 100%;">
+              <el-input placeholder="请输入事件名称" suffix-icon="el-icon-search" v-model="eventName" class="sj-input-style "></el-input>
+              <el-select v-model="eventStatus" placeholder="请选择催办督办" class="sj-select-50" popper-class="sj-s-pop">
+                <el-option v-for="item in eventStatusList" :key="item.value" :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
             <div class="list-ul-style-tit list-ul-100-tit">
               <span style="width: 80%;">事件名称</span>
-              <span style="width: 70px;">催办情况</span>
-              <span style="width: 65px;">处理情况</span>
-              <span style="width: 30px;">定位</span>
+              <span style="width: 80px;">催办情况</span>
+              <span style="width: 80px;">督办情况</span>
+              <span style="width: 80px;">处理情况</span>
+              <span style="width: 55px;">定位</span>
             </div>
             <ul class="list-ul-style list-ul-100" style="height:580px!important; overflow-y:scroll ; ">
               <li v-for="item in eventList" :key="item.id"  @click="openEventDetail(item)">
                 <span style="width: 80%;">{{ item.eventTitle }}</span>
-                <span style="width: 70px;">{{ item.expediteStatusLabel}}</span>
-                <span style="width: 65px;"
+                <span style="width: 80px;">{{ item.expediteStatusLabel}}</span>
+                <span style="width: 80px;">{{ item.superviseStatusLabel}}</span>
+                <span style="width: 80px;"
                       :class=" item.eventStatusLabel == '已完成' ? 'green-txt' : 'blue-txt' ">{{ item.eventStatusLabel }}</span>
-                <span style="width: 30px;"><img src="../../assets/index_img/dw-icon.png" alt="" @click="flyTo(item.longitude,item.latitude)"></span>
+                <span style="width: 55px;"><img src="../../assets/index_img/dw-icon.png" alt="" @click="flyTo(item.longitude,item.latitude)"></span>
               </li>
               <strong></strong>
             </ul>
@@ -148,6 +156,9 @@ export default {
     eventType(newVal) {
       this.selectEventList()
     },
+    eventStatus(newVal) {
+      this.selectEventList()
+    },
   },
   mounted() {
     // 初始化地图数据
@@ -212,6 +223,19 @@ export default {
         }
       ],
       eventType: '',
+      eventStatusList: [
+        {
+          value: '1',
+          label: '催办'
+        }, {
+          value: '2',
+          label: '督办'
+        }, {
+          value: '3',
+          label: '催办且督办'
+        }
+      ],
+      eventStatus: '',
       eventName:'',
 
     }
@@ -224,7 +248,26 @@ export default {
      * 预警列表
      */
     selectEventList() {
-      selectEventList({industry: this.industry,eventTitle: this.eventName,eventTypeDl:this.eventType,eventTypeDl:400}).then(res => {
+      const params = {
+        industry: this.industry,
+        eventTitle: this.eventName,
+        eventTypeDl: this.eventType,
+        expediteStatus: null,
+        superviseStatus: null,
+      };
+      // 根据状态动态添加参数
+      if (this.eventStatus === '1') {
+        params.expediteStatus = '1';
+      }else if (this.eventStatus === '2') {
+        params.superviseStatus = '1';
+      }else if (this.eventStatus === '3') {
+        params.expediteStatus = '1';
+        params.superviseStatus = '1';
+      }else{
+        params.expediteStatus = null;
+        params.superviseStatus = null;
+      }
+      selectEventList(params).then(res => {
         this.eventList = res.rows
         this.setMakersHandler('longitude', 'latitude', res.rows)
       })
@@ -765,8 +808,8 @@ export default {
 }
 
 .sj-input-style {
-  margin-top: 5px !important;
-
+  margin-top: 10px !important;
+  width: 50% !important;
   .el-input__inner {
     height: 30px;
     line-height: 30px;