Skip to content

P
pica-admin-IM
提交 85b600e2 编写于 作者: huangwensu's avatar huangwensu
浏览文件
操作

修改store和校验

上级 46ed9d46
显示空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 90 行删除
src/App.vue
浏览文件 @ 85b600e2
...@@ -95,15 +95,9 @@ export default { ...@@ -95,15 +95,9 @@ export default {
// 获取用户权限 // 获取用户权限
getUserAuth(token) { getUserAuth(token) {
let req = null let req = null
if(localStorage.getItem('storageToken')) {
req = {
token: localStorage.getItem('storageToken')
}
} else {
req = { req = {
token: token token: token
} }
}
vm.GET('common/v1/role',req).then((res) => { vm.GET('common/v1/role',req).then((res) => {
if(res.code == '000000') { if(res.code == '000000') {
vm.changeIdType(res.data.idType) vm.changeIdType(res.data.idType)
......
src/store/actions.js 已删除 100644 → 0
浏览文件 @ 46ed9d46
import * as types from './mutations-types'
export const changeToken = ({commit}, data) => {
commit(types.TOKEN, data)
}
export const changeIdType = ({commit}, data) => {
commit(types.ID_TYPE, data)
}
\ No newline at end of file
src/store/getters.js
浏览文件 @ 85b600e2
export const _token = state => state._token
export const idType = state => state.idType const getters = {
_token: state => state.common._token,
idType: state => state.common.idType
}
export default getters
src/store/index.js
浏览文件 @ 85b600e2
import Vue from 'vue' import Vue from 'vue'
import Vuex from 'vuex' import Vuex from 'vuex'
import * as actions from './actions' import common from './modules/common'
import * as getters from './getters' import getters from './getters'
import state from './state'
import mutations from './mutations'
Vue.use(Vuex) Vue.use(Vuex)
export default new Vuex.Store({ export default new Vuex.Store({
actions, modules: {
getters, common
state, },
mutations, getters
}) })
src/store/modules/common.js 0 → 100644
浏览文件 @ 85b600e2
const common = {
state: {
_token: '',
idType: ''
},
mutations: {
CHANGE_TOKEN: (state, data) => {
state._token = data
},
CHANGE_IDTYPE: (state, data) => {
state.idType = data
}
},
actions: {
changeToken({ commit }, tokenData) {
commit('CHANGE_TOKEN', tokenData)
},
changeIdType({ commit }, idTypeData) {
commit('CHANGE_IDTYPE', idTypeData)
}
}
}
export default common
\ No newline at end of file
src/store/mutations-types.js 已删除 100644 → 0
浏览文件 @ 46ed9d46
export const TOKEN = 'TOKEN'
export const ID_TYPE = 'ID_TYPE'
\ No newline at end of file
src/store/mutations.js 已删除 100644 → 0
浏览文件 @ 46ed9d46
import * as types from './mutations-types'
const mutations = {
[types.TOKEN](state, tokenData) {
state._token = tokenData
},
[types.ID_TYPE](state, idTypeData) {
state.idType = idTypeData
}
}
export default mutations
\ No newline at end of file
src/store/state.js 已删除 100644 → 0
浏览文件 @ 46ed9d46
const state = {
_token: '',
idType: ''
}
export default state
\ No newline at end of file
src/views/education/create-component.vue
浏览文件 @ 85b600e2
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</el-col> </el-col>
<el-col :span="10" v-if="idType == 1"> <el-col :span="10" v-if="idType == 1">
<el-form-item label="是否对外开放" prop="openFlag"> <el-form-item label="是否对外开放" prop="openFlag">
<el-radio-group v-model="item.openFlag" @change="selectIsOpen(index)" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)"> <el-radio-group v-model="item.openFlag" @change="selectIsOpen(index)" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)">
<el-radio :label="2" @change="moduleOpenChange">是</el-radio> <el-radio :label="2" @change="moduleOpenChange">是</el-radio>
<el-radio :label="1" @change="moduleOpenChange">否</el-radio> <el-radio :label="1" @change="moduleOpenChange">否</el-radio>
</el-radio-group> </el-radio-group>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<div class="template-btn" v-if="idType == 1"> <div class="template-btn" v-if="idType == 1">
<span class="word-size">添加一个模板</span> <span class="word-size">添加一个模板</span>
<el-button <el-button
:disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)"
v-for="(_item,_index) in templateDataList" v-for="(_item,_index) in templateDataList"
:key="_index" :key="_index"
type="primary" type="primary"
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<div class="template-content-div"> <div class="template-content-div">
<div class="title"> <div class="title">
{{item1.name}} {{item1.name}}
<span v-if="item.moduleType == 1 && componentId && item.openFlag == 1"> <span v-if="item.moduleType == 1 && (item.id == '' || (item.id != '' && item.openFlag == 1))">
变更顺序: 变更顺序:
<i class="el-icon-caret-bottom" @click="sortUp(index,index1)" style="font-size:17px;"></i> <i class="el-icon-caret-bottom" @click="sortUp(index,index1)" style="font-size:17px;"></i>
<i class="el-icon-caret-top" @click="sortDown(index,index1)" style="font-size:17px;"></i> <i class="el-icon-caret-top" @click="sortDown(index,index1)" style="font-size:17px;"></i>
...@@ -141,15 +141,15 @@ ...@@ -141,15 +141,15 @@
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="考试名称"> <el-form-item label="考试名称">
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" maxlength='30' placeholder="请输入考试名称" style="width:288px;"></el-input> <el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)" size="mini" maxlength='30' placeholder="请输入考试名称" style="width:288px;"></el-input>
<span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span> <span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && (item.id == '' || (item.id != '' && item.openFlag == 1))"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span>
<span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span> <span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && (item.id == '' || (item.id != '' && item.openFlag == 1))"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="关联考试"> <el-form-item label="关联考试">
<el-select v-model="item3.content2" @focus="examIDfocus(index,index1,index2,index3)" @change="changeExamID" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择考试ID" style="width:288px;"> <el-select v-model="item3.content2" @focus="examIDfocus(index,index1,index2,index3)" @change="changeExamID" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)" size="mini" placeholder="请选择考试ID" style="width:288px;">
<el-option <el-option
v-for="(itemTest,indexTest) in testIdSelect" v-for="(itemTest,indexTest) in testIdSelect"
:key="indexTest" :key="indexTest"
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="配置证书"> <el-form-item label="配置证书">
<el-radio-group v-model="item3.certificateFlag" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)"> <el-radio-group v-model="item3.certificateFlag" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)">
<el-radio :label="2">是</el-radio> <el-radio :label="2">是</el-radio>
<el-radio :label="1">否</el-radio> <el-radio :label="1">否</el-radio>
</el-radio-group> </el-radio-group>
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<el-col :span="10" v-if="item3.certificateFlag == 2" class="item-icon"> <el-col :span="10" v-if="item3.certificateFlag == 2" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="选择证书"> <el-form-item label="选择证书">
<el-select v-model="item3.content3" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择证书" style="width:288px;"> <el-select v-model="item3.content3" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)" size="mini" placeholder="请选择证书" style="width:288px;">
<el-option <el-option
v-for="(itemCertificate,indexCertificate) in certificateIdSelect" v-for="(itemCertificate,indexCertificate) in certificateIdSelect"
:key="indexCertificate" :key="indexCertificate"
...@@ -193,15 +193,15 @@ ...@@ -193,15 +193,15 @@
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="课程名称"> <el-form-item label="课程名称">
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" maxlength='30' placeholder="请输入课程名称" style="width:288px;"></el-input> <el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)" size="mini" maxlength='30' placeholder="请输入课程名称" style="width:288px;"></el-input>
<span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span> <span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && (item.id == '' || (item.id != '' && item.openFlag == 1))"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span>
<span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span> <span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && (item.id == '' || (item.id != '' && item.openFlag == 1))"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" class="item-icon"> <el-col :span="10" class="item-icon">
<span class="require">*</span> <span class="require">*</span>
<el-form-item label="关联课程"> <el-form-item label="关联课程">
<el-select v-model="item3.content2" @focus="courseIDfocus(index,index1,index2,index3)" @change="changeCourseID" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择课程ID" style="width:288px;"> <el-select v-model="item3.content2" @focus="courseIDfocus(index,index1,index2,index3)" @change="changeCourseID" :disabled="item.moduleType == 2 || (item.id != '' && item.openFlag == 2)" size="mini" placeholder="请选择课程ID" style="width:288px;">
<el-option <el-option
v-for="(itemCourse,indexCourse) in courseIdSelect" v-for="(itemCourse,indexCourse) in courseIdSelect"
:key="indexCourse" :key="indexCourse"
...@@ -287,7 +287,7 @@ import BreadCrumb from '../../components/breadcrumb.vue' ...@@ -287,7 +287,7 @@ import BreadCrumb from '../../components/breadcrumb.vue'
import { doUpload, getFilePath } from "../../utils/qiniuUtil" import { doUpload, getFilePath } from "../../utils/qiniuUtil"
import { validateWord150 } from "../../utils/validate.js" import { validateWord150 } from "../../utils/validate.js"
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { openLoading, closeLoading, isNotEmptyUtils } from '../../utils/utils'; import { openLoading, closeLoading, isNotEmptyUtils, isEmptyList } from '../../utils/utils';
let vm = null let vm = null
// 判断组件是否重名 // 判断组件是否重名
let validateRepeatWord = function(rule, value, callback, message) { let validateRepeatWord = function(rule, value, callback, message) {
...@@ -384,7 +384,7 @@ export default { ...@@ -384,7 +384,7 @@ export default {
courseIdSelect: [], // 课程下拉列表 courseIdSelect: [], // 课程下拉列表
dialogData: [], dialogData: [],
portalComponent: { portalComponent: {
idType: 1, idType: '',
organizationId: '', organizationId: '',
name: '', name: '',
id: '', id: '',
...@@ -507,6 +507,7 @@ export default { ...@@ -507,6 +507,7 @@ export default {
}, },
// 暂存(下一步) // 暂存(下一步)
storageAndNext(flag) { storageAndNext(flag) {
vm.itemName = vm.portalComponent.name
if(vm.componentId) { // 编辑 if(vm.componentId) { // 编辑
vm.submitBasicData(flag,'portalComponent/updatePortalComponent') vm.submitBasicData(flag,'portalComponent/updatePortalComponent')
}else{ // 新增 }else{ // 新增
...@@ -663,9 +664,9 @@ export default { ...@@ -663,9 +664,9 @@ export default {
vm.componentList.moduleModelList[index].openFlag = vm.componentList.moduleModelList[index].openFlag == 1 ? 2 : 1 vm.componentList.moduleModelList[index].openFlag = vm.componentList.moduleModelList[index].openFlag == 1 ? 2 : 1
}, },
moduleOpenChange(value) { moduleOpenChange(value) {
for(let i=0;i<vm.componentList.moduleModelList.length;i++) { for(let i = 0; i < vm.componentList.moduleModelList.length; i++) {
if(vm.moduleIndex == i) { if(vm.moduleIndex == i) {
if(value == '是') { if(value == '1') {
vm.componentList.moduleModelList[i].openFlag = 2 vm.componentList.moduleModelList[i].openFlag = 2
}else{ }else{
vm.componentList.moduleModelList[i].openFlag = 1 vm.componentList.moduleModelList[i].openFlag = 1
...@@ -784,6 +785,7 @@ export default { ...@@ -784,6 +785,7 @@ export default {
vm.GET('portalComponent/deletePortalTemplateById',{id: vm.componentList.moduleModelList[i].templetModelList[index1].id}).then((res) => { vm.GET('portalComponent/deletePortalTemplateById',{id: vm.componentList.moduleModelList[i].templetModelList[index1].id}).then((res) => {
if( res.code == '000000') { if( res.code == '000000') {
vm.$message.info('成功删除模板！') vm.$message.info('成功删除模板！')
vm.getModuleData()
} }
}) })
} else { } else {
...@@ -804,8 +806,8 @@ export default { ...@@ -804,8 +806,8 @@ export default {
vm.componentList.moduleModelList[i].templetModelList[j].partModelList[q].partContentModelList.push({ vm.componentList.moduleModelList[i].templetModelList[j].partModelList[q].partContentModelList.push({
id: '', id: '',
seqNo: '', seqNo: '',
content_1: '', content1: '',
content_2: '' content2: ''
}) })
break break
} }
...@@ -874,7 +876,7 @@ export default { ...@@ -874,7 +876,7 @@ export default {
finishConponent(flag) { finishConponent(flag) {
let req = null let req = null
if(vm.componentList.moduleModelList && vm.componentList.moduleModelList.length > 0) { if(vm.componentList.moduleModelList && vm.componentList.moduleModelList.length > 0) {
for(let i=0;i<vm.componentList.moduleModelList.length;i++) { for(let i = 0; i < vm.componentList.moduleModelList.length; i++) {
if(flag == 2) { // 完成 if(flag == 2) { // 完成
req = { req = {
id: vm.componentId, id: vm.componentId,
...@@ -884,10 +886,18 @@ export default { ...@@ -884,10 +886,18 @@ export default {
vm.$message.info("请输入模块名称") vm.$message.info("请输入模块名称")
return return
} }
if(!vm.componentList.moduleModelList[i]) { if(isEmptyList(vm.componentList.moduleModelList[i].templetModelList)) {
vm.$message.info("请给第"+ parseInt(i + 1) +"个模块添加有效模板后再保存") vm.$message.info("请给第"+ parseInt(i + 1) +"个模块添加有效模板后再保存")
return return
} }
for(let j = 0; j < vm.componentList.moduleModelList[i].templetModelList.length; j++) {
for(let k = 0; k < vm.componentList.moduleModelList[i].templetModelList[j].partModelList.length; k++) {
if(!vm.componentList.moduleModelList[i].templetModelList[j].partModelList[k].partContentModelList[0].content1 || !vm.componentList.moduleModelList[i].templetModelList[j].partModelList[k].partContentModelList[0].content2) {
vm.$message.info( vm.componentList.moduleModelList[i].templetModelList[j].name + "中名称为空，请添加内容后保存")
return
}
}
}
}else{ // 暂存 }else{ // 暂存
req = { req = {
id: vm.componentId, id: vm.componentId,
...@@ -905,15 +915,17 @@ export default { ...@@ -905,15 +915,17 @@ export default {
finishModule(req, flag) { finishModule(req, flag) {
vm.POST('portalComponent/insertOrUpdatePortalModule',{model: vm.componentList.moduleModelList,status: flag}).then((res) => { vm.POST('portalComponent/insertOrUpdatePortalModule',{model: vm.componentList.moduleModelList,status: flag}).then((res) => {
if( res.code == '000000') { if( res.code == '000000') {
vm.enableComponent(req) vm.enableComponent(req, flag)
} }
}) })
}, },
// 启用 // 启用
enableComponent(req) { enableComponent(req, flag) {
vm.GET('portalComponent/disableOrStart',req).then((res) => { vm.GET('portalComponent/disableOrStart',req).then((res) => {
if(res.code == "000000") { if(res.code == "000000") {
if(flag == 2) {
vm.$router.push({ path: 'item-component' }) vm.$router.push({ path: 'item-component' })
}
} else { } else {
vm.$message({ vm.$message({
message: res.message, message: res.message,
......
src/views/home.vue
浏览文件 @ 85b600e2
...@@ -59,24 +59,7 @@ export default { ...@@ -59,24 +59,7 @@ export default {
spanSecondNum: 12, spanSecondNum: 12,
tableData: [], tableData: [],
count: 0, count: 0,
messageList:[ messageList:[]
// {
// menuName: '审核提醒',
// type: 1,
// portalTime: '2019-01-02',
// content: '王小波创建了"浙江省2019高血压第一季度考试"项目，提醒您审核。'
// },{
// menuName: '审核未通过',
// type: 2,
// portalTime: '2019-01-02',
// content: '王小波创建了"浙江省2019高血压第一季度考试"项目，提醒您审核。'
// },{
// menuName: '审核通过',
// type: 3,
// portalTime: '2019-01-02',
// content: '王小波创建了"浙江省2019高血压第一季度考试"项目，提醒您审核。'
// }
]
} }
}, },
created() { created() {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或