1

src/views/spectrum/dynamicMonitor/waterQualityLedger/widget.vue

@@ -194,6 +194,7 @@ export default {
       let params = JSON.parse(JSON.stringify(this.pagination))
       if (this.form.deviceName) params['deviceName'] = this.form.deviceName
       if (this.form.deviceType) params['deviceType'] = this.form.deviceType
+      if (this.form.siteId&&this.form.siteId.length>0) params['siteId'] = this.form.siteId.join(',')
       params['isValid'] = this.checked ? 0 : 1
       params['isOther'] = true
       if (this.form.date && this.form.date.length == 2) {

src/views/spectrum/statisticalAnalysis/wqMultipleSites/sitesanalysisResult/widget.vue

@@ -14,9 +14,11 @@
       </div>
     </div>
     <div class="chart-box">
+      <div class="head-title">监测趋势图</div>
       <div class="chart-item" ref="chart1">
         <div class="empty"></div>
       </div>
+      <div class="head-title">上下游站点监测对比图</div>
       <div class="chart-item" ref="chart2">
         <div class="empty"></div>
       </div>
@@ -155,6 +157,7 @@ export default {
      * 加载图表
      */
     loadChart(chartData, domId) {
+      console.log('69--->>',chartData);
       let chartDom = this.$refs[domId]
       let myChart = echarts.init(chartDom)
       let colorAry = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
@@ -163,6 +166,9 @@ export default {
           trigger: 'axis'
         },
         color: colorAry,
+        legend:{
+
+        },
         grid: {
           top: 30,
           bottom: 30,
@@ -321,7 +327,7 @@ export default {
 .chart-box {
   height: 260px;
   .chart-item {
-    width: 50%;
+    width: 100%;
     height: 100%;
     float: left;
     > div.empty {

src/views/widgets/warningPanel/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="panel-container">
     <div class="panel-header"></div>
-    <div class="panel-content"></div>
+    <div class="panel-content">
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="date"></el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 
@@ -12,7 +17,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.panel-container{
+.panel-container {
   width: 300px;
   height: 500px;
   background-color: #fff;