diff --git a/.env.development b/.env.development index ffefc80..5a691aa 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # VITE_API_URL = 'http://192.168.34.155:6688' VITE_WPAPI_URL = "http://182.90.224.147:8081" -VITE_API_URL = "http://182.90.224.147:6688" +# VITE_API_URL = "http://182.90.224.147:6688" +VITE_API_URL = "http://47.104.132.250:9000" # 上传 # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/components/LeftMenu/leftMenu.scss b/src/components/LeftMenu/leftMenu.scss index c91d05d..b6cab3e 100644 --- a/src/components/LeftMenu/leftMenu.scss +++ b/src/components/LeftMenu/leftMenu.scss @@ -1,5 +1,5 @@ .leftMenu { - min-width: 300px; + width: 300px; min-height: 94%; border-radius: 5px; // box-shadow: 0px 4px 4px 0px rgba(0, 55, 143, 0.2); @@ -62,7 +62,8 @@ border-bottom-left-radius: 8px; } .content { - min-height: 83%; + height: calc(100% - 150px); + overflow-y: scroll; // padding: 0 10px; background-color: #ffffff; .fule { diff --git a/src/views/goverment/AIwarning/accessSituation/index.scss b/src/views/goverment/AIwarning/accessSituation/index.scss index 37403d5..c593af1 100644 --- a/src/views/goverment/AIwarning/accessSituation/index.scss +++ b/src/views/goverment/AIwarning/accessSituation/index.scss @@ -6,7 +6,7 @@ .right_container { display: flex; flex-direction: column; - width: 83%; + flex: 1; // margin-left: 20px; padding: 0 0 0 20px; @@ -140,6 +140,7 @@ } .leftMenu { + // width: 300px; // width: 290px; // 页面的项目工程 .leftProject { diff --git a/src/views/goverment/AIwarning/accessSituation/index.vue b/src/views/goverment/AIwarning/accessSituation/index.vue index 4471b78..66e1017 100644 --- a/src/views/goverment/AIwarning/accessSituation/index.vue +++ b/src/views/goverment/AIwarning/accessSituation/index.vue @@ -167,7 +167,7 @@ const searchName = ref(""); const pages = ref({ pageNo: 1, - pageSize: 7, + pageSize: 10, total: 0 }); const pageable = ref({ diff --git a/src/views/goverment/AIwarning/alarmRecord/index.scss b/src/views/goverment/AIwarning/alarmRecord/index.scss index 37b8de1..061a0fd 100644 --- a/src/views/goverment/AIwarning/alarmRecord/index.scss +++ b/src/views/goverment/AIwarning/alarmRecord/index.scss @@ -6,7 +6,7 @@ .right_container { display: flex; flex-direction: column; - width: 83%; + flex: 1; // margin-left: 20px; padding: 0 0 0 20px; diff --git a/src/views/goverment/AIwarning/alarmRecord/index.vue b/src/views/goverment/AIwarning/alarmRecord/index.vue index 189f0e1..6d6307e 100644 --- a/src/views/goverment/AIwarning/alarmRecord/index.vue +++ b/src/views/goverment/AIwarning/alarmRecord/index.vue @@ -153,7 +153,7 @@ const searchSn = ref(""); const searchName = ref(""); const pages = ref({ pageNo: 1, - pageSize: 6, + pageSize: 10, total: 0 }); diff --git a/src/views/goverment/AIwarning/warningMap/index.scss b/src/views/goverment/AIwarning/warningMap/index.scss index 80a2d49..cbf5c29 100644 --- a/src/views/goverment/AIwarning/warningMap/index.scss +++ b/src/views/goverment/AIwarning/warningMap/index.scss @@ -110,16 +110,13 @@ } .LeftMenu { position: absolute; - width: 300px; top: 10px; left: 10px; - height: 94%; - min-height: 83%; + height: calc(100% - 122px); border-radius: 8px; box-shadow: 0 4px 4px 0 rgb(0 55 143 / 20%); opacity: 0.9; - overflow-y: scroll; - + width: 300px; // background-color: rgba(255 255 255 / 80%) !important; } .ellipsisName { diff --git a/src/views/goverment/AIwarning/warningMap/index.vue b/src/views/goverment/AIwarning/warningMap/index.vue index c642b0b..5952c36 100644 --- a/src/views/goverment/AIwarning/warningMap/index.vue +++ b/src/views/goverment/AIwarning/warningMap/index.vue @@ -106,7 +106,7 @@ import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government const active = ref(0); const pages = ref({ pageNo: 1, - pageSize: 6, + pageSize: 10, total: 0 }); const mapTitle = ref({ diff --git a/src/views/goverment/dangerousEngineering/index.vue b/src/views/goverment/dangerousEngineering/index.vue index e5e0f23..bfeed51 100644 --- a/src/views/goverment/dangerousEngineering/index.vue +++ b/src/views/goverment/dangerousEngineering/index.vue @@ -117,7 +117,7 @@ import { import LeftMenu from "@/components/LeftMenu/LeftMenu.vue"; const pages = ref({ pageNo: 1, - pageSize: 7, + pageSize: 10, total: 0 }); const records = ref([]); diff --git a/src/views/goverment/dustManagement/index.scss b/src/views/goverment/dustManagement/index.scss index 8e5bafb..64cd35a 100644 --- a/src/views/goverment/dustManagement/index.scss +++ b/src/views/goverment/dustManagement/index.scss @@ -227,13 +227,12 @@ position: absolute; top: 92px; left: 10px; - height: 90%; + height: calc(100% - 122px); min-height: 60%; border-radius: 8px; box-shadow: 0 4px 4px 0 rgb(0 55 143 / 20%); opacity: 0.9; - width: 290px; - overflow-y: scroll; + width: 300px; // background-color: rgba(255 255 255 / 80%) !important; } .mapTopData { diff --git a/src/views/goverment/dustManagement/index.vue b/src/views/goverment/dustManagement/index.vue index 6ac4b88..66820ec 100644 --- a/src/views/goverment/dustManagement/index.vue +++ b/src/views/goverment/dustManagement/index.vue @@ -148,7 +148,7 @@ const globalStore = GlobalStore(); const active = ref(0); const pages = ref({ pageNo: 1, - pageSize: 7, + pageSize: 10, total: 0 }); const mapTitle = ref({ diff --git a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue index fbc1a24..5cdefe1 100644 --- a/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue +++ b/src/views/goverment/engineeringAcceptance/acceptanceApply/index.vue @@ -79,7 +79,7 @@ import { acceptanceApplyProList, acceptanceApplyEngList, acceptanceApplyPage } f import { ElMessage } from "element-plus"; const pages = ref({ pageNo: 1, - pageSize: 7, + pageSize: 10, total: 0 }); // 搜索用的项目sn或者工程sn diff --git a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue index f9bb4ac..cf94d18 100644 --- a/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue +++ b/src/views/goverment/engineeringAcceptance/acceptancePlan/index.vue @@ -71,7 +71,7 @@ import LeftMenu from "@/components/LeftMenu/LeftMenu.vue"; import { acceptancePlanProList, acceptancePlanEngList } from "@/api/modules/goverment"; const pages = ref({ pageNo: 1, - pageSize: 7, + pageSize: 10, total: 0 }); // 搜索用的项目sn或者工程sn diff --git a/src/views/goverment/unmannedVideo/accessSituation/index.scss b/src/views/goverment/unmannedVideo/accessSituation/index.scss index e54db29..7c82095 100644 --- a/src/views/goverment/unmannedVideo/accessSituation/index.scss +++ b/src/views/goverment/unmannedVideo/accessSituation/index.scss @@ -6,7 +6,7 @@ .right_container { display: flex; flex-direction: column; - width: 83%; + flex: 1; // margin-left: 20px; padding: 0 0 0 20px; .form_div { diff --git a/src/views/goverment/unmannedVideo/accessSituation/index.vue b/src/views/goverment/unmannedVideo/accessSituation/index.vue index f4474c5..7a561b6 100644 --- a/src/views/goverment/unmannedVideo/accessSituation/index.vue +++ b/src/views/goverment/unmannedVideo/accessSituation/index.vue @@ -150,7 +150,7 @@ const searchName = ref(""); const pages = ref({ pageNo: 1, - pageSize: 7, + pageSize: 10, total: 0 }); const pageable = ref({ diff --git a/src/views/goverment/unmannedVideo/alarmRecord/index.scss b/src/views/goverment/unmannedVideo/alarmRecord/index.scss index 1c7d052..dae8746 100644 --- a/src/views/goverment/unmannedVideo/alarmRecord/index.scss +++ b/src/views/goverment/unmannedVideo/alarmRecord/index.scss @@ -6,8 +6,7 @@ .right_container { display: flex; flex-direction: column; - width: 83%; - + flex: 1; // margin-left: 20px; padding: 0 0 0 20px; @@ -23,8 +22,9 @@ // align-items: center; } .form { + border-radius: 8px; padding: 16px 0 0 36px; - + margin-bottom: 20px; // height: 56px; background-color: #ffffff; }