From bdf5cf5ead288eca7c11a2f5265c3232701d7e4f Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 31 Jul 2023 14:26:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .../goverment/huizhou/droneImaging/index.scss | 16 +++++++++----- .../goverment/huizhou/droneImaging/index.vue | 4 ++-- .../GanttchartChart/index.vue | 7 +++++-- .../divisionsAndISubItems/index.scss | 15 ++++++++----- .../divisionsAndISubItems/index.vue | 21 ++----------------- .../engineerInventory/index.scss | 15 ++++++++----- .../engineerInventory/index.vue | 4 ++-- .../investmentPayment/index.scss | 15 ++++++++----- .../investmentPayment/index.vue | 4 ++-- .../panoramicPlan/index.scss | 15 ++++++++----- .../panoramicPlan/index.vue | 4 ++-- .../planFinishSituation/index.scss | 15 ++++++++----- .../planFinishSituation/index.vue | 4 ++-- .../progressManagement/index.scss | 15 ++++++++----- .../progressManagement/index.vue | 4 ++-- .../qualityControl/index.scss | 15 ++++++++----- .../qualityControl/index.vue | 4 ++-- .../safetyManagement/index.scss | 15 ++++++++----- .../safetyManagement/index.vue | 4 ++-- .../environmentalMonitoring/index.scss | 15 ++++++++----- .../environmentalMonitoring/index.vue | 4 ++-- .../siteSupervision/videoMonitoring/index.vue | 10 ++++++++- .../huizhou/smartConstructionSite/index.scss | 3 +++ .../huizhou/smartConstructionSite/index.vue | 4 ++-- 25 files changed, 142 insertions(+), 94 deletions(-) diff --git a/.env.development b/.env.development index e1394ff..ebb6d1b 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,10 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) -VITE_API_URL = 'http://192.168.34.155:6688' +# VITE_API_URL = 'http://192.168.34.155:6688' # VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296' VITE_WPAPI_URL = "http://182.90.224.147:8081" -# VITE_API_URL = "http://182.90.224.147:9013" +VITE_API_URL = "http://182.90.224.147:9013" # 上传 # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/views/goverment/huizhou/droneImaging/index.scss b/src/views/goverment/huizhou/droneImaging/index.scss index 4ef1ed8..74c5899 100644 --- a/src/views/goverment/huizhou/droneImaging/index.scss +++ b/src/views/goverment/huizhou/droneImaging/index.scss @@ -4,13 +4,19 @@ width: 100%; height: 100%; .leftMenu { + width: 300px; // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 170px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 170px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/droneImaging/index.vue b/src/views/goverment/huizhou/droneImaging/index.vue index 5850932..b0c9520 100644 --- a/src/views/goverment/huizhou/droneImaging/index.vue +++ b/src/views/goverment/huizhou/droneImaging/index.vue @@ -99,7 +99,7 @@ const pages = ref({ total: 0 }); const records = ref([]); -const active = ref(0); +const active = ref(1); const store = GlobalStore(); interface formData { title: string; @@ -254,7 +254,7 @@ watch( ); onMounted(async () => { getVideoData(); - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; diff --git a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue index 7ee7d7c..db15c1e 100644 --- a/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue +++ b/src/views/goverment/huizhou/progressManagement/GanttchartChart/index.vue @@ -144,7 +144,7 @@ const headerList = reactive([ { label: "暂停状态", color: "#C13F5B" } ]); const colors = ref(["#D0A530", "#35e5fd", "#f1d520", "#4fd389", "#F80840", "#fc6f8e", "#C13F5B"]); -const active = ref(0); +const active = ref(1); const records = ref([]); const projects = ref([]); const pages = ref({ @@ -360,7 +360,7 @@ const getEngPage = async () => { onBeforeMount(() => {}); onMounted(async () => { getDataList(); - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; @@ -595,6 +595,9 @@ watch( .tab.active { color: #0bc4f0; } + .tab-wrapper { + display: none; + } .isActive { background-color: #09314e; } diff --git a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss index 7c6f2a1..3d20fb7 100644 --- a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss +++ b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss @@ -6,11 +6,16 @@ .leftMenu { // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue index 3d1222d..0a36f2a 100644 --- a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.vue @@ -254,7 +254,7 @@ const pages = ref({ total: 0 }); const records = ref([]); -const active = ref(0); +const active = ref(1); const baseUrl = import.meta.env.VITE_API_URL; const globalStore = GlobalStore(); const fileList = ref([]); @@ -380,23 +380,6 @@ const searchSn = ref(""); // 项目或者工程名字 const searchName = ref(""); -// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段 -// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行 -const dataCallback = (data: any) => { - // console.log(data); - return { - list: data.records, - total: Number(data.total), - pageNo: Number(data.current), - pageSize: Number(data.size) - }; -}; -// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口 -// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList" -const getTableList = (params: any) => { - let newParams = JSON.parse(JSON.stringify(params)); - return getRealTimePage(newParams); -}; // 页面的项目名称和工程名称的div点击事件 const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { const { result } = await getAIQuestionPage( @@ -500,7 +483,7 @@ watch( ); onMounted(async () => { getVideoData(); - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; diff --git a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss index 76b702d..cc34b1a 100644 --- a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss +++ b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss @@ -7,11 +7,16 @@ width: 300px; // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue index 13687f4..2dc980d 100644 --- a/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue +++ b/src/views/goverment/huizhou/progressManagement/engineerInventory/index.vue @@ -89,7 +89,7 @@ const pages = ref({ total: 0 }); const records = ref([]); -const active = ref(0); +const active = ref(1); const store = GlobalStore(); const headers = ref({ Authorization: "Bearer " + store.token }); const baseUrl = import.meta.env.VITE_API_URL; @@ -236,7 +236,7 @@ watch( } ); onMounted(async () => { - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = records.value[0].projectSn; searchName.value = records.value[0].projectName; diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss index 76b702d..cc34b1a 100644 --- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss +++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss @@ -7,11 +7,16 @@ width: 300px; // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue index a91632e..4221b60 100644 --- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue +++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.vue @@ -110,7 +110,7 @@ const pages = ref({ total: 0 }); const records = ref([]); -const active = ref(0); +const active = ref(1); const fileList = ref([]); const store = GlobalStore(); // { @@ -445,7 +445,7 @@ watch( } ); onMounted(async () => { - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = records.value[0].projectSn; searchName.value = records.value[0].projectName; diff --git a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss index 84a5817..ad8d161 100644 --- a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss +++ b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss @@ -7,11 +7,16 @@ width: 300px; // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue index 7e36e3f..3f8a613 100644 --- a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue +++ b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.vue @@ -94,7 +94,7 @@ const pages = ref({ }); const records = ref([]); const DicMainList = ref([]); -const active = ref(0); +const active = ref(1); const store = GlobalStore(); // 表格配置项 const columns: ColumnProps[] = [ @@ -510,7 +510,7 @@ watch( ); onMounted(async () => { getDicMainList(); - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss index 4908463..5dabd42 100644 --- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss +++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss @@ -7,11 +7,16 @@ width: 300px; // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue index 2a651bf..777a40e 100644 --- a/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue +++ b/src/views/goverment/huizhou/progressManagement/planFinishSituation/index.vue @@ -92,7 +92,7 @@ const relativeId = ref(""); const detailsDialog = ref(false); const globalStore = GlobalStore(); const openVisible = ref(false); -const active = ref(0); +const active = ref(1); const records = ref([]); // 弹窗中的配置 const formConfig = { @@ -333,7 +333,7 @@ watch( } ); onMounted(async () => { - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = records.value[0].projectSn; searchName.value = records.value[0].projectName; diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss index a4b74b0..f6283b6 100644 --- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss +++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss @@ -7,11 +7,16 @@ width: 300px; // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue index 4f3a4af..5712bc9 100644 --- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue @@ -127,7 +127,7 @@ const pages = ref({ }); const router = useRouter(); const records = ref([]); -const active = ref(0); +const active = ref(1); const fileList = ref([]); const store = GlobalStore(); // { @@ -442,7 +442,7 @@ watch( ); onMounted(async () => { getVideoData(); - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss index 5d15a64..face3b8 100644 --- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss +++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss @@ -6,11 +6,16 @@ .leftMenu { // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue index 3189c9d..c651c27 100644 --- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue @@ -201,7 +201,7 @@ const pageable = ref({ pageSize: 12, total: 0 }); -const active = ref(0); +const active = ref(1); const detailsDialog = ref(false); const orderDialog = ref(false); const relativeId = ref(""); @@ -333,7 +333,7 @@ watch( } ); onMounted(async () => { - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss index 5d15a64..face3b8 100644 --- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss +++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss @@ -6,11 +6,16 @@ .leftMenu { // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue index 02ceb83..4165606 100644 --- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue +++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue @@ -170,7 +170,7 @@ const pageable = ref({ pageSize: 12, total: 0 }); -const active = ref(0); +const active = ref(1); const detailsDialog = ref(false); const orderDialog = ref(false); const relativeId = ref(""); @@ -301,7 +301,7 @@ watch( } ); onMounted(async () => { - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss index ea08e8a..011becd 100644 --- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss +++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.scss @@ -6,11 +6,16 @@ .leftMenu { // width: 290px; // 页面的项目工程 - :deep(.item) { - height: 78px !important; - } - :deep(.content) { - height: calc(100% - 160px) !important; + :deep() { + .item { + height: 78px !important; + } + .content { + height: calc(100% - 160px) !important; + } + .tab-wrapper { + display: none; + } } .leftProject { // padding: 5px 8px; diff --git a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue index 7d32ec1..08ad5c0 100644 --- a/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/environmentalMonitoring/index.vue @@ -77,7 +77,7 @@ const pages = ref({ total: 0 }); const records = ref([]); -const active = ref(0); +const active = ref(1); const fileList = ref([]); const store = GlobalStore(); // 表格配置项 @@ -294,7 +294,7 @@ watch( ); onMounted(async () => { getVideoData(); - await getProPage(); + await getEngPage(); onSearch(records.value[0]); searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; searchName.value = (records.value as ResAiProjectPage[])[0].projectName; diff --git a/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue b/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue index bab9723..4cebf9a 100644 --- a/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue +++ b/src/views/goverment/huizhou/siteSupervision/videoMonitoring/index.vue @@ -57,7 +57,7 @@ const pageable = reactive({ total: 0 }); -const active = ref("first"); +const active = ref("two"); const parentTitle = ref(""); const rightForm = ref({ createTime: "", @@ -245,4 +245,12 @@ onMounted(async () => { :deep(.btn-next) { border: 1px solid #e5e5e5; } +:deep() { + .el-tabs__header { + display: none; + } + .el-tabs__content { + margin-top: 15px; + } +} diff --git a/src/views/goverment/huizhou/smartConstructionSite/index.scss b/src/views/goverment/huizhou/smartConstructionSite/index.scss index 9b33f4b..dba26ed 100644 --- a/src/views/goverment/huizhou/smartConstructionSite/index.scss +++ b/src/views/goverment/huizhou/smartConstructionSite/index.scss @@ -227,6 +227,9 @@ .tab.active { color: #0bc4f0; } + .tab-wrapper { + display: none; + } .isActive { background-color: #09314e; } diff --git a/src/views/goverment/huizhou/smartConstructionSite/index.vue b/src/views/goverment/huizhou/smartConstructionSite/index.vue index e5b8389..2a79ef0 100644 --- a/src/views/goverment/huizhou/smartConstructionSite/index.vue +++ b/src/views/goverment/huizhou/smartConstructionSite/index.vue @@ -138,7 +138,7 @@ const BDMaps = ref({}); const router = useRouter(); const globalStore = GlobalStore(); -const active = ref(0); +const active = ref(1); const pages = ref({ pageNo: 1, pageSize: 7, @@ -397,7 +397,7 @@ onMounted(async () => { getproList(); await mapData(); addMarker(); - await getAIproPage(); + await getAIengPage(); onSearch(records.value[0]); // addMarker(); });