Skip to content

T
tea-resources-web
Commit 5919d194 authored by YLKCNK's avatar YLKCNK
Browse files
Options

Merge remote-tracking branch 'origin/1.0' into 1.0 

# Conflicts:
#	src/views/contentManagement/banner/index.vue
parents be15b5e5 a849cdcd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 125 deletions
src/views/courseInformation/classManagement/index.vue
View file @ 5919d194
......@@ -21,8 +21,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="适用岗位" prop="value">
<el-select v-model="queryParams.value" placeholder="适用岗位" clearable>
<el-form-item label="岗位分类" prop="value">
<el-select v-model="queryParams.value" placeholder="岗位分类" clearable>
<el-option
v-for="item in valueOptions"
:key="item.value"
......@@ -31,8 +31,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="技术方向" prop="teDirection">
<el-select v-model="queryParams.teDirection" placeholder="技术方向" clearable>
<el-form-item label="技术分类" prop="teDirection">
<el-select v-model="queryParams.teDirection" placeholder="技术分类" clearable>
<el-option
v-for="item in courseDirection"
:key="item.value"
......@@ -95,7 +95,7 @@
<div class="tableTitle">开课管理列表</div>
<el-table v-loading="loading" border :data="dateList">
<el-table-column type="index" label="序号" width="90" />
<el-table-column label="单位" prop="roleName" :show-overflow-tooltip="true">
<el-table-column label="单位名称" prop="roleName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.unitName || '-' }}
</template>
......@@ -105,12 +105,12 @@
{{ scope.row.lessonName || '-' }}
</template>
</el-table-column>
<el-table-column label="适用岗位" prop="roleSort" :show-overflow-tooltip="true">
<el-table-column label="岗位分类" prop="roleSort" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>后端开发</span>
</template>
</el-table-column>
<el-table-column label="技术方向" prop="value" :show-overflow-tooltip="true">
<el-table-column label="技术分类" prop="value" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.teDirection || '-' }}
</template>
......
src/views/courseInformation/examinationManagement/examinationPaper.vue
View file @ 5919d194
......@@ -481,6 +481,10 @@ export default {
this.$refs.form.validate(valid => {
if (valid) {
if (this.form.businessId !== undefined) {
if (this.form.questionType === 2) {
form.answer = this.getAnswer(form.answerList)
}
form.optionsList = this.getOptionList()
// 编辑
updateTeaExamQuestions(form).then(res => {
if (res.code === 200) {
......@@ -662,6 +666,10 @@ export default {
handleUpdate(row) {
getTeaExamQuestions(row.businessId).then(res => {
const { optionA, optionB, optionC, optionD } = this.handleOptionContent(res.data.optionsList)
res.data.optionA = optionA
res.data.optionB = optionB
res.data.optionC = optionC
res.data.optionD = optionD
// 当题目是多选的时候,处理题目答案选项
if (res.data.questionType === 2) {
res.data.answerList = []
......@@ -670,10 +678,10 @@ export default {
}
// 处理选项内容
this.form = res.data
this.form.optionA = optionA
this.form.optionB = optionB
this.form.optionC = optionC
this.form.optionD = optionD
// this.form.optionA = optionA
// this.form.optionB = optionB
// this.form.optionC = optionC
// this.form.optionD = optionD
this.title = '修改试题'
this.dialogFormVisible = true
})
......
src/views/courseInformation/tryoutApplication/index.vue 0 → 100644
View file @ 5919d194
<template>
<div>试用申请</div>
</template>
<script>
export default {
name: 'Index'
}
</script>
<style scoped lang="scss">
</style>
src/views/courseInformation/tryoutCommencement/index.vue 0 → 100644
View file @ 5919d194
<template>
<div>
试用开课
</div>
</template>
<script>
export default {
name: 'Index'
}
</script>
<style scoped lang="scss">
</style>
src/views/courseInformation/unitManagement/index.vue
View file @ 5919d194
......@@ -22,6 +22,16 @@
style="width: 200px"
/>
</el-form-item>
<el-form-item prop="unitName" label="单位管理员账号">
<el-input
v-model="queryParams.unitNumber"
placeholder="单位管理员账号"
clearable
:maxlength="255"
size="small"
style="width: 200px"
/>
</el-form-item>
<el-form-item>
<el-button
:class="commonField.queryClass"
......@@ -64,26 +74,36 @@
{{ scope.row.unitName || '-' }}
</template>
</el-table-column>
<el-table-column label="单位管理员" width="150" prop="unitNumber" :show-overflow-tooltip="true">
<!-- <el-table-column label="单位管理员" width="150" prop="unitNumber" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.unitNumber || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="单位管理员账号" width="150" prop="unitNumber" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.unitNumber || '-' }}
</template>
</el-table-column>
<el-table-column label="出口ip" width="200" prop="exitId" :show-overflow-tooltip="true">
<!-- <el-table-column label="备注" width="520" prop="exitId" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.exitId || '-' }}-->
<!-- </template>-->
<!-- </el-table-column> -->
<el-table-column label="备注" width="520" prop="remarks" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.exitId || '-' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建人" prop="createDate" width="160">
<template slot-scope="scope">
<span>{{ scope.row.creteName || '-' }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160">
<template slot-scope="scope">
<span>{{ scope.row.createDate }}</span>
{{ scope.row.remarks || '-' }}
</template>
</el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" label="创建人" prop="createDate" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.creteName || '-' }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.createDate }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column width="70" label="状态" prop="flag">
<template slot-scope="scope">
<el-switch
......@@ -149,6 +169,15 @@
<el-form-item label="出口Ip" prop="exitId">
<el-input v-model.trim="form.exitId" :maxlength="255" placeholder="请输入出口ip" />
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
v-model.trim="form.remarks"
type="textarea"
:rows="4"
:maxlength="255"
placeholder="请输入备注"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="cancelBtn" @click="cancel">取 消</el-button>
......
src/views/system/role/index.vue
View file @ 5919d194
......@@ -13,16 +13,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="权限字符" prop="roleKey">
<el-input
v-model="queryParams.roleKey"
placeholder="请输入权限字符"
clearable
size="small"
style="width: 150px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="角色状态" prop="flag">
<el-select
v-model="queryParams.flag"
......@@ -83,23 +73,13 @@
<div style="padding:5px 10px">
<div class="tableTitle">角色管理列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="90" />
<el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true">
<el-table-column type="index" label="角色编号" width="120" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.roleName || '-' }}
</template>
</el-table-column>
<el-table-column label="权限字符" prop="roleKey">
<template slot-scope="scope">
{{ scope.row.roleKey || '-' }}
</template>
</el-table-column>
<el-table-column label="显示顺序" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column>
<el-table-column label="状态" align="center" width="100">
<el-table-column label="角色状态" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
......@@ -114,6 +94,11 @@
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<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">
<!-- //修改-->
......
src/views/system/user/index.vue
View file @ 5919d194
......@@ -89,22 +89,32 @@
:data="userList"
>
<el-table-column type="index" label="序号" width="90" />
<!-- <el-table-column label="用户类型" prop="username" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.username || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="登录名" prop="username" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.username || '-' }}
</template>
</el-table-column>
<el-table-column label="姓名" prop="userType" :show-overflow-tooltip="true">
<el-table-column label="用户姓名" prop="userType" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.name || '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="所属单位" prop="username" :show-overflow-tooltip="true">&ndash;&gt;-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.username || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="手机号" prop="phone" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.phone || '-' }}
</template>
</el-table-column>
<el-table-column width="120" label="状态" prop="flag">
<el-table-column width="120" label="用户状态" prop="flag">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
......@@ -115,6 +125,11 @@
/>
</template>
</el-table-column>
<el-table-column label="角色" prop="phone" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.roleNames || '-' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" prop="createDate" width="160">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment