confirm确认弹框禁止点击遮盖层关闭

master
yujialong 9 months ago
parent d5c72572be
commit 7d02d3baba
  1. 2
      public/index.html
  2. 206
      src/pages/achievement/edit/index.vue
  3. 8
      src/pages/achievement/show/index.vue
  4. 3
      src/pages/activity/details/index.vue
  5. 3
      src/pages/activity/list/index.vue
  6. 6
      src/pages/activity/manage/add/index.vue
  7. 8
      src/pages/activity/manage/manage/index.vue
  8. 66
      src/pages/activity/manage/manage/matchProgress.vue
  9. 61
      src/pages/activity/manage/manage/notice.vue
  10. 6
      src/pages/assessment/add/index.vue
  11. 3
      src/pages/assessment/list/index.vue
  12. 9
      src/pages/course/add/index.vue
  13. 3
      src/pages/course/contentSettings/index.vue
  14. 3
      src/pages/expSystem/backstage/addModel.vue
  15. 3
      src/pages/expSystem/backstage/sourceModel.vue
  16. 6
      src/pages/information/addarticle/index.vue
  17. 18
      src/pages/information/contentManage/index.vue
  18. 22
      src/pages/information/list/index.vue
  19. 9
      src/pages/match/add/index.vue
  20. 3
      src/pages/match/manage/index.vue
  21. 3
      src/pages/match/manage/matchInfo.vue
  22. 69
      src/pages/match/manage/matchProgress.vue
  23. 3
      src/pages/match/manage/matchRank.vue
  24. 64
      src/pages/match/manage/notice.vue
  25. 9
      src/pages/project/add/index.vue
  26. 26
      src/pages/setting/list/index.vue
  27. 349
      src/pages/setting/list/info.vue
  28. 3
      src/pages/station/preview/index.vue
  29. 3
      vue.config.js

@ -10,7 +10,7 @@
var _hmt = _hmt || []; var _hmt = _hmt || [];
(function() { (function() {
var hm = document.createElement('script'); var hm = document.createElement('script');
hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654'; hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e';
var s = document.getElementsByTagName('script')[0]; var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(hm, s); s.parentNode.insertBefore(hm, s);
})(); })();

@ -2,21 +2,30 @@
<div> <div>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="flex-between"> <div class="flex-between">
<div class="per_title" @click="goback()"> <div class="per_title"
@click="goback()">
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
<span class="per_back">返回</span> <span class="per_back">返回</span>
<span class="per_school">修改分数</span> <span class="per_school">修改分数</span>
</div> </div>
<div> <div>
<el-button type="success" round class="mag" @click="saveAdd('form')">预览</el-button> <el-button type="success"
<el-button type="primary" round class="mag" @click="saveAdd('form')">发布成绩</el-button> round
class="mag"
@click="saveAdd('form')">预览</el-button>
<el-button type="primary"
round
class="mag"
@click="saveAdd('form')">发布成绩</el-button>
</div> </div>
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<h6 style="text-align: center;font-size: 20px">实验成绩报告</h6> <h6 style="text-align: center;font-size: 20px">实验成绩报告</h6>
<div class="flex-center mgb20 user_header"> <div class="flex-center mgb20 user_header">
<p class="addhr_tag"></p> <p class="addhr_tag"></p>
@ -24,159 +33,239 @@
</div> </div>
<div> <div>
<el-table :data="infoData" class="table" stripe header-align="center"> <el-table :data="infoData"
<el-table-column prop="projectName" label="实验名称" align="center"> class="table"
stripe
header-align="center">
<el-table-column prop="projectName"
label="实验名称"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="period" label="实验学时" align="center"> <el-table-column prop="period"
label="实验学时"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="userName" label="学生姓名" align="center"> <el-table-column prop="userName"
label="学生姓名"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="number" label="学生学号" align="center"> <el-table-column prop="number"
label="学生学号"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="class" label="学生班级" align="center"> <el-table-column prop="class"
label="学生班级"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="content" label="实验内容" align="center"> <el-table-column prop="content"
label="实验内容"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="desc" label="实验数据与结果分析" align="center"> <el-table-column prop="desc"
label="实验数据与结果分析"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="result" label="实验结论" align="center"> <el-table-column prop="result"
label="实验结论"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="experience" label="实验与心得体会" align="center"> <el-table-column prop="experience"
label="实验与心得体会"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="total" label="总分" align="center"> <el-table-column prop="total"
label="总分"
align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验项目名称</p> <p class="meta-title">实验项目名称</p>
</div> </div>
<el-input v-model="form.projectName" type="textarea" :disabled="true" rows="5"></el-input> <el-input v-model="form.projectName"
type="textarea"
:disabled="true"
rows="5"></el-input>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验目的</p> <p class="meta-title">实验目的</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-input v-model="form.experimentGoal" type="textarea" :disabled="true" rows="5"></el-input> <el-input v-model="form.experimentGoal"
type="textarea"
:disabled="true"
rows="5"></el-input>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验原理</p> <p class="meta-title">实验原理</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-input v-model="form.principle" type="textarea" :disabled="true" rows="5"></el-input> <el-input v-model="form.principle"
type="textarea"
:disabled="true"
rows="5"></el-input>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验内容</p> <p class="meta-title">实验内容</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-input v-model="form.content" type="textarea" :disabled="true" rows="5"></el-input> <el-input v-model="form.content"
type="textarea"
:disabled="true"
rows="5"></el-input>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验步骤</p> <p class="meta-title">实验步骤</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-input v-model="form.step" type="textarea" :disabled="true" rows="5"></el-input> <el-input v-model="form.step"
type="textarea"
:disabled="true"
rows="5"></el-input>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验数据</p> <p class="meta-title">实验数据</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-table :data="expData" class="table" stripe header-align="center"> <el-table :data="expData"
<el-table-column type="index" width="100" label="序号" align="center"> class="table"
stripe
header-align="center">
<el-table-column type="index"
width="100"
label="序号"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="module" label="模块" align="center"> <el-table-column prop="module"
label="模块"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="judgmentPointsName" label="考核点" align="center"> <el-table-column prop="judgmentPointsName"
label="考核点"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="userAnswer" label="学生答案" align="center"> <el-table-column prop="userAnswer"
label="学生答案"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="answer" label="参考答案" align="center"> <el-table-column prop="answer"
label="参考答案"
align="center">
</el-table-column> </el-table-column>
<el-table-column prop="codeScore" label="得分" align="center"> <el-table-column prop="codeScore"
label="得分"
align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">实验结论</p> <p class="meta-title">实验结论</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-input type="textarea" v-model="form.conclusion" rows="5"></el-input> <el-input type="textarea"
<div class="flex-between" style="margin-top: 10px"> v-model="form.conclusion"
rows="5"></el-input>
<div class="flex-between"
style="margin-top: 10px">
<span>教师评分</span> <span>教师评分</span>
<div> <div>
<el-input style="display: inline-block;width: auto;" placeholder="请输入"></el-input> <el-input style="display: inline-block;width: auto;"
placeholder="请输入"></el-input>
(10) (10)
</div> </div>
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">总结及心得体会</p> <p class="meta-title">总结及心得体会</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-input type="textarea" v-model="form.summarize" rows="5"></el-input> <el-input type="textarea"
<div class="flex-between" style="margin-top: 10px"> v-model="form.summarize"
rows="5"></el-input>
<div class="flex-between"
style="margin-top: 10px">
<span>教师评分</span> <span>教师评分</span>
<div> <div>
<el-input style="display: inline-block;width: auto;" placeholder="请输入"></el-input> <el-input style="display: inline-block;width: auto;"
placeholder="请输入"></el-input>
(10) (10)
</div> </div>
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title">对本实验过程及方法手段的改进建议</p> <p class="meta-title">对本实验过程及方法手段的改进建议</p>
<span>得分50/60</span> <span>得分50/60</span>
</div> </div>
<el-input type="textarea" rows="5" v-model="form.improvement"></el-input> <el-input type="textarea"
rows="5"
v-model="form.improvement"></el-input>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<div class="flex-between mgb20"> <div class="flex-between mgb20">
<span>老师寄语</span> <span>老师寄语</span>
</div> </div>
<el-input type="textarea" rows="5"></el-input> <el-input type="textarea"
rows="5"></el-input>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover"
class="mgb20">
<p class="mgb20">教师签名</p> <p class="mgb20">教师签名</p>
<div class="mgb20"> <div class="mgb20">
<el-radio v-model="autograph" label="1">不使用</el-radio> <el-radio v-model="autograph"
<el-radio v-model="autograph" label="2">已有签名</el-radio> label="1">不使用</el-radio>
<el-radio v-model="autograph" label="3">重新上传</el-radio> <el-radio v-model="autograph"
label="2">已有签名</el-radio>
<el-radio v-model="autograph"
label="3">重新上传</el-radio>
</div> </div>
<el-row v-if="autograph != 1"> <el-row v-if="autograph != 1">
<el-col :span="6"> <el-col :span="6">
<el-select class="sign-select" v-model="signId" placeholder="请选择签名" size="mini" v-show="autograph == 2"> <el-select class="sign-select"
<el-option v-model="signId"
v-for="item in signList" placeholder="请选择签名"
size="mini"
v-show="autograph == 2">
<el-option v-for="item in signList"
:key="item.id" :key="item.id"
:label="item.signatureName" :label="item.signatureName"
:value="item.id" :value="item.id">
>
</el-option> </el-option>
</el-select> </el-select>
<el-upload <el-upload :data="{userId: userId}"
:data="{userId: userId}"
:limit="1" :limit="1"
:action="api.uploadSignature" :action="api.uploadSignature"
list-type="picture-card" list-type="picture-card"
@ -311,7 +400,8 @@ export default {
}, },
goback () { goback () {
this.$confirm("确定返回?未更新的信息将不会保存。", "提示", { this.$confirm("确定返回?未更新的信息将不会保存。", "提示", {
type: "warning" type: "warning",
closeOnClickModal: false
}) })
.then(() => { .then(() => {
this.$router.back(); this.$router.back();

@ -156,12 +156,7 @@
<div v-if='scope.row.lcRuleRecords'> <div v-if='scope.row.lcRuleRecords'>
<div v-for="(item, index) in scope.row.lcRuleRecords" <div v-for="(item, index) in scope.row.lcRuleRecords"
:key="index"> :key="index">
<span v-if='item.userAnswer'> {{index+1}}. {{item.userAnswer || '未填写'}}
<span>{{index+1}}. </span>{{item.userAnswer}}
</span>
<span v-else>
<span>{{index+1}}. </span>未填写
</span>
</div> </div>
</div> </div>
<div v-else <div v-else
@ -290,6 +285,7 @@ export default {
e.lcRuleRecords.map((n, i) => { e.lcRuleRecords.map((n, i) => {
e.assessmentPoint += `${i + 1}.${n.name}` e.assessmentPoint += `${i + 1}.${n.name}`
e.referenceAnswer += `${i + 1}.${n.ruleAnswer}` e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
if (!n.userAnswer) n.userAnswer = '未填写'
e.answer += `${i + 1}.${n.userAnswer}` e.answer += `${i + 1}.${n.userAnswer}`
}) })
}) })

@ -333,7 +333,8 @@ export default {
} else if (status == 1) { } else if (status == 1) {
// //
this.$confirm('是否要取消报名?', '提示', { this.$confirm('是否要取消报名?', '提示', {
type: 'success' type: 'success',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$post(`${this.api.delActivityApplicant}?id=${this.form.cancelId}`).then(res => { this.$post(`${this.api.delActivityApplicant}?id=${this.form.cancelId}`).then(res => {
this.getData() this.getData()

@ -354,7 +354,8 @@ export default {
} else if (status == 1) { } else if (status == 1) {
// //
this.$confirm('是否要取消报名?', '提示', { this.$confirm('是否要取消报名?', '提示', {
type: 'success' type: 'success',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$post(`${this.api.delActivityApplicant}?id=${item.cancelId}`).then(res => { this.$post(`${this.api.delActivityApplicant}?id=${item.cancelId}`).then(res => {
this.getData() this.getData()

@ -261,7 +261,8 @@ export default {
// //
if (this.updateTime) { if (this.updateTime) {
this.$confirm(`所填写内容暂未保存,是否保存?`, '提示', { this.$confirm(`所填写内容暂未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(this.form.publishStatus) this.save(this.form.publishStatus)
}).catch(() => { }).catch(() => {
@ -433,7 +434,8 @@ export default {
// //
if (this.updateTime) { if (this.updateTime) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(this.form.publishStatus) this.save(this.form.publishStatus)
}).catch(() => { }).catch(() => {

@ -64,8 +64,9 @@ export default {
beforeRouteLeave (to, from, next) { beforeRouteLeave (to, from, next) {
const detail = this.$refs.detail const detail = this.$refs.detail
if (detail && detail.updateTime) { if (detail && detail.updateTime) {
this.$confirm(`编辑的内容未保存,是否保存并且发布?`, '提示.......', { this.$confirm(`编辑的内容未保存,是否保存并且发布?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
detail.save(detail.form.publishStatus) detail.save(detail.form.publishStatus)
}).catch(() => { }).catch(() => {
@ -89,7 +90,8 @@ export default {
const detail = this.$refs.detail const detail = this.$refs.detail
if (detail && detail.updateTime) { if (detail && detail.updateTime) {
this.$confirm(`编辑的内容未保存,是否保存并且发布?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存并且发布?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
detail.save(detail.form.publishStatus) detail.save(detail.form.publishStatus)
this.backOrTab(i) this.backOrTab(i)

@ -1,38 +1,71 @@
<template> <template>
<!-- 竞赛进展 --> <!-- 竞赛进展 -->
<div class="page-content" style="padding: 24px"> <div class="page-content"
<el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id"> style="padding: 24px">
<el-table-column type="index" width="60" label="序号" align="center"> <el-table ref="table"
:data="listData"
class="table"
stripe
header-align="center"
@selection-change="handleSelectionChange"
row-key="id">
<el-table-column type="index"
width="60"
label="序号"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + (pageNo - 1) * pageSize + 1 }} {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="标题"> <el-table-column prop="name"
label="标题">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input placeholder="请输入标题" :disabled="!scope.row.operate" v-model="scope.row.title"></el-input> <el-input placeholder="请输入标题"
:disabled="!scope.row.operate"
v-model="scope.row.title"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="详情描述"> <el-table-column prop="name"
label="详情描述">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input placeholder="请输入详情描述" :disabled="!scope.row.operate" type="textarea" v-model="scope.row.description"></el-input> <el-input placeholder="请输入详情描述"
:disabled="!scope.row.operate"
type="textarea"
v-model="scope.row.description"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="状态" width="150"> <el-table-column prop="name"
label="状态"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.status" :disabled="!scope.row.operate" clearable placeholder="请选择状态"> <el-select v-model="scope.row.status"
<el-option v-for="(item,index) in statusList" :key="index" :label="item.name" :value="item.value"></el-option> :disabled="!scope.row.operate"
clearable
placeholder="请选择状态">
<el-option v-for="(item,index) in statusList"
:key="index"
:label="item.name"
:value="item.value"></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="170"> <el-table-column label="操作"
align="center"
width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="!scope.row.operate" type="text" @click="operateIt(scope.row)">编辑</el-button> <el-button v-if="!scope.row.operate"
<el-button v-else type="text" @click="saveData(scope.row)">保存</el-button> type="text"
<el-button type="text" @click="handleDelete(scope.row, scope.$index)">删除</el-button> @click="operateIt(scope.row)">编辑</el-button>
<el-button v-else
type="text"
@click="saveData(scope.row)">保存</el-button>
<el-button type="text"
@click="handleDelete(scope.row, scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="plus" @click="addData"> <div class="plus"
@click="addData">
<i class="el-icon-circle-plus-outline"></i> <i class="el-icon-circle-plus-outline"></i>
</div> </div>
</div> </div>
@ -170,7 +203,8 @@ export default {
this.$confirm('暂未保存,是否保存本次编辑?', '提示', { this.$confirm('暂未保存,是否保存本次编辑?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
let num = 0; let num = 0;
for (var i = 0; i < this.listData.length; i++) { for (var i = 0; i < this.listData.length; i++) {

@ -1,44 +1,67 @@
<template> <template>
<!-- 报名人员 --> <!-- 报名人员 -->
<div class="page-content" style="padding: 24px"> <div class="page-content"
<div class="tool" style="justify-content: flex-end"> style="padding: 24px">
<el-button type="primary" round @click="add">新增</el-button> <div class="tool"
style="justify-content: flex-end">
<el-button type="primary"
round
@click="add">新增</el-button>
</div> </div>
<el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id"> <el-table ref="table"
<el-table-column type="index" width="60" label="序号" align="center"> :data="listData"
class="table"
stripe
header-align="center"
@selection-change="handleSelectionChange"
row-key="id">
<el-table-column type="index"
width="60"
label="序号"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + (pageNo - 1) * pageSize + 1 }} {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="announcementTitle" label="标题名称"> <el-table-column prop="announcementTitle"
label="标题名称">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间"> <el-table-column prop="createTime"
label="创建时间">
</el-table-column> </el-table-column>
<el-table-column prop="updateTime" label="发布时间"> <el-table-column prop="updateTime"
label="发布时间">
</el-table-column> </el-table-column>
<el-table-column prop="phone" label="状态"> <el-table-column prop="phone"
label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status ? '已发布' : '草稿' }} {{ scope.row.status ? '已发布' : '草稿' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="250"> <el-table-column label="操作"
align="center"
width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="edit(scope.row)">编辑</el-button> <el-button type="text"
<el-button type="text" @click="del(scope.row)">删除</el-button> @click="edit(scope.row)">编辑</el-button>
<el-switch <el-button type="text"
v-model="scope.row.isOpen" @click="del(scope.row)">删除</el-button>
<el-switch v-model="scope.row.isOpen"
:active-text="scope.row.isOpen ? '关' : '开'" :active-text="scope.row.isOpen ? '关' : '开'"
:active-value="0" :active-value="0"
:inactive-value="1" :inactive-value="1"
style="margin: 0 10px 0 5px" style="margin: 0 10px 0 5px"
@change="switchOff($event,scope.row,scope.$index)" @change="switchOff($event,scope.row,scope.$index)"></el-switch>
></el-switch>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination background layout="total, prev, pager, next" :total="totals" @current-change="handleCurrentChange" :current-page="pageNo"> <el-pagination background
layout="total, prev, pager, next"
:total="totals"
@current-change="handleCurrentChange"
:current-page="pageNo">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
@ -107,7 +130,8 @@ export default {
this.$put(`${this.api.disableActivityAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { }) this.$put(`${this.api.disableActivityAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { })
} else if (!row.status) { } else if (!row.status) {
this.$confirm('是否发布该公告?', '提示', { this.$confirm('是否发布该公告?', '提示', {
type: 'success' type: 'success',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$put(`${this.api.disableActivityAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => { this.$put(`${this.api.disableActivityAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {
this.$post(this.api.updateActivityAnnouncement, { this.$post(this.api.updateActivityAnnouncement, {
@ -135,5 +159,4 @@ export default {
</script> </script>
<style scoped> <style scoped>
</style> </style>

@ -313,7 +313,8 @@ export default {
beforeRouteLeave (to, from, next) { beforeRouteLeave (to, from, next) {
if (!this.isToProject && this.updateTime) { if (!this.isToProject && this.updateTime) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', { this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(next) this.save(next)
}).catch(() => { }).catch(() => {
@ -623,7 +624,8 @@ export default {
// //
if (this.updateTime) { if (this.updateTime) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save() this.save()
}).catch(() => { }).catch(() => {

@ -470,7 +470,8 @@ export default {
}, },
finish (row) { finish (row) {
this.$confirm("确定要提前结束吗?", "提示", { this.$confirm("确定要提前结束吗?", "提示", {
type: "warning" type: "warning",
closeOnClickModal: false
}).then(() => { }).then(() => {
let data = { let data = {
id: row.id, id: row.id,

@ -264,7 +264,8 @@ export default {
beforeRouteLeave (to, from, next) { beforeRouteLeave (to, from, next) {
if (this.updateTime) { if (this.updateTime) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', { this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(next) this.save(next)
}).catch(() => { }).catch(() => {
@ -388,7 +389,8 @@ export default {
this.$confirm("课程创建成功,是否马上进行课程内容设置?", "提示", { this.$confirm("课程创建成功,是否马上进行课程内容设置?", "提示", {
type: "success", type: "success",
confirmButtonText: "马上设置", confirmButtonText: "马上设置",
cancelButtonText: "稍后操作" cancelButtonText: "稍后操作",
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$router.replace(`/course/contentSettings?id=${courseId}`); this.$router.replace(`/course/contentSettings?id=${courseId}`);
}).catch(() => { }).catch(() => {
@ -410,7 +412,8 @@ export default {
// //
if (updateTime) { if (updateTime) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save() this.save()
}).catch(() => { }).catch(() => {

@ -449,7 +449,8 @@ export default {
// //
if (this.moved) { if (this.moved) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.saveSort() this.saveSort()
this.moved = false this.moved = false

@ -184,7 +184,8 @@ export default {
// //
if ((id && updateTime > 1) || (!id && updateTime)) { if ((id && updateTime > 1) || (!id && updateTime)) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.submit(this.postStatus ? 1 : 0, 1) this.submit(this.postStatus ? 1 : 0, 1)
this.backPage() this.backPage()

@ -253,7 +253,8 @@ export default {
} }
}) })
this.$confirm(`确定要${off ? '启用' : '禁用'}吗?`, "提示", { this.$confirm(`确定要${off ? '启用' : '禁用'}吗?`, "提示", {
type: "warning" type: "warning",
closeOnClickModal: false
}).then(() => { }).then(() => {
// //
this.$post(this.api[isSystem ? (off ? 'demoHiddenOpen' : 'demoHiddenClose') : 'disableModelDemo'], list).then(async res => { this.$post(this.api[isSystem ? (off ? 'demoHiddenOpen' : 'demoHiddenClose') : 'disableModelDemo'], list).then(async res => {

@ -145,7 +145,8 @@ export default {
beforeRouteLeave (to, from, next) { beforeRouteLeave (to, from, next) {
if (this.updateTime) { if (this.updateTime) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', { this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(next) this.save(next)
}).catch(() => { }).catch(() => {
@ -248,7 +249,8 @@ export default {
// //
if (this.updateTime) { if (this.updateTime) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save() this.save()
}).catch(() => { }).catch(() => {

@ -2,10 +2,19 @@
<!-- 内容管理 --> <!-- 内容管理 -->
<div class="flex"> <div class="flex">
<div class="menu-con"> <div class="menu-con">
<el-tree ref="column" :data="menuList" :props="{ label: 'name' }" highlight-current :expand-on-click-node="false" default-expand-all node-key="id" @node-click="handleSelect"></el-tree> <el-tree ref="column"
:data="menuList"
:props="{ label: 'name' }"
highlight-current
:expand-on-click-node="false"
default-expand-all
node-key="id"
@node-click="handleSelect"></el-tree>
</div> </div>
<div class="right"> <div class="right">
<ContentList ref="content" v-show="menuList.length" :columnId="columnId" /> <ContentList ref="content"
v-show="menuList.length"
:columnId="columnId" />
</div> </div>
</div> </div>
</template> </template>
@ -76,7 +85,8 @@ export default {
// //
if (JSON.stringify(list) !== JSON.stringify(originList)) { if (JSON.stringify(list) !== JSON.stringify(originList)) {
this.$confirm(`您已更改了文章排序,是否保存更改?`, '提示', { this.$confirm(`您已更改了文章排序,是否保存更改?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
content.sortSubmit() content.sortSubmit()
this.setColumn(key.id) this.setColumn(key.id)
@ -96,7 +106,7 @@ export default {
width: 210px; width: 210px;
height: calc(100vh - 250px); height: calc(100vh - 250px);
border-right: solid 1px #e6e6e6; border-right: solid 1px #e6e6e6;
background-color: #F2F6FC; background-color: #f2f6fc;
/deep/.el-tree-node__content { /deep/.el-tree-node__content {
height: 50px; height: 50px;
} }

@ -2,11 +2,17 @@
<!-- 资讯管理 --> <!-- 资讯管理 -->
<div class="page"> <div class="page">
<ul class="column-tab"> <ul class="column-tab">
<li :class="{active: tabsName == 1}" @click="handleClick(1)"><i class="el-icon-collection-tag"></i> 栏目管理</li> <li :class="{active: tabsName == 1}"
<li :class="{active: tabsName == 2}" @click="handleClick(2)"><i class="el-icon-document"></i> 内容管理</li> @click="handleClick(1)"><i class="el-icon-collection-tag"></i> 栏目管理</li>
<li :class="{active: tabsName == 2}"
@click="handleClick(2)"><i class="el-icon-document"></i> 内容管理</li>
</ul> </ul>
<columnManage class="flex-1" ref="content1" v-if="tabsName == 1" /> <columnManage class="flex-1"
<ContentManage class="flex-1" ref="content2" v-if="tabsName == 2" /> ref="content1"
v-if="tabsName == 1" />
<ContentManage class="flex-1"
ref="content2"
v-if="tabsName == 2" />
</div> </div>
</template> </template>
@ -47,7 +53,8 @@ export default {
// //
if (JSON.stringify(list) !== JSON.stringify(originList)) { if (JSON.stringify(list) !== JSON.stringify(originList)) {
this.$confirm(`您已更改了${tab == 1 ? '栏目' : '文章'}排序,是否保存更改?`, '提示', { this.$confirm(`您已更改了${tab == 1 ? '栏目' : '文章'}排序,是否保存更改?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
content.sortSubmit() content.sortSubmit()
fn(param) fn(param)
@ -84,8 +91,9 @@ export default {
i { i {
margin-right: 5px; margin-right: 5px;
} }
&:hover, &.active { &:hover,
color: #9278FF; &.active {
color: #9278ff;
} }
} }
} }

@ -208,7 +208,8 @@ export default {
const { updateTime } = this.$refs['step' + this.step] const { updateTime } = this.$refs['step' + this.step]
if (this.$refs['step' + this.step] && updateTime) { if (this.$refs['step' + this.step] && updateTime) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(0, 1) this.save(0, 1)
}).catch(() => { }).catch(() => {
@ -257,7 +258,8 @@ export default {
const { updateTime } = this.$refs['step' + this.step] const { updateTime } = this.$refs['step' + this.step]
if (this.step < 4 && this.$refs['step' + this.step] && updateTime) { if (this.step < 4 && this.$refs['step' + this.step] && updateTime) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(0, 3) this.save(0, 3)
}).catch(() => { }).catch(() => {
@ -275,7 +277,8 @@ export default {
const { updateTime } = this.$refs['step' + this.step] const { updateTime } = this.$refs['step' + this.step]
if (this.step < 4 && this.$refs['step' + this.step] && updateTime) { if (this.step < 4 && this.$refs['step' + this.step] && updateTime) {
this.$confirm(`编辑的内容未保存,是否保存?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(0) this.save(0)
}).catch(() => { }).catch(() => {

@ -134,7 +134,8 @@ export default {
const step = detail.$refs['step' + detail.step] const step = detail.$refs['step' + detail.step]
if (detail.step < 4 && step && step.updateTime) { if (detail.step < 4 && step && step.updateTime) {
this.$confirm(`编辑的内容未保存,是否保存并且发布?`, '提示', { this.$confirm(`编辑的内容未保存,是否保存并且发布?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
detail.save(1, 1) detail.save(1, 1)
this.backOrTab(i) this.backOrTab(i)

@ -539,7 +539,8 @@ export default {
} }
} }
this.$confirm(include ? `该成员已被指定参加${include},踢出后需重新指定成员参加,是否确认踢出团队?` : '确定要踢出该成员吗?', '提示', { this.$confirm(include ? `该成员已被指定参加${include},踢出后需重新指定成员参加,是否确认踢出团队?` : '确定要踢出该成员吗?', '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$post(`${this.api.removeTheLine}?teamId=${this.info.teamId}&competitionId=${this.id}&accountId=${row.accountId}`).then(res => { this.$post(`${this.api.removeTheLine}?teamId=${this.info.teamId}&competitionId=${this.id}&accountId=${row.accountId}`).then(res => {
util.successMsg('移除成功') util.successMsg('移除成功')

@ -1,38 +1,74 @@
<template> <template>
<!-- 竞赛进展 --> <!-- 竞赛进展 -->
<div class="page-content" style="padding: 24px"> <div class="page-content"
<el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id"> style="padding: 24px">
<el-table-column type="index" width="60" label="序号" align="center"> <el-table ref="table"
:data="listData"
class="table"
stripe
header-align="center"
@selection-change="handleSelectionChange"
row-key="id">
<el-table-column type="index"
width="60"
label="序号"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + (pageNo - 1) * pageSize + 1 }} {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="标题"> <el-table-column prop="name"
label="标题">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input placeholder="请输入标题" :disabled="!scope.row.operate" v-model="scope.row.title"></el-input> <el-input placeholder="请输入标题"
:disabled="!scope.row.operate"
v-model="scope.row.title"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="详情描述"> <el-table-column prop="name"
label="详情描述">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input placeholder="请输入详情描述" :disabled="!scope.row.operate" type="textarea" v-model="scope.row.description"></el-input> <el-input placeholder="请输入详情描述"
:disabled="!scope.row.operate"
type="textarea"
v-model="scope.row.description"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="状态" width="150"> <el-table-column prop="name"
label="状态"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.status" :disabled="!scope.row.operate" clearable placeholder="请选择状态"> <el-select v-model="scope.row.status"
<el-option v-for="(item,index) in statusList" :key="index" :label="item.name" :value="item.value"></el-option> :disabled="!scope.row.operate"
clearable
placeholder="请选择状态">
<el-option v-for="(item,index) in statusList"
:key="index"
:label="item.name"
:value="item.value"></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="170"> <el-table-column label="操作"
align="center"
width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="!scope.row.operate" type="text" @click="operateIt(scope.row)" v-auth="'/match:管理:竞赛进展:编辑'">编辑</el-button> <el-button v-if="!scope.row.operate"
<el-button v-else type="text" @click="saveData(scope.row)">保存</el-button> type="text"
<el-button type="text" @click="handleDelete(scope.row, scope.$index)" v-auth="'/match/list:管理:竞赛进展:删除'">删除</el-button> @click="operateIt(scope.row)"
v-auth="'/match:管理:竞赛进展:编辑'">编辑</el-button>
<el-button v-else
type="text"
@click="saveData(scope.row)">保存</el-button>
<el-button type="text"
@click="handleDelete(scope.row, scope.$index)"
v-auth="'/match/list:管理:竞赛进展:删除'">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="plus" @click="addData" v-auth="'/match/list:管理:竞赛进展:新增'"> <div class="plus"
@click="addData"
v-auth="'/match/list:管理:竞赛进展:新增'">
<i class="el-icon-circle-plus-outline"></i> <i class="el-icon-circle-plus-outline"></i>
</div> </div>
</div> </div>
@ -174,7 +210,8 @@ export default {
this.$confirm('暂未保存,是否保存本次编辑?', '提示', { this.$confirm('暂未保存,是否保存本次编辑?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
let num = 0; let num = 0;
for (var i = 0; i < this.listData.length; i++) { for (var i = 0; i < this.listData.length; i++) {

@ -604,7 +604,8 @@ export default {
this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => { this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || this.stageId}&isOverallRanking=${this.active ? 0 : 1}&publicationType=${this.type}`).then(({ whetherToPublish }) => {
whetherToPublish ? whetherToPublish ?
this.$confirm('排名已经发布,是否直接覆盖?', '提示', { this.$confirm('排名已经发布,是否直接覆盖?', '提示', {
type: 'success' type: 'success',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.publishSubmit() this.publishSubmit()
}).catch(() => { }) : }).catch(() => { }) :

@ -1,45 +1,71 @@
<template> <template>
<!-- 报名人员 --> <!-- 报名人员 -->
<div class="page-content" style="padding: 24px"> <div class="page-content"
<div class="tool" style="justify-content: flex-end"> style="padding: 24px">
<el-button type="primary" round @click="add" v-auth="'/match/list:管理:公告通知:新增'">新增</el-button> <div class="tool"
style="justify-content: flex-end">
<el-button type="primary"
round
@click="add"
v-auth="'/match/list:管理:公告通知:新增'">新增</el-button>
</div> </div>
<el-table ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id"> <el-table ref="table"
<el-table-column type="index" width="60" label="序号" align="center"> :data="listData"
class="table"
stripe
header-align="center"
@selection-change="handleSelectionChange"
row-key="id">
<el-table-column type="index"
width="60"
label="序号"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + (pageNo - 1) * pageSize + 1 }} {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="announcementTitle" label="标题名称"> <el-table-column prop="announcementTitle"
label="标题名称">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建时间"> <el-table-column prop="createTime"
label="创建时间">
</el-table-column> </el-table-column>
<el-table-column prop="updateTime" label="发布时间"> <el-table-column prop="updateTime"
label="发布时间">
</el-table-column> </el-table-column>
<el-table-column prop="phone" label="状态"> <el-table-column prop="phone"
label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status ? '已发布' : '草稿' }} {{ scope.row.status ? '已发布' : '草稿' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="250"> <el-table-column label="操作"
align="center"
width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="edit(scope.row)" v-auth="'/match/list:管理:公告通知:编辑'">编辑</el-button> <el-button type="text"
<el-button type="text" @click="del(scope.row)" v-auth="'/match/list:管理:公告通知:删除'">删除</el-button> @click="edit(scope.row)"
<el-switch v-auth="'/match/list:管理:公告通知:编辑'">编辑</el-button>
v-auth="'/match/list:管理:公告通知:启用'" <el-button type="text"
@click="del(scope.row)"
v-auth="'/match/list:管理:公告通知:删除'">删除</el-button>
<el-switch v-auth="'/match/list:管理:公告通知:启用'"
v-model="scope.row.isOpen" v-model="scope.row.isOpen"
:active-text="scope.row.isOpen ? '关' : '开'" :active-text="scope.row.isOpen ? '关' : '开'"
:active-value="0" :active-value="0"
:inactive-value="1" :inactive-value="1"
style="margin: 0 10px 0 5px" style="margin: 0 10px 0 5px"
@change="switchOff($event,scope.row,scope.$index)" @change="switchOff($event,scope.row,scope.$index)"></el-switch>
></el-switch>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination background layout="total, prev, pager, next" :total="totals" @current-change="handleCurrentChange" :current-page="pageNo"> <el-pagination background
layout="total, prev, pager, next"
:total="totals"
@current-change="handleCurrentChange"
:current-page="pageNo">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
@ -108,7 +134,8 @@ export default {
this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { }) this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => { }).catch(err => { })
} else if (!row.status) { } else if (!row.status) {
this.$confirm('是否发布该公告?', '提示', { this.$confirm('是否发布该公告?', '提示', {
type: 'success' type: 'success',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => { this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {
this.$post(this.api.amendmentAnnouncement, { this.$post(this.api.amendmentAnnouncement, {
@ -136,5 +163,4 @@ export default {
</script> </script>
<style scoped> <style scoped>
</style> </style>

@ -388,7 +388,8 @@ export default {
if (this.updateTime) { if (this.updateTime) {
if (!this.backType) { if (!this.backType) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', { this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.next = next this.next = next
this.save(this.projectManage.state) this.save(this.projectManage.state)
@ -494,7 +495,8 @@ export default {
systemChange () { // systemChange () { //
if (this.projectJudgmentData.length) { if (this.projectJudgmentData.length) {
this.$confirm("更换系统会清空实验任务,确认更换?", "提示", { this.$confirm("更换系统会清空实验任务,确认更换?", "提示", {
type: "warning" type: "warning",
closeOnClickModal: false
}).then(() => { }).then(() => {
this.projectJudgmentData = []; this.projectJudgmentData = [];
this.setSystemId(this.projectManage.systemId); this.setSystemId(this.projectManage.systemId);
@ -846,7 +848,8 @@ export default {
// //
if (this.updateTime) { if (this.updateTime) {
this.$confirm('编辑的内容未保存,是否保存?', "提示", { this.$confirm('编辑的内容未保存,是否保存?', "提示", {
type: "warning" type: "warning",
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(this.projectManage.state) this.save(this.projectManage.state)
}).catch(() => { }).catch(() => {

@ -4,21 +4,32 @@
<div class="left"> <div class="left">
<div class="inner"> <div class="inner">
<div class="text-center"> <div class="text-center">
<img :src="avatar" class="avatar" /> <img :src="avatar"
<el-upload :headers="{token}" :action="this.api.uploadUserAvatars" name="file" :limit="10" :show-file-list="false" :on-success="changeAvatar"> class="avatar" />
<el-button type="text" size="small">点击更换头像</el-button> <el-upload :headers="{token}"
:action="this.api.uploadUserAvatars"
name="file"
:limit="10"
:show-file-list="false"
:on-success="changeAvatar">
<el-button type="text"
size="small">点击更换头像</el-button>
</el-upload> </el-upload>
</div> </div>
<ul class="menu"> <ul class="menu">
<li v-for="item in typeList" :key="item.index" :class="{active: item.index == active}"> <li v-for="item in typeList"
:key="item.index"
:class="{active: item.index == active}">
{{ item.title }} {{ item.title }}
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<info ref="info" v-if="active == 1" @updateStatus="updateStatus"></info> <info ref="info"
v-if="active == 1"
@updateStatus="updateStatus"></info>
<download v-else></download> <download v-else></download>
</div> </div>
</div> </div>
@ -48,7 +59,8 @@ export default {
beforeRouteLeave (to, from, next) { beforeRouteLeave (to, from, next) {
if (this.edited) { if (this.edited) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', { this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$refs.info.save() this.$refs.info.save()
next() next()
@ -97,7 +109,7 @@ export default {
.left { .left {
margin-right: 12px; margin-right: 12px;
background-color: #fff; background-color: #fff;
box-shadow: 2px 0px 6px 0px #EEEEEE; box-shadow: 2px 0px 6px 0px #eeeeee;
.inner { .inner {
width: 170px; width: 170px;
padding: 20px 0; padding: 20px 0;

@ -1,53 +1,76 @@
<template> <template>
<div> <div>
<div class="scroll" v-loading="loading"> <div class="scroll"
v-loading="loading">
<div class="page"> <div class="page">
<h6 class="l-title"><img src="@/assets/img/info1.png" alt=""> 用户信息</h6> <h6 class="l-title"><img src="@/assets/img/info1.png"
alt=""> 用户信息</h6>
<div class="page-content"> <div class="page-content">
<ul class="list"> <ul class="list">
<div class="line info"> <div class="line info">
<li> <li>
<label>姓名</label> <label>姓名</label>
<el-input id="username" class="username" placeholder="请输入姓名" type="text" v-model="form.userName" /> <el-input id="username"
class="username"
placeholder="请输入姓名"
type="text"
v-model="form.userName" />
</li> </li>
<li> <li>
<label>所在国家</label> <label>所在国家</label>
<el-select <el-select v-model="form.countries"
v-model="form.countries" placeholder>
placeholder <el-option v-for="item in countryList"
>
<el-option
v-for="item in countryList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"></el-option>
></el-option>
</el-select> </el-select>
</li> </li>
</div> </div>
<div class="line info"> <div class="line info">
<li> <li>
<label>性别</label> <label>性别</label>
<el-select size="small" v-model="form.sex"> <el-select size="small"
<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"></el-option> v-model="form.sex">
<el-option v-for="item in sexList"
:key="item.value"
:label="item.name"
:value="item.value"></el-option>
</el-select> </el-select>
</li> </li>
<li class="selects"> <li class="selects">
<label>所在地</label> <label>所在地</label>
<div class="mul"> <div class="mul">
<div class="child"> <div class="child">
<el-select size="small" v-model="form.countries" placeholder> <el-select size="small"
<el-option v-for="item in countryList" :key="item.value" :label="item.label" :value="item.label"></el-option> v-model="form.countries"
placeholder>
<el-option v-for="item in countryList"
:key="item.value"
:label="item.label"
:value="item.label"></el-option>
</el-select> </el-select>
</div> </div>
<div class="child"> <div class="child">
<el-select size="small" v-model="form.provinceId" placeholder @change="id => getCity(id,1)"> <el-select size="small"
<el-option v-for="item in provinceList" :key="item.provinceId" :label="item.provinceName" :value="item.provinceId"></el-option> v-model="form.provinceId"
placeholder
@change="id => getCity(id,1)">
<el-option v-for="item in provinceList"
:key="item.provinceId"
:label="item.provinceName"
:value="item.provinceId"></el-option>
</el-select> </el-select>
</div> </div>
<div class="child"> <div class="child">
<el-select size="small" v-model="form.cityId" placeholder :disabled="form.provinceId ? false : true"> <el-select size="small"
<el-option v-for="item in cityList" :key="item.cityId" :label="item.cityName" :value="item.cityId"></el-option> v-model="form.cityId"
placeholder
:disabled="form.provinceId ? false : true">
<el-option v-for="item in cityList"
:key="item.cityId"
:label="item.cityName"
:value="item.cityId"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
@ -56,8 +79,7 @@
<div class="line info"> <div class="line info">
<li> <li>
<label>出生年月</label> <label>出生年月</label>
<el-date-picker <el-date-picker v-model="form.dateBirth"
v-model="form.dateBirth"
:clearable="false" :clearable="false"
class="block-right" class="block-right"
type="date"> type="date">
@ -65,77 +87,144 @@
</li> </li>
<li> <li>
<label>身份证</label> <label>身份证</label>
<el-input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" id="idnumber" class="idnumber" placeholder="请输入身份证" type="text" v-model="form.idNumber" /> <el-input onkeyup="value=value.replace(/[^\w\.\/]/ig,'')"
id="idnumber"
class="idnumber"
placeholder="请输入身份证"
type="text"
v-model="form.idNumber" />
</li> </li>
</div> </div>
<div class="line info"> <div class="line info">
<li> <li>
<label>教育程度</label> <label>教育程度</label>
<el-select size="small" v-model="form.educationDegree" placeholder="请选择教育程度"> <el-select size="small"
<el-option v-for="(item,index) in educationDegreeList" :key="index" :label="item.name" :value="item.value"></el-option> v-model="form.educationDegree"
placeholder="请选择教育程度">
<el-option v-for="(item,index) in educationDegreeList"
:key="index"
:label="item.name"
:value="item.value"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>当前所在学校</label> <label>当前所在学校</label>
<el-input size="small" readonly placeholder="请输入学校" v-model="form.schoolName" clearable></el-input> <el-input size="small"
readonly
placeholder="请输入学校"
v-model="form.schoolName"
clearable></el-input>
</li> </li>
</div> </div>
</ul> </ul>
</div> </div>
<div class="arc-action flex j-between a-center"> <div class="arc-action flex j-between a-center">
<h6 class="l-title"><img src="@/assets/img/info2.png" alt=""> 个人档案</h6> <h6 class="l-title"><img src="@/assets/img/info2.png"
<el-button type="text" icon="el-icon-plus" style="margin-left: 16px" @click="addArch">新增</el-button> alt=""> 个人档案</h6>
<el-button type="text"
icon="el-icon-plus"
style="margin-left: 16px"
@click="addArch">新增</el-button>
</div> </div>
<div class="page-content"> <div class="page-content">
<div class="archives" v-for="(archive,index) in archivesList" :key="index" v-show="index == 0 || showArch"> <div class="archives"
v-for="(archive,index) in archivesList"
:key="index"
v-show="index == 0 || showArch">
<ul class="list"> <ul class="list">
<div class="line"> <div class="line">
<li> <li>
<label>职业</label> <label>职业</label>
<el-select size="small" v-model="archive.personalCareerId" placeholder="选择职业"> <el-select size="small"
<el-option v-for="item in occupationList" :key="item.value" :label="item.label" :value="item.value"></el-option> v-model="archive.personalCareerId"
placeholder="选择职业">
<el-option v-for="item in occupationList"
:key="item.value"
:label="item.label"
:value="item.value"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>所在国家</label> <label>所在国家</label>
<el-select size="small" v-model="form.countries" placeholder> <el-select size="small"
<el-option v-for="item in countryList" :key="item.value" :label="item.label" :value="item.label" ></el-option> v-model="form.countries"
placeholder>
<el-option v-for="item in countryList"
:key="item.value"
:label="item.label"
:value="item.label"></el-option>
</el-select> </el-select>
</li> </li>
</div> </div>
<div class="line"> <div class="line">
<li> <li>
<label>学校名称</label> <label>学校名称</label>
<el-select size="small" v-model="archive.schoolId" filterable placeholder="选择学校" @change="id => getSchoolName(id,index)"> <el-select size="small"
<el-option v-for="item in schoolList" :key="item.value" :label="item.schoolName" :value="item.schoolId"></el-option> v-model="archive.schoolId"
filterable
placeholder="选择学校"
@change="id => getSchoolName(id,index)">
<el-option v-for="item in schoolList"
:key="item.value"
:label="item.schoolName"
:value="item.schoolId"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>专业学科</label> <label>专业学科</label>
<el-select size="small" v-model="archive.disciplineId" placeholder="选择专业学科" @change="id => getItemProfessionalClass(id,index)" @clear="() => clearItemClass(index)"> <el-select size="small"
<el-option v-for="item in subjectList" :key="item.value" :label="item.disciplineName" :value="item.disciplineId"></el-option> v-model="archive.disciplineId"
placeholder="选择专业学科"
@change="id => getItemProfessionalClass(id,index)"
@clear="() => clearItemClass(index)">
<el-option v-for="item in subjectList"
:key="item.value"
:label="item.disciplineName"
:value="item.disciplineId"></el-option>
</el-select> </el-select>
</li> </li>
</div> </div>
<div class="line" style="margin-bottom: 0"> <div class="line"
style="margin-bottom: 0">
<li> <li>
<label>专业类</label> <label>专业类</label>
<el-select size="small" v-model="archive.professionalClassId" placeholder="选择专业类" :disabled="archive.disciplineId ? false : true" @change="id => getItemProfessional(id,index)" @clear="() => clearItemProfess(index)"> <el-select size="small"
<el-option v-for="item in archive.ProfessionalClassList" :key="item.professionalClassId" :label="item.professionalClassName" :value="item.professionalClassId"></el-option> v-model="archive.professionalClassId"
placeholder="选择专业类"
:disabled="archive.disciplineId ? false : true"
@change="id => getItemProfessional(id,index)"
@clear="() => clearItemProfess(index)">
<el-option v-for="item in archive.ProfessionalClassList"
:key="item.professionalClassId"
:label="item.professionalClassName"
:value="item.professionalClassId"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>专业</label> <label>专业</label>
<el-select size="small" v-model="archive.professionalId" placeholder="选择专业" :disabled="archive.professionalClassId ? false : true" @change="getItemStuGrade"> <el-select size="small"
<el-option v-for="item in archive.ProfessionalList" :key="item.professionalId" :label="item.professionalName" :value="item.professionalId"></el-option> v-model="archive.professionalId"
placeholder="选择专业"
:disabled="archive.professionalClassId ? false : true"
@change="getItemStuGrade">
<el-option v-for="item in archive.ProfessionalList"
:key="item.professionalId"
:label="item.professionalName"
:value="item.professionalId"></el-option>
</el-select> </el-select>
</li> </li>
</div> </div>
</ul> </ul>
<img class="del" src="@/assets/img/trash.png" alt="" v-if="index" @click="delArchive(index)"> <img class="del"
src="@/assets/img/trash.png"
alt=""
v-if="index"
@click="delArchive(index)">
</div> </div>
<div class="fold" v-if="archivesList.length > 1"> <div class="fold"
<span :class="{active: showArch}" @click="showArch = !showArch"> v-if="archivesList.length > 1">
<span :class="{active: showArch}"
@click="showArch = !showArch">
展开更多 展开更多
<i class="el-icon-arrow-down"></i> <i class="el-icon-arrow-down"></i>
</span> </span>
@ -143,32 +232,60 @@
</div> </div>
</div> </div>
<div class="page"> <div class="page">
<h6 class="l-title"><img src="@/assets/img/info3.png" alt=""> 账号信息</h6> <h6 class="l-title"><img src="@/assets/img/info3.png"
alt=""> 账号信息</h6>
<div class="page-content"> <div class="page-content">
<ul class="list"> <ul class="list">
<div class="line info imp"> <div class="line info imp">
<li style="width: 333px;margin-right: 90px"> <li style="width: 333px;margin-right: 90px">
<label>学号</label> <label>学号</label>
<el-input class="m-r-10" size="small" v-model="form.workNumber" clearable disabled></el-input> <el-input class="m-r-10"
size="small"
v-model="form.workNumber"
clearable
disabled></el-input>
</li> </li>
<li> <li>
<label>手机号</label> <label>手机号</label>
<el-input class="m-r-10" type="text" size="small" v-model="form.phone" disabled></el-input> <el-input class="m-r-10"
<el-button type="text" size="small" @click="bindPhone">{{ form.phone ? '更换' : '绑定' }}</el-button> type="text"
<el-button v-if="form.phone" type="text" size="small" @click="unbind">解绑</el-button> size="small"
v-model="form.phone"
disabled></el-input>
<el-button type="text"
size="small"
@click="bindPhone">{{ form.phone ? '更换' : '绑定' }}</el-button>
<el-button v-if="form.phone"
type="text"
size="small"
@click="unbind">解绑</el-button>
</li> </li>
</div> </div>
<div class="line info imp"> <div class="line info imp">
<li> <li>
<label>邮箱</label> <label>邮箱</label>
<el-input class="m-r-10" size="small" v-model="form.email" disabled></el-input> <el-input class="m-r-10"
<el-button v-if="form.email" type="text" size="small" @click="bindEmail">更换</el-button> size="small"
<el-button v-else type="text" size="small" @click="bindEmail">添加</el-button> v-model="form.email"
disabled></el-input>
<el-button v-if="form.email"
type="text"
size="small"
@click="bindEmail">更换</el-button>
<el-button v-else
type="text"
size="small"
@click="bindEmail">添加</el-button>
</li> </li>
<li> <li>
<label>密码</label> <label>密码</label>
<el-input class="m-r-10" size="small" value="******" disabled></el-input> <el-input class="m-r-10"
<el-button type="text" size="small" @click="bindPassword">更换</el-button> size="small"
value="******"
disabled></el-input>
<el-button type="text"
size="small"
@click="bindPassword">更换</el-button>
</li> </li>
</div> </div>
</ul> </ul>
@ -177,87 +294,129 @@
</div> </div>
<div class="btns"> <div class="btns">
<!-- <el-button size="small" v-throttle @click="cancel">取消</el-button> --> <!-- <el-button size="small" v-throttle @click="cancel">取消</el-button> -->
<el-button type="primary" size="small" v-throttle @click="save">更新</el-button> <el-button type="primary"
size="small"
v-throttle
@click="save">更新</el-button>
</div> </div>
<el-dialog <el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'"
:title="form.email ? '更换邮箱' : '绑定邮箱'"
:visible.sync="emailVisible" :visible.sync="emailVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closeEmail" @close="closeEmail"
width="30%"> width="30%">
<el-form ref="form" :model="form" label-width="60px"> <el-form ref="form"
:model="form"
label-width="60px">
<el-form-item label="邮箱"> <el-form-item label="邮箱">
<el-input placeholder="请输入邮箱" v-model="email"></el-input> <el-input placeholder="请输入邮箱"
v-model="email"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="验证码"> <el-form-item label="验证码">
<div class="flex-between"> <div class="flex-between">
<el-input v-model="emailCode" placeholder="请输入验证码" maxlength="6"></el-input> <el-input v-model="emailCode"
<el-button style="margin-left: 10px" type="text" @click="sendEmailCode" :disabled="emailDisabled">{{ emailBtnText }}</el-button> placeholder="请输入验证码"
maxlength="6"></el-input>
<el-button style="margin-left: 10px"
type="text"
@click="sendEmailCode"
:disabled="emailDisabled">{{ emailBtnText }}</el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
class="dialog-footer">
<el-button @click="emailVisible = false"> </el-button> <el-button @click="emailVisible = false"> </el-button>
<el-button type="primary" @click="emailSubmit"> </el-button> <el-button type="primary"
@click="emailSubmit"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'"
:title="form.phone ? '更换手机号' : '绑定手机号'"
:visible.sync="phoneVisible" :visible.sync="phoneVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closePhone" @close="closePhone"
width="30%"> width="30%">
<el-form ref="form" :model="form" label-width="60px"> <el-form ref="form"
:model="form"
label-width="60px">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input style="width: 404px;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input> <el-input style="width: 404px;"
placeholder="请输入手机号"
v-model="phone"
maxlength="11"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="验证码"> <el-form-item label="验证码">
<div class="flex-between"> <div class="flex-between">
<el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input> <el-input v-model="phoneCode"
<el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{ phoneBtnText }}</el-button> placeholder="请输入验证码"
maxlength="6"></el-input>
<el-button style="margin-left: 10px"
type="text"
@click="sendPhoneCode"
:disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
class="dialog-footer">
<el-button @click="phoneVisible = false"> </el-button> <el-button @click="phoneVisible = false"> </el-button>
<el-button type="primary" @click="phoneSubmit"> </el-button> <el-button type="primary"
@click="phoneSubmit"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog title="更换密码"
title="更换密码"
:visible.sync="passwordVisible" :visible.sync="passwordVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="closePassword" @close="closePassword"
width="30%"> width="30%">
<el-form ref="passwordForm" :model="form" label-width="60px"> <el-form ref="passwordForm"
:model="form"
label-width="60px">
<el-form-item label="原密码"> <el-form-item label="原密码">
<el-input type="password" v-model="passwordForm.password" placeholder="请输入原密码"></el-input> <el-input type="password"
v-model="passwordForm.password"
placeholder="请输入原密码"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码"> <el-form-item label="新密码">
<el-input type="password" v-model="passwordForm.newPassword" placeholder="请输入新密码" @keyup.enter.native="editPassword"></el-input> <el-input type="password"
v-model="passwordForm.newPassword"
placeholder="请输入新密码"
@keyup.enter.native="editPassword"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码"> <el-form-item label="新密码">
<el-input type="password" v-model="passwordForm.reNewPassword" placeholder="请确认新密码" @keyup.enter.native="editPassword"></el-input> <el-input type="password"
v-model="passwordForm.reNewPassword"
placeholder="请确认新密码"
@keyup.enter.native="editPassword"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
class="dialog-footer">
<el-button @click="passwordVisible = false"> </el-button> <el-button @click="passwordVisible = false"> </el-button>
<el-button type="primary" @click="editPassword"> </el-button> <el-button type="primary"
@click="editPassword"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="修改用户账号" :visible.sync="accountVisible" :close-on-click-modal="false" width="30%"> <el-dialog title="修改用户账号"
:visible.sync="accountVisible"
:close-on-click-modal="false"
width="30%">
<el-form label-width="82px"> <el-form label-width="82px">
<el-form-item label="用户账号"> <el-form-item label="用户账号">
<el-input v-model="editUsername" placeholder="请输入用户账号"></el-input> <el-input v-model="editUsername"
placeholder="请输入用户账号"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer"
<el-button size="small" @click="accountVisible = false"> </el-button> class="dialog-footer">
<el-button size="small" type="primary" @click="confirmAccount"> </el-button> <el-button size="small"
@click="accountVisible = false"> </el-button>
<el-button size="small"
type="primary"
@click="confirmAccount"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -621,7 +780,8 @@ export default {
// //
unbind () { unbind () {
this.$confirm('确定要解绑该手机号吗?', '提示', { this.$confirm('确定要解绑该手机号吗?', '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.$get(this.api.unbindMobilePhone).then(res => { this.$get(this.api.unbindMobilePhone).then(res => {
this.$message.success('解绑成功') this.$message.success('解绑成功')
@ -804,7 +964,8 @@ export default {
cancel () { cancel () {
if (this.updateTime > 1) { if (this.updateTime > 1) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', { this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save(1) this.save(1)
}).catch(() => { }).catch(() => {
@ -992,7 +1153,8 @@ export default {
goBack () { goBack () {
if (this.updateTime > 0) { if (this.updateTime > 0) {
this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', { this.$confirm(`您所更改的内容未更新,是否更新?`, '提示', {
type: 'warning' type: 'warning',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.save() this.save()
this.$router.go(-1); this.$router.go(-1);
@ -1014,7 +1176,7 @@ export default {
.page { .page {
margin-bottom: 12px; margin-bottom: 12px;
/deep/.el-input__inner { /deep/.el-input__inner {
border-color: #CACFDB; border-color: #cacfdb;
} }
.list { .list {
.line { .line {
@ -1032,10 +1194,11 @@ export default {
} }
} }
} }
.el-input, .el-select{ .el-input,
.el-select {
width: 220px; width: 220px;
.el-input__inner { .el-input__inner {
border-color: #CACFDB; border-color: #cacfdb;
} }
} }
li { li {
@ -1085,7 +1248,7 @@ export default {
padding: 16px 0; padding: 16px 0;
margin-bottom: 6px; margin-bottom: 6px;
border-radius: 4px; border-radius: 4px;
background-color: #FAFAFA; background-color: #fafafa;
.del { .del {
position: absolute; position: absolute;
top: 80px; top: 80px;
@ -1100,11 +1263,11 @@ export default {
margin-top: 20px; margin-top: 20px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
color: #006EFF; color: #006eff;
span { span {
cursor: pointer; cursor: pointer;
i { i {
transition: .5s; transition: 0.5s;
} }
&.active i { &.active i {
transform: rotate(180deg); transform: rotate(180deg);

@ -933,7 +933,8 @@ export default {
this.$confirm('是否要继续上次的实验?', '提示', { this.$confirm('是否要继续上次的实验?', '提示', {
confirmButtonText: '是', confirmButtonText: '是',
cancelButtonText: '否', cancelButtonText: '否',
type: 'success' type: 'success',
closeOnClickModal: false
}).then(() => { }).then(() => {
this.curProject = projectId this.curProject = projectId
this.toSub() this.toSub()

@ -15,5 +15,6 @@ module.exports = {
assetsDir: Setting.assetsDir, assetsDir: Setting.assetsDir,
devServer: { devServer: {
port: 8081 // 固定端口 port: 8081 // 固定端口
} },
productionSourceMap: false,
} }
Loading…
Cancel
Save