diff --git a/.env.development b/.env.development index bd41f8a..ffefc80 100644 --- a/.env.development +++ b/.env.development @@ -2,9 +2,9 @@ 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_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_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/main.ts b/src/main.ts index 0caef04..8aa382a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -31,7 +31,7 @@ import I18n from "@/languages/index"; // pinia store import pinia from "@/stores/index"; // rem自适应 -// import "amfe-flexible/index.js"; +import "amfe-flexible/index.js"; // errorHandler // import errorHandler from "@/utils/errorHandler"; diff --git a/src/views/enterprise/progressManagement/ganttChart/index.vue b/src/views/enterprise/progressManagement/ganttChart/index.vue index be00359..880ee00 100644 --- a/src/views/enterprise/progressManagement/ganttChart/index.vue +++ b/src/views/enterprise/progressManagement/ganttChart/index.vue @@ -269,12 +269,12 @@ const getDataList = async () => { const arr = dealArr(res.result); projects.value = arr; } - setTimeout(function () { - setGantts(); - }, 300); } else { projects.value = []; } + setTimeout(function () { + setGantts(); + }, 300); }; const dealArr = arr => { arr.map(item => { diff --git a/src/views/goverment/AIwarning/accessSituation/index.vue b/src/views/goverment/AIwarning/accessSituation/index.vue index fae76ed..9eb4b69 100644 --- a/src/views/goverment/AIwarning/accessSituation/index.vue +++ b/src/views/goverment/AIwarning/accessSituation/index.vue @@ -338,21 +338,30 @@ const handSearch = async () => { const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { const { result } = await getAIQuestionPage( active.value === 0 - ? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize } + ? { + projectSn: params ? (params as ResAiProjectPage).projectSn : "", + pageNo: pageable.value.pageNo, + pageSize: pageable.value.pageSize + } : { - engineeringSn: (params as ResAiEngineerPage).engineeringSn, + engineeringSn: params ? (params as ResAiEngineerPage).engineeringSn : "", pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize } ); - questList.value = result.records; - pageable.value.total = Number(result.total); + if (result) { + questList.value = result.records; + pageable.value.total = Number(result.total); + } else { + questList.value = []; + pageable.value.total = 0; + } active.value === 0 - ? (searchSn.value = (params as ResAiProjectPage).projectSn) - : (searchSn.value = (params as ResAiEngineerPage).engineeringSn); + ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "") + : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : ""); active.value === 0 - ? (searchName.value = (params as ResAiProjectPage).projectName) - : (searchName.value = (params as ResAiEngineerPage).engineeringName); + ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "") + : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : ""); // 清空form form.value = { code: "", diff --git a/src/views/goverment/AIwarning/alarmRecord/index.vue b/src/views/goverment/AIwarning/alarmRecord/index.vue index 39574ff..189f0e1 100644 --- a/src/views/goverment/AIwarning/alarmRecord/index.vue +++ b/src/views/goverment/AIwarning/alarmRecord/index.vue @@ -239,7 +239,15 @@ const dataCallback = (data: any) => { // 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList" const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); - active.value === 0 ? (newParams.projectSn = searchSn.value) : (newParams.engineeringSn = searchSn.value); + if (searchSn.value) { + if (active.value === 0) { + newParams.projectSn = searchSn.value; + } else { + newParams.engineeringSn = searchSn.value; + } + } else { + return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; + } return getAIRecordPage(newParams); }; @@ -252,11 +260,11 @@ const getTableList = (params: any) => { const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { // changeColor(); active.value === 0 - ? (searchSn.value = (params as ResAiProjectPage).projectSn) - : (searchSn.value = (params as ResAiEngineerPage).engineeringSn); + ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "") + : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : ""); active.value === 0 - ? (searchName.value = (params as ResAiProjectPage).projectName) - : (searchName.value = (params as ResAiEngineerPage).engineeringName); + ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "") + : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : ""); proTable.value.getTableList(); }; diff --git a/src/views/goverment/progressManagement/GanttchartChart/index.vue b/src/views/goverment/progressManagement/GanttchartChart/index.vue index 05175be..0cc6a52 100644 --- a/src/views/goverment/progressManagement/GanttchartChart/index.vue +++ b/src/views/goverment/progressManagement/GanttchartChart/index.vue @@ -232,6 +232,7 @@ const searchSn = ref(""); // 页面的项目名称和工程名称的div点击事件 const onSearch = async (params: any) => { + console.log(params); // const { result } = await getAIQuestionPage( // active.value === 0 // ? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize } @@ -242,8 +243,10 @@ const onSearch = async (params: any) => { // } // ); // pageable.value.total = Number(result.total); - active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn); - active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName); + active.value === 0 ? (searchSn.value = params ? params.projectSn : "") : (searchSn.value = params ? params.engineeringSn : ""); + active.value === 0 + ? (searchName.value = params ? params.projectName : "") + : (searchName.value = params ? params.engineeringName : ""); getDataList(); }; // leftMenu页面的搜索按钮 @@ -334,12 +337,12 @@ const getDataList = async () => { const arr = dealArr(res.result); projects.value = arr; } - setTimeout(function () { - setGantts(); - }, 300); } else { projects.value = []; } + setTimeout(function () { + setGantts(); + }, 300); }; const dealArr = arr => { arr.map(item => { diff --git a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue index 34feee0..6501de6 100644 --- a/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue +++ b/src/views/goverment/progressManagement/divisionsAndISubItems/index.vue @@ -366,7 +366,6 @@ const getDataList = async () => { } else { tableData.value = []; } - console.log(res); }; // 搜索用的项目sn或者工程sn const searchSn = ref(""); @@ -385,8 +384,10 @@ const onSearch = async (params: any) => { // } // ); // pageable.value.total = Number(result.total); - active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn); - active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName); + active.value === 0 ? (searchSn.value = params ? params.projectSn : "") : (searchSn.value = params ? params.engineeringSn : ""); + active.value === 0 + ? (searchName.value = params ? params.projectName : "") + : (searchName.value = params ? params.engineeringName : ""); getDataList(); }; // leftMenu页面的搜索按钮 diff --git a/src/views/goverment/progressManagement/investmentPayment/index.vue b/src/views/goverment/progressManagement/investmentPayment/index.vue index 2735a89..f76408d 100644 --- a/src/views/goverment/progressManagement/investmentPayment/index.vue +++ b/src/views/goverment/progressManagement/investmentPayment/index.vue @@ -294,10 +294,14 @@ const getTableList = (params: any) => { newParams.contractTime_end = newParams.contractTime[1]; delete newParams.contractTime; } - if (active.value === 0) { - newParams.projectSn = searchSn.value; + if (searchSn.value) { + if (active.value === 0) { + newParams.projectSn = searchSn.value; + } else { + newParams.engineeringSn = searchSn.value; + } } else { - newParams.engineeringSn = searchSn.value; + return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; } return payGovermentList(newParams); }; @@ -305,11 +309,11 @@ const getTableList = (params: any) => { const onSearch = async (params: any) => { console.log(params); if (active.value === 0) { - searchSn.value = params.projectSn; - searchName.value = params.projectName; + searchSn.value = params ? params.projectSn : ""; + searchName.value = params ? params.projectName : ""; } else { - searchSn.value = params.engineeringSn; - searchName.value = params.engineeringName; + searchSn.value = params ? params.engineeringSn : ""; + searchName.value = params ? params.engineeringName : ""; } proTable.value.getTableList(); }; diff --git a/src/views/goverment/progressManagement/panoramicPlan/index.vue b/src/views/goverment/progressManagement/panoramicPlan/index.vue index 0b35df4..c65b3b2 100644 --- a/src/views/goverment/progressManagement/panoramicPlan/index.vue +++ b/src/views/goverment/progressManagement/panoramicPlan/index.vue @@ -394,17 +394,23 @@ const getTableList = (params: any) => { newParams.realCompleteTime_end = newParams.realCompleteTime[1]; delete newParams.realCompleteTime; } - if (active.value === 0) { - newParams.projectSn = searchSn.value; + if (searchSn.value) { + if (active.value === 0) { + newParams.projectSn = searchSn.value; + } else { + newParams.engineeringSn = searchSn.value; + } } else { - newParams.engineeringSn = searchSn.value; + return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; } return globalPlanGovermentList(newParams); }; // 页面的项目名称和工程名称的div点击事件 const onSearch = async (params: any) => { - active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn); - active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName); + active.value === 0 ? (searchSn.value = params ? params.projectSn : "") : (searchSn.value = params ? params.engineeringSn : ""); + active.value === 0 + ? (searchName.value = params ? params.projectName : "") + : (searchName.value = params ? params.engineeringName : ""); proTable.value.getTableList(); }; // leftMenu页面的搜索按钮 diff --git a/src/views/goverment/progressManagement/planFinishSituation/index.vue b/src/views/goverment/progressManagement/planFinishSituation/index.vue index c520de2..b37e8c1 100644 --- a/src/views/goverment/progressManagement/planFinishSituation/index.vue +++ b/src/views/goverment/progressManagement/planFinishSituation/index.vue @@ -170,11 +170,11 @@ const columns: ColumnProps[] = [ const onSearch = async (params: any) => { console.log(params); if (active.value === 0) { - searchSn.value = params.projectSn; - searchName.value = params.projectName; + searchSn.value = params ? params.projectSn : ""; + searchName.value = params ? params.projectName : ""; } else { - searchSn.value = params.engineeringSn; - searchName.value = params.engineeringName; + searchSn.value = params ? params.engineeringSn : ""; + searchName.value = params ? params.engineeringName : ""; } proTable.value.getTableList(); }; @@ -259,10 +259,14 @@ const getTableList = (params: any) => { newParams.contractTime_end = newParams.contractTime[1]; delete newParams.contractTime; } - if (active.value === 0) { - newParams.projectSn = searchSn.value; + if (searchSn.value) { + if (active.value === 0) { + newParams.projectSn = searchSn.value; + } else { + newParams.engineeringSn = searchSn.value; + } } else { - newParams.engineeringSn = searchSn.value; + return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; } return applyTimeGovermentList(newParams); }; diff --git a/src/views/goverment/unmannedVideo/accessSituation/index.vue b/src/views/goverment/unmannedVideo/accessSituation/index.vue index 9bf9ed7..f4474c5 100644 --- a/src/views/goverment/unmannedVideo/accessSituation/index.vue +++ b/src/views/goverment/unmannedVideo/accessSituation/index.vue @@ -125,8 +125,8 @@ import { ref, reactive, onMounted, watch } from "vue"; import { getUnmannedProjectPage, getUnmannedEngineeringPage, - getUnmannedPage - // addAIrecords, + getUnmannedPage, + addAIrecords // getAiMonitorDev } from "@/api/modules/goverment"; import LeftMenu from "@/components/LeftMenu/LeftMenu.vue"; @@ -326,12 +326,13 @@ const handSearch = async () => { }; // 页面的项目名称和工程名称的div点击事件 const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { + console.log(params); active.value === 0 - ? (searchSn.value = (params as ResAiProjectPage).projectSn) - : (searchSn.value = (params as ResAiEngineerPage).engineeringSn); + ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "") + : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : ""); active.value === 0 - ? (searchName.value = (params as ResAiProjectPage).projectName) - : (searchName.value = (params as ResAiEngineerPage).engineeringName); + ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "") + : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : ""); // 清空form form.value = { title: "", @@ -381,14 +382,12 @@ const getAIproPage = async () => { const { result } = await getUnmannedProjectPage(pages.value); records.value = result.records; pages.value.total = Number(result.total); - searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn; }; // 获取工程名称分页 const getAIengPage = async () => { const { result } = await getUnmannedEngineeringPage(pages.value); records.value = result.records; pages.value.total = +result.total; - searchSn.value = (records.value as ResAiProjectPage[])[0].engineeringSn; }; // 这里监控名称的下拉框列表 diff --git a/src/views/goverment/unmannedVideo/alarmRecord/index.vue b/src/views/goverment/unmannedVideo/alarmRecord/index.vue index 2fcf246..95dec0d 100644 --- a/src/views/goverment/unmannedVideo/alarmRecord/index.vue +++ b/src/views/goverment/unmannedVideo/alarmRecord/index.vue @@ -249,8 +249,12 @@ const dataCallback = (data: any) => { // 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList" const getTableList = (params: any) => { let newParams = JSON.parse(JSON.stringify(params)); - active.value === 0 ? (newParams.projectSn = searchSn.value) : (newParams.engineeringSn = searchSn.value); - newParams.dname = searchParams.value.dname || ""; + if (searchSn.value) { + active.value === 0 ? (newParams.projectSn = searchSn.value) : (newParams.engineeringSn = searchSn.value); + newParams.dname = searchParams.value.dname || ""; + } else { + return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } }; + } return getDevicePage(newParams); }; @@ -263,11 +267,11 @@ const getTableList = (params: any) => { const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { // changeColor(); active.value === 0 - ? (searchSn.value = (params as ResAiProjectPage).projectSn) - : (searchSn.value = (params as ResAiEngineerPage).engineeringSn); + ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "") + : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : ""); active.value === 0 - ? (searchName.value = (params as ResAiProjectPage).projectName) - : (searchName.value = (params as ResAiEngineerPage).engineeringName); + ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "") + : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : ""); proTable.value.getTableList(); }; diff --git a/src/views/project/progressManagement/ganttChart/index.vue b/src/views/project/progressManagement/ganttChart/index.vue index 0e9ed89..33870f0 100644 --- a/src/views/project/progressManagement/ganttChart/index.vue +++ b/src/views/project/progressManagement/ganttChart/index.vue @@ -302,12 +302,12 @@ const getDataList = async () => { const arr = dealArr(res.result); projects.value = arr; } - setTimeout(function () { - setGantts(); - }, 300); } else { projects.value = []; } + setTimeout(function () { + setGantts(); + }, 300); }; const dealArr = arr => { arr.map(item => {