diff --git a/src/api/model/enp.js b/src/api/model/enp.js index e681d98c..8210cb2b 100644 --- a/src/api/model/enp.js +++ b/src/api/model/enp.js @@ -6,7 +6,7 @@ export default { drain: { list: { name: "列表", - req: async function(data){ + req: async function (data) { return await http.get( `${config.API_URL}/enp/drain/`, data @@ -15,7 +15,7 @@ export default { }, create: { name: "创建", - req: async function(data){ + req: async function (data) { return await http.post( `${config.API_URL}/enp/drain/`, data); @@ -23,7 +23,7 @@ export default { }, item: { name: "详情", - req: async function(id){ + req: async function (id) { return await http.get( `${config.API_URL}/enp/drain/${id}/` ); @@ -31,7 +31,7 @@ export default { }, update: { name: "更新", - req: async function(id, data){ + req: async function (id, data) { return await http.put( `${config.API_URL}/enp/drain/${id}/`, data); @@ -39,7 +39,7 @@ export default { }, delete: { name: "删除", - req: async function(id){ + req: async function (id) { return await http.delete( `${config.API_URL}/enp/drain/${id}/`); } @@ -49,16 +49,16 @@ export default { drain_equip: { list: { name: "排口/设备关系", - req: async function(data){ + req: async function (data) { return await http.get( `${config.API_URL}/enp/drain_equip/`, data ); } }, - create: { + create: { name: "创建", - req: async function(data){ + req: async function (data) { return await http.post( `${config.API_URL}/enp/drain_equip/`, data); @@ -67,20 +67,28 @@ export default { , delete: { name: "删除", - req: async function(id){ + req: async function (id) { return await http.delete( `${config.API_URL}/enp/drain_equips/${id}/`); } } }, + vehicle_access: { + name: "车辆出入记录", + req: async function (data) { + return await http.get( + `${config.API_URL}/enp/vehicle_access/`, + data); + } + }, envdata: { export_excel: { name: "导出Excel", - req: async function(data){ + req: async function (data) { return await http.post( `${config.API_URL}/enp/envdata/export_excel/`, data); } } - } + } } diff --git a/src/style/dark.scss b/src/style/dark.scss index 0ca45eec..ee4d10fe 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -81,6 +81,10 @@ html.dark { background-color: rgba(163, 166, 173, 0.5); } + .el-main { + // padding: 13px 15px; + } + .el-main.nopadding { background: transparent; background-color: transparent; @@ -106,7 +110,34 @@ html.dark { padding: 0; } + .el-input { + --el-input-text-color: #ffffff; + --el-input-placeholder-color: #ffffff; + --el-input-transparent-border: #ffffff; + --el-input-border-color: #ffffff; + --el-input-hover-border-color: #ffffff; + } + .el-button { + color: #ffffff; + border-color: #ffffff; + } + + .el-select { + margin: 0 5px; + } + + .el-select .el-input .el-select__caret { + color: #ffffff; + } + + .el-select-dropdown__item.selected { + color: #ffffff; + } + + .el-date-editor { + --el-input-border-color: #ffffff; + } .el-main { background: transparent; @@ -134,8 +165,12 @@ html.dark { border-right: none; } + .el-drawer { + box-shadow: 0 0 20px 5px rgb(4, 50, 83); + } + .scTable-table { - padding: 30px; + padding: 1vw; border-radius: 20px; background: rgb(4, 50, 83); background-color: rgb(4, 50, 83); @@ -174,17 +209,25 @@ html.dark { background: #111; } + .el-pagination.is-background .el-pager li.is-active { + background-color: #1e789a; + } + + .el-pagination__jump, + .el-pagination__total { + color: #ffffff; + } //// /// /// //页面标题 .panel_title { - height: 3.5vh; + height: 55px; width: 100%; - line-height: 3.5vh; + line-height: 55px; color: #ffffff; - font-size: 1.5vh; + font-size: 2vh; padding-left: 1vw; position: relative; border-left: 5px solid #1279c3; @@ -194,10 +237,10 @@ html.dark { //条件搜索 .searchWrap { width: 100%; - height: 4vh; + height: 50px; display: flex; justify-content: space-between; - line-height: 4vh; + line-height: 50px; border-radius: 5px; padding: 0 1vw; align-items: center; diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue index 618751f3..69aa736a 100644 --- a/src/views/bigScreen/enpComponents/cems.vue +++ b/src/views/bigScreen/enpComponents/cems.vue @@ -1,6 +1,6 @@ diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue new file mode 100644 index 00000000..c661e083 --- /dev/null +++ b/src/views/bigScreen/enpComponents/innerclean.vue @@ -0,0 +1,76 @@ + + \ No newline at end of file diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue index 634564f2..361e3c21 100644 --- a/src/views/bigScreen/enpComponents/orgwryList.vue +++ b/src/views/bigScreen/enpComponents/orgwryList.vue @@ -484,11 +484,11 @@ export default { } .backMap { - height: 2vh; - line-height: 2vh; + height: 25px; + line-height: 25px; position: absolute; right: 1vw; - top: 0.7vh; + top: 15px; font-size: 1vh; width: -moz-fit-content; width: fit-content; diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue new file mode 100644 index 00000000..ee78d845 --- /dev/null +++ b/src/views/bigScreen/enpComponents/transport.vue @@ -0,0 +1,96 @@ + + \ No newline at end of file diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index eddb6986..b297272f 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -64,8 +64,8 @@