From af1c9e588f1de0240390648f9bb56aa486870aff Mon Sep 17 00:00:00 2001 From: chengxiangling <291105840@qq.com> Date: 星期五, 16 五月 2025 17:40:18 +0800 Subject: [PATCH] 提交高度修改; --- src/views/mainPlan/abnormalProcessAnalysis/index.vue | 2 src/views/basicData/event/index.vue | 2 src/views/mainPlan/sheetMetalSupplyGap/index.vue | 2 src/views/mainPlan/plateProcessStat/index.vue | 2 src/layout/components/Navbar.vue | 4 +- src/views/basicData/gasMaterialUsage/index.vue | 2 src/views/basicData/resourceGroup/index.vue | 2 src/views/mainPlan/gasPiping/index.vue | 2 src/views/mainPlan/gasProduceStatics/index.vue | 2 src/views/basicData/bom/index.vue | 5 +- src/views/mainPlan/apsPartRoutStat/index.vue | 2 src/views/mainPlan/abnormalPartNumberReport/index.vue | 2 src/views/mainPlan/gasPlanning/index.vue | 4 +- src/views/basicData/processRouteDataPreparate/index.vue | 2 src/views/mainPlan/platePlan/index.vue | 2 src/views/basicData/apsPlant/index.vue | 2 src/views/mainPlan/weldSeam/index.vue | 2 src/views/mainPlan/sheetMetalRedundantReport/index.vue | 2 src/views/mainPlan/pipeProduceStatics/index.vue | 2 src/views/mainPlan/workOrderJobLog/index.vue | 2 src/views/demand/planManage/index.vue | 3 + src/views/mainPlan/sheetMetalOrderManage/index.vue | 2 src/views/mainPlan/platePlanList/index.vue | 2 src/views/basicData/apsShop/index.vue | 2 src/views/basicData/processCapacityManagement/index.vue | 7 ++- src/views/basicData/standardProcess/index.vue | 5 +- src/views/basicData/materialManagement/index.vue | 2 src/views/partPlan/index.vue | 2 src/views/mainPlan/pipePlanning/index.vue | 4 +- src/views/basicData/materialStorageManagement/index.vue | 2 src/views/basicData/professionalFixedCycleManagement/index.vue | 7 ++- 31 files changed, 47 insertions(+), 38 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 44d13e3..9b6f205 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -20,7 +20,7 @@ <div class="right-menu"> <template v-if="appStore.device !== 'mobile'"> </template> <div class="mt5"> - <!-- <el-dropdown> + <el-dropdown> <img class="zh_icon" v-if="locale === 'zh'" @@ -43,7 +43,7 @@ }}</el-dropdown-item> </el-dropdown-menu> </template> - </el-dropdown> --> + </el-dropdown> </div> <div class="avatar-container"> <el-dropdown diff --git a/src/views/basicData/apsPlant/index.vue b/src/views/basicData/apsPlant/index.vue index 335ebc4..1347cab 100644 --- a/src/views/basicData/apsPlant/index.vue +++ b/src/views/basicData/apsPlant/index.vue @@ -97,7 +97,7 @@ const { proxy } = getCurrentInstance(); const { aps_plant_status } = proxy.useDict('aps_plant_status'); -const height = ref(document.documentElement.clientHeight - 160 + "px;"); +const height = ref(document.documentElement.clientHeight - 170 + "px;"); const plantNameRules = ref(null); const plantCodeRules = ref(null); const dataForm = ref(); diff --git a/src/views/basicData/apsShop/index.vue b/src/views/basicData/apsShop/index.vue index efabdfa..e5844ea 100644 --- a/src/views/basicData/apsShop/index.vue +++ b/src/views/basicData/apsShop/index.vue @@ -102,7 +102,7 @@ const { proxy } = getCurrentInstance(); const { aps_plant_status } = proxy.useDict('aps_plant_status'); -const height = ref(document.documentElement.clientHeight - 160 + "px;"); +const height = ref(document.documentElement.clientHeight - 170 + "px;"); const shopNameRules = ref(null); const shopCodeRules = ref(null); const plantCodeRules = ref(null); diff --git a/src/views/basicData/bom/index.vue b/src/views/basicData/bom/index.vue index 6769e3a..b690cbd 100644 --- a/src/views/basicData/bom/index.vue +++ b/src/views/basicData/bom/index.vue @@ -70,7 +70,8 @@ </el-col> <right-toolbar v-model:showSearch="showSearch" - @refreshTable="getList" + @queryTable="handleQuery" + @resetTable="resetQuery" ></right-toolbar> </el-row> @@ -149,7 +150,7 @@ const loadingRefresh = ref(false); const showSearch = ref(true); const total = ref(0); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); const heightSub = ref(document.documentElement.clientHeight - 320 + "px;"); // 琛ㄦ牸閰嶇疆 const columns = ref([]); diff --git a/src/views/basicData/event/index.vue b/src/views/basicData/event/index.vue index e7047b6..7114b5f 100644 --- a/src/views/basicData/event/index.vue +++ b/src/views/basicData/event/index.vue @@ -224,7 +224,7 @@ const processList = ref([]); const calendarList = ref([]); -const height = ref(document.documentElement.clientHeight - 210 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") // 澶氶�夋閫変腑鏁版嵁 const handleCheckboxChange = (data) => { diff --git a/src/views/basicData/gasMaterialUsage/index.vue b/src/views/basicData/gasMaterialUsage/index.vue index 43e13eb..7e907bc 100644 --- a/src/views/basicData/gasMaterialUsage/index.vue +++ b/src/views/basicData/gasMaterialUsage/index.vue @@ -158,7 +158,7 @@ const total = ref(0); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 210 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") const isVisible = ref(false); const isError = ref(false); const planned = ref(true); diff --git a/src/views/basicData/materialManagement/index.vue b/src/views/basicData/materialManagement/index.vue index c992438..a476cfa 100644 --- a/src/views/basicData/materialManagement/index.vue +++ b/src/views/basicData/materialManagement/index.vue @@ -66,7 +66,7 @@ const multiple = ref(true); const total = ref(0); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 210 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") const data = reactive({ form: {}, diff --git a/src/views/basicData/materialStorageManagement/index.vue b/src/views/basicData/materialStorageManagement/index.vue index 781b394..2c3c21b 100644 --- a/src/views/basicData/materialStorageManagement/index.vue +++ b/src/views/basicData/materialStorageManagement/index.vue @@ -58,7 +58,7 @@ const single = ref(true); const multiple = ref(true); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 210 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") const queryPlants = ref({status: 1}); const plantList = ref([]); diff --git a/src/views/basicData/processCapacityManagement/index.vue b/src/views/basicData/processCapacityManagement/index.vue index e20d4b3..4687228 100644 --- a/src/views/basicData/processCapacityManagement/index.vue +++ b/src/views/basicData/processCapacityManagement/index.vue @@ -22,7 +22,10 @@ </el-form> <el-row :gutter="10" class="mb8"> - <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> + <right-toolbar v-model:showSearch="showSearch" + @queryTable="handleQuery" + @resetTable="resetQuery" + ></right-toolbar> </el-row> <HxlhTable @@ -58,7 +61,7 @@ const single = ref(true); const multiple = ref(true); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 230 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") const { aps_capacity_type } = proxy.useDict('aps_capacity_type');//浜ц兘绫诲瀷 // 鍒嗛〉灞炴�� diff --git a/src/views/basicData/processRouteDataPreparate/index.vue b/src/views/basicData/processRouteDataPreparate/index.vue index 0f5bc74..f05d3f8 100644 --- a/src/views/basicData/processRouteDataPreparate/index.vue +++ b/src/views/basicData/processRouteDataPreparate/index.vue @@ -165,7 +165,7 @@ const single = ref(true); const total = ref(0); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); const heightSub = ref(document.documentElement.clientHeight - 320 + "px;"); // 琛ㄦ牸閰嶇疆 const columns = ref([]); diff --git a/src/views/basicData/professionalFixedCycleManagement/index.vue b/src/views/basicData/professionalFixedCycleManagement/index.vue index fe75d80..6c1f23a 100644 --- a/src/views/basicData/professionalFixedCycleManagement/index.vue +++ b/src/views/basicData/professionalFixedCycleManagement/index.vue @@ -22,7 +22,10 @@ </el-form> <el-row :gutter="10" class="mb8"> - <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> + <right-toolbar v-model:showSearch="showSearch" + @queryTable="handleQuery" + @resetTable="resetQuery" + ></right-toolbar> </el-row> <HxlhTable @@ -70,7 +73,7 @@ const single = ref(true); const multiple = ref(true); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 230 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") const queryPlants = ref({status: 1}); const plantList = ref([]); diff --git a/src/views/basicData/resourceGroup/index.vue b/src/views/basicData/resourceGroup/index.vue index f6b2e48..7645032 100644 --- a/src/views/basicData/resourceGroup/index.vue +++ b/src/views/basicData/resourceGroup/index.vue @@ -178,7 +178,7 @@ const title = ref(""); const daterangeRequestDate = ref([]); //寮圭獥鐩稿叧 -const height = ref(document.documentElement.clientHeight - 210 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") const isVisible = ref(false); const isError = ref(false); const planned = ref(true); diff --git a/src/views/basicData/standardProcess/index.vue b/src/views/basicData/standardProcess/index.vue index 550a649..7e0d76e 100644 --- a/src/views/basicData/standardProcess/index.vue +++ b/src/views/basicData/standardProcess/index.vue @@ -162,7 +162,8 @@ </el-col> <right-toolbar v-model:showSearch="showSearch" - @queryTable="getList" + @queryTable="handleQuery" + @resetTable="resetQuery" ></right-toolbar> </el-row> @@ -364,7 +365,7 @@ const total = ref(0); const title = ref(""); //寮圭獥鐩稿叧 -const height = ref(document.documentElement.clientHeight - 330 + "px;"); +const height = ref(document.documentElement.clientHeight - 270 + "px;"); const isVisible = ref(false); const isError = ref(false); const planned = ref(true); diff --git a/src/views/demand/planManage/index.vue b/src/views/demand/planManage/index.vue index 5256fe5..b9ca3a3 100644 --- a/src/views/demand/planManage/index.vue +++ b/src/views/demand/planManage/index.vue @@ -67,7 +67,8 @@ </el-col> <right-toolbar v-model:showSearch="showSearch" - @queryTable="getList" + @queryTable="handleQuery" + @resetTable="resetQuery" ></right-toolbar> </el-row> <HxlhTable diff --git a/src/views/mainPlan/abnormalPartNumberReport/index.vue b/src/views/mainPlan/abnormalPartNumberReport/index.vue index 7201815..bef57ec 100644 --- a/src/views/mainPlan/abnormalPartNumberReport/index.vue +++ b/src/views/mainPlan/abnormalPartNumberReport/index.vue @@ -104,7 +104,7 @@ }); const { queryParams, form, rules } = toRefs(data); const plantList = ref([]); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); // 琛ㄦ牸閰嶇疆-鍒楄〃 const columns = ref([]); // 鍒嗛〉灞炴�� diff --git a/src/views/mainPlan/abnormalProcessAnalysis/index.vue b/src/views/mainPlan/abnormalProcessAnalysis/index.vue index e3d1090..7885596 100644 --- a/src/views/mainPlan/abnormalProcessAnalysis/index.vue +++ b/src/views/mainPlan/abnormalProcessAnalysis/index.vue @@ -40,7 +40,7 @@ const multiple = ref(true); const total = ref(0); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 160 + "px;") +const height = ref(document.documentElement.clientHeight - 170 + "px;") const data = reactive({ form: {}, diff --git a/src/views/mainPlan/apsPartRoutStat/index.vue b/src/views/mainPlan/apsPartRoutStat/index.vue index 2395889..0fe2316 100644 --- a/src/views/mainPlan/apsPartRoutStat/index.vue +++ b/src/views/mainPlan/apsPartRoutStat/index.vue @@ -38,7 +38,7 @@ const { t, locale } = useI18n(); const loading = ref(false); const gridRef = ref(); -const height = ref(document.documentElement.clientHeight - 130 + "px;"); +const height = ref(document.documentElement.clientHeight - 170 + "px;"); const headers = ref([]); const exportData = ref([]); diff --git a/src/views/mainPlan/gasPiping/index.vue b/src/views/mainPlan/gasPiping/index.vue index bd6326b..e290460 100644 --- a/src/views/mainPlan/gasPiping/index.vue +++ b/src/views/mainPlan/gasPiping/index.vue @@ -283,7 +283,7 @@ const total = ref(0); const daterangePlanStartDay = ref([]); const daterangePlanEndDay = ref([]); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); const isVisible = ref(false); const isError = ref(false); const planned = ref(true); diff --git a/src/views/mainPlan/gasPlanning/index.vue b/src/views/mainPlan/gasPlanning/index.vue index 5e3e3d3..fe65884 100644 --- a/src/views/mainPlan/gasPlanning/index.vue +++ b/src/views/mainPlan/gasPlanning/index.vue @@ -59,7 +59,7 @@ <!-- <div class="box_container"> --> <el-row> <el-col :span="12" style="margin-bottom: 10px"> - <el-button v-if="!clickedTableRefGas" class="title_btn" plain type="default" @click="editRowEventGas">{{ + <el-button v-if="!clickedTableRefGas" class="title_btn" type="primary" @click="editRowEventGas">{{ $t("common.common.edit") }}</el-button> <el-button @@ -322,7 +322,7 @@ // import { ElMessage } from "element-plus"; import { listGasPlan, getGasPlanSave } from "@/api/mainPlan/gasPlanning"; import { useI18n } from "vue-i18n"; //瑕佸湪js涓娇鐢ㄥ浗闄呭寲 -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); const { t, locale } = useI18n(); const { proxy } = getCurrentInstance(); const { aps_factory } = proxy.useDict("aps_factory"); diff --git a/src/views/mainPlan/gasProduceStatics/index.vue b/src/views/mainPlan/gasProduceStatics/index.vue index 8331702..8ece8bf 100644 --- a/src/views/mainPlan/gasProduceStatics/index.vue +++ b/src/views/mainPlan/gasProduceStatics/index.vue @@ -133,7 +133,7 @@ const { aps_factory } = proxy.useDict("aps_factory"); const loading = ref(false); const gridRef = ref(); -const height = ref(document.documentElement.clientHeight - 170 + "px;"); +const height = ref(document.documentElement.clientHeight - 180 + "px;"); const headers = ref([]); // const exportData = ref([]); const showSearch = ref(true); diff --git a/src/views/mainPlan/pipePlanning/index.vue b/src/views/mainPlan/pipePlanning/index.vue index 3a30e1d..76e91f6 100644 --- a/src/views/mainPlan/pipePlanning/index.vue +++ b/src/views/mainPlan/pipePlanning/index.vue @@ -55,7 +55,7 @@ <!-- <div class="box_container"> --> <el-row> <el-col :span="12" style="margin-bottom: 10px"> - <el-button v-if="!clickedTableRef" class="title_btn" plain type="default" @click="editRowEvent">{{ + <el-button v-if="!clickedTableRef" class="title_btn" type="primary" @click="editRowEvent">{{ $t("common.common.edit") }}</el-button> <el-button @@ -306,7 +306,7 @@ <script setup name="GasPlanning"> // import { ElMessage } from "element-plus"; import { listGasPlan, getGasPlanSave } from "@/api/mainPlan/gasPlanning"; -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); import { useI18n } from "vue-i18n"; //瑕佸湪js涓娇鐢ㄥ浗闄呭寲 const { t, locale } = useI18n(); const { proxy } = getCurrentInstance(); diff --git a/src/views/mainPlan/pipeProduceStatics/index.vue b/src/views/mainPlan/pipeProduceStatics/index.vue index c9c8bbe..3b57414 100644 --- a/src/views/mainPlan/pipeProduceStatics/index.vue +++ b/src/views/mainPlan/pipeProduceStatics/index.vue @@ -149,7 +149,7 @@ const { aps_factory } = proxy.useDict("aps_factory"); const loading = ref(false); const gridRef = ref(); -const height = ref(document.documentElement.clientHeight - 170 + "px;"); +const height = ref(document.documentElement.clientHeight - 180 + "px;"); const headers = ref([]); const exportData = ref([]); const showSearch = ref(true); diff --git a/src/views/mainPlan/platePlan/index.vue b/src/views/mainPlan/platePlan/index.vue index b14c931..e35d530 100644 --- a/src/views/mainPlan/platePlan/index.vue +++ b/src/views/mainPlan/platePlan/index.vue @@ -282,7 +282,7 @@ const daterangePlanStartDay = ref([]); const daterangePlanEndDay = ref([]); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); const isVisible = ref(false); const isError = ref(false); const planned = ref(true); diff --git a/src/views/mainPlan/platePlanList/index.vue b/src/views/mainPlan/platePlanList/index.vue index 0b9ebce..593c557 100644 --- a/src/views/mainPlan/platePlanList/index.vue +++ b/src/views/mainPlan/platePlanList/index.vue @@ -133,7 +133,7 @@ const multiple = ref(true); const total = ref(0); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 180 + "px;"); +const height = ref(document.documentElement.clientHeight - 170 + "px;"); const columnsVersion = ref(0); const data = reactive({ // form: {}, diff --git a/src/views/mainPlan/plateProcessStat/index.vue b/src/views/mainPlan/plateProcessStat/index.vue index 7481479..0347fe6 100644 --- a/src/views/mainPlan/plateProcessStat/index.vue +++ b/src/views/mainPlan/plateProcessStat/index.vue @@ -128,7 +128,7 @@ const multiple = ref(true); const total = ref(0); const title = ref(""); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); const data = reactive({ // form: {}, diff --git a/src/views/mainPlan/sheetMetalOrderManage/index.vue b/src/views/mainPlan/sheetMetalOrderManage/index.vue index 4e09bc9..8a5e536 100644 --- a/src/views/mainPlan/sheetMetalOrderManage/index.vue +++ b/src/views/mainPlan/sheetMetalOrderManage/index.vue @@ -319,7 +319,7 @@ const shopList = ref([]); const allShopList = ref([]); const processList = ref([]); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); const heightSub = ref(document.documentElement.clientHeight - 200 + "px;"); const heightSubUpdate = ref(document.documentElement.clientHeight - 270 + "px;"); // 琛ㄦ牸閰嶇疆-鍒楄〃 diff --git a/src/views/mainPlan/sheetMetalRedundantReport/index.vue b/src/views/mainPlan/sheetMetalRedundantReport/index.vue index 3a5ab76..10879a8 100644 --- a/src/views/mainPlan/sheetMetalRedundantReport/index.vue +++ b/src/views/mainPlan/sheetMetalRedundantReport/index.vue @@ -104,7 +104,7 @@ }); const { queryParams } = toRefs(data); const plantList = ref([]); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); // 琛ㄦ牸閰嶇疆-鍒楄〃 const columns = ref([]); // 鍒嗛〉灞炴�� diff --git a/src/views/mainPlan/sheetMetalSupplyGap/index.vue b/src/views/mainPlan/sheetMetalSupplyGap/index.vue index aad56ad..71b0898 100644 --- a/src/views/mainPlan/sheetMetalSupplyGap/index.vue +++ b/src/views/mainPlan/sheetMetalSupplyGap/index.vue @@ -110,7 +110,7 @@ }); const { queryParams } = toRefs(data); const plantList = ref([]); -const height = ref(document.documentElement.clientHeight - 210 + "px;"); +const height = ref(document.documentElement.clientHeight - 220 + "px;"); // 琛ㄦ牸閰嶇疆-鍒楄〃 const columns = ref([]); // 鍒嗛〉灞炴�� diff --git a/src/views/mainPlan/weldSeam/index.vue b/src/views/mainPlan/weldSeam/index.vue index 184a9f5..2ff8ae5 100644 --- a/src/views/mainPlan/weldSeam/index.vue +++ b/src/views/mainPlan/weldSeam/index.vue @@ -268,7 +268,7 @@ const isVisible = ref(false); const isError = ref(false); const planned = ref(true); -const height = ref(document.documentElement.clientHeight - 160 + "px;"); +const height = ref(document.documentElement.clientHeight - 170 + "px;"); const exampleHeight = ref("500px"); const uploadRef = ref(); const exampleList = ref([]); diff --git a/src/views/mainPlan/workOrderJobLog/index.vue b/src/views/mainPlan/workOrderJobLog/index.vue index 7f409e7..c3d0fc4 100644 --- a/src/views/mainPlan/workOrderJobLog/index.vue +++ b/src/views/mainPlan/workOrderJobLog/index.vue @@ -136,7 +136,7 @@ import HxlhTable from "@/components/HxlhTable/index.vue"; const { proxy } = getCurrentInstance(); -const height = ref(document.documentElement.clientHeight - 270 + "px;") +const height = ref(document.documentElement.clientHeight - 220 + "px;") const virtualYConfig = { enabled: true, gt: 0 diff --git a/src/views/partPlan/index.vue b/src/views/partPlan/index.vue index e5ff769..f5c26db 100644 --- a/src/views/partPlan/index.vue +++ b/src/views/partPlan/index.vue @@ -306,7 +306,7 @@ const total = ref(0); const daterangePlanStartDay = ref([]); const daterangePlanEndDay = ref([]); -const height = ref(document.documentElement.clientHeight - 220 + "px;"); +const height = ref(document.documentElement.clientHeight - 230 + "px;"); const isVisible = ref(false); const isError = ref(false); const planned = ref(true); -- Gitblit v1.9.3