Skip to content

C
center-certificate
提交 2acd1e08 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

修改bug

上级 f846ac36
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 212 行删除
src/components/base/EditStyle.vue
浏览文件 @ 2acd1e08
......@@ -52,16 +52,29 @@
</div>
<div class="tool-item" v-if="item.name === 'width'">
<div class="tit">宽</div>
<el-input v-if="item.disabled" :disabled="true" @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
<el-input v-else @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
<el-input
v-if="item.disabled"
:disabled="true"
@input="changeStyle"
v-model="item.value"
placeholder="请输入数字"
type="number"
></el-input>
<el-input
type="number"
v-else
@input="changeStyle"
v-model="item.value"
placeholder="请输入数字"
></el-input>
</div>
<div class="tool-item" v-if="item.name === 'height'">
<div class="tit">高</div>
<el-input @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
<el-input type="number" @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
</div>
<div class="tool-item" v-if="item.name === 'zIndex'">
<div class="tit">层级</div>
<el-input @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
<el-input type="number" @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
</div>
<div class="tool-item" v-if="item.name === 'proportionWidth'">
<div class="tit">宽高比</div>
......@@ -287,7 +300,7 @@ export default {
padding-top: 15px;
justify-content: space-between;
flex-wrap: wrap;
&.active{
&.active {
border: 1px solid #ccc;
border-top: 0;
padding: 20px 23px 0;
......
src/modules/project/components/DisplayType.vue deleted 100644 → 0
浏览文件 @ f846ac36
<template>
<div>
<el-form :disabled="!!$route.query.type" ref="form" :rules="rules" :model="data" label-width="100px">
<el-form-item label="按钮文案：" prop="title">
<el-input v-model="data.title"></el-input>
</el-form-item>
<el-form-item label="页面展示：" prop="desc">
<v-editor :disabled="!!$route.query.type" v-model="data.desc"></v-editor>
</el-form-item>
</el-form>
</div>
</template>
<script>
import VEditor from '@/components/tinymce/Index.vue'
export default {
components: { VEditor },
props: {
data: { type: Object, default: () => {} }
},
data() {
return {
form: {
edit: '',
btnText: ''
},
rules: {
title: [{ required: true, message: '请填写按钮文案', trigger: 'change' }],
desc: [{ required: true, message: '请填写页面内容', trigger: 'change' }]
}
}
},
methods: {
submitForm() {
let flag = false
this.$refs.form.validate(valid => {
if (valid) {
flag = true
}
})
return flag
}
},
mounted() {
console.log(this.data, 'display')
}
}
</script>
<style lang="scss">
.tox-notifications-container {
display: none !important;
}
</style>
src/modules/project/components/SetBasic.vue deleted 100644 → 0
浏览文件 @ f846ac36
<template>
<div>
<el-form ref="form" :disabled="!!$route.query.type" :inline="true" :rules="rules" :model="form">
<el-form-item label="页面标题：" prop="title">
<el-input v-model="form.title"></el-input>
</el-form-item>
<el-form-item label="活动名称：" prop="name">
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="人数限制：" prop="max_number">
<el-input v-model="form.max_number"></el-input>
</el-form-item>
<el-form-item label="关联项目：" prop="project_id">
<el-select v-model="form.project_id" placeholder="请选择">
<el-option v-for="item in projectMap" :key="item.key" :label="item.value" :value="item.key"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="活动开始时间：" prop="activity_time">
<el-date-picker
v-model="form.activity_time"
type="datetime"
@change="activityDateChange"
placeholder="选择日期时间"
:picker-options="pickerOptions"
>
</el-date-picker>
</el-form-item>
<el-form-item label="报名时间：" prop="time">
<el-date-picker
@change="dateChange"
v-model="form.time"
type="datetimerange"
range-separator="至"
start-placeholder="报名开始日期"
end-placeholder="报名结束日期"
>
</el-date-picker>
</el-form-item>
</el-form>
</div>
</template>
<script>
export default {
props: {
form: { type: Object, default: () => {} }
},
data() {
return {
rules: {
title: { required: true, message: '请填写页面标题', trigger: 'blur' },
name: { required: true, message: '请填写活动标题', trigger: 'blur' },
max_number: [
{ required: true, message: '请填写最大参与人数', trigger: 'blur' },
{
trigger: 'blur',
min: 1,
message: '最大人数限制不能小于1人',
validator(rule, value, callback) {
if (parseInt(Number(value)) && Number(value) >= 1) {
callback()
} else {
callback(new Error('最大人数限制不能小于1人'))
}
}
}
],
project_id: { required: true, message: '请关联项目', trigger: 'change' },
time: { required: true, message: '请选择时间', trigger: 'change' },
activity_time: { required: true, message: '请选择时间', trigger: 'change' }
},
pickerOptions: {
disabledDate(v) {
return v.getTime() < new Date().getTime() - 86400000
}
}
}
},
computed: {
projectMap() {
return this.$store.state.commonMap.project_map || {}
}
},
mounted() {
console.log(this.form)
},
methods: {
submitForm() {
let flag = false
this.$refs.form.validate(valid => {
if (valid) {
flag = true
}
})
return flag
},
// 日期改变的时候。吧日期转成后台需要的格式
dateChange(date) {
this.form.start_time = this.setDate(date[0])
this.form.end_time = this.setDate(date[1])
},
setDate(val) {
const d = new Date(val)
const date = `${d.getFullYear()}-${this.toDo(d.getMonth() + 1)}-${this.toDo(d.getDate())} ${this.toDo(
d.getHours()
)}:${this.toDo(d.getMinutes())}:${this.toDo(d.getSeconds())}`
return date
},
toDo(n) {
return n < 10 ? `0${n}` : n
},
activityDateChange() {
this.form.activity_time = this.setDate(this.form.activity_time)
}
}
}
</script>
<style lang="scss" scoped></style>
src/modules/project/views/Update.vue
浏览文件 @ 2acd1e08
......@@ -37,15 +37,9 @@
</el-form>
</app-card>
<el-drawer size="60%" :visible.sync="drawer" :direction="direction" :destroy-on-close="true">
<app-list
v-if="drawer"
@selection-change="selectionChange"
v-bind="selectTableOptions"
ref="list"
style="padding: 0 30px 0; height: auto"
>
<app-list @selection-change="selectionChangeList" v-if="drawer" v-bind="selectTableOptions" ref="list" style="padding: 0 30px 0; height: auto">
</app-list>
<div style="padding-left: 30px"><el-button type="primary" @click="drawer = false">确认</el-button></div>
<div style="padding-left: 30px"><el-button type="primary" @click="selectionChange">确认</el-button></div>
</el-drawer>
</div>
</template>
......@@ -56,6 +50,7 @@ export default {
components: {},
data() {
return {
selections: false,
drawer: false,
direction: 'rtl',
ruleForm: {
......@@ -96,12 +91,12 @@ export default {
{
type: 'input',
label: '姓名:',
props: 'name'
prop: 'name'
},
{
type: 'input',
label: '手机号:',
props: 'mobile'
prop: 'mobile'
}
],
columns: [
......@@ -129,6 +124,9 @@ export default {
}
},
methods: {
selectionChangeList(row) {
this.selections = row
},
// 删除绑定的学员
handleDelete(row) {
const findIndex = this.studentTableOptions.findIndex(item => row.id === item.id)
......@@ -137,12 +135,10 @@ export default {
}
},
// 选择学员
selectionChange(selection) {
selection.forEach(item => {
const find = this.studentTableOptions.find(i => i.id === item.id)
if (!find) {
this.studentTableOptions.push(item)
}
selectionChange() {
this.drawer = false
this.selections.forEach(item => {
this.studentTableOptions.push(item)
})
},
// 证书模板
......
src/modules/student/components/importPeople.vue
浏览文件 @ 2acd1e08
......@@ -25,9 +25,9 @@
</el-upload>
<div style="text-align: center">
<a
href="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/pages/highway/road/%E4%BA%BA%E5%91%98%E6%A8%A1%E6%9D%BF.xlsx"
href="https://webapp-pub.oss-cn-beijing.aliyuncs.com/project/pages/highway/road/A%E4%BA%BA%E5%91%98%E6%A8%A1%E6%9D%BF.xlsx"
download="人员模板.xlsx"
style="color: #1655B2"
style="color: #1655b2"
>
<i class="el-icon-download"></i>人员模板.xlsx</a
>
......@@ -62,7 +62,7 @@ export default {
methods: {
// 获取项目列表
getProjectList() {
getProjectList().then(res => {
getProjectList({ 'per-page': '1000' }).then(res => {
this.options = res.data.list.filter(item => item.status !== '2')
})
},
......@@ -78,12 +78,11 @@ export default {
fetchFileUpload(data) {
importPeople({
file: data.file,
activity_id: this.form.activity_id,
activity_detail_id: this.form.activity_detail_id
projects_id: this.form.projects_id.toString()
}).then(res => {
if (res.code === 0) {
this.$message.success('导入数据成功')
history.go(0)
// history.go(0)
}
})
},
......
src/modules/student/views/List.vue
浏览文件 @ 2acd1e08
......@@ -106,13 +106,13 @@ export default {
methods: {
// 项目列表
getProjectList() {
getProjectList().then(res => {
getProjectList({ 'per-page': '1000' }).then(res => {
this.projectList = res.data.list
})
},
// 证书模板
getTemplateList() {
getTemplateList({ 'per-page': 100 }).then(res => {
getTemplateList({ 'per-page': 1000 }).then(res => {
this.templateList = res.data.list
})
},
......
src/modules/student/views/Update.vue
浏览文件 @ 2acd1e08
......@@ -140,7 +140,7 @@ export default {
},
// 获取项目列表
getProjectList() {
getProjectList().then(res => {
getProjectList({ 'per-page': '1000' }).then(res => {
this.options = res.data.list.filter(item => item.status !== '2')
})
}
......
src/modules/template/components/stepTwo.vue
浏览文件 @ 2acd1e08
......@@ -10,7 +10,7 @@
<div v-for="(item, index) in certElement" :key="index" style="margin-top: 20px">
<div class="tool-title" @click="domShow(item.id)">
<div class="title">
{{ item.title }}<span> (层级{{ index + 1 }})</span>
{{ item.title }}
</div>
<div class="icons">
<i class="el-icon-delete-solid" @click="deleteEdit(item)"></i>
......
src/modules/template/views/List.vue
浏览文件 @ 2acd1e08
......@@ -3,7 +3,7 @@
<app-list v-bind="tableOptions" ref="list">
<div class="line"></div>
<div class="btn-box">
<el-button type="primary" @click="dialogVisible = true">新建模板</el-button>
<el-button type="primary" @click="popShow">新建模板</el-button>
</div>
<template v-slot:filter-time>
<el-date-picker
......@@ -42,8 +42,21 @@
</el-form-item>
<el-form-item label="编号生成规则" prop="rule">
<el-radio-group v-model="form.rule">
<el-radio label="0">规则一</el-radio>
<el-radio label="1">规则二</el-radio>
<div style="margin-top: 8px">
<el-radio label="01">政策宣贯</el-radio>
<el-radio label="02">公益讲堂</el-radio>
</div>
<div style="margin-top: 10px">
<el-radio label="03">知识更新</el-radio>
<el-radio label="04">考前培训</el-radio>
</div>
<div style="margin-top: 10px">
<el-radio label="05">岗位培训</el-radio>
<el-radio label="06">安全培训</el-radio>
</div>
<div style="margin-top: 10px">
<el-radio label="07">继续教育</el-radio>
</div>
</el-radio-group>
</el-form-item>
</el-form>
......@@ -68,7 +81,7 @@ export default {
return {
form: {
title: '',
rule: '0'
rule: '01'
},
dialogVisible: false,
imgViewShow: false,
......@@ -82,7 +95,8 @@ export default {
rules: {
title: [{ required: true, message: '请填模板名称', trigger: 'blur' }],
rule: [{ required: true, message: '请选择', trigger: 'blur' }]
}
},
id: ''
}
},
computed: {
......@@ -145,11 +159,19 @@ export default {
}
},
methods: {
popShow() {
this.form = {
title: '',
rule: '01'
}
this.id = ''
this.dialogVisible = true
},
uploadTemplate() {
if (this.form.title === '') return
this.$router.push({
path: '/template/update',
query: this.form
query: Object.assign({ id: this.id }, this.form)
})
},
// 项目列表
......@@ -184,7 +206,13 @@ export default {
})
},
handleEdit(row) {
this.$router.push({ path: '/template/update', query: { id: row.id } })
this.id = row.id
this.form = {
title: row.title,
rule: '0' + row.rule
}
this.dialogVisible = true
// this.$router.push({ path: '/template/update', query: { id: row.id } })
},
handleDelete(row) {
this.$confirm('此操作将永久删除该模板, 是否继续?', '提示', {
......
src/modules/template/views/Update.vue
浏览文件 @ 2acd1e08
......@@ -86,7 +86,7 @@ export default {
const data = res.data
this.form = {
title: data.title,
rule: data.rule
rule: '0' + data.rule
}
this.step2Data = JSON.parse(data.info)
this.loading.close()
......
src/modules/variable/views/List.vue
浏览文件 @ 2acd1e08
......@@ -135,6 +135,7 @@ export default {
})
this.dialogVisible = false
}
this.$refs.list.refetch(true)
})
} else {
createVariable(this.ruleForm).then(res => {
......@@ -145,6 +146,7 @@ export default {
})
this.dialogVisible = false
}
this.$refs.list.refetch(true)
})
}
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论