diff --git a/epmet-oper-web/.eslintignore b/epmet-oper-web/.eslintignore index 89317ca..ba2c163 100644 --- a/epmet-oper-web/.eslintignore +++ b/epmet-oper-web/.eslintignore @@ -1,3 +1,2 @@ /src/icons/iconfont.js /*.js -/*.vue \ No newline at end of file diff --git a/epmet-oper-web/.vscode/settings.json b/epmet-oper-web/.vscode/settings.json index ad2327f..a4bba5a 100644 --- a/epmet-oper-web/.vscode/settings.json +++ b/epmet-oper-web/.vscode/settings.json @@ -13,11 +13,9 @@ "eslint.autoFixOnSave": true, // 添加 vue 支持 "eslint.validate": [], - "semi": true, //在代码尾部添加分号 - "singleQuote": true, //把双引号换成单引号 - "trailingComma": "es5", //在代码尾部添加逗号 // #去掉代码结尾的分号 "prettier.semi": false, + "prettier.trailingComma": "none", // #使用带引号替代双引号 "prettier.singleQuote": true, // #让函数(名)和后面的括号之间加个空格 diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html index ca6361e..a683c38 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -1,59 +1,67 @@ + + + + + + - - - - - - + + - - + + <% 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') { %> + + <% } %> + - - <% 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/views/components/CForm.vue b/epmet-oper-web/src/views/components/CForm.vue index 11380cb..b282094 100644 --- a/epmet-oper-web/src/views/components/CForm.vue +++ b/epmet-oper-web/src/views/components/CForm.vue @@ -552,7 +552,7 @@ export default { handleOk (data, key, formIndex) { this.model[key] = data.label// 显示值 const keyid = this.columns[formIndex].keyid// 获取显示值对应的存储值key - const id = data.id + let id = data.id const p = /[a-z]/i if (p.test(data.id.substring(0, 1))) { // 判断第一位是否是字母，是的话截掉 id = data.id.substring(1) @@ -625,7 +625,7 @@ export default { // 控制界面组件显隐 changeShow (showKeyArray, showIndexArray, showDefault, hideKeyArray, hideIndexArray) { // debugger - for (const i = 0; i < showIndexArray.length; i++) { + for (let 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 (const j = 0; j < hideIndexArray.length; j++) { + for (let j = 0; j < hideIndexArray.length; j++) { // this.columns[showIndexArray[j]].showFlag = '1' this.columns[hideIndexArray[j]].show = false if (this.columns[hideIndexArray[j]].required) { // 隐藏的时候为非必填 diff --git a/epmet-oper-web/src/views/modules/code/CommitForm.vue b/epmet-oper-web/src/views/modules/code/CommitForm.vue index 515a19d..0a7becc 100644 --- a/epmet-oper-web/src/views/modules/code/CommitForm.vue +++ b/epmet-oper-web/src/views/modules/code/CommitForm.vue @@ -66,8 +66,7 @@ export default { data () { return { tempForm: { - commitUrl: '/third/code/upload', - // commitUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/audit', + commitUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/upload', method: 'A', dataUrl: [], // 下拉框/单选框/复选框等获取数据的url data: { @@ -88,8 +87,7 @@ export default { }, // 模板列表 selTempId: '', - tableUrl: '/third/code/templatelist', - // tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/templatelist', + tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/templatelist', tableParams: { type: Object, // table的查询参数 default () { @@ -154,7 +152,7 @@ export default { return false } this.startLoading() - const url = '/third/code/getextjson' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/getextjson' const param = { customerId: _data.customerId, clientType: _data.clientType diff --git a/epmet-oper-web/src/views/modules/code/CommitList.vue b/epmet-oper-web/src/views/modules/code/CommitList.vue index 3f1508c..251d06e 100644 --- a/epmet-oper-web/src/views/modules/code/CommitList.vue +++ b/epmet-oper-web/src/views/modules/code/CommitList.vue @@ -138,7 +138,7 @@ export default { source: this.env }, // 列表相关 - tableUrl: '/third/code/uploadlist', + tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/uploadlist', // 列表操作栏的操作项数组 operations: [ { @@ -352,7 +352,7 @@ export default { // 审核撤回 submitRecall (row) { - const url = '/third/code/undo' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/undo' const param = { codeId: row.id } @@ -368,7 +368,7 @@ export default { // 体验版二维码 showQRCode (row) { this.qrCodeDia.visible = true - const url = '/third/code/qrcode' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/qrcode' const param = { codeId: row.id } @@ -390,7 +390,7 @@ export default { }, // 发布 issueCode (row) { - const url = '/third/code/release' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/release' const param = { codeId: row.id } diff --git a/epmet-oper-web/src/views/modules/code/OperHistory.vue b/epmet-oper-web/src/views/modules/code/OperHistory.vue index 4cb2950..b89b974 100644 --- a/epmet-oper-web/src/views/modules/code/OperHistory.vue +++ b/epmet-oper-web/src/views/modules/code/OperHistory.vue @@ -35,8 +35,7 @@ export default { diaVisible: false, codeId: '', // 模板列表 - tableUrl: '/third/code/history', - // tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/history', + tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/history', tableParams: { type: Object, // table的查询参数 default () { diff --git a/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue b/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue index 4e0efbc..2d9469b 100644 --- a/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue +++ b/epmet-oper-web/src/views/modules/code/SubmitFailReason.vue @@ -14,7 +14,7 @@ label-width="150px" style="display:block"> - {{dataForm.reason}} +
{{dataForm.reason}}
@@ -67,7 +67,7 @@ export default { 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 url = 'https://epmet-cloud.elinkservice.cn/api/third/code/reason' const param = { codeId: codeId } diff --git a/epmet-oper-web/src/views/modules/code/SubmitForm.vue b/epmet-oper-web/src/views/modules/code/SubmitForm.vue index 59e0b33..abde924 100644 --- a/epmet-oper-web/src/views/modules/code/SubmitForm.vue +++ b/epmet-oper-web/src/views/modules/code/SubmitForm.vue @@ -238,7 +238,7 @@ export default { }, // 上传素材 - dialogImageUrl: '/third/code/mediaupload', + dialogImageUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/mediaupload', upload_url: '', // 上传URL upload_name: '', // 图片或视频名称 picList: [], // 预览列表 @@ -557,7 +557,7 @@ export default { // console.log('反馈图片：') // console.log(params.feedbackStuff) - const url = '/third/code/audit' + const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/audit' this.startLoading() window.app.ajax.post(url, params, (data, rspMsg) => { diff --git a/epmet-oper-web/src/views/modules/code/SubmitItem.vue b/epmet-oper-web/src/views/modules/code/SubmitItem.vue index 06c59ca..b6aa13e 100644 --- a/epmet-oper-web/src/views/modules/code/SubmitItem.vue +++ b/epmet-oper-web/src/views/modules/code/SubmitItem.vue @@ -179,10 +179,8 @@ export default { data () { return { codeId: '', - // addressUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/getpage', - addressUrl: '/third/code/getpage', - categoryUrl: '/third/code/getcategory', - // categoryUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/getcategory', + addressUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getpage', + categoryUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getcategory', addressList: [], // 页面列表 categoryList: [], // 类目列表 templateRadio: '', 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 b3f13b3..827cad3 100644 --- a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue @@ -9,7 +9,6 @@ - @@ -28,10 +27,8 @@ @commitCode="commitCode" @init="init"> - - @@ -48,7 +45,8 @@ export default { name: '' // 组织名称 }, // 列表相关 - tableUrl: 'https://epmet-cloud.elinkservice.cn/api/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: { source: this.env @@ -63,8 +61,12 @@ export default { slot: '', plain: false, methodName: 'init', // 回调方法名称 - isShow: function (row) { - if (row.initState === 0 && row.resiAuth === 1 && row.workAuth === 1) { + isShow: (row) => { + if ( + row.initState === 0 && + row.resiAuth === 1 && + row.workAuth === 1 + ) { return true } else { return false @@ -79,7 +81,7 @@ export default { slot: '', plain: false, methodName: 'commitCode', // 回调方法名称 - isShow: function (row) { + isShow: (row) => { if (row.initState === 1) { return true } else { @@ -89,8 +91,7 @@ export default { } ], // 查询栏下拉框数据 - optionData: - { + optionData: { client: [ { value: '01', @@ -173,7 +174,9 @@ export default { const param = { customerId: row.customerId } - window.app.ajax.post(this.initUrl, param, + window.app.ajax.post( + this.initUrl, + param, (data, rspMsg) => { this.endLoading() this.$message.success('初始化成功') @@ -183,11 +186,13 @@ export default { (rspMsg, data) => { this.endLoading() this.$message.error(rspMsg) - }) + } + ) }, // 上传代码 commitCode (row) { - const customerUrl = 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerbyauth' + const customerUrl = + 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerbyauth' const param = { // workAuth: 1, // resiAuth: 1, @@ -195,13 +200,15 @@ export default { initState: 1 } this.startLoading() - window.app.ajax.post(customerUrl, param, + window.app.ajax.post( + customerUrl, + param, (data, rspMsg) => { this.endLoading() if (data) { let customerList = [] - data.forEach(element => { + data.forEach((element) => { let oneObj = { value: element.customerId, label: element.customerName @@ -210,8 +217,8 @@ export default { }) this.$router.push({ - 'name': 'code-CommitList', - 'params': { + name: 'code-CommitList', + params: { showCommit: true, customerId: row.customerId, name: row.agencyName, @@ -223,7 +230,8 @@ export default { (rspMsg, data) => { this.endLoading() this.$message.error(rspMsg) - }) + } + ) }, // 开启加载动画 startLoading () { diff --git a/epmet-oper-web/src/views/modules/customer-manage/customer-info.vue b/epmet-oper-web/src/views/modules/customer-manage/customer-info.vue index 4d2d72f..492c91b 100644 --- a/epmet-oper-web/src/views/modules/customer-manage/customer-info.vue +++ b/epmet-oper-web/src/views/modules/customer-manage/customer-info.vue @@ -44,7 +44,7 @@ export default { props: { dataList: { type: [Object, Array], - default: function () { + default: () => { return { customerInfoDTO: {}, rootAgencyDTO: {}, diff --git a/epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue b/epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue index 5b8802a..720faa2 100644 --- a/epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue +++ b/epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue @@ -225,7 +225,7 @@ >