diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development
index 9cd8fb8..7ebfcb6 100644
--- a/epmet-oper-web/.env.development
+++ b/epmet-oper-web/.env.development
@@ -1,5 +1,5 @@
NODE_ENV=development
-# VUE_APP_API_SERVER = http://192.168.1.130:8080/api
+VUE_APP_API_SERVER = http://192.168.1.130:8080/api
# VUE_APP_API_SERVER = http://10.10.10.98:8080/api
-VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
+# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
VUE_APP_NODE_ENV=dev
\ No newline at end of file
diff --git a/epmet-oper-web/src/App.vue b/epmet-oper-web/src/App.vue
index 1a3bc1d..b5306cf 100644
--- a/epmet-oper-web/src/App.vue
+++ b/epmet-oper-web/src/App.vue
@@ -39,10 +39,23 @@ export default {
})
})
},
- ...mapActions(['setClientHeight', 'setSize', 'setResolution'])
+ ...mapActions(['setClientHeight', 'setSize', 'setResolution', 'setEnv'])
},
mounted () {
const that = this
+ let envShow = process.env.VUE_APP_NODE_ENV
+ let env = 'dev'
+ if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境
+ env = 'dev'
+ } else if (envShow === 'prod:uat') { // 体验
+ env = 'test'
+ } else if (envShow === 'prod') { // 生产
+ env = 'prod'
+ }
+ // eslint-disable-next-line
+ // debugger
+ that.setEnv(env)
+
// 根据屏幕分辨率调整size
if (document.documentElement.clientHeight < 800) {
// medium大小
diff --git a/epmet-oper-web/src/js/store/modules/app.js b/epmet-oper-web/src/js/store/modules/app.js
index c0da6df..4e16e70 100644
--- a/epmet-oper-web/src/js/store/modules/app.js
+++ b/epmet-oper-web/src/js/store/modules/app.js
@@ -4,12 +4,14 @@ export default {
state: {
clientHeight: document.documentElement.clientHeight,
size: 'medium',
- resolution: 'medium'
+ resolution: 'medium',
+ env: 'dev'
},
getters: {
clientHeight: state => state.clientHeight,
size: state => state.size,
- resolution: state => state.resolution
+ resolution: state => state.resolution,
+ env: state => state.env
},
mutations: {
[type.client_height] (state, payload) {
@@ -20,6 +22,9 @@ export default {
},
[type.resolution] (state, payload) {
state.resolution = payload
+ },
+ [type.env] (state, payload) {
+ state.env = payload
}
},
actions: {
@@ -31,6 +36,9 @@ export default {
},
setResolution ({ commit }, payload) {
commit(type.resolution, payload)
+ },
+ setEnv ({ commit }, payload) {
+ commit(type.env, payload)
}
}
}
diff --git a/epmet-oper-web/src/js/store/type.js b/epmet-oper-web/src/js/store/type.js
index d54d1cb..735ae7d 100644
--- a/epmet-oper-web/src/js/store/type.js
+++ b/epmet-oper-web/src/js/store/type.js
@@ -1,5 +1,6 @@
export default {
client_height: 'CLIENT_HEIGHT',
size: 'SIZE',
- resolution: 'RESOLUTION'
+ resolution: 'RESOLUTION',
+ env: 'ENV'
}
diff --git a/epmet-oper-web/src/views/components/CTable.vue b/epmet-oper-web/src/views/components/CTable.vue
index 12c1968..db37e52 100644
--- a/epmet-oper-web/src/views/components/CTable.vue
+++ b/epmet-oper-web/src/views/components/CTable.vue
@@ -214,6 +214,7 @@ export default {
this.loadData()
},
loadData () {
+ // eslint-disable-next-line
this.loading = true
Object.keys(this.params).forEach(key => {
if (this.params[key] instanceof Array) {
diff --git a/epmet-oper-web/src/views/modules/code/CommitList.vue b/epmet-oper-web/src/views/modules/code/CommitList.vue
index eb6053f..3f1508c 100644
--- a/epmet-oper-web/src/views/modules/code/CommitList.vue
+++ b/epmet-oper-web/src/views/modules/code/CommitList.vue
@@ -5,8 +5,7 @@
+ :model="tableParams">
{
this.$refs.table.loadData() // 获取表格数据
})
@@ -344,9 +344,9 @@ export default {
// 提交审核
submitCodeDiaShow (row) {
let feedbackShow = false
- // if (row.status === 'audit_failed') {
- feedbackShow = true
- // }
+ if (row.status === 'audit_failed') {
+ feedbackShow = true
+ }
this.$refs['ref_submit_form'].initData(row.id, feedbackShow)
},
@@ -418,12 +418,12 @@ export default {
this.qrCodeDia.visible = false
},
async renderSelData () { // 渲染下拉框/单选框/复选框等数据
- const customerUrl = '/third/pacustomer/registerbyauth'
- // const customerUrl = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/pacustomer/registerbyauth'
+ const customerUrl = ' https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerbyauth'
const param = {
- // initState: 1,
+ // workAuth: 1,
// resiAuth: 1,
- workAuth: 1
+ source: this.env,
+ initState: 1
}
this.startLoading()
await window.app.ajax.post(customerUrl, param,
diff --git a/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue b/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue
index 4f58d4f..4e0efbc 100644
--- a/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue
+++ b/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue
@@ -65,20 +65,21 @@ export default {
this.codeId = codeId
this.diaVisible = true
- this.dataForm.reason = '没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败,没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败'
-
- this.dataForm.screenshotUrl = ['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg']
- // const url = '/third/code/reason'
- // const param = {
- // codeId: row.id
- // }
- // window.app.ajax.post(url, param,
- // (data, rspMsg) => {
- // this.$message.success(rspMsg)
- // },
- // (rspMsg, data) => {
- // this.$message.error(rspMsg)
- // })
+ // this.dataForm.reason = '没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败,没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败没有提供用户名密码失败失败'
+ // this.dataForm.screenshotUrl = ['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg']
+ const url = '/third/code/reason'
+ const param = {
+ codeId: codeId
+ }
+ window.app.ajax.post(url, param,
+ (data, rspMsg) => {
+ this.dataForm.reason = data.reason
+ this.dataForm.screenshotUrl = data.screenshotUrl
+ // this.$message.success(rspMsg)
+ },
+ (rspMsg, data) => {
+ this.$message.error(rspMsg)
+ })
},
getSrcList (index) {
return this.dataForm.screenshotUrl.slice(index).concat(this.dataForm.screenshotUrl.slice(0, index))
diff --git a/epmet-oper-web/src/views/modules/code/SubmitForm.vue b/epmet-oper-web/src/views/modules/code/SubmitForm.vue
index 5e5fbb7..59e0b33 100644
--- a/epmet-oper-web/src/views/modules/code/SubmitForm.vue
+++ b/epmet-oper-web/src/views/modules/code/SubmitForm.vue
@@ -37,13 +37,14 @@
:action="upload_url"
list-type="picture-card"
:name="upload_name"
- :on-exceed="handleExceed"
+ :on-exceed="exceedPic"
+ :on-remove="removePic"
:file-list="picList"
- :limit="3"
+ :limit="5"
:http-request="uploadPic">
选择图片
小程序页面截图,最多3张,每张大小2M以内
+ class="el-upload__tip">小程序页面截图,最多5张,每张大小2M以内
@@ -54,9 +55,10 @@
ref="uploadVedio"
:action="upload_url"
:name="upload_name"
- :on-exceed="handleExceed"
- :file-list="vedioList"
- :limit="1"
+ :on-exceed="exceedVedio"
+ :on-remove="removeVedio"
+ :file-list="videoList"
+ :limit="2"
:http-request="uploadVedio">
选择视频
@@ -103,13 +105,14 @@
:action="upload_url"
list-type="picture-card"
:name="upload_name"
- :on-exceed="handleExceed"
+ :on-exceed="exceedFeedbackPic"
+ :on-remove="removeFeedbackPic"
:file-list="feedbackPicList"
- :limit="3"
+ :limit="5"
:http-request="uploadFeedbackPic">
选择图片
大小2M以内
+ class="el-upload__tip">反馈图片,最多5张,大小2M以内
@@ -223,10 +226,6 @@ export default {
sceneOtherDisabled: true, // 其他场景是否禁用
dataForm: {
versionDesc: '', // 小程序版本说明和功能解释
- previewInfo: { // 预览信息
- videoIdList: [],
- picIdList: []
- },
feedbackInfo: '', // 反馈内容
feedbackStuff: '', // 反馈素材
ugcDeclare: { // 用户生成内容场景(UGC)信息安全声明
@@ -237,16 +236,13 @@ export default {
auditDesc: '' // 说明当前对UGC内容的审核机制,不超过256字
}
},
- previewPicArray: [],
- previewVedioArray: [],
- feedbackPicArray: [],
// 上传素材
dialogImageUrl: '/third/code/mediaupload',
upload_url: '', // 上传URL
upload_name: '', // 图片或视频名称
picList: [], // 预览列表
- vedioList: [], // 预览列表
+ videoList: [], // 预览列表
feedbackPicList: [], // 预览列表
// 弹出框相关
@@ -276,10 +272,6 @@ export default {
reseatDataForm () {
this.dataForm = {
versionDesc: '', // 小程序版本说明和功能解释
- previewInfo: { // 预览信息
- videoIdList: [],
- picIdList: []
- },
feedbackInfo: '', // 反馈内容
feedbackStuff: '', // 反馈素材
ugcDeclare: { // 用户生成内容场景(UGC)信息安全声明
@@ -296,77 +288,83 @@ export default {
this.$refs['ref_submit_item'].initData(this.codeId)
}
},
- handleExceed: function () {
+ removeVedio (file) {
+ this.videoList.splice(this.videoList.findIndex(item => item.uid === file.uid), 1)
+ // console.log(this.videoList)
+ },
+ removePic (file) {
+ this.picList.splice(this.picList.findIndex(item => item.uid === file.uid), 1)
+ // console.log(this.picList)
+ },
+ removeFeedbackPic (file) {
+ this.feedbackPicList.splice(this.feedbackPicList.findIndex(item => item.uid === file.uid), 1)
+ // console.log(this.feedbackPicList)
+ },
+ exceedPic: function () {
+ this.$message({
+ message: '最多上传5张预览图片',
+ type: 'warning'
+ })
+ },
+ exceedVedio: function () {
+ this.$message({
+ message: '最多上传2个预览视频',
+ type: 'warning'
+ })
+ },
+ exceedFeedbackPic: function () {
this.$message({
- message: '请先删除选择的图片或视频,再上传',
+ message: '最多上传5张反馈图片',
type: 'warning'
})
},
// 上传视频
uploadVedio: function (params) {
- // eslint-disable-next-line
- debugger
let file = params.file
let fileType = file.type
let isVideo = fileType.indexOf('video') !== -1
- let fileUrl = this.$refs.uploadVedio.uploadFiles[this.vedioList.length].url
+ let fileUrl = this.$refs.uploadVedio.uploadFiles[this.videoList.length].url
file.url = fileUrl
- this.vedioList.push(file)
+ this.videoList.push(file)
let isLt2M = file.size / 1024 / 1024 < 2
if (!isLt2M) {
this.$message({
message: '上传视频大小不能超过 2MB!',
- type: 'error'
- })
- this.$refs.upload.uploadFiles = []
- return
- }
- if (!isVideo) {
- this.$message({
- message: '请选择视频!',
- type: 'error'
+ type: 'warning'
})
- this.$refs.upload.uploadFiles = []
+ this.videoList.pop()
return
}
-
let isMP4 = file.type === 'video/mp4'
- if (!isMP4) {
+ if (!isVideo || !isMP4) {
this.$message({
- message: '上传视频只支持 mp4 格式!',
- type: 'error'
+ message: '请选择mp4格式的视频!',
+ type: 'warning'
})
- this.$refs.upload.uploadFiles = []
+ this.videoList.pop()
return
}
+ this.startLoading()
this.upload_name = 'file_video[]'
let formData = new FormData()
- // // eslint-disable-next-line
- // debugger
+
formData.append('type', fileType)
formData.append('media', file)
formData.append('codeId', this.codeId)
window.app.ajax.post2(this.dialogImageUrl, formData,
(data, rspMsg) => {
- // eslint-disable-next-line
- debugger
+ this.endLoading()
if (data.code === 0) {
- console.log('成功')
- let obj = {
- mediaid: data,
- uid: file.uid
- }
- this.previewVedioArray.push(obj)
- this.$message.success(rspMsg)
+ this.videoList[this.videoList.length - 1].mediaid = data.data
} else {
- console.log('失败')
- this.vedioList.pop()
+ this.videoList.pop()
this.$message.error(rspMsg)
}
},
(rspMsg, data) => {
- this.vedioList.pop()
+ this.videoList.pop()
+ this.endLoading()
this.$message.error(rspMsg)
})
},
@@ -379,51 +377,44 @@ export default {
file.url = fileUrl
this.picList.push(file)
- // let isLt2M = file.size / 1024 / 1024 < 2
- // if (!isLt2M) {
- // this.$message({
- // message: '上传图片大小不能超过 2MB!',
- // type: 'error'
- // })
- // this.$refs.upload.uploadFiles = []
- // // return
- // }
+ let isLt2M = file.size / 1024 / 1024 < 2
+ if (!isLt2M) {
+ this.$message({
+ message: '上传图片大小不能超过 2MB!',
+ type: 'warning'
+ })
+ this.picList.pop()
+ return
+ }
if (!isImage) {
this.$message({
message: '请选择图片!',
- type: 'error'
+ type: 'warning'
})
- this.$refs.uploadPic.uploadFiles = []
+ this.picList.pop()
return
}
// console.log(this.picList)
this.upload_name = 'file_img[]'
let formData = new FormData()
-
+ this.startLoading()
formData.append('type', fileType)
formData.append('media', file)
formData.append('codeId', this.codeId)
window.app.ajax.post2(this.dialogImageUrl, formData,
(data, rspMsg) => {
- // eslint-disable-next-line
- debugger
+ this.endLoading()
if (data.code === 0) {
- console.log('成功')
- let obj = {
- mediaid: data,
- uid: file.uid
- }
- this.previewPicArray.push(obj)
- this.$message.success(rspMsg)
+ this.picList[this.picList.length - 1].mediaid = data.data
} else {
- console.log('失败')
this.picList.pop()
this.$message.error(rspMsg)
}
},
(rspMsg, data) => {
this.picList.pop()
+ this.endLoading()
this.$message.error(rspMsg)
}, { headers: { 'Content-Type': 'multipart/form-data' } })
},
@@ -436,24 +427,23 @@ export default {
file.url = fileUrl
this.feedbackPicList.push(file)
- // let isLt2M = file.size / 1024 / 1024 < 2
- // if (!isLt2M) {
- // this.$message({
- // message: '上传图片大小不能超过 2MB!',
- // type: 'error'
- // })
- // this.$refs.upload.uploadFiles = []
- // // return
- // }
+ let isLt2M = file.size / 1024 / 1024 < 2
+ if (!isLt2M) {
+ this.$message({
+ message: '上传图片大小不能超过 2MB!',
+ type: 'warning'
+ })
+ this.feedbackPicList.pop()
+ return
+ }
if (!isImage) {
this.$message({
message: '请选择图片!',
- type: 'error'
+ type: 'warning'
})
- this.$refs.uploadPic.uploadFiles = []
+ this.feedbackPicList.pop()
return
}
- // console.log(this.picList)
this.upload_name = 'file_img[]'
let formData = new FormData()
@@ -461,26 +451,20 @@ export default {
formData.append('type', fileType)
formData.append('media', file)
formData.append('codeId', this.codeId)
+ this.startLoading()
window.app.ajax.post2(this.dialogImageUrl, formData,
(data, rspMsg) => {
- // eslint-disable-next-line
- debugger
+ this.endLoading()
if (data.code === 0) {
- console.log('成功')
- let obj = {
- mediaid: data,
- uid: file.uid
- }
- this.feedbackPicArray.push(obj)
- this.$message.success(rspMsg)
+ this.feedbackPicList[this.feedbackPicList.length - 1].mediaid = data.data
} else {
- console.log('失败')
this.feedbackPicList.pop()
this.$message.error(rspMsg)
}
},
(rspMsg, data) => {
this.feedbackPicList.pop()
+ this.endLoading()
this.$message.error(rspMsg)
}, { headers: { 'Content-Type': 'multipart/form-data' } })
},
@@ -511,32 +495,36 @@ export default {
this.dataForm.ugcDeclare.auditDesc = ''
},
submitCode () {
- // const url = '/third/code/audit'
let params = {
codeId: this.codeId,
ugcDeclare: this.dataForm.ugcDeclare // 信息安全
}
// 功能说明
// 解析预览信息
- this.dataForm.previewInfo.picIdList = []
- this.dataForm.previewInfo.videoIdList = []
- this.previewPicArray.forEach(element => {
- this.dataForm.previewInfo.picIdList.push(element.mediaid)
+ let picIdList = []
+ let videoIdList = []
+ this.picList.forEach(element => {
+ picIdList.push(element.mediaid)
})
-
- this.previewVedioArray.forEach(element => {
- this.dataForm.previewInfo.videoIdList.push(element.mediaid)
+ // // eslint-disable-next-line
+ // debugger
+ this.videoList.forEach(element => {
+ videoIdList.push(element.mediaid)
})
// 预览信息排除空数组
- if (this.dataForm.previewInfo.picIdList.length > 0 || this.dataForm.previewInfo.videoIdList.length > 0) {
- params.previewInfo = Object
- if (this.dataForm.previewInfo.picIdList.length > 0) {
- params.previewInfo.picIdList = this.dataForm.previewInfo.picIdList
+ if (picIdList.length > 0 || videoIdList.length > 0) {
+ params.previewInfo = {}
+ if (picIdList.length > 0) {
+ params.previewInfo.picIdList = picIdList
}
- if (this.dataForm.previewInfo.videoIdList.length > 0) {
- params.previewInfo.videoIdList = this.dataForm.previewInfo.videoIdList
+ if (videoIdList.length > 0) {
+ params.previewInfo.videoIdList = videoIdList
}
+ // console.log('预览图片:')
+ // console.log(params.previewInfo.picIdList)
+ // console.log('预览视频:')
+ // console.log(params.previewInfo.videoIdList)
}
// 小程序描述排除空内容
@@ -554,42 +542,51 @@ export default {
if (this.dataForm.feedbackInfo !== '') {
params.feedbackInfo = this.dataForm.feedbackInfo
}
+ this.dataForm.feedbackStuff = ''
+ this.feedbackPicList.forEach(element => {
+ this.dataForm.feedbackStuff = this.dataForm.feedbackStuff + element.mediaid + '|'
+ })
+
if (this.dataForm.feedbackStuff !== '') {
+ this.dataForm.feedbackStuff = this.dataForm.feedbackStuff.slice(0, this.dataForm.feedbackStuff.length - 1)
params.feedbackStuff = this.dataForm.feedbackStuff
}
console.log(params)
- // this.startLoading()
- // window.app.ajax.post(url, params,
- // (data, rspMsg) => {
- // this.endLoading()
- // this.$message.success('提交审核成功,请等待审核结果')
- // this.diaCancel()
- // this.$emit('refresh')
- // },
- // (rspMsg, data) => {
- // this.endLoading()
- // this.$message.error(rspMsg)
- // })
+
+ // console.log('反馈图片:')
+ // console.log(params.feedbackStuff)
+
+ const url = '/third/code/audit'
+ this.startLoading()
+ window.app.ajax.post(url, params,
+ (data, rspMsg) => {
+ this.endLoading()
+ this.$message.success('提交审核成功,请等待审核结果')
+ this.diaCancel()
+ this.$emit('refresh')
+ },
+ (rspMsg, data) => {
+ this.endLoading()
+ this.$message.error(rspMsg)
+ })
},
// 取消
diaCancel () {
this.resetData()
+ this.activeName = 'desc'
this.diaVisible = false
},
resetData () {
this.reseatDataForm()
// 功能说明
this.picList = []
- this.previewPicArray = []
- this.vedioList = []
- this.previewVedioArray = []
+ this.videoList = []
// 审核项
this.$refs['ref_submit_item'].reseatData()
// 反馈说明
this.feedbackPicList = []
- this.feedbackPicArray = []
// 信息安全
},
// 开启加载动画
diff --git a/epmet-oper-web/src/views/modules/code/SubmitItem.vue b/epmet-oper-web/src/views/modules/code/SubmitItem.vue
index cc035df..06c59ca 100644
--- a/epmet-oper-web/src/views/modules/code/SubmitItem.vue
+++ b/epmet-oper-web/src/views/modules/code/SubmitItem.vue
@@ -10,7 +10,7 @@
label-width="150px">
小程序的标签,用空格分隔,标签至多10个,标签长度至多20
@@ -32,11 +34,9 @@
+ label-width="150px">
@@ -61,32 +61,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 删除
+
+
@@ -184,19 +197,7 @@ export default {
operations: [],
// 最终的审核列表数据
- itemTableData: [
- // {
- // address: 'index',
- // tag: '学习 生活',
- // title: '首页',
- // firstClass: '文娱',
- // firstId: 1,
- // secondClass: '资讯',
- // secondId: 2,
- // thirdClass: '',
- // thirdId: null
- // }
- ]
+ itemTableData: []
}
},
components: {
@@ -220,6 +221,7 @@ export default {
},
methods: {
initData (codeId) {
+ this.reseatData()
this.codeId = codeId
const params = {
codeId: this.codeId
@@ -239,20 +241,20 @@ export default {
window.app.ajax.post(this.categoryUrl, params,
(data, rspMsg) => {
- data = [
- {
- 'first_class': '社交',
- 'second_class': '社区/论坛',
- 'first_id': 684,
- 'second_id': 794
- },
- {
- 'first_class': '社交1',
- 'second_class': '社区/论坛1',
- 'first_id': 685,
- 'second_id': 796
- }
- ]
+ // data = [
+ // {
+ // 'first_class': '社交',
+ // 'second_class': '社区/论坛',
+ // 'first_id': 684,
+ // 'second_id': 794
+ // },
+ // {
+ // 'first_class': '社交1',
+ // 'second_class': '社区/论坛1',
+ // 'first_id': 685,
+ // 'second_id': 796
+ // }
+ // ]
data.forEach((item, index) => {
item.id = index
})
@@ -263,30 +265,43 @@ export default {
})
},
getRadioRow (index, row) {
- console.log(row)
this.selCategory = row
},
// 增加一条审核项
addItem () {
- let oneObj = this.selCategory
- oneObj.address = this.dataForm.address
- oneObj.title = this.dataForm.title
- oneObj.tag = this.dataForm.tag
+ if (this.itemTableData.length === 5) {
+ this.$message.warning('最多填写5项审核项')
+ return false
+ }
+ // eslint-disable-next-line
+ // debugger
// 判断是否重复添加页面
- let repeatAdress = this.itemTableData.filter(item => item.address === oneObj.address)
- // let result = this.itemTableData.fliter(function (value) {
- // console.log(value)
- // return value.address === oneObj.address
- // })
+ const that = this
+ let result = this.itemTableData.some(function (value) {
+ return value.address === that.dataForm.address
+ })
- if (repeatAdress.length > 0) {
+ if (result) {
this.$message.warning('当前页面已添加,请更换页面后重新添加')
return false
}
+ let oneObj = {}
+ oneObj.address = this.dataForm.address
+ oneObj.title = this.dataForm.title
+ oneObj.tag = this.dataForm.tag
+ oneObj.firstClass = this.selCategory.firstClass
+ oneObj.firstId = this.selCategory.firstId
+ oneObj.secondClass = this.selCategory.secondClass
+ oneObj.secondId = this.selCategory.secondId
+ oneObj.thirdClass = this.selCategory.thirdClass
+ oneObj.thirdId = this.selCategory.thirdId
this.itemTableData.push(oneObj)
},
+ deleteItem (index) {
+ this.itemTableData.splice(index, 1)
+ },
getItemList () {
return this.itemTableData
},
@@ -296,6 +311,9 @@ export default {
tag: '',
title: ''
}
+ this.templateRadio = ''
+ this.addressList = []
+ this.categoryList = []
this.itemTableData = []
this.selCategory = {}
},
diff --git a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
index bcd03e3..b3f13b3 100644
--- a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
+++ b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
@@ -48,13 +48,10 @@ export default {
name: '' // 组织名称
},
// 列表相关
- tableUrl: '/third/pacustomer/registerinfo',
+ tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerinfo',
// tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/pacustomer/registerinfo',
tableParams: {
- type: Object, // table的查询参数
- default () {
- return {}
- }
+ source: this.env
},
// 列表操作栏的操作项数组
operations: [
@@ -155,13 +152,15 @@ export default {
})
},
mounted () {
+ this.tableParams.source = this.env
+ // eslint-disable-next-line
this.loadData()
},
computed: {
tableHeight () {
return this.clientHeight - 60 - 80 - 80 - 50
},
- ...mapGetters(['clientHeight'])
+ ...mapGetters(['clientHeight', 'env'])
},
methods: {
// 获取列表数据
@@ -188,12 +187,12 @@ export default {
},
// 上传代码
commitCode (row) {
- const customerUrl = '/third/pacustomer/registerbyauth'
- // const customerUrl = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/pacustomer/registerbyauth'
+ const customerUrl = 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerbyauth'
const param = {
- // initState: 1,
+ // workAuth: 1,
// resiAuth: 1,
- workAuth: 1
+ source: this.env,
+ initState: 1
}
this.startLoading()
window.app.ajax.post(customerUrl, param,