修改

src/views/reaplceMusicPlayer/api.js

@@ -61,8 +61,8 @@ export function getInstrumentActivityList (data) {
 export function updateInstrumentActivity (data) {
   return request2({
     url: api + `/replacementInstrumentActivity/update`,
-    method: 'get',
-    params: data,
+    method: 'post',
+    data,
     requestType: 'form',
   })
 }

src/views/reaplceMusicPlayer/index.vue

@@ -92,6 +92,15 @@
           </el-table-column>
           <el-table-column
             align="center"
+            prop="showQuestion"
+            label="是否参加问卷调查"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.showQuestion ? '是' : '否' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             prop="activeNum"
             label="调查人数"
           ></el-table-column>
@@ -170,7 +179,7 @@
     <el-dialog
       title="详情"
       :visible.sync="detailVisible"
-      width="1000px"
+      width="1200px"
       v-if="detailVisible"
     >
       <detail ref="detail" @close="close" :detail="activeRow" />
@@ -328,7 +337,7 @@ export default {
         //   });
         let str;
         if (name == "调查链接") {
-          let returnUrl = vaildStudentUrl() + `/#/questionnaire?` + encode(`o=${row.organId}&c=${row.cooperationOrganId}`);
+          let returnUrl = vaildStudentUrl() + `/#/questionnaire?` + encodeURIComponent(encode(`o=${row.organId}&c=${row.cooperationOrganId}`));
           // console.log(returnUrl)
           // let tempUrl =
           //   vaildStudentUrl() +

src/views/reaplceMusicPlayer/modals/addUrl.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="form" label-width="80px" ref="form">
+    <el-form :model="form" label-width="120px" ref="form">
       <el-form-item
         label="分部"
         prop="organId"
@@ -41,6 +41,20 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item
+        label="是否参与调查"
+        prop="showQuestion"
+        :rules="[{ required: true, message: '请选择是否参与调查' }]"
+      >
+        <el-select
+          v-model.trim="form.showQuestion"
+          filterable
+          clearable
+        >
+          <el-option label="是" :value="1"></el-option>
+          <el-option label="否" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
   </div>
 </template>
@@ -53,6 +67,7 @@ export default {
       form: {
         organId: "",
         school: "",
+        showQuestion: 1,
       },
       cooperationList: [],
     };
@@ -70,7 +85,7 @@ export default {
       this.$refs.form.validate( async(res) => {
         if (res) {
           try{
-          const res = await addReplacement({cooperationOrganId:this.form.school,organId:this.form.organId})
+          const res = await addReplacement({cooperationOrganId:this.form.school,organId:this.form.organId, showQuestion: this.form.showQuestion})
           this.$message.success('生成链接成功')
            this.$emit('getList')
           this.$emit('close')

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -47,6 +47,28 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="hasYesFirstAnswer">
+        <el-select
+          v-model.trim="searchForm.hasYesFirstAnswer"
+          filterable
+          clearable
+          placeholder="请选择是否参加市赛"
+        >
+          <el-option label="是" :value="1"></el-option>
+          <el-option label="否" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="hasInstrumentsId">
+        <el-select
+          v-model.trim="searchForm.hasInstrumentsId"
+          filterable
+          clearable
+          placeholder="请选择是置换乐器"
+        >
+          <el-option label="是" :value="true"></el-option>
+          <el-option label="否" :value="false"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button native-type="submit" type="primary">搜索</el-button>
         <el-button native-type="reset" type="danger">重置</el-button>
@@ -75,6 +97,20 @@
         ></el-table-column>
         <el-table-column
           align="center"
+          prop="question1"
+          label="是否参加市赛"
+        >
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="是否置换"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.instrumentsId ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
           prop="subjectName"
           label="声部"
         ></el-table-column>
@@ -117,8 +153,7 @@
         </el-table-column>
       </el-table>
       <pagination
-        sync
-        :total.sync="rules.total"
+        :total="rules.total"
         :page.sync="rules.page"
         :limit.sync="rules.limit"
         :page-sizes="rules.page_size"
@@ -173,6 +208,8 @@ export default {
         specification: "",
         search: "",
         subjectId: "",
+        hasYesFirstAnswer: '',
+        hasInstrumentsId: ''
       },
       tableList: [],
       rules: {
@@ -204,7 +241,12 @@ export default {
           page: this.rules.page,
           rows: this.rules.limit,
         });
-        this.tableList = res.data.rows;
+         let temp = res.data.rows || []
+          temp.forEach(item => {
+              let questionResult = item.questionResult.split('')
+              item.question1 = questionResult[0] == 1 ? '是' : '否'
+          })
+        this.tableList = temp;
         this.rules.total = res.data.total;
       } catch (e) {}
     },

src/views/reaplceMusicPlayer/modals/resetInfo.vue

@@ -24,7 +24,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="instrumentsId" label="品牌型号" :rules="[{required: true, message: '请选择品牌型号'}]">
+      <el-form-item prop="instrumentsId" label="品牌型号" >
         <el-select
           v-model.trim="form.instrumentsId"
           filterable