Merge branch 'master' of http://gitlab.91isoft.com:90/zhangbotao/intelligent_station_web

src/api/resDatasetInfo.js

+import request from '@/utils/request'
+import Qs from 'qs'
+
+/**
+* 1. 列表查询
+* 2. 查询详细信息
+* 3. 新增
+* 4. 修改
+* 5. 逻辑删除
+* 6. 导出
+*
+*/
+
+// 1. 查询数据集信息列表
+export function listResDatasetInfo(query) {
+  return request({
+    url: '/resdatasetinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 2. 查询数据集信息详细信息
+export function getResDatasetInfo(businessId) {
+  return request({
+    url: '/resdatasetinfo/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 3. 新增数据集信息
+export function addResDatasetInfo(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/resdatasetinfo/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 4. 修改数据集信息
+export function updateResDatasetInfo(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/resdatasetinfo/update/' + businessId,
+    method: 'put',
+    data
+  })
+}
+
+// 5. 逻辑删除数据集信息
+export function delResDatasetInfo(businessId) {
+  return request({
+    url: '/resdatasetinfo/deleteLogical/' + businessId,
+    method: 'delete'
+  })
+}
+
+// 6. 导出数据集信息
+export function exportResDatasetInfo(query) {
+  return request({
+    url: '/resdatasetinfo/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/busStudentInfo/index.vue

@@ -96,11 +96,6 @@
             {{ scope.row.userName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="用户" prop="userId" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.userId || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="姓名" prop="stuName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.stuName || '-' }}
@@ -132,11 +127,6 @@
             {{ scope.row.remarks || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
           <template slot-scope="scope">
             <el-button
@@ -168,11 +158,8 @@
         <el-form-item label="学号" prop="userCode">
           <el-input v-model.trim="form.userCode" show-word-limit :maxlength="255" placeholder="请输入学号" />
         </el-form-item>
-        <el-form-item label="账号（关联sys_user)" prop="userName">
-          <el-input v-model.trim="form.userName" show-word-limit :maxlength="255" placeholder="请输入账号（关联sys_user)" />
-        </el-form-item>
-        <el-form-item label="用户（关联sys_user）" prop="userId">
-          <el-input-number v-model.trim="form.userId" controls-position="right" :min="0" />
+        <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="stuName">
           <el-input v-model.trim="form.stuName" show-word-limit :maxlength="255" placeholder="请输入姓名" />
@@ -251,6 +238,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        userCode: [
+          { required: true, message: '学号不能为空', trigger: 'blur' }
+        ],
+        userName: [
+          { required: true, message: '账号不能为空', trigger: 'blur' }
+        ],
+        stuName: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        stuPhone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' }
+        ],
+        classesId: [
+          { required: true, message: '班级不能为空', trigger: 'blur' }
+        ]
       }
     }
   },
@@ -360,9 +362,13 @@ export default {
             })
           } else {
             addBusStudentInfo(this.form).then(response => {
-              this.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
+              if (response.code === 200) {
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.$message.error(response.message)
+              }
             })
           }
         }

src/views/resDatasetInfo/index.vue

+<template>
+  <div class="app-container">
+    <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
+            <el-form-item label="数据集名称" prop="dataName">
+        <el-input
+          v-model="queryParams.dataName"
+          placeholder="请输入数据集名称"
+          clearable
+          :maxlength="255"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
+      <el-form-item label="数据集编号" prop="dataCode">
+        <el-input
+          v-model="queryParams.dataCode"
+          placeholder="请输入数据集编号"
+          clearable
+          :maxlength="255"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
+      <el-form-item label="数据集路径" prop="dataOssPath">
+        <el-input
+          v-model="queryParams.dataOssPath"
+          placeholder="请输入数据集路径"
+          clearable
+          :maxlength="255"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
+      <el-form-item label="数据集分类（1语言，2视觉，3多模态）" prop="dataType">
+        <el-input
+          v-model="queryParams.dataType"
+          placeholder="请输入数据集分类（1语言，2视觉，3多模态）"
+          clearable
+          :maxlength="255"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="flag">
+        <el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
+          <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          :class="commonField.queryClass"
+          :type="commonField.typePrimary"
+          :icon="commonField.queryIcon"
+          :size="commonField.smallSize"
+          @click="handleQuery">查询</el-button>
+        <el-button
+          :class="commonField.resetClass"
+          :icon="commonField.resetIcon"
+          :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"
+            :icon="commonField.addIcon"
+            :size="commonField.smallSize"
+            @click="handleAdd">新增</el-button>
+          <el-button
+            :class="commonField.exportClass"
+            :type="commonField.typeSuccess"
+            :icon="commonField.exportIcon"
+            :size="commonField.smallSize"
+            @click="handleExport">导出</el-button>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div class="placeholder" />
+    <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="dataName" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.dataName || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数据集编号" prop="dataCode" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.dataCode || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数据集路径" prop="dataOssPath" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.dataOssPath || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数据集分类（1语言，2视觉，3多模态）" prop="dataType" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.dataType || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column width="120" label="状态" prop="flag">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.flag"
+              class="switchDisabledStyle"
+              inactive-value="0"
+              active-value="1"
+              @click.native="handleStatusChange(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.remarks || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
+          <template slot-scope="scope">
+            <el-button
+              :class="commonField.updateClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
+            <el-button
+              :class="commonField.delClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.rows"
+        @pagination="getList"
+    />
+    <!-- 添加或修改数据集信息配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="200px">
+        <el-form-item label="数据集名称" prop="dataName">
+          <el-input v-model.trim="form.dataName" show-word-limit :maxlength="255" placeholder="请输入数据集名称" />
+        </el-form-item>
+        <el-form-item label="数据集编号" prop="dataCode">
+          <el-input v-model.trim="form.dataCode" show-word-limit :maxlength="255" placeholder="请输入数据集编号" />
+        </el-form-item>
+        <el-form-item label="数据集路径" prop="dataOssPath">
+          <el-input v-model.trim="form.dataOssPath" show-word-limit :maxlength="255" placeholder="请输入数据集路径" />
+        </el-form-item>
+        <!-- <el-form-item label="数据集分类（1语言，2视觉，3多模态）" prop="dataType">
+          <el-input v-model.trim="form.dataType" show-word-limit :maxlength="255" placeholder="请输入数据集分类（1语言，2视觉，3多模态）" />
+        </el-form-item> -->
+        <el-form-item label="数据集分类" prop="dataType">
+            <el-radio-group v-model="form.dataType">
+              <el-radio label="1">语言</el-radio>
+              <el-radio label="2">视觉</el-radio>
+              <el-radio label="3">多模态</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-radio-group v-model="form.flag">
+              <el-radio label="1">启用</el-radio>
+              <el-radio label="0">停用</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model.trim="form.remarks" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="cancelBtn" @click="cancel">取 消</el-button>
+        <el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listResDatasetInfo,
+  getResDatasetInfo,
+  delResDatasetInfo,
+  addResDatasetInfo,
+  updateResDatasetInfo,
+  exportResDatasetInfo } from '@/api/resDatasetInfo'
+import commonField from '@/utils/commonField'
+export default {
+  name: 'ResDatasetInfo',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 数据集信息表格数据
+      resDatasetInfoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 状态菜单
+      statusOptions: [
+        {
+          dictLabel: '启用',
+          dictValue: '1'
+        },
+        {
+          dictLabel: '停用',
+          dictValue: '0'
+        }
+      ],
+      // 查询参数
+      queryParams: {
+        page: 1,
+        rows: 10,
+        dataName: undefined,
+        dataCode: undefined,
+        dataOssPath: undefined,
+        dataType: undefined,
+        flag: ''
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dataName:[{type: 'string',required: true,message: "数据集名称必填", trigger: 'blur'}],
+        dataCode:[{type: 'string',required: true,message: "数据集号码必填", trigger: 'blur'}],
+        dataOssPath:[{type: 'string',required: true,message: "数据集地址必填", trigger: 'blur'}],
+        dataType:[{type: 'string',required: true,message: "数据集类型必填", trigger: 'blur'}]
+      }
+    }
+  },
+  computed: {
+    commonField() {
+      return commonField
+    }
+  },
+  created() {
+    this.getList() // 列表查询
+  },
+  methods: {
+    /** 查询数据集信息列表 */
+    getList() {
+      this.loading = true
+      listResDatasetInfo(this.queryParams).then(
+              response => {
+                this.resDatasetInfoList = response.rows
+                this.total = response.total
+                this.loading = false
+              }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        businessId: undefined,
+        remarks: undefined,
+        dataName: undefined,
+        dataCode: undefined,
+        dataOssPath: undefined,
+        dataType: undefined,
+        flag: '1'
+      }
+      this.resetForm('form')
+    },
+    /** 查询按钮操作 */
+    handleQuery() {
+      this.queryParams.page = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        dataName: undefined,
+        dataCode: undefined,
+        dataOssPath: undefined,
+        dataType: undefined,
+        flag: ''
+      }
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加数据集信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.businessId
+      getResDatasetInfo(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改数据集信息'
+      })
+    },
+    // 改变状态
+    handleStatusChange(row) {
+      const text = row.flag === '1' ? '启用' : '停用'
+      this.$confirm('确认操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return updateResDatasetInfo(row)
+      }).then(() => {
+        this.$message({
+          message: text + '成功',
+          type: 'success'
+        })
+      }).catch(function() {
+        row.flag = row.flag === '0' ? '1' : '0'
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.businessId !== undefined) {
+            updateResDatasetInfo(this.form).then(response => {
+              this.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addResDatasetInfo(this.form).then(response => {
+              this.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.businessId
+      this.$confirm('是否确认操作？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delResDatasetInfo(id)
+      }).then(() => {
+        this.getList()
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+      }).catch(function() {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams
+      this.$confirm('是否确认操作?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return exportResDatasetInfo(queryParams).then(response => {
+          const blob = new Blob([response])
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)// 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = '数据集信息信息' + '.xls' // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click()// 点击下载
+          document.body.removeChild(downloadElement)// 下载完成移除元素
+          window.URL.revokeObjectURL(href)// 释放掉blob对象
+        })
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .app-container {
+    font-size: 18px;
+    padding: 0;
+
+  .placeholder {
+    height: 1.3vh;
+    background-color: #F4F4F4;
+    margin-bottom: 10px
+  }
+  }
+</style>