From c6aa7ac8867e6bc0fde9f1134b69b5d1352a640a Mon Sep 17 00:00:00 2001 From: jiangyuying Date: Tue, 28 Jul 2020 15:41:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/.env.development | 4 +- epmet-oper-web/public/index.html | 2 +- .../scss/modules/wx-mini/index-set.scss | 5 +- .../src/views/components/CTable.vue | 2 +- .../src/views/components/CTableNoPage.vue | 20 +----- .../src/views/modules/code/CommitForm.vue | 17 +++-- .../src/views/modules/code/CommitList.vue | 67 +++++++++---------- .../modules/customer-manage/RegisterList.vue | 45 ++++++++++--- 8 files changed, 86 insertions(+), 76 deletions(-) diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development index a386e44..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://10.10.10.98: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 acfff63..7c9fd34 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -38,7 +38,7 @@ <% } %> - https://epmet-dev.elinkservice.cn/ + <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> <% } %> diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss index 6258ff3..3cec64e 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss +++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss @@ -983,7 +983,7 @@ font-family: PingFang SC; padding:3px 10px; font-weight: 500; - background-color: rgb(255, 21, 21); + background-color: rgba(239, 60, 61, 1); color: rgb(255, 255, 255); border-radius: 90px; } @@ -1019,7 +1019,6 @@ } .list { - width: 100%; margin:10px 15px; .item { margin:8px 0; @@ -1027,6 +1026,8 @@ background-color: #ffffff; width: 100%; display:flex; + height: 40px ; + align-items:center; .logo { width:10%; height: 21px; diff --git a/epmet-oper-web/src/views/components/CTable.vue b/epmet-oper-web/src/views/components/CTable.vue index 7b899ed..12c1968 100644 --- a/epmet-oper-web/src/views/components/CTable.vue +++ b/epmet-oper-web/src/views/components/CTable.vue @@ -340,7 +340,7 @@ export default { } .page { - padding: 20px 6px 0; + padding: 0 6px; text-align: right; } diff --git a/epmet-oper-web/src/views/components/CTableNoPage.vue b/epmet-oper-web/src/views/components/CTableNoPage.vue index 0c06b77..404058a 100644 --- a/epmet-oper-web/src/views/components/CTableNoPage.vue +++ b/epmet-oper-web/src/views/components/CTableNoPage.vue @@ -95,10 +95,7 @@ export default { loading: false, table: { height: this.tableHeight, - params: { - size: this.size, // 当前页数显示记录数 - page: this.page // 当前页数 - } + params: {} }, selected: false, @@ -143,14 +140,6 @@ export default { return [{}] } }, - page: { - type: Number, - default: 0 - }, - size: { - type: Number, - default: 10 - }, tableHeight: { type: Number }, @@ -242,13 +231,6 @@ export default { // 关闭popover弹出层 scope._self.$refs[`popover-${scope.$index}`].doClose() }, - handleSizeChange (size) { - this.table.params.size = size - this.table.params.page = 0 - this.$nextTick(() => { - this.loadData() - }) - }, // 单选选中 getRadioRow (index, row) { // 获取选中数据 diff --git a/epmet-oper-web/src/views/modules/code/CommitForm.vue b/epmet-oper-web/src/views/modules/code/CommitForm.vue index 7bcda98..515a19d 100644 --- a/epmet-oper-web/src/views/modules/code/CommitForm.vue +++ b/epmet-oper-web/src/views/modules/code/CommitForm.vue @@ -8,12 +8,11 @@ class="aui-card--fill"> - - + -->
{ if (valid) { - if (this.extJson.json === '') { - this.$message.warning('请获取配置') - return - } + // if (this.extJson.json === '') { + // this.$message.warning('请获取配置') + // return + // } if (this.selTempId === '') { this.$message.warning('请选择模板') return @@ -194,11 +193,11 @@ export default { this.startLoading() // 表单对象 let _data = this.$refs['ref_form_temp'].model - _data.extJson = this.extJson.json + // _data.extJson = this.extJson.json _data.templateId = this.selTempId console.log(_data) - window.app.ajax.post2(this.tempForm.commitUrl, _data, + window.app.ajax.post(this.tempForm.commitUrl, _data, (data, rspMsg) => { this.endLoading() this.$message.success('上传成功') diff --git a/epmet-oper-web/src/views/modules/code/CommitList.vue b/epmet-oper-web/src/views/modules/code/CommitList.vue index b8b72a6..91610e1 100644 --- a/epmet-oper-web/src/views/modules/code/CommitList.vue +++ b/epmet-oper-web/src/views/modules/code/CommitList.vue @@ -9,7 +9,8 @@ @keyup.enter.native="loadTableData()"> + placeholder="客户" + clearable> + placeholder="类型" + clearable> + placeholder="状态" + clearable> { @@ -313,7 +312,7 @@ export default { }, computed: { tableHeight () { - return this.clientHeight - 60 - 80 - 80 - 85 + return this.clientHeight - 60 - 80 - 80 - 90 }, ...mapGetters(['clientHeight']) }, 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 bdf98f0..bcd03e3 100644 --- a/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue +++ b/epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue @@ -188,14 +188,43 @@ export default { }, // 上传代码 commitCode (row) { - this.$router.push({ - 'name': 'code-CommitList', - 'params': { - showCommit: true, - customerId: row.customerId, - name: row.agencyName - } - }) + const customerUrl = '/third/pacustomer/registerbyauth' + // const customerUrl = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/pacustomer/registerbyauth' + const param = { + // initState: 1, + // resiAuth: 1, + workAuth: 1 + } + this.startLoading() + window.app.ajax.post(customerUrl, param, + (data, rspMsg) => { + this.endLoading() + if (data) { + let customerList = [] + + data.forEach(element => { + let oneObj = { + value: element.customerId, + label: element.customerName + } + customerList.push(oneObj) + }) + + this.$router.push({ + 'name': 'code-CommitList', + 'params': { + showCommit: true, + customerId: row.customerId, + name: row.agencyName, + customerList: customerList + } + }) + } + }, + (rspMsg, data) => { + this.endLoading() + this.$message.error(rspMsg) + }) }, // 开启加载动画 startLoading () {