修改按键位置，学生下拉框数据改为查出来的班级数据

src/views/busClassesInfo/index.vue

@@ -53,7 +53,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <div style="float: right">
+        <el-form-item>
         <el-button
           :class="commonField.queryClass"
           :type="commonField.typePrimary"
@@ -66,7 +67,6 @@
           :size="commonField.smallSize"
           @click="resetQuery">重置</el-button>
       </el-form-item>
-      <div style="float: right">
         <el-form-item>
           <el-button
             :class="commonField.addClass"

src/views/busStudentInfo/index.vue

@@ -53,7 +53,9 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item>
+        
+        <div style="float: right">
+          <el-form-item>
           <el-button
             :class="commonField.queryClass"
             :type="commonField.typePrimary"
@@ -67,7 +69,6 @@
             :size="commonField.smallSize"
             @click="resetQuery">重置</el-button>
         </el-form-item>
-        <div style="float: right">
           <el-form-item>
             <el-button
               :class="commonField.addClass"
@@ -180,9 +181,9 @@
           >
             <el-option
               v-for="item in classData"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+              :key="item.businessId"
+              :label="item.classesName"
+              :value="item.businessId"
             />
           </el-select>
         </el-form-item>
@@ -212,7 +213,9 @@ import {
   addBusStudentInfo,
   updateBusStudentInfo,
   exportBusStudentInfo } from '@/api/busStudentInfo'
+  import {listBusClassesInfo} from '@/api/busClassesInfo'
 import commonField from '@/utils/commonField'
+import { get } from 'js-cookie';
 export default {
   name: 'BusStudentInfo',
   data() {
@@ -275,14 +278,14 @@ export default {
       },
       // 班级参数
       classData: [
-        { id: 1, name: '软件工程1班' },
-        { id: 2, name: '软件工程2班' },
-        { id: 3, name: '软件工程3班' },
-        { id: 4, name: '软件工程4班' },
-        { id: 5, name: '物联网工程1班' },
-        { id: 6, name: '物联网工程2班' },
-        { id: 7, name: '物联网工程3班' },
-        { id: 8, name: '物联网工程4班' }
+        // { id: 1, name: '软件工程1班' },
+        // { id: 2, name: '软件工程2班' },
+        // { id: 3, name: '软件工程3班' },
+        // { id: 4, name: '软件工程4班' },
+        // { id: 5, name: '物联网工程1班' },
+        // { id: 6, name: '物联网工程2班' },
+        // { id: 7, name: '物联网工程3班' },
+        // { id: 8, name: '物联网工程4班' }
       ]
     }
   },
@@ -295,8 +298,17 @@ export default {
   },
   created() {
     this.getList() // 列表查询
+    this.getClassList()// 班级列表
   },
   methods: {
+    //查询班级列表
+    getClassList() {
+      listBusClassesInfo().then(
+        response => {
+          this.classData = response.rows
+        }
+      )
+    },
     // 手机号校验
     isStuPhoneValid(rule, value, callback) {
       const reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/

src/views/busTeacherInfo/index.vue

@@ -53,7 +53,9 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item>
+        
+        <div style="float: right">
+          <el-form-item>
           <el-button
             :class="commonField.queryClass"
             :type="commonField.typePrimary"
@@ -67,7 +69,6 @@
             :size="commonField.smallSize"
             @click="resetQuery">重置</el-button>
         </el-form-item>
-        <div style="float: right">
           <el-form-item>
             <el-button
               :class="commonField.addClass"
@@ -99,11 +100,6 @@
             {{ scope.row.userName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="用户" prop="teaId" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.teaId || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="姓名" prop="teaName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.teaName || '-' }}
@@ -169,9 +165,6 @@
         <el-form-item label="账号" prop="userName">
           <el-input v-model.trim="form.userName" show-word-limit :maxlength="255" placeholder="请输入账号" />
         </el-form-item>
-        <el-form-item label="用户" prop="teaId">
-          <el-input-number v-model.trim="form.teaId" controls-position="right" :min="0" />
-        </el-form-item>
         <el-form-item label="姓名" prop="teaName">
           <el-input v-model.trim="form.teaName" show-word-limit :maxlength="255" placeholder="请输入姓名" />
         </el-form-item>

src/views/resDatasetInfo/index.vue

@@ -52,7 +52,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      
+      <div style="float: right">
+        <el-form-item>
         <el-button
           :class="commonField.queryClass"
           :type="commonField.typePrimary"
@@ -65,7 +67,6 @@
           :size="commonField.smallSize"
           @click="resetQuery">重置</el-button>
       </el-form-item>
-      <div style="float: right">
         <el-form-item>
           <el-button
             :class="commonField.addClass"
@@ -113,8 +114,6 @@
         </el-table-column>
         <el-table-column width="100" label="状态" prop="flag">
           <template slot-scope="scope">
-            <span v-if="scope.row.flag === '1'">启动  </span>  
-            <span v-else-if="scope.row.flag === '0'">停用 </span>
             <el-switch
               v-model="scope.row.flag"
               class="switchDisabledStyle"
@@ -129,7 +128,7 @@
             {{ scope.row.remarks || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" width="160" prop="createDate" :show-overflow-tooltip="true">
+        <el-table-column label="创建时间" width="200" prop="createDate" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
@@ -179,7 +178,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="标签选择" >
-            <el-select name="lableSelect" id="lableSelect" v-model="form.labelId" placeholder="请选择" multiple collapse-tags @change="labelChang()">
+            <el-select name="lableSelect" id="lableSelect" class="custom-select" v-model="form.labelId" placeholder="请选择" multiple collapse-tags @change="labelChang()">
               <el-option
               v-for="labelInfo in statusArr"
               :key="labelInfo.businessId"
@@ -419,6 +418,7 @@ export default {
     },
     // 改变状态
     handleStatusChange(row) {
+      console.log(row)
       const text = row.flag === '1' ? '启用' : '停用'
       this.$confirm('确认操作?', '提示', {
         confirmButtonText: '确定',
@@ -520,5 +520,8 @@ export default {
     background-color: #F4F4F4;
     margin-bottom: 10px
   }
+  .custom-select .el-input {
+    display: none;
+  }
   }
 </style>

src/views/resLabelInfo/index.vue

@@ -33,8 +33,9 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button
+        <div style="float: right">
+          <el-form-item>
+            <el-button
             :class="commonField.queryClass"
             :type="commonField.typePrimary"
             :icon="commonField.queryIcon"
@@ -48,9 +49,6 @@
             :size="commonField.smallSize"
             @click="resetQuery"
           >重置</el-button>
-        </el-form-item>
-        <div style="float: right">
-          <el-form-item>
             <el-button
               :class="commonField.addClass"
               :type="commonField.typePrimary"