修改打包

dist/static/css/chunk-0e6419c2.f12d1121.css

@@ -0,0 +1 @@
+.btnList[data-v-78b2539f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.code-url[data-v-78b2539f]{margin-top:10px}

dist/static/css/chunk-7386f3b0.bd68b159.css

@@ -0,0 +1 @@
+.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-a10777a0] .el-input__inner,.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

src/layout/components/AppMain.vue

@@ -45,16 +45,16 @@ export default {
   /*50 = navbar  */
   /* height: calc(100vh - 80px); */
   /* height: 100vh; */
-  padding-top: 80px;
+  padding-top: 90px;
   /* min-width: 1440px; */
   position: relative;
   /* overflow: auto; */
   box-sizing: border-box;
-  margin-left: 10px;
+  margin-left: 20px;
   margin-top: 20px;
 }
 .fixed-header + .app-main {
-  padding-top: 85px;
+  padding-top: 105px;
 }
 </style>
 

src/layout/components/Navbar.vue

@@ -41,7 +41,7 @@
         <!-- <div class="active"></div> -->
       </div>
       <div class="left-menu">
-        <el-popover placement="top-start" width="300" trigger="hover" style="display: flex;height: 69px;">
+        <el-popover placement="top-start" width="300" trigger="hover" style="display: flex;height: 89px;">
           <div class="popover-container">
             <el-tag
               class="navbar_tag"
@@ -51,7 +51,7 @@
               >{{ item }}</el-tag
             >
           </div>
-          <span slot="reference" style="display: flex;align-items: center;justify-content: center;height: 69px;">
+          <span slot="reference" style="display: flex;align-items: center;justify-content: center;height: 89px;">
             <!-- {{ organName.length > 10 ? organName.substr(0, 10) + "..." : organName }} -->
             <!-- <i class="el-icon-s-home" style="font-size: 23px; color: #1A1A1A;"></i> -->
             <img src="@/assets/images/base/base-home.svg" style="width: 23px;">
@@ -303,8 +303,8 @@ export default {
 
 .indexlayout-top-menu{
   padding-left: 57px;
-  height: 70px;
-  line-height: 68px;
+  height: 90px;
+  line-height: 88px;
   flex: 1;
   display: flex;
   overflow: hidden;
@@ -312,7 +312,7 @@ export default {
   .indexlayout-top-menu-li{
     display: inline-block;
     padding: 0 5px;
-    height: 70px;
+    height: 90px;
     text-decoration: none;
     color: #f2f2f2;
     font-size: 18px;
@@ -332,7 +332,7 @@ export default {
     }
   }
   .breadcrumb{
-    line-height: 70px;
+    line-height: 90px;
     margin-left: 10px;
     .el-breadcrumb__item{
       display: inline-block;
@@ -348,19 +348,19 @@ export default {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  height: 70px;
+  height: 90px;
   overflow: hidden;
   position: relative;
   background: #363D55;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
   h2 {
     font-size: 18px;
-    line-height: 70px;
+    line-height: 90px;
     margin: 0 0 0 30px;
     display: inline-block;
   }
   .hamburger-container {
-    line-height: 70px;
+    line-height: 90px;
     height: 100%;
     float: left;
     cursor: pointer;
@@ -376,7 +376,7 @@ export default {
     float: left;
   }
   .left-menu {
-    line-height: 70px;
+    line-height: 90px;
     padding-right: 22px;
     font-size: 16px;
     color: #fff;
@@ -389,7 +389,7 @@ export default {
     min-width: 154px;
     float: right;
     height: 100%;
-    line-height: 70px;
+    line-height: 90px;
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
@@ -438,7 +438,7 @@ export default {
     }
 
     .avatar-container {
-      height: 70px;
+      height: 90px;
       margin-right: 42px;
       cursor: pointer;
 

src/layout/components/Sidebar/index.vue

@@ -139,7 +139,9 @@ export default {
 }
 
 /deep/.el-menu-item.is-active {
+    font-weight: bold;
     background-color: #EEF4F4 !important;
+    color: #14928a !important;
     position: relative;
     &::after{
       position: absolute;
@@ -152,7 +154,17 @@ export default {
       height: 100%;
     }
 }
+/deep/.el-submenu .el-menu-item.is-active {
+  color: #14928a !important;
+}
 /deep/.el-menu .menu-wrapper .el-menu-item {
   color: #666666;
 }
+/deep/.el-menu-item, /deep/.el-submenu__title {
+  height: 60px !important;
+  line-height: 60px !important;
+}
+/deep/.el-submenu .el-menu-item {
+  color: #666666 !important;
+}
 </style>

src/layout/index.vue

@@ -9,7 +9,7 @@
     </div>
     <sidebar class="sidebar-container" @childStatus="childStatus" v-show="onlyStatus" />
     <div class="main-container" :class="[ onlyStatus ? null : 'noContainer' ]">
-      <div :class="{'fixed-header':fixedHeader, 'noTagView': !onlyStatus}" style="top: 70px;" >
+      <div :class="{'fixed-header':fixedHeader, 'noTagView': !onlyStatus}" style="top: 90px;" >
         <!-- <navbar /> -->
         <tags-view></tags-view>
       </div>
@@ -72,7 +72,7 @@ export default {
 @import "~@/styles/variables.scss";
 
 #app .sidebar-container {
-  top: 70px;
+  top: 90px;
   background-color: #fff;
 
 }

src/router/index.js

@@ -436,7 +436,9 @@ export const asyncRoutes = {
   // 未在班级学员
   notClassStudent:()=>import('@/views/main/notClassStudent'),
   // 报表中心 下载列表
-  downList:()=>import('@/views/reportForm/downList')
+  downList:()=>import('@/views/reportForm/downList'),
+  // 乐器置换
+  reaplceMusicPlayer:()=>import('@/views/reaplceMusicPlayer')
 }
 
 export default router

src/router/notKeepAliveList.js

@@ -104,5 +104,6 @@ export default [
   '/business/remedy', //
   '/setSilder/setSilder',
   '/downList', //下载列表
+  '/business/reaplceMusicPlayer' // 乐器置换
   // '/business/feeAudit',
 ]

src/utils/validate.js

@@ -54,6 +54,22 @@ export function vaildTeacherUrl() {
   return returnUrl
 }
 
+// 教务地址
+export function vaildTeachingUrl() {
+  let url = window.location.href
+  let returnUrl = ''
+  if (/dev/.test(url)) { // dev 环境
+    returnUrl = 'http://mandev.dayaedu.com'
+  } else if (/test/.test(url)) { // dev 环境
+    returnUrl = 'http://mantest.dayaedu.com'
+  } else if (/online/.test(url)) { //线上
+    returnUrl = 'https://manonline.dayaedu.com'
+  } else { // 默认dev环境
+    returnUrl = 'http://mandev.dayaedu.com'
+  }
+  return returnUrl
+}
+
 
 export function nextMonthLastDay(year, month) { //日期显示为次月最后一天
   // var time = date ? new Date(date) : new Date();

src/views/evaluateManager/networkList.vue

@@ -138,8 +138,7 @@
           v-if="tableData.length > 0"
           v-permission="'export/courseReviews'"
           @click="netWorkExport"
-          >导出</el-button
-        >
+          >导出</el-button>
       </el-form-item>
     </save-form>
     <div class="tableWrap">

src/views/main/constant.js

@@ -68,7 +68,7 @@ export const errorType = {
   MUSIC_PATROL_ITEM: {
     name: '乐团巡查事项异常',
     isError: false,
-    url: '/teacherManager/musicInspection',
+    url: '/musicInspection',
     permission: '/musicInspection',
     always: true,
     query: {
@@ -106,7 +106,7 @@ export const errorType = {
   STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP: {
     name: '申请退团学员数',
     isError: true,
-    url: '/studentManager/WithdrawalApplication',
+    url: '/journal/WithdrawalApplication',
     permission: '/WithdrawalApplication',
     always: true,
     query: {
@@ -203,7 +203,7 @@ export const errorType = {
   INSPECTION_ITEM_PLAN: {
     name: '乐团巡查任务未提交',
     isError: true,
-    url: '/teacherManager/musicInspection',
+    url: '/musicInspection',
     permission: '/musicInspection',
     always: true,
     query: {

src/views/reaplceMusicPlayer/api.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+import request2 from '@/utils/request2'
+import qs from 'qs'
+let api = '/api-web'
+
+
+// 生成链接
+export function addReplacement (data) {
+  return request2({
+    url: api + `/replacementInstrumentCooperation/add`,
+    method: 'post',
+    params:{},
+    requestType: 'form',
+    data,
+
+  })
+}
+
+// 查询活动列表
+export function getReplacementList (data) {
+  return request2({
+    url: api + `/replacementInstrumentCooperation/queryPage`,
+    method: 'get',
+    params: data,
+    requestType: 'form',
+  })
+}
+
+// 开启缴费
+export function openPayReplacement (data) {
+  return request2({
+    url: api + `/replacementInstrumentCooperation/openPay`,
+    method: 'post',
+    params:{},
+    data,
+    requestType: 'form',
+  })
+}

src/views/reaplceMusicPlayer/index.vue

@@ -0,0 +1,347 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      乐器置换
+    </h2>
+    <div class="m-core">
+      <div class="btnList">
+        <!--      v-permission="'export/practiceGroup'" -->
+        <div
+          class="newBand"
+          @click="makeUrl"
+          style="max-width: 150px; margin-right: 10px"
+          v-if="permission('replacementInstrumentCooperation/add')"
+        >
+          生成链接
+        </div>
+        <!-- <div class="newBand" @click="onExport" style="max-width: 150px">
+          导出
+        </div> -->
+      </div>
+      <save-form
+        :inline="true"
+        ref='searchForm'
+        :model="searchForm"
+        @submit="search"
+        @reset="onReSet"
+      >
+        <el-form-item prop="search">
+          <el-input
+            v-model.trim="searchForm.search"
+            clearable
+            @keyup.enter.native="search"
+            placeholder="学校名称或编号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="organId">
+          <el-select
+            v-model.trim="searchForm.organId"
+            filterable
+            clearable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="openPay">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.openPay"
+            filterable
+            clearable
+            placeholder="是否开启缴费"
+          >
+            <el-option label="是" value="YES"></el-option>
+            <el-option label="否" value="NO"></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>
+        </el-form-item>
+      </save-form>
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="organName"
+            label="分部"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="cooperationOrganName"
+            label="合作单位"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.cooperationOrganName }}
+                (<copy-text> {{ scope.row.cooperationOrganId }} </copy-text>)
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="activeNum"
+            label="调查人数"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="replaceNum"
+            label="置换人数"
+          ></el-table-column>
+          <el-table-column align="center" prop="replaceScale" label="置换率">
+            <template slot-scope="scope">
+              <div>{{ scope.row.replaceScale }}%</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="openPay" label="是否开启缴费">
+            <template slot-scope="scope">
+              <div>{{ scope.row.openPay ? "是" : "否" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="studentId" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <!-- <el-button type="text" @click="lookDetail(scope.row)"
+                  >详情</el-button
+                > -->
+                <el-button
+                  type="text"
+                  @click="onCreateQRCode(scope.row, '调查链接')"
+                  >调查链接</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="onCreateQRCode(scope.row, '统计链接')"
+                  >统计链接</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="openPay(scope.row)"
+                  v-if="!scope.row.openPay&&permission('replacementInstrumentCooperation/openPay')"
+                  >开启缴费</el-button
+                >
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+    <el-dialog
+      title="生成链接"
+      :visible.sync="makeUrlVisible"
+      width="500px"
+      v-if="makeUrlVisible"
+    >
+      <addUrl ref="addUrl" @close="close" @getList="getList" />
+      <div slot="footer">
+        <el-button @click="makeUrlVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addurl">生成链接</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      title="详情"
+      :visible.sync="detailVisible"
+      width="1000px"
+      v-if="detailVisible"
+    >
+      <detail ref="detail" @close="close" />
+      <div slot="footer">
+        <el-button type="primary" @click="detailVisible = false"
+          >确定</el-button
+        >
+      </div>
+    </el-dialog>
+
+      <qr-code v-model="qrcodeStatus"
+             :title="qrcodeName"
+             :codeUrl="codeUrl" />
+
+    <!-- <el-dialog :title="qrcodeName" :visible.sync="qrcodeStatus" width="300px">
+      <div class="left-code">
+        <div id="qrcode" class="qrcode code" ref="qrCodeUrl"></div>
+        <p class="code-url" v-if="codeUrl">
+          <copy-text>
+            {{ codeUrl }}
+          </copy-text>
+        </p>
+      </div>
+    </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import { permission } from "@/utils/directivePage";
+import { vaildStudentUrl, vaildTeachingUrl } from "@/utils/validate";
+import pagination from "@/components/Pagination/index";
+import addUrl from "./modals/addUrl";
+import detail from "./modals/detail";
+import load from "@/utils/loading";
+import { getReplacementList, openPayReplacement } from "./api";
+import QrCode from "@/components/QrCode/index";
+export default {
+  components: { pagination, addUrl, detail, QrCode, },
+  data() {
+    return {
+      searchForm: {
+        search: null,
+        organId: "",
+        openPay: "",
+      },
+
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      makeUrlVisible: false,
+      detailVisible: false,
+      codeUrl: "",
+      qrcodes: true,
+      qrcodeStatus: false,
+      qrcodeName: "调查链接",
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    // 获取分部
+
+    this.init();
+  },
+  methods: {
+    permission(str, parent) {
+      return permission(str, parent);
+    },
+    init() {
+      this.$store.dispatch("setBranchs");
+      this.getList();
+    },
+    async getList() {
+      try {
+        const res = await getReplacementList({
+          ...this.searchForm,
+          page: this.rules.page,
+          rows: this.rules.limit,
+        });
+        this.rules.total = res.data.total;
+        this.tableList = res.data.rows;
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {
+      this.$refs.searchForm.resetFields()
+      this.search()
+    },
+    makeUrl() {
+      this.makeUrlVisible = true;
+    },
+    addurl() {
+      this.$refs.addUrl.submit();
+    },
+    close() {
+      this.makeUrlVisible = false;
+      this.detailVisible = false;
+    },
+    onExport() {},
+    lookDetail(row) {
+      this.detailVisible = true;
+    },
+    onCreateQRCode(row, name) {
+      // 生成链接
+      this.qrcodeName = name;
+      this.qrcodeStatus = true;
+
+      let id = this.$route.query.id;
+      if (this.qrcodes) {
+        this.qrcodes = false;
+
+        // setTimeout(() => {
+        //   document.getElementById("qrcode").innerHTML = "";
+        //   this.qrcode = new QRCode("qrcode", {
+        //     width: 260,
+        //     height: 260,
+        //     colorDark: "#000000",
+        //     colorLight: "#ffffff",
+        //     correctLevel: QRCode.CorrectLevel.H,
+        //   });
+          let str;
+          if (name == "调查链接") {
+            let returnUrl = vaildStudentUrl()+`/#/questionnaire?o=${row.organId}&c=${row.cooperationOrganId}`;
+            // console.log(returnUrl)
+            let tempUrl = vaildStudentUrl()+`/#/transfer?returnUrl=${encodeURIComponent(returnUrl)}`
+            str = tempUrl
+          } else if (name == "统计链接") {
+            str = vaildTeachingUrl()+`/#/questionStatistics?o=${row.organId}&c=${row.cooperationOrganId}`;
+          }
+          // vaildTeachingUrl
+          // this.qrcode.makeCode(
+          //   str +
+          //     `/#/questionnaireInfo?o=${row.organId}&c=${row.cooperationOrganId}`
+          // );
+          this.codeUrl =str;
+          this.qrcodes = true;
+        // }, 100);
+      }
+    },
+    openPay(row) {
+      this.$confirm("确定开启缴费?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          try {
+            const res = await openPayReplacement({ id: row.id });
+            this.$message.success("开启缴费成功");
+            this.getList();
+          } catch (e) {
+            console.log(e);
+          }
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.btnList {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
+.code-url {
+  margin-top: 10px;
+}
+</style>

src/views/reaplceMusicPlayer/modals/addUrl.vue

@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <el-form :model="form" label-width="80px" ref="form">
+      <el-form-item
+        label="分部"
+        prop="organId"
+        :rules="[{ required: true, message: '请选择分部' }]"
+      >
+        <el-select
+          v-model.trim="form.organId"
+          filterable
+          clearable
+          placeholder="请选择分部"
+          @change="changeSection"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="合作单位"
+        prop="school"
+        :rules="[{ required: true, message: '请选择合作单位' }]"
+      >
+        <el-select
+          v-model.trim="form.school"
+          :disabled="!form.organId"
+          filterable
+          clearable
+        >
+          <el-option
+            v-for="(item, index) in cooperationList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { queryByOrganId } from "@/api/systemManage";
+import { addReplacement } from "../api"
+export default {
+  data() {
+    return {
+      form: {
+        organId: "",
+        school: "",
+      },
+      cooperationList: [],
+    };
+  },
+  methods: {
+    changeSection(val) {
+      this.form.school = "";
+      queryByOrganId({ organId: val }).then((res) => {
+        if (res.code == 200) {
+          this.cooperationList = res.data;
+        }
+      });
+    },
+   submit() {
+      this.$refs.form.validate( async(res) => {
+        if (res) {
+          try{
+          const res = await addReplacement({cooperationOrganId:this.form.school,organId:this.form.organId})
+          this.$message.success('生成链接成功')
+           this.$emit('getList')
+          this.$emit('close')
+          }catch(e){
+          console.log(e)
+          }
+
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -0,0 +1,174 @@
+<template>
+  <div>
+    <el-form
+      :inline="true"
+      :model="searchForm"
+      ref="searchForm"
+      @submit="search"
+      @reset="onReSet"
+    >
+      <el-form-item>
+        <el-input
+          v-model.trim="searchForm.search"
+          clearable
+          @keyup.enter.native="search"
+          placeholder="学生姓名或手机号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="organIdList">
+        <el-select
+          v-model.trim="searchForm.organIdList"
+          filterable
+          clearable
+          placeholder="请选择声部"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="organIdList">
+        <el-select
+          v-model.trim="searchForm.organIdList"
+          filterable
+          clearable
+          placeholder="请选择品牌"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item prop="organIdList">
+        <el-select
+          v-model.trim="searchForm.organIdList"
+          filterable
+          clearable
+          placeholder="请选择型号"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></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>
+      </el-form-item>
+    </el-form>
+    <div class="tableWrap">
+      <el-table
+        style="width: 100%"
+        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        :data="tableList"
+      >
+        <el-table-column
+          align="center"
+          prop="studentId"
+          label="声部"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="studentId"
+          label="学员姓名"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="studentId"
+          label="联系电话"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="studentId"
+          label="品牌"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="studentId"
+          label="型号"
+        ></el-table-column>
+        <el-table-column align="center" prop="studentId" label="操作">
+          <template slot-scope="scope">
+            <div>
+              <el-button type="text" @click="resetMusic(scope.row)">修改</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        sync
+        :total.sync="rules.total"
+        :page.sync="rules.page"
+        :limit.sync="rules.limit"
+        :page-sizes="rules.page_size"
+        @pagination="getList"
+      />
+    </div>
+    <el-dialog
+        title="修改信息"
+        :visible.sync="dialogVisible"
+        width="1000px"
+        append-to-body v-if="dialogVisible">
+        <resetInfo @close="close"/>
+        <div slot="footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确认修改</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import pagination from "@/components/Pagination/index";
+import resetInfo from './resetInfo'
+export default {
+  components: { pagination,resetInfo },
+  data() {
+    return {
+      searchForm: {
+        organIdList: "",
+        search: "",
+      },
+      tableList: [{}],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      dialogVisible:false
+    };
+  },
+  mounted() {},
+  methods: {
+    init() {
+      this.getList();
+    },
+    getList() {},
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet(){
+        this.$refs.searchForm.resetFields();
+        this.search()
+    },
+    resetMusic(row){
+        this.dialogVisible = true
+    },
+    close(){
+        this.dialogVisible = false
+    }
+  },
+};
+</script>

src/views/reaplceMusicPlayer/modals/resetInfo.vue

@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <el-form :model="form" label-width="80px" :inline="true">
+      <el-form-item label="学员姓名">
+        <div style="width:180px"></div>
+      </el-form-item>
+      <el-form-item label="联系电话">
+        <div></div>
+      </el-form-item>
+      <br />
+      <el-form-item prop="organIdList" label="声部">
+        <el-select
+          v-model.trim="form.organIdList"
+          filterable
+          clearable
+          placeholder="请选择声部"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="organIdList" label="品牌">
+        <el-select
+          v-model.trim="form.organIdList"
+          filterable
+          clearable
+          placeholder="请选择品牌"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item prop="organIdList" label="型号">
+        <el-select
+          v-model.trim="form.organIdList"
+          filterable
+          clearable
+          placeholder="请选择型号"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      form: {
+        sound: "",
+        pinpai: "",
+        xinghao: "",
+        organIdList: "",
+      },
+    };
+  },
+};
+</script>

src/views/setSilder/addSilder.vue

@@ -3,7 +3,7 @@
     <!-- <h2><div class="squrt"></div>侧边栏管理
     </h2> -->
     <div class="m-core slider-container">
-      <div style="position: fixed; z-index: 100; top: 100px;left: 245px;right: 30px">
+      <div style="position: fixed; z-index: 100; top: 155px;left: 245px;right: 30px">
         <el-input placeholder="请输入关键词" v-model="keyword" clearable>
           <el-button
             v-permission="'menu/add'"

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -55,7 +55,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: false,
+    https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
@@ -66,7 +66,7 @@ module.exports = {
       // let target = 'http://dev.dayaedu.com'
       // 'http://dev.dayaedu.com'
       '/api-auth': {
-        target: 'http://dev.dayaedu.com',
+        target: target,
         // target: 'http://47.114.176.40:8000',
         changeOrigin: true,
         pathRewrite: {