Skip to content

L
learn-online-pc
提交 512439d2 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

办事大厅

上级 c774f6fd
隐藏空白字符变更
内嵌 并排
正在显示 包含 428 行增加 和 67 行删除
client/client/project/components/layout/sidebar.vue
浏览文件 @ 512439d2
......@@ -85,11 +85,11 @@ export default {
{ name: '我的学分', index: '2-1' }
]
},
// {
// name: '办事大厅',
// iconClass: 'el-icon-self-fankuiyijian',
// index: '4'
// },
{
name: '办事大厅',
iconClass: 'el-icon-self-fankuiyijian',
index: '4'
},
{
name: '意见反馈',
iconClass: 'el-icon-self-fankuiyijian',
......
client/client/project/components/module/mPage.vue
浏览文件 @ 512439d2
......@@ -67,9 +67,7 @@ export default {
}
},
beforeMount () {
setTimeout(() => {
this.getList()
}, 500)
this.getList()
},
watch: {
/* 解决 赋值后 会多请求一次接口问题 */
......@@ -91,11 +89,7 @@ export default {
},
'objFn.paramsFn': {
handler () {
if (this.isWatch) {
this.getList()
} else {
this.isWatch = true
}
this.getList()
}
}
}
......
client/client/project/components/module/mTable.vue
浏览文件 @ 512439d2
......@@ -54,18 +54,19 @@
<template v-for="(_item, _index) in head.commandArr">
<template v-if="scope.row['approve_status'] !== undefined">
<!-- 学术报告 - 列表 -->
<template v-if="_index === 0 && scope.row['approve_status'] === '通过' && scope.row['reportscount'] !== 0">
<el-button v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
<template v-if="_index === 0 && scope.row['approve_status'] === '通过' && scope.row['symposium_attachments'] !== ''">
<el-button v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
</template>
<template v-else-if="_index === 1 && scope.row['approve_status'] === '通过' && scope.row['reportscount'] === 0">
<template v-else-if="_index === 1 && scope.row['approve_status'] === '通过' && scope.row['symposium_attachments'] === ''">
<el-button v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
</template>
<template v-else-if="_index === 2 && scope.row['reportscount'] === 0">
<el-button v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
<template v-else-if="_index === 2">
<el-button v-show="scope.row['approve_status'] === '未审核' && scope.row['isPage'] !== undefined" v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
</template>
<template v-else-if="_index === 3 && scope.row['reportscount'] === 0">
<el-button v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
<template v-else-if="_index === 3">
<el-button v-show="scope.row['approve_status'] === '未审核' && scope.row['isPage'] !== undefined" v-bind:key="_index" type="text" @click="itemClick(scope.row.index, _item)">{{_item.name}}</el-button>
</template>
<!-- v-show="scope.row['approve_status'] !== '未审核' && scope.row['isPage'] !== undefined" -->
</template>
<template v-else-if="scope.row['passed'] !== undefined">
<!-- 积分 - 重修列表 -->
......
client/client/project/pages/serviceHall/hall.vue
浏览文件 @ 512439d2
......@@ -11,13 +11,15 @@
<el-button type="primary" v-show="tapIndex==2" @click="golearningAdd(2)">申请重修</el-button>
<!-- <el-button style="float:right;" type="text" @click='gobackReportList'>返回报告列表</el-button> -->
<div style="width: 100%; height: 0.2rem;"></div>
<m-page
:tableHead="tableHead"
:tableData="tableData"
:params="params"
:objFn="objFn"
:tableConfig="tableConfig"
/>
<template v-if="ismPageFlag">
<m-page
:tableHead="tableHead"
:tableData="tableData"
:params="params"
:objFn="objFn"
:tableConfig="tableConfig"
/>
</template>
</div>
</div>
</template>
......@@ -33,6 +35,7 @@ export default {
},
data () {
return {
ismPageFlag: false,
tapIndex: 0,
// tap切换
tapParam: [{
......@@ -65,11 +68,11 @@ export default {
this.VueEvent.$on('command-tablelist-x', (_obj) => {
if (_obj.command.command === 'activelist-show') {
let rid = _obj.tableData[_obj.index - 1].id
this.$router.push({ path: `/app/my-learn/report-list-all/${rid}` })
this.$router.push({ path: `/app/service-hall/view-report/${rid}` })
}
if (_obj.command.command === 'activereport-add') {
let syid = _obj.tableData[_obj.index - 1].id
this.$router.push({ path: `/app/my-learn/report-submit/${syid}/-1` })
let syid = _obj.tableData[_obj.index - 1].formId
this.$router.push({ path: `/app/service-hall/upload-report/${syid}/-1` })
}
if (_obj.command.command === 'activelist-edit') {
let rid = _obj.tableData[_obj.index - 1].id
......@@ -100,12 +103,14 @@ export default {
// _this.params.total = data.length
data.forEach((elem, i) => {
let datas = {}
datas.approve_status = '未通过'
datas.approve_status = elem.status = elem.status === 1 || elem.status === 2 || elem.status === 4 ? '通过' : (elem.status === 0 || elem.status === 3 ? '未通过' : '未审核') // 0 未通过；1 通过；2 未审核
// datas.index = elem.index = i + 1 + (_this.params.curPage - 1) * _this.params.pageSize
datas.index = i + 1
datas.reportscount = elem.reportscount = Number(elem.reportscount || '0')
datas.approve_time = elem.apply_time
datas.isPage = 0
if (parseInt(this.tapIndex) === 0) {
datas.symposium_attachments = elem.form.symposium_attachments
// datas.approve_status = elem.approve_status = elem.approve_status === 1 ? '通过' : (elem.approve_status === 0 ? '未通过' : '未审核') // 0 未通过；1 通过；2 未审核
// datas.index = elem.index = i + 1 + (_this.params.curPage - 1) * _this.params.pageSize
// datas.reportscount = elem.reportscount = Number(elem.reportscount || '0')
......@@ -113,6 +118,7 @@ export default {
datas.symposium_time = elem.form.symposium_time
datas.symposium_lecturer = elem.form.symposium_lecturer
datas.id = elem.id
datas.formId = elem.form.id
} else if (parseInt(this.tapIndex) === 1) {
datas.personal_name = elem.form.personal_name
datas.trade_name = elem.form.trade_name
......@@ -133,6 +139,7 @@ export default {
})
}
}
this.ismPageFlag = true
},
tapIndexs (data) {
this.tapIndex = data.index
......@@ -207,7 +214,7 @@ export default {
}
},
goMyApply () {
this.$router.push({ path: `/app/service-hall/my-apply` })
this.$router.push({ path: `/app/service-hall/my-apply`, query: { id1: this.tapParam[0].arrItem[0].val, id2: this.tapParam[0].arrItem[1].val, id3: this.tapParam[0].arrItem[2].val } })
}
}
}
......
client/client/project/pages/serviceHall/learningAdd.vue
浏览文件 @ 512439d2
......@@ -6,6 +6,12 @@
<el-row type="flex" justify="center">
<el-col :xs="24" :sm="24" :md="16" :lg="12" :xl="8">
<el-form ref="setApplyForm" :label-width="labelWidth" :model="setApply" :rules="applyRules">
<!-- <el-form-item label="姓名" prop="personal_name">
<el-input v-model="setApply.personal_name" placeholder="请输入您的姓名" type="text" />
</el-form-item>
<el-form-item label="班级" prop="class_name">
<el-input v-model="setApply.class_name" placeholder="请输入您的班级" type="text" />
</el-form-item> -->
<el-form-item label="学术活动名称" prop="name">
<el-input v-model="setApply.name" placeholder="请输入活动名称" type="text" />
</el-form-item>
......@@ -64,6 +70,8 @@ export default {
return {
labelWidth: '110px',
setApply: {
personal_name: '',
class_name: '',
name: '',
time: '',
author: '',
......@@ -72,6 +80,12 @@ export default {
affair_id: ''
},
applyRules: {
'personal_name': [
{ required: true, message: '请输入您的姓名', trigger: 'blur' }
],
'class_name': [
{ required: true, message: '请输入您的班级', trigger: 'blur' }
],
'name': [
{ required: true, message: '活动名称不能为空', trigger: 'blur' }
],
......@@ -108,6 +122,8 @@ export default {
cAction.reportAction.getAffairsDetails(this.rid).then(data => {
console.log(data)
if (data.form.symposium_name) {
this.setApply.personal_name = data.form.personal_name
this.setApply.class_name = data.form.class_name
this.setApply.name = data.form.symposium_name
this.setApply.time = data.form.symposium_time
this.setApply.author = data.form.symposium_lecturer
......@@ -158,6 +174,8 @@ export default {
/* 修改 */
reportActive = cAction.reportAction.updateAffairs(this.rid, {
affair_id: this.affair_id,
personal_name: this.setApply.personal_name,
class_name: this.setApply.class_name,
symposium_name: this.setApply.name,
symposium_time: this.setApply.time,
symposium_lecturer: this.setApply.author,
......@@ -169,6 +187,8 @@ export default {
/* 新建 */
reportActive = cAction.reportAction.submitLearning({
affair_id: this.affair_id,
personal_name: this.setApply.personal_name,
class_name: this.setApply.class_name,
symposium_name: this.setApply.name,
symposium_time: this.setApply.time,
symposium_lecturer: this.setApply.author,
......
client/client/project/pages/serviceHall/myApply.vue
浏览文件 @ 512439d2
......@@ -2,7 +2,14 @@
<div class="con-boxs">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item>
<el-input v-model="formInline.user" placeholder="请输入申请的事项"></el-input>
<el-select v-model="selsectValue" clearable placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
......@@ -14,10 +21,10 @@
</div>
<template>
<el-table
:data="tableData"
:data="unfinishedCount"
style="width: 100%">
<el-table-column
prop="date"
prop="index"
label="序号">
</el-table-column>
<el-table-column
......@@ -25,23 +32,23 @@
label="事项">
</el-table-column>
<el-table-column
prop="address"
prop="personal_name"
label="提交人">
</el-table-column>
<el-table-column
prop="address"
prop="class_name"
label="提交人班级">
</el-table-column>
<el-table-column
prop="address"
prop="apply_time"
label="提交时间">
</el-table-column>
<el-table-column
prop="address"
prop="status"
label="审批结果">
</el-table-column>
<el-table-column
prop="address"
prop="approve_time1"
label="审批时间">
</el-table-column>
</el-table>
......@@ -53,10 +60,10 @@
</div>
<template>
<el-table
:data="tableData"
:data="finishedCount"
style="width: 100%">
<el-table-column
prop="date"
prop="index"
label="序号">
</el-table-column>
<el-table-column
......@@ -64,23 +71,23 @@
label="事项">
</el-table-column>
<el-table-column
prop="address"
prop="personal_name"
label="提交人">
</el-table-column>
<el-table-column
prop="address"
prop="class_name"
label="提交人班级">
</el-table-column>
<el-table-column
prop="address"
prop="apply_time"
label="提交时间">
</el-table-column>
<el-table-column
prop="address"
prop="status"
label="审批结果">
</el-table-column>
<el-table-column
prop="address"
prop="approve_time1"
label="审批时间">
</el-table-column>
</el-table>
......@@ -90,9 +97,12 @@
</template>
<script>
import cAction from '@actions'
export default {
data () {
return {
selsectValue: '',
options: [],
formInline: {
user: '',
region: ''
......@@ -105,12 +115,62 @@
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}]
}],
unfinishedCount: [],
finishedCount: []
}
},
created () {
// this.getInfo()
this.getSelect()
this.onSubmit()
},
methods: {
getSelect () {
cAction.reportAction.getAffairsType().then(data => {
for (let i = 0; i < data.length; i++) {
this.options.push({ label: data[i].affair_name, value: data[i].id })
}
}).catch(e => {
this.$message.error(e.message)
})
},
onSubmit () {
console.log('submit!')
cAction.reportAction.getAffairsData({ affair_id: this.selsectValue }).then(data => {
this.unfinishedCount = []
this.finishedCount = []
let num1 = 0
let num2 = 0
for (let i = 0; i < data.length; i++) {
if (data[i].status === -1) {
data[i].status = '未审核'
num1++
data[i].index = parseInt(num1)
data[i].personal_name = data[i].form.personal_name
data[i].class_name = data[i].form.class_name
data[i].name = this.screenId(data[i].affair_id)
this.unfinishedCount.push(data[i])
} else {
num2++
data[i].index = parseInt(num2)
data[i].status = data[i].status === 1 || data[i].status === 2 ? '通过' : '未通过'
data[i].personal_name = data[i].form.personal_name
data[i].class_name = data[i].form.class_name
data[i].name = this.screenId(data[i].affair_id)
this.finishedCount.push(data[i])
}
}
}).catch(e => {
this.$message.error(e.message)
})
},
screenId (id) {
for (let i = 0; i < this.options.length; i++) {
if (this.options[i].value === id) {
return this.options[i].label
}
}
return false
}
}
}
......
client/client/project/pages/serviceHall/uploadReport.vue 0 → 100644
浏览文件 @ 512439d2
<template>
<div>
<div class="con-title">学术报告提交</div>
<div class="con-box">
<el-button type="text" @click='gobackActiveList'>返回活动列表</el-button>
<el-row type="flex" justify="center">
<el-col :xs="24" :sm="24" :md="16" :lg="12" :xl="8">
<el-form ref="setSubmitForm" :label-width="labelWidth" :model="setSubmit" :rules="submitRules">
<el-form-item label="学术报告主题" prop="name">
<el-input v-model="setSubmit.name" placeholder="请输入报告主题" type="text" />
</el-form-item>
<el-form-item label="学术报告摘要" prop="title">
<el-input v-model="setSubmit.title" placeholder="请输入报告摘要" type="text" />
</el-form-item>
<el-form-item label="附 件" prop="file">
<el-upload
ref="upFile"
class="upload-demo"
action=""
:multiple="false"
:limit="1"
:show-file-list="false"
:on-change="handleChange"
:http-request="uploadFile"
:file-list="filesArr">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">（可以上传word、ppt等资源。系统提供模板下载）<a href="http://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/static/build/learn-mba/%E3%80%8AMBA%E5%AD%A6%E7%94%9F%E5%AD%A6%E6%9C%AF%E6%B4%BB%E5%8A%A8%E8%AE%B0%E5%BD%95%E6%8A%A5%E5%91%8A%E3%80%8B%E6%A8%A1%E6%9D%BFXXX%E5%AD%A6%E7%94%9F.docx">模板下载</a></div>
<template v-if="successFileUrl">
{{successFileUrl.replace(/.*\/([^\/]*\.[^.]+)$/gi, '$1')}}
</template>
</el-upload>
<template v-if="successFileUrl">
<a :href="successFileUrl">下载已上传附件</a>
</template>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmitFrom">保存并提交</el-button>
</el-form-item>
</el-form>
</el-col>
</el-row>
</div>
</div>
</template>
<script>
import cAction from '@actions'
export default {
props: {
rid: { type: String, required: false },
reid: { type: String, required: false }
},
components: {},
data () {
return {
labelWidth: '110px',
setSubmit: {
name: '',
title: ''
},
submitRules: {
'name': [
{ required: true, message: '报告主题不能为空', trigger: 'blur' }
],
'title': []
},
successFileUrl: '',
filesArr: [],
file: {
id: 'WU_FILE_0',
name: '',
type: '',
lastModifiedDate: '',
size: '',
file: ''
}
}
},
mounted () {
if (this.reid !== '-1') {
const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
cAction.reportAction.getSubmitReport(this.rid, this.reid).then(data => {
if (data.report_name) {
this.setSubmit.name = data.report_name
this.setSubmit.title = data.report_description
this.successFileUrl = data.file_url
}
}).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
}
window.addEventListener('resize', () => {
let width = document.documentElement.clientWidth
if (width < 790) {
this.labelWidth = 'auto'
} else {
this.labelWidth = '110px'
}
})
},
methods: {
handleChange (file, filelist) {
this.file.name = file.raw.name
this.file.type = file.raw.type
this.file.lastModifiedDate = file.raw.lastModifiedDate
this.file.size = file.raw.size
this.file.file = file.raw
},
uploadFile () {
const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
cAction.chapterAction.uploadFile(this.file).then(data => {
this.successFileUrl = data.url
this.filesArr.pop()
}).catch(e => { this.filesArr.pop(); this.$message.error(e.message) }).finally(() => { loading.close() })
},
gobackActiveList () {
// this.$router.push({ path: `/app/my-learn/report-list-all/${this.rid}` })
this.$router.push({ path: `/app/service-hall/hall` })
},
onSubmitFrom () {
this.$refs['setSubmitForm'].validate((valid) => {
if (valid) {
// if (!this.successFileUrl) {
// this.$message.error('请上传附件')
// return
// // this.$refs['setApplyForm'].resetFields()
// }
const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
let report = null
if (this.reid !== '-1') {
/* 修改 */
report = cAction.reportAction.updateSubmitReport(this.rid, this.reid, {
report_name: this.setSubmit.name,
report_description: this.setSubmit.title,
file_url: JSON.stringify([{
name: this.file.name,
url: this.successFileUrl
}])
})
} else {
/* 新建 */
report = cAction.reportAction.submitReport(this.rid, {
report_name: this.setSubmit.name,
report_description: this.setSubmit.title,
file_url: JSON.stringify([{
name: this.file.name,
url: this.successFileUrl
}])
})
}
report.then(data => {
if (data.flag) {
this.$message({ type: 'success', message: '提交成功' })
setTimeout(() => {
this.$router.push({ path: `/app/my-learn/report-list-all/${this.rid}` })
}, 500)
}
}).catch(e => { this.filesArr.pop(); this.$message.error(e.message) }).finally(() => { loading.close() })
} else {
this.$message.error('请检查输入项，确认无误后，重新提交')
return false
}
})
}
}
}
</script>
<style lang="scss" scoped>
/* 申请 */
.el-date-editor.el-input {
width: 100%;
}
.el-upload__tip {
line-height: 1.5;
}
</style>
client/client/project/pages/serviceHall/viewReport.vue 0 → 100644
浏览文件 @ 512439d2
<template>
<div>
<div class="con-title">学术报告所在活动列表</div>
<div class="con-box">
<!-- <el-button type="primary" @click="goReportSubmit">申请报告</el-button> -->
<el-button type="text" @click='gobackReportActiveList'>返回活动列表</el-button>
<div style="width: 100%; height: 0.2rem;"></div>
<m-page
:tableHead="tableHead"
:tableData="tableData"
:params="params"
:objFn="objFn"
:tableConfig="tableConfig"
/>
</div>
</div>
</template>
<script>
import cAction from '@actions'
import mPage from '../../components/module/mPage.vue'
export default {
props: {
rid: { type: String, required: true }
},
components: { mPage },
data () {
return {
tableConfig: { border: '', size: '', selection: { has: false, sels: [], width: '50px', fix: 'left', align: '' } }, // 增加选择框，has设置为true
tableHead: [
{ prop: 'index', label: '序号', minWidth: '80', fix: false },
{ prop: 'report_name', label: '报告名称', minWidth: '150', fix: false },
{ prop: 'report_description', label: '报告摘要', minWidth: '120', fix: false },
{ prop: 'submit_time', label: '提交时间', minWidth: '120', fix: false },
{ prop: 'approve_status', label: '审核状态', minWidth: '120', fix: false },
{ prop: 'file_url', label: '附件下载', minWidth: '120', fix: false },
// { prop: '', label: '', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数
{ prop: 'operate-x', label: '操作', width: '140px', fix: false, commandArr: [ { command: 'reportlist-', name: '' }, { command: 'reportlist-edit', name: '编辑' }, { command: 'reportlist-delete', name: '删除' } ] }
],
tableData: [],
params: { keywords: '', curPage: 1, pageSize: 100, total: '' },
objFn: {
paramsFn: (_this) => { return { rid: this.rid } },
nameAPI: 'getReportListAll',
actionClass: 'reportAction',
// nameExcel: 'getStatSummaryExcel',
nameExcel: 'getExportExcel3_4_14',
callback: (_this, data) => {
_this.params.total = 100
data.forEach((elem, i) => {
elem.approve_status = elem.is_checked === 1 ? '通过' : (elem.is_checked === 0 ? '未通过' : '未审核')
elem.file_url = JSON.parse(elem.file_url)[0].url
elem.index = i + 1 + (_this.params.curPage - 1) * _this.params.pageSize
_this.tableData.push(elem)
})
}
}
}
},
mounted () {
this.VueEvent.$on('command-tablelist-x', (_obj) => {
if (_obj.command.command === 'reportlist-edit') {
let reid = _obj.tableData[_obj.index - 1].id
this.$router.push({ path: `/app/my-learn/report-submit/${this.rid}/${reid}` })
}
if (_obj.command.command === 'reportlist-delete') {
let reid = _obj.tableData[_obj.index - 1].id
/* 删除 */
const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
cAction.reportAction.deleteSubmitReport(this.rid, reid).then(data => {
if (data.flag) {
this.$message({ type: 'success', message: '删除成功' })
}
this.params.pageSize += 1
}).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
}
})
},
methods: {
goReportSubmit () {
this.$router.push({ path: `/app/my-learn/report-submit/${this.rid}/-1` })
},
gobackReportActiveList () {
this.$router.push({ path: `/app/service-hall/hall` })
}
}
}
</script>
<style lang="scss" scoped>
/* 申请 */
.el-date-editor.el-input {
width: 100%;
}
.el-upload__tip {
line-height: 1.5;
}
</style>
client/client/project/router/routes.js
浏览文件 @ 512439d2
......@@ -73,19 +73,21 @@ export default [
{ path: 'feedbackList', component: () => import('../pages/account/feedbackList.vue') },
{ path: 'feedbackCreate', component: () => import('../pages/account/feedbackCreate.vue') }
]
},
{
path: 'service-hall',
redirect: 'error/404',
component: container,
children: [
{ path: 'hall', component: () => import('../pages/serviceHall/hall.vue') },
{ path: 'learning-add/:rid', component: () => import('../pages/serviceHall/learningAdd.vue'), props: true },
{ path: 'share-add/:rid', component: () => import('../pages/serviceHall/shareAdd.vue'), props: true },
{ path: 'again-add/:rid', component: () => import('../pages/serviceHall/againAdd.vue'), props: true },
{ path: 'my-apply', component: () => import('../pages/serviceHall/myApply.vue'), props: true },
{ path: 'upload-report/:rid/:reid', component: () => import('../pages/serviceHall/uploadReport.vue'), props: true },
{ path: 'view-report/:rid', component: () => import('../pages/serviceHall/viewReport.vue'), props: true }
]
}
// {
// path: 'service-hall',
// redirect: 'error/404',
// component: container,
// children: [
// { path: 'hall', component: () => import('../pages/serviceHall/hall.vue') },
// { path: 'learning-add/:rid', component: () => import('../pages/serviceHall/learningAdd.vue'), props: true },
// { path: 'share-add/:rid', component: () => import('../pages/serviceHall/shareAdd.vue'), props: true },
// { path: 'again-add/:rid', component: () => import('../pages/serviceHall/againAdd.vue'), props: true },
// { path: 'my-apply', component: () => import('../pages/serviceHall/myApply.vue'), props: true }
// ]
// }
]
},
/* App 内未找到页面时 - 指向 */
......
client/package-lock.json
浏览文件 @ 512439d2
......@@ -11528,9 +11528,9 @@
}
},
"vue-router": {
"version": "3.1.6",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
"integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.7.tgz",
"integrity": "sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ=="
},
"vue-style-loader": {
"version": "4.1.2",
......
client/package.json
浏览文件 @ 512439d2
......@@ -76,7 +76,7 @@
"vue": "^2.6.11",
"vue-loader": "^15.9.0",
"vue-meta-info": "^0.1.7",
"vue-router": "^3.1.6",
"vue-router": "^3.0.7",
"vue-template-compiler": "^2.6.11"
}
}
server/server/config.js
浏览文件 @ 512439d2
......@@ -6,8 +6,8 @@ if (state === 'test') {
// conf.agentApiUrl = 'http://10.1.1.5:8024/'
// conf.agentApiUrl = 'http://192.168.3.254:8081'
} else if (state === 'production') {
conf.agentApiUrl = 'https://zapi.ezijing.com/'
// conf.agentApiUrl = 'https://api2.ezijing.com/'
// conf.agentApiUrl = 'https://zapi.ezijing.com/'
conf.agentApiUrl = 'https://api2.ezijing.com/'
}
global.app = null
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论