diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index 19283e6..a386e44 100644 --- a/epmet-oper-web/.env.development +++ b/epmet-oper-web/.env.development @@ -1,4 +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_NODE_ENV=dev \ No newline at end of file diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html index 4f928bb..c9509c0 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -1,5 +1,6 @@ + @@ -32,23 +33,26 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> - - + + + <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> - + <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> - + <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> - + <% } %> +
- + + \ No newline at end of file diff --git a/epmet-oper-web/src/js/ajax.js b/epmet-oper-web/src/js/ajax.js index b4d8d45..bc512c9 100644 --- a/epmet-oper-web/src/js/ajax.js +++ b/epmet-oper-web/src/js/ajax.js @@ -101,6 +101,38 @@ axios.interceptors.response.use( } ) +const post = (url, params, headers) => { + return new Promise((reslove, reject) => { + axios + .post(processUrl(url), params, headers) + .then((res) => { + resolve(res); + }) + .catch((err) => { + reject(err) + }) + }) +} + +export const requestPost = async (url = '', params = {}, headers = {}) => { + const ret = await post(url, params, headers) + console.log(url, ret) + // if (ret.status === 200) { + // var data = res.data + // if (data.code == 0) { + // //业务成功 + // if (typeof cb_su === 'function') { + // cb_su(data.data, data.msg) + // } + // } else { + // //业务失败 + // if (typeof cb_err === 'function') cb_err(data.msg, data.data) + // } + // } else { + // if (typeof cb_err === 'function') cb_err(res) + // } +} + /* * 1、后台请求成功均返回（业务上的异常也属于请求成功） res.status=200的响应码 * 2、res.data：后台自定义的响应体，包括： @@ -199,6 +231,7 @@ export default { } }) }, + post (url, data, cb_su, cb_err, headers) { var h = {} if (headers && JSON.stringify(headers) != '{}') { @@ -358,10 +391,10 @@ export default { if (res.status === 200) { var data = res.data //直接返回blob - if (data) { + if (data.code == 0) { //业务成功 if (typeof cb_su === 'function') { - cb_su(data, '操作成功') + cb_su(data.data, data.msg) } } else { //业务失败 @@ -423,9 +456,9 @@ export default { var errorMsg = '操作失败' let requestConfig = { headers: { - 'Content-Type': 'multipart/form-data', - Authorization: auth.loadTokenType() + ' ' + auth.loadAccessToken(), - }, + 'Content-Type': 'multipart/form-data' + // Authorization: auth.loadTokenType() + ' ' + auth.loadAccessToken(), + } } Vue.http diff --git a/epmet-oper-web/src/js/columns/code/commitCode.js b/epmet-oper-web/src/js/columns/code/commitCode.js index 860970b..de49c6a 100644 --- a/epmet-oper-web/src/js/columns/code/commitCode.js +++ b/epmet-oper-web/src/js/columns/code/commitCode.js @@ -196,23 +196,23 @@ export default { display: ['formA', 'formU', 'model'], block: false, width: 120 - }, - { - key: 'extJson', - title: '小程序配置', - type: 'textarea', - rule: [{ - required: true, - message: '请输入小程序配置', - trigger: 'blur' - }], - option: { - minRows: 5, - maxRows: 8, - rows: 6 - }, - display: ['formA', 'formU', 'model'], - block: false } + // { + // key: 'extJson', + // title: '小程序配置', + // type: 'textarea', + // rule: [{ + // required: true, + // message: '请输入小程序配置', + // trigger: 'blur' + // }], + // option: { + // minRows: 5, + // maxRows: 8, + // rows: 6 + // }, + // display: ['formA', 'formU', 'model'], + // block: false + // } ] } diff --git a/epmet-oper-web/src/js/columns/code/temp.js b/epmet-oper-web/src/js/columns/code/temp.js index 6f03d6c..6154f12 100644 --- a/epmet-oper-web/src/js/columns/code/temp.js +++ b/epmet-oper-web/src/js/columns/code/temp.js @@ -1,6 +1,6 @@ export default [ { - key: 'templateId', + key: 'id', title: '版本ID', type: 'select', rule: [{ @@ -11,7 +11,7 @@ export default [ display: ['formA', 'formU', 'table', 'model'], fixed: false, block: true, - width: 120 + width: 60 }, { key: 'userVersion', @@ -25,7 +25,7 @@ export default [ display: ['formA', 'formU', 'table', 'model'], fixed: false, block: true, - width: 120 + width: 60 }, { key: 'userDesc', @@ -37,7 +37,8 @@ export default [ trigger: 'blur' }], display: ['formA', 'formU', 'table', 'model'], - block: true + block: true, + width: 200 }, { key: 'createTime', @@ -51,6 +52,6 @@ export default [ display: ['formA', 'formU', 'table', 'model'], fixed: false, block: true, - width: 120 + width: 80 } ] diff --git a/epmet-oper-web/src/js/columns/customer/customer.js b/epmet-oper-web/src/js/columns/customer/customer.js index 7b35bbe..8b6178b 100644 --- a/epmet-oper-web/src/js/columns/customer/customer.js +++ b/epmet-oper-web/src/js/columns/customer/customer.js @@ -13,7 +13,7 @@ export default [ display: ['formA', 'formU', 'table', 'model'], fixed: false, block: true, - width: 120 + width: 100 }, { key: 'province', @@ -52,7 +52,14 @@ export default [ // }, { key: 'partybranchnum', - title: '党支部数量', + title: '党支部', + display: ['formA', 'formU', 'table', 'model'], + block: true, + width: 60 + }, + { + key: 'phone', + title: '注册人电话', display: ['formA', 'formU', 'table', 'model'], block: true }, @@ -69,7 +76,8 @@ export default [ } else { return '未知' } - } + }, + width: 60 }, { key: 'workAuth', @@ -84,11 +92,12 @@ export default [ } else { return '未知' } - } + }, + width: 60 }, { key: 'initState', - title: '初始化状态', + title: '初始化', display: ['formA', 'formU', 'table', 'model'], block: true, format: function (cellValue, index) { @@ -99,6 +108,7 @@ export default [ } else { return '未知' } - } + }, + width: 80 } ] diff --git a/epmet-oper-web/src/views/components/CForm.vue b/epmet-oper-web/src/views/components/CForm.vue index 8233f80..11380cb 100644 --- a/epmet-oper-web/src/views/components/CForm.vue +++ b/epmet-oper-web/src/views/components/CForm.vue @@ -452,7 +452,7 @@ export default { }, defaultNodeKey () { return function (key, index) { - var keyid = this.columns[index].keyid// 获取显示值对应的存储值key + const keyid = this.columns[index].keyid// 获取显示值对应的存储值key // alert(this.model[keyid]) /* if (!this.model[keyid]) { return 0 @@ -464,7 +464,7 @@ export default { // 上传图片的图片部分 // imageUrl () { // return function (key) { - // var picPath = this.model[key] + // const picPath = this.model[key] // } // }, }, @@ -473,7 +473,7 @@ export default { }, methods: { getFile (aaa) { - // var bbb = aaa.target.files[0] + // const bbb = aaa.target.files[0] }, assign (currentData) { if (currentData) { @@ -531,29 +531,29 @@ export default { }, // 点击选择树的【清空】 handleClear (data, key, formIndex) { - var keyid = this.columns[formIndex].keyid// 获取显示值对应的存储值key + const keyid = this.columns[formIndex].keyid// 获取显示值对应的存储值key this.model[keyid] = '' this.model[key] = '' this.$nextTick(() => { - var ref = 'tree_' + key + const ref = 'tree_' + key this.$refs[ref][0].loadData(null, 0, [0], false) }) }, multihandleClear (data, key, formIndex) { - var keyid = this.columns[formIndex].keyid// 获/* */取显示值对应的存储值key + const keyid = this.columns[formIndex].keyid// 获/* */取显示值对应的存储值key this.model[keyid] = '' this.model[key] = '' - // var keyid = this.columns[formIndex].keyid// 获取显示值对应的存储值key + // const keyid = this.columns[formIndex].keyid// 获取显示值对应的存储值key // this.model[keyid] = '' // this.model[key] = '' }, // 点击选择树的【节点】/【确定】 handleOk (data, key, formIndex) { this.model[key] = data.label// 显示值 - var keyid = this.columns[formIndex].keyid// 获取显示值对应的存储值key - var id = data.id - var p = /[a-z]/i + const keyid = this.columns[formIndex].keyid// 获取显示值对应的存储值key + const id = data.id + const p = /[a-z]/i if (p.test(data.id.substring(0, 1))) { // 判断第一位是否是字母，是的话截掉 id = data.id.substring(1) } @@ -571,7 +571,7 @@ export default { handleName = handleNameArr.join(',') handleId = handleIdArr.join(',') this.model[key] = handleName - var keyid = this.columns[formIndex].keyid + const keyid = this.columns[formIndex].keyid this.model[keyid] = handleId }, handleDel (data, key, formIndex) { @@ -586,7 +586,7 @@ export default { handleName = handleNameArr.join(',') handleId = handleIdArr.join(',') this.model[key] = handleName - var keyid = this.columns[formIndex].keyid + const keyid = this.columns[formIndex].keyid this.model[keyid] = handleId }, changePass (value) { // 判断渲染，true:暗文显示，false:明文显示 @@ -625,7 +625,7 @@ export default { // 控制界面组件显隐 changeShow (showKeyArray, showIndexArray, showDefault, hideKeyArray, hideIndexArray) { // debugger - for (var i = 0; i < showIndexArray.length; i++) { + for (const i = 0; i < showIndexArray.length; i++) { // this.columns[showIndexArray[i]].showFlag = '1' this.columns[showIndexArray[i]].show = true if (this.columns[showIndexArray[i]].required) { // 显示的时候为必填 @@ -633,7 +633,7 @@ export default { } this.model[showKeyArray[i]] = showDefault[i] } - for (var j = 0; j < hideIndexArray.length; j++) { + for (const j = 0; j < hideIndexArray.length; j++) { // this.columns[showIndexArray[j]].showFlag = '1' this.columns[hideIndexArray[j]].show = false if (this.columns[hideIndexArray[j]].required) { // 隐藏的时候为非必填 @@ -654,13 +654,13 @@ export default { }, // 单选树自定义参数赋值 setDiyParams (key, index) { - var diyName = this.columns[index].diyParams.name - var diyValue = this.model[this.columns[index].diyParams.value] + const diyName = this.columns[index].diyParams.name + const diyValue = this.model[this.columns[index].diyParams.value] if (diyValue === '' || diyValue === null) { return {} } - var paramsStr = '{"' + diyName + '":"' + diyValue + '"}' - var params = JSON.parse(paramsStr) + const paramsStr = '{"' + diyName + '":"' + diyValue + '"}' + const params = JSON.parse(paramsStr) // alert(JSON.stringify(params)) return params } diff --git a/epmet-oper-web/src/views/components/CTableNoPage.vue b/epmet-oper-web/src/views/components/CTableNoPage.vue index 9f46f5e..0c06b77 100644 --- a/epmet-oper-web/src/views/components/CTableNoPage.vue +++ b/epmet-oper-web/src/views/components/CTableNoPage.vue @@ -112,7 +112,6 @@ export default { } }, props: { - keyword: { type: String, required: true @@ -178,6 +177,7 @@ export default { this.loadData() }, loadData () { + this.templateRadio = '' this.loading = true Object.keys(this.params).forEach(key => { if (this.params[key] instanceof Array) { @@ -191,7 +191,7 @@ export default { this.table.params, (data, rspMsg) => { if (data) { - this.tableData = data.list + this.tableData = data } this.loading = false }, diff --git a/epmet-oper-web/src/views/modules/code/CommitForm.vue b/epmet-oper-web/src/views/modules/code/CommitForm.vue index 9838ab3..e8bf7af 100644 --- a/epmet-oper-web/src/views/modules/code/CommitForm.vue +++ b/epmet-oper-web/src/views/modules/code/CommitForm.vue @@ -10,22 +10,24 @@ :option-data="optionData"> - + + placeholder='请输入小程序配置' + v-model="extJson.json"> - 移除 + @click="getExtJson">获取配置 @@ -39,7 +41,7 @@ :params="tableParams" keyword="Temp" :operations="operations" - @selTemp="selTemp"> + @selectRadioRow="selectRadioRow"> @@ -48,6 +50,7 @@ + diff --git a/epmet-oper-web/src/views/modules/code/SubmitForm.vue b/epmet-oper-web/src/views/modules/code/SubmitForm.vue index c116954..f1cc290 100644 --- a/epmet-oper-web/src/views/modules/code/SubmitForm.vue +++ b/epmet-oper-web/src/views/modules/code/SubmitForm.vue @@ -165,9 +165,9 @@ align="center" width="80"> @@ -192,6 +192,7 @@ export default { data () { return { loading: false, + // codeId: '', // 上一界面传来的codeId dataForm: { versionDesc: '', // 小程序版本说明和功能解释 previewInfo: { // 预览信息 @@ -271,13 +272,11 @@ export default { }, // 上传视频 uploadVedio: function (params) { - // eslint-disable-next-line - debugger let self = this let file = params.file let fileType = file.type let isVideo = fileType.indexOf('video') !== -1 - let fileUrl = self.$refs.upload.uploadFiles[0].url + // let fileUrl = self.$refs.upload.uploadFiles[0].url let isLt2M = file.size / 1024 / 1024 < 2 if (!isLt2M) { @@ -306,25 +305,24 @@ export default { self.$refs.upload.uploadFiles = [] return } - let videoDiv = document.createElement('video') - videoDiv.src = fileUrl + self.upload_name = 'file_video[]' + self.uploadFile(file, fileType) + // let videoDiv = document.createElement('video') + // videoDiv.src = fileUrl - videoDiv.onloadeddata = function (event) { - // 视频上传 - self.upload_url = '你的视频上传URL' - self.upload_name = 'file_video[]' - self.uploadFile(file, isVideo, videoDiv) - } + // videoDiv.onloadeddata = function (event) { + // // 视频上传 + // self.upload_name = 'file_video[]' + // self.uploadFile(file, fileType, isVideo, videoDiv) + // } }, // 上传图片 uploadPic: function (params) { - // eslint-disable-next-line - debugger + console.log(this.codeId) let self = this let file = params.file let fileType = file.type let isImage = fileType.indexOf('image') !== -1 - let fileUrl = self.$refs.upload.uploadFiles[0].url let isLt2M = file.size / 1024 / 1024 < 2 if (!isLt2M) { @@ -343,43 +341,26 @@ export default { self.$refs.upload.uploadFiles = [] return } - - let img = new Image() - img.src = fileUrl - img.onload = function () { - // 图片上传 - self.upload_url = '你的图片上传URL' - self.upload_name = 'file_img[]' - self.uploadFile(file, '', '') - } + self.upload_name = 'file_img[]' + self.uploadFile(file, fileType) }, - uploadFile: function (file, isVideo, videoDiv) { - let self = this + uploadFile: function (file, fileType) { + // const uploadUrl = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/mediaupload' + const uploadUrl = '/third/code/mediaupload' let formData = new FormData() - formData.append(self.upload_name, file) - - // axios.post(self.upload_url, formData, { headers: { 'Content-Type': 'multipart/form-data' } }) - // .then(function (res) { - // if (res.result === '0000') { - // self.ad_url = res.data[0] - // // 创建一个显示video的容器 - // if (isVideo) { - // let liItem = document.getElementsByClassName('el-upload-list__item')[0] - // videoDiv.style.width = '278px' - // videoDiv.style.height = '415px' - // liItem.prepend(videoDiv) - // } - // return - // } - // this.$message({ - // message: '上传失败，请重新上传', - // type: 'error' - // }) - // self.$refs.upload.uploadFiles = [] - // }) - // .catch(function (err) { - // console.error(err) - // }) + // // eslint-disable-next-line + // debugger + formData.append('type', fileType) + formData.append('media', file) + formData.append('codeId', this.codeId) + window.app.ajax.post(uploadUrl, formData, + (data, rspMsg) => { + this.$message.success(rspMsg) + this.beforeClose() + }, + (rspMsg, data) => { + this.$message.error(rspMsg) + }, { headers: { 'Content-Type': 'multipart/form-data' } }) }, // 上传代码 commitCode (id) { @@ -390,24 +371,20 @@ export default { submitCode (id) { }, - // 审核撤回 - submitRecall (id) { - }, - // 审核失败原因 - submitFailReason (id) { - - }, handleCancel () { this.dialog.title = '' this.dialog.visible = false } - }, props: { feedbackShow: { type: Boolean, default: false + }, + codeId: { + type: String, + required: true } } } 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 5bd3daa..72259c8 100644 --- a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue @@ -18,14 +18,15 @@ - + @commitCode="commitCode" + @init="init"> @@ -64,7 +65,7 @@ export default { plain: false, methodName: 'init', // 回调方法名称 isShow: function (row) { - if (row.initState === 0) { + if (row.initState === 0 && row.resiAuth === 1 && row.workAuth === 1) { return true } else { return false @@ -80,7 +81,7 @@ export default { plain: false, methodName: 'commitCode', // 回调方法名称 isShow: function (row) { - if (row.resiAuth === 1 && row.workAuth === 1) { + if (row.initState === 1) { return true } else { return false @@ -137,8 +138,10 @@ export default { resi: '未授权', work: '已授权' } - ] + ], + // 初始化相关 + initUrl: '/oper/crm/customer/init' } }, components: { @@ -164,17 +167,28 @@ export default { this.$refs.table.loadData() }, // 客户初始化 - init (id) { - + init (row) { + const param = { + customerId: row.customerId + } + window.app.ajax.post(this.initUrl, param, + (data, rspMsg) => { + this.$message.success('初始化成功') + this.loadData() + // eslint-disable-next-line + }, + (rspMsg, data) => { + this.$message.error(rspMsg) + }) }, // 上传代码 - commitCode (id) { + commitCode (row) { this.$router.push({ 'name': 'code-CommitList', 'params': { showCommit: true, - id: '1', - name: '市北区政府' + customerId: row.customerId, + name: row.agencyName } }) }