commit

+<template xmlns:el-col="http://www.w3.org/1999/html">
+  <div>
+    <br/>
+    <span>进行中活动</span>
+    <el-table
+      :data="nowActList"
+      border
+      style="width: 100%"
+      :header-cell-style="{background: 'deepskyblue', color: 'snow'}">
+      <el-table-column
+        prop="id"
+        label="活动ID"
+        min-width="1">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="活动名称"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="活动开始时间"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="活动结束时间"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="provinceName"
+        label="所属机构"
+        min-width="1">
+      </el-table-column>
+    </el-table>
+    <br/>
+    <br/>
+    <span>未开始活动</span>
+    <el-table
+      :data="yesterdayByStartTimeList"
+      border
+      style="width: 100%"
+      :header-cell-style="{background: 'deepskyblue', color: 'snow'}">
+      <el-table-column
+        prop="id"
+        label="活动ID"
+        min-width="1">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="活动名称"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="活动开始时间"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="活动结束时间"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="provinceName"
+        label="所属机构"
+        min-width="1">
+      </el-table-column>
+    </el-table>
+    <br/>
+    <br/>
+    <span>已结束活动</span>
+    <el-table
+      :data="tomorrowByEndTimeList"
+      border
+      style="width: 100%"
+      :header-cell-style="{background: 'deepskyblue', color: 'snow'}">
+      <el-table-column
+        prop="id"
+        label="活动ID"
+        min-width="1">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="活动名称"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="活动开始时间"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="活动结束时间"
+        min-width="2">
+      </el-table-column>
+      <el-table-column
+        prop="provinceName"
+        label="所属机构"
+        min-width="1">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<style>
+.el-table .warning-row {
+  background: LightPink;
+}
+</style>
+
+<script>
+  export default {
+    data() {
+      return {
+        nowActList: [],
+        yesterdayByStartTimeList: [],
+        tomorrowByEndTimeList: []
+      }
+    },
+    mounted() {
+      this.activity()
+    },
+    methods: {
+      activity() {
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        let config = {
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+          }
+        }
+        this.$http.get('/tool/selectActOnlineShenZhen?'+this.$qs.stringify({
+        }),config).then((res)=>{
+          console.log(res.data)
+          this.nowActList=res.data.nowActList
+          this.yesterdayByStartTimeList=res.data.yesterdayByStartTimeList
+          this.tomorrowByEndTimeList=res.data.tomorrowByEndTimeList
+          loading.close();
+        }).catch(error=>{
+          console.log(error);
+          loading.close();
+          this.$message({
+            showClose: true,
+            message: '服务器处理失败，请核对参数！',
+            type: 'error'
+          });
+        })
+      }
+    }
+  }
+</script>

@@ -796,6 +796,20 @@
           </el-card>
         </el-form>
       </el-col>
+      <el-col :span="8">
+        <el-form ref="selectActOnline" :model="selectActOnlineShenZhen" label-width="0px">
+          <el-card class="darkred" shadow="always">
+            <div slot="header" class="clearfix">
+              <span>查询云活动平台全部活动</span>
+            </div>
+            <div class="text item">
+              <el-form-item>
+                <el-button round @click="selectActOnlineShenZhenSubmit">查询全部活动</el-button>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-form>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -1109,6 +1123,8 @@
         selectActOnline: {
           mailReceiver: ''
         },
+        selectActOnlineShenZhen: {
+        },
         actProvinceOptions: [],
         actCityOptions: [],
         nlpApi: {
@@ -1778,6 +1794,11 @@
             {mailReceiver: this.selectActOnline.mailReceiver}})
         window.open(href, '_blank')
       },
+      selectActOnlineShenZhenSubmit() {
+        const {href} = this.$router.resolve({ name:'selectActOnlineShenZhen', query:
+            {}})
+        window.open(href, '_blank')
+      },
       changeOrgAllSubmit() {
         let config = {
           headers: {

@@ -30,6 +30,7 @@ import bizDataResponse from '@/page/bizDataResponse'
 import bigdataReport from '@/page/bigdataReport'
 import bizDataByUid from '@/page/bizDataByUid'
 import selectActOnline from '@/page/selectActOnline'
+import selectActOnlineShenZhen from '@/page/selectActOnlineShenZhen'
 import toolWaiBao from '@/page/toolWaiBao'
 
 Vue.use(Router)
@@ -245,6 +246,14 @@ export default new Router({
           meta: {
             title: '测试工具平台'
           }
+        },
+        {
+          path: '/selectActOnlineShenZhen',
+          component: selectActOnlineShenZhen,
+          name: 'selectActOnlineShenZhen',
+          meta: {
+            title: '测试工具平台'
+          }
         }
       ]
     },