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">