Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/busTeacherInfo/index.vue
#	src/views/resDatasetInfo/index.vue

src/views/busClassesInfo/index.vue

@@ -53,6 +53,7 @@
           />
         </el-select>
       </el-form-item>
+      <div style="float: right">
         <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -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,6 +53,8 @@
             />
           </el-select>
         </el-form-item>
+        
+        <div style="float: right">
           <el-form-item>
           <el-button
             :class="commonField.queryClass"
@@ -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"
@@ -85,7 +86,6 @@
         </div>
       </el-form>
     </div>
-    <div class="placeholder" />
     <div style="padding:5px 10px">
       <el-table v-loading="loading" border :data="busStudentInfoList" >
         <el-table-column type="index" label="序号" width="55" align="center" />
@@ -180,9 +180,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 +212,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 +277,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 +297,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,8 @@
             />
           </el-select>
         </el-form-item>
-        <div class="search">
+        
+        <div style="float: right">
           <el-form-item>
           <el-button
             :class="commonField.queryClass"
@@ -68,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"
@@ -84,10 +84,8 @@
               @click="handleExport">导出</el-button>
           </el-form-item>
         </div>
-        </div>
       </el-form>
     </div>
-    <div class="placeholder" />
     <div style="padding:5px 10px">
       <el-table v-loading="loading" border :data="busTeacherInfoList" >
         <el-table-column type="index" label="序号" width="55" align="center" />

src/views/resDatasetInfo/index.vue

@@ -52,6 +52,8 @@
           />
         </el-select>
       </el-form-item>
+      
+      <div style="float: right">
         <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -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"
@@ -83,6 +84,7 @@
       </div>
     </el-form>
     <div style="padding:5px 10px">
+      <div class="mb12 font-small-bold">数据集信息列表</div>
       <el-table v-loading="loading" border :data="resDatasetInfoList" >
         <el-table-column type="index" label="序号" width="55" align="center" />
         <el-table-column label="数据集编号" prop="dataCode" :show-overflow-tooltip="true">
@@ -111,8 +113,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"
@@ -177,7 +177,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"
@@ -417,6 +417,7 @@ export default {
     },
     // 改变状态
     handleStatusChange(row) {
+      console.log(row)
       const text = row.flag === '1' ? '启用' : '停用'
       this.$confirm('确认操作?', '提示', {
         confirmButtonText: '确定',
@@ -518,5 +519,8 @@ export default {
     background-color: #F4F4F4;
     margin-bottom: 10px
   }
+  .custom-select .el-input {
+    display: none;
+  }
   }
 </style>

src/views/resLabelInfo/index.vue

@@ -33,6 +33,7 @@
             />
           </el-select>
         </el-form-item>
+        <div style="float: right">
           <el-form-item>
             <el-button
             :class="commonField.queryClass"
@@ -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"