1

src/components/education/activityList.vue

@@ -97,7 +97,7 @@
           width="180"
         >
           <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" content="查看" placement="top" >
+            <el-tooltip class="item" effect="dark" content="意见调查表" placement="top" >
               <img src="../../assets/img/setup/send.png" alt="" class="imgstyle" @click="grant(scope.row)">
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="编辑" placement="top" >

src/components/education/addActivity.vue

@@ -6,11 +6,7 @@
     <div class="content">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px" style="width:50%">
 
-        <el-form-item label="领奖方式" size="small" class="is-required">
-          <el-radio-group v-model="addMsg.PrizeType">
-            <el-radio :label="x.Id" v-for="(x,y) in platList" :key="y">{{x.Name}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+
         <el-form-item label="标题" prop="Title" class="is-required" size="small">
           <el-input v-model="addMsg.Title" placeholder="请输入标题" class="w400"/>
         </el-form-item>
@@ -22,8 +18,11 @@
                           range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-
-
+        <el-form-item label="领奖方式" size="small" class="is-required">
+          <el-radio-group v-model="addMsg.PrizeType">
+            <el-radio :label="x.Id" v-for="(x,y) in platList" :key="y">{{x.Name}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="奖品地址" prop="PrizeAddress" class="is-required" size="small">
           <el-input v-model="addMsg.PrizeAddress" placeholder="请输入奖品地址" class="w400"/>
         </el-form-item>

src/components/education/educationIndex.vue

@@ -193,6 +193,9 @@
           <li class="menu_item" :class="{'Fchecked':isChecked=='/activityList'}"  @click="isChecked='/activityList',CommonJump('activityList')">
             <i class="el-icon-menu"></i><span>活动列表</span>
           </li>
+          <li class="menu_item" :class="{'Fchecked':isChecked=='/resultPageList'}"  @click="isChecked='/resultPageList',CommonJump('resultPageList')">
+            <i class="el-icon-menu"></i><span>调查列表</span>
+          </li>
         </ul>
       </div>
     </div>

src/components/education/questionnaireList.vue

@@ -156,8 +156,8 @@
         </el-form-item>
         <el-form-item label="是否必填" size="small" class="is-required" label-width="80px">
           <el-radio-group v-model="addMsg.IsRequired">
-            <el-radio label="0" >不必填</el-radio>
             <el-radio label="1" >必填</el-radio>
+            <el-radio label="0" >不必填</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="排序" prop="Sort" class="is-required" size="small" label-width="80px">

src/components/education/resultPageList.vue

+<template>
+  <div class="resultPageList">
+    <div class="el-card__header">
+      <span>问卷调查列表</span>
+
+    </div>
+    <div class="content">
+      <div style="display: flex;flex-direction: row;align-items: center">
+        <div class="block">
+          <div class="searchInput" style="width:250px">
+            <el-input style="display:inline-block;width:225px;height:30px"
+                      placeholder="请输入昵称搜索"
+                      v-model="msg.AliasName"
+                      size="small"
+                      @clear="getList"
+                      @keyup.enter.native="getList"
+                      clearable>
+            </el-input>
+            <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
+          </div>
+          <span>填写时间：</span>
+          <el-date-picker v-model="dateList" @change="getList()" size="small" type="datetimerange"
+                          range-separator="至" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
+          </el-date-picker>
+
+        </div>
+      </div>
+      <el-dialog title="用户问卷调查详情" :visible.sync="dialogVisible" width="600px">
+
+      </el-dialog>
+    </div>
+
+
+    <div style="padding: 20px;background: #fff;">
+      <el-table
+        :data="tableData"
+        header-cell-class-name="headClass"
+        style="width: 100%"
+        border
+      >
+
+        <el-table-column
+          prop="ID"
+          label="ID"
+          width="100">
+        </el-table-column>
+
+        <el-table-column
+          prop="ActiveSurveyName"
+          label="活动名称">
+
+        </el-table-column>
+        <el-table-column
+          prop="AliasName"
+          label="信息">
+          <template slot-scope="scope">
+            <div class="app-image" :style="{backgroundImage:'url(' + scope.row.Photo + ')',backgroundSize:'cover'}"></div>
+            <div flex="dir:left cross:center">
+              {{scope.row.AliasName}}
+            </div>
+          </template>
+
+        </el-table-column>
+
+
+
+        <el-table-column
+          label="创建时间"
+          prop="CreateDateStr">
+        </el-table-column>
+
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="详情" placement="top" >
+              <img src="../../assets/img/userman/detail.png" alt="" class="imgstyle" @click="grant(scope.row)">
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination style="text-align:right"
+                     background
+                     @current-change="handleCurrentChange"
+                     :page-size="msg.pageSize"
+                     layout="prev, pager, next"
+                     :current-page.sync="msg.pageIndex"
+                     :total="count">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "resultPageList",
+    data(){
+      return{
+        msg:{
+          pageIndex:1,
+          pageSize:20,
+          AliasName:'',
+          StartDate:'',
+          EndDate:'',
+        },
+        tableData:[],
+        count:0,
+        loading:false,
+        dateList:[],
+        dialogVisible:false,
+        xqdata:{},
+      }
+    },
+    created(){
+      this.getDateList();
+    },
+    methods:{
+      getDateList(){
+        this.loading=true;
+        if (this.dateList && this.dateList.length > 0) {
+          this.msg.StartDate = this.dateList[0];
+          this.msg.EndDate = this.dateList[1];
+        } else {
+          this.msg.StartDate = '';
+          this.msg.EndDate = '';
+        }
+        this.apipost("/api/Survey/GetResultPageList", this.msg, res => {
+          this.loading=false;
+          if(res.data.resultCode==1){
+            this.tableData = res.data.data.pageData;
+            this.count = res.data.data.count;
+          }else {
+            this.Info(res.data.message);
+          }
+        })
+      },
+
+      getList(){
+        this.msg.pageIndex = 1
+        this.getDateList()
+      },
+
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getDateList();
+      },
+      grant(row){
+        this.apipost("/api/Survey/GetGuestSurveyDetails", {SurveyID:row.ID}, res => {
+          if(res.data.resultCode==1){
+            this.xqdata = res.data.data;
+
+          }else {
+            this.Info(res.data.message);
+          }
+
+        })
+      }
+    },
+  }
+</script>
+
+<style >
+  .resultPageList .el-card__header{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    background: #fff;
+
+  }
+  .resultPageList .el-button--small{
+    padding: 9px 15px;
+  }
+  .resultPageList .content .searchInput{
+    border: 1px solid #DCDFE6;
+    border-radius: 4px;
+    margin-left: 20px;
+  }
+  .resultPageList .content .searchInput .el-input__inner{
+    border:none;outline:none;
+    height: 30px;
+    line-height: 30px;
+  }
+  .resultPageList .content .searchInput{
+    line-height: normal;
+    display: inline-table;
+    border-collapse: separate;
+    border-spacing: 0;
+    width:250px;
+  }
+  .resultPageList .content{
+    background: #fff;
+    margin-top:10px;
+    padding: 15px;
+    box-sizing: border-box;
+  }
+  .resultPageList .app-image{
+    background-position: center center;
+    width: 50px;
+    height: 50px;
+    border-radius:0%;
+    float: left;
+    margin-right: 8px;
+  }
+</style>

src/router/index.js

@@ -379,6 +379,12 @@ export default new Router({
           path: '/questionnaireList',
           name: 'questionnaireList',
           component: resolve => require(['@/components/education/questionnaireList'], resolve),
+        },
+        //网课 用户问卷调查列表
+        {
+          path: '/resultPageList',
+          name: 'resultPageList',
+          component: resolve => require(['@/components/education/resultPageList'], resolve),
         }
       ]
     },