commit

+<template xmlns:el-col="http://www.w3.org/1999/html">
+  <div>
+    <br/>
+    <span>查询服务器log，最多展示100条</span>
+    <el-table
+      :data="selectActStart"
+      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="type"
+        label="活动类型"
+        :formatter="changeType"
+        min-width="1">
+      </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>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        huanjing: this.$route.query.huanjing,
+        selectActStart: []
+      }
+    },
+    mounted() {
+      this.activity()
+    },
+    methods: {
+      changeType(row, column) {
+        switch(row[column.property]) {
+          case 1:
+            return "转盘";
+          case 2:
+            return "红包";
+          case 3:
+            return "小简互动";
+          case 4:
+            return "健康币";
+          case 5:
+            return "重庆苏宁活动";
+          case 6:
+            return "吼一吼";
+          case 7:
+            return "等级卡活动";
+          case 8:
+            return "通知活动";
+          case 9:
+            return "投票活动";
+          case 10:
+            return "报名活动";
+          case 11:
+            return "老虎机活动";
+          case 12:
+            return "黄金客户";
+          case 13:
+            return "礼包领取";
+          case 14:
+            return "调查问卷";
+          case 15:
+            return "碰一碰礼包领取";
+          case 16:
+            return "粽子游戏";
+          case 17:
+            return "信息展示";
+          case 18:
+            return "兑换";
+          case 19:
+            return "代理人扫码签到活动";
+          case 22:
+            return "广东兑礼活动";
+          default:
+            return row[column.property];
+        }
+      },
+      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/selectActStart?'+this.$qs.stringify({
+          type: this.huanjing
+        }),config).then((res)=>{
+          console.log(res.data)
+          this.selectActStart=res.data
+          loading.close();
+        }).catch(error=>{
+          console.log(error);
+          loading.close();
+          this.$message({
+            showClose: true,
+            message: '服务器处理失败，请核对参数！',
+            type: 'error'
+          });
+        })
+      }
+    }
+  }
+</script>

@@ -417,19 +417,16 @@
     </el-row>
     <el-row style="margin-bottom: 15px;">
       <el-col :span="8">
-        <el-form ref="nlpApi" :model="nlpApi" label-width="0px">
+        <el-form ref="selectActStart" :model="selectActStart" label-width="0px">
           <el-card class="darkred" shadow="always">
             <div slot="header" class="clearfix">
-              <span>NLP语义接口测试</span>
+              <span>查询进行中的活动</span>
             </div>
             <div class="text item">
               <el-form-item>
-                <el-input placeholder="请输入nlp问题，比如今天天气怎么样" v-model="nlpApi.keyword" clearable></el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-select v-model="nlpApi.huanjing" placeholder="请选择执行环境">
+                <el-select v-model="selectActStart.huanjing" placeholder="请选择执行环境">
                   <el-option
-                    v-for="item in nlpApiOptions"
+                    v-for="item in selectActStartOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value">
@@ -438,7 +435,7 @@
               </el-form-item>
               <div style="margin: 15px 0;"></div>
               <el-form-item>
-                <el-button round @click="nlpApiSubmit">调用接口</el-button>
+                <el-button round @click="selectActStartSubmit">查询活动</el-button>
               </el-form-item>
             </div>
           </el-card>
@@ -536,6 +533,34 @@
         </el-dialog>
       </el-col>
       <el-col :span="8">
+        <el-form ref="nlpApi" :model="nlpApi" label-width="0px">
+          <el-card class="darkred" shadow="always">
+            <div slot="header" class="clearfix">
+              <span>NLP语义接口测试</span>
+            </div>
+            <div class="text item">
+              <el-form-item>
+                <el-input placeholder="请输入nlp问题，比如今天天气怎么样" v-model="nlpApi.keyword" clearable></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-select v-model="nlpApi.huanjing" placeholder="请选择执行环境">
+                  <el-option
+                    v-for="item in nlpApiOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <div style="margin: 15px 0;"></div>
+              <el-form-item>
+                <el-button round @click="nlpApiSubmit">调用接口</el-button>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-form>
+      </el-col>
+      <el-col :span="8">
         <el-form ref="updateBe" :model="updateBe" label-width="0px">
           <el-card class="darkred" shadow="always">
             <div slot="header" class="clearfix">
@@ -699,6 +724,16 @@
           value: '0',
           label: '测试环境'
         }],
+        selectActStart: {
+          huanjing: []
+        },
+        selectActStartOptions: [{
+          value: '0',
+          label: '测试环境'
+        }, {
+          value: '1',
+          label: '线上环境'
+        }],
         callLinuxLogByUid: {
           uid: '',
           method: ''
@@ -1219,6 +1254,11 @@
             {code: this.queryProvince.provinceCode.toString()}})
         window.open(href, '_blank')
       },
+      selectActStartSubmit() {
+        const {href} = this.$router.resolve({ name:'selectActStart', query:
+            {huanjing: this.selectActStart.huanjing.toString()}})
+        window.open(href, '_blank')
+      },
       queryPhoneCodeSubmit() {
         const loading = this.$loading({
           lock: true,

@@ -15,6 +15,7 @@ import toolAime from '@/page/toolAime'
 import nlpApi from '@/page/nlpApi'
 import hadoop from '@/page/hadoop'
 import queryProvince from '@/page/queryProvince'
+import selectActStart from '@/page/selectActStart'
 
 Vue.use(Router)
 
@@ -82,6 +83,14 @@ export default new Router({
           }
         },
         {
+          path: '/selectActStart',
+          component: selectActStart,
+          name: 'selectActStart',
+          meta: {
+            title: '测试工具平台'
+          }
+        },
+        {
           path: '/queryProvince',
           component: queryProvince,
           name: 'queryProvince',