|
|
@@ -27,10 +27,7 @@
|
|
|
<div class="phaseList" v-if="nowschoolData.period">
|
|
|
<div class="phaseitem" v-for="(item, index) in nowschoolData.period" :key="index" :class="{ 'checkedis': pathNowphase === index }" @click="cutPhase(index)">
|
|
|
<div class="phasei-item-name">
|
|
|
- <div class="namebox" v-if="item.changed === false">{{ item.name }}</div>
|
|
|
- <div class="namebox" v-show="item.changed === true">
|
|
|
- <el-input ref="editbox" v-model="item.name" @blur="nameChanges(index)" />
|
|
|
- </div>
|
|
|
+ <div class="namebox">{{ item.name }}</div>
|
|
|
<span class="campus">{{ item.area }}</span>
|
|
|
</div>
|
|
|
<p class="phasei-item-common">
|
|
|
@@ -418,7 +415,10 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="所属阶段" class="stage-checkbox">
|
|
|
<div class="checkbox-stage">
|
|
|
- <el-checkbox v-for="(item,index) in stageData.checkeds" :key="index" v-model="item.state" :label="item.name" size="small" />
|
|
|
+ <!-- <el-checkbox v-for="(item,index) in stageData.checkeds" :key="index" v-model="item.state" :label="item.name" size="small" /> -->
|
|
|
+ <el-radio-group v-model="stageData.ptichValue">
|
|
|
+ <el-radio v-for="(item,index) in stageData.checkeds" :key="index" :label="item.name" size="small" />
|
|
|
+ </el-radio-group>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -789,7 +789,7 @@ export default {
|
|
|
}
|
|
|
//接收到学校信息处理数据
|
|
|
function conductData (data) {
|
|
|
- console.log(data, '进来的数据')
|
|
|
+ console.log(data,pathNowphase.value, '进来的数据')
|
|
|
if (!data) {
|
|
|
return
|
|
|
}
|
|
|
@@ -956,11 +956,12 @@ export default {
|
|
|
(dialogModels.value = 'semester')))
|
|
|
: ''
|
|
|
state === 'updateSubjects'
|
|
|
- ? ((subjectsData.value.name = value.name),
|
|
|
- (subjectsData.value.type = value.type.toString()),
|
|
|
- (subjectsData.value.id = value.id),
|
|
|
- (dialogModels.value = 'subjects'),
|
|
|
- (editDialogName.value = proxy.$t(`schoolManages.gradSet.popup.updatesubject`)),
|
|
|
+ ? (subjectsData.value.name = value.name,
|
|
|
+ subjectsData.value.type = value.type.toString(),
|
|
|
+ subjectsData.value.id = value.id,
|
|
|
+ dialogModels.value = 'subjects',
|
|
|
+ editDialogName.value = proxy.$t(`schoolManages.gradSet.popup.compile`),
|
|
|
+ // editDialogName.value='编辑学科',
|
|
|
(subjectsData.value.models = 'subjectsUpdate'))
|
|
|
: ''
|
|
|
state === 'addSubjects'
|
|
|
@@ -970,7 +971,18 @@ export default {
|
|
|
(subjectsData.value.models = 'subjectsAdd'),
|
|
|
(editDialogName.value = proxy.$t(`schoolManages.gradSet.popup.addSubject`)),
|
|
|
(dialogModels.value = 'subjects'))
|
|
|
- : ''
|
|
|
+ :
|
|
|
+ state === 'stage'
|
|
|
+ ? (
|
|
|
+ (editDialogName.value = '编辑学段属性'),
|
|
|
+ console.log(stageData, value, '属性属性'),
|
|
|
+ (stageData.value.checkeds.forEach((a) => { a.state = false })),
|
|
|
+ (stageData.value.name = value.name),
|
|
|
+ stageData.value.checkeds.forEach((items) => {
|
|
|
+ items.value == value.periodType ? stageData.value.ptichValue = items.name : ''
|
|
|
+ }),
|
|
|
+ dialogModels.value = 'stage')
|
|
|
+ : ''
|
|
|
if (state === 'updateTimebucket') {
|
|
|
let timetables = nowschoolData.value.period[pathNowphase.value].timetable
|
|
|
let timeindex = timetables[index].time.indexOf('-')
|
|
|
@@ -1001,18 +1013,6 @@ export default {
|
|
|
(editDialogName.value = proxy.$t(`schoolManages.gradSet.popup.addTime`)),
|
|
|
(dialogModels.value = 'timebucket'))
|
|
|
: ''
|
|
|
- state === 'stage'
|
|
|
- ? (
|
|
|
- (editDialogName.value = '编辑学段属性'),
|
|
|
- (stageData.value.checkeds.forEach((a) => { a.state = false })),
|
|
|
- (stageData.value.name = value.name),
|
|
|
- (value.type.forEach((item) => {
|
|
|
- stageData.value.checkeds.forEach((items) => {
|
|
|
- item == items.value ? items.state = true : ''
|
|
|
- })
|
|
|
- })),
|
|
|
- dialogModels.value = 'stage')
|
|
|
- : ''
|
|
|
console.log(form.value)
|
|
|
editDialog.value = true
|
|
|
}
|
|
|
@@ -1066,6 +1066,14 @@ export default {
|
|
|
(nowschoolData.value.period[pathNowphase.value].timetable = settimeArr),
|
|
|
timeSort(nowschoolData.value.period[pathNowphase.value].timetable))
|
|
|
: ''
|
|
|
+ //编辑学段名称和阶段
|
|
|
+ if (dialogModels.value === 'stage') {
|
|
|
+ console.log(nowschoolData.value.period, '当前学段')
|
|
|
+ nowschoolData.value.period[pathNowphase.value].name = stageData.value.name
|
|
|
+ let stageTrue = ''
|
|
|
+ stageData.value.checkeds.forEach((item) => { item.name === stageData.value.ptichValue ? stageTrue = item.value : '' })
|
|
|
+ nowschoolData.value.period[pathNowphase.value].periodType = stageTrue
|
|
|
+ }
|
|
|
console.log(nowschoolData.value, '修改后的数据')
|
|
|
store.commit('changeShowbtn', true)
|
|
|
editDialog.value = false
|
|
|
@@ -2252,7 +2260,7 @@ export default {
|
|
|
|
|
|
.form-semester-name {
|
|
|
width: 55%;
|
|
|
- padding-left: 2.5%;
|
|
|
+ /* padding-left: 2.5%; */
|
|
|
}
|
|
|
|
|
|
.form-semester-entrance .form-radio {
|
chenmy