admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-08-18 18:48:01 +08:00
parent 330abe56a3
commit 1bf1b3f780
13 changed files with 101 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -2,9 +2,9 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/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_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=' # VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

2
src/main.ts
View File

@ -31,7 +31,7 @@ import I18n from "@/languages/index";
// pinia store // pinia store
import pinia from "@/stores/index"; import pinia from "@/stores/index";
// rem自适应 // rem自适应
// import "amfe-flexible/index.js"; import "amfe-flexible/index.js";
// errorHandler // errorHandler
// import errorHandler from "@/utils/errorHandler"; // import errorHandler from "@/utils/errorHandler";

6
src/views/enterprise/progressManagement/ganttChart/index.vue
View File

@ -269,12 +269,12 @@ const getDataList = async () => {
const arr = dealArr(res.result); const arr = dealArr(res.result);
projects.value = arr; projects.value = arr;
} }
setTimeout(function () {
setGantts();
}, 300);
} else { } else {
projects.value = []; projects.value = [];
} }
setTimeout(function () {
setGantts();
}, 300);
}; };
const dealArr = arr => { const dealArr = arr => {
arr.map(item => { arr.map(item => {

25
src/views/goverment/AIwarning/accessSituation/index.vue
View File

@ -338,21 +338,30 @@ const handSearch = async () => {
const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
const { result } = await getAIQuestionPage( const { result } = await getAIQuestionPage(
active.value === 0 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, pageNo: pageable.value.pageNo,
pageSize: pageable.value.pageSize pageSize: pageable.value.pageSize
} }
); );
questList.value = result.records; if (result) {
pageable.value.total = Number(result.total); questList.value = result.records;
pageable.value.total = Number(result.total);
} else {
questList.value = [];
pageable.value.total = 0;
}
active.value === 0 active.value === 0
? (searchSn.value = (params as ResAiProjectPage).projectSn) ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "")
: (searchSn.value = (params as ResAiEngineerPage).engineeringSn); : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : "");
active.value === 0 active.value === 0
? (searchName.value = (params as ResAiProjectPage).projectName) ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "")
: (searchName.value = (params as ResAiEngineerPage).engineeringName); : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : "");
// 清空form // 清空form
form.value = { form.value = {
code: "", code: "",

18
src/views/goverment/AIwarning/alarmRecord/index.vue
View File

@ -239,7 +239,15 @@ const dataCallback = (data: any) => {
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList" // 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"
const getTableList = (params: any) => { const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params)); 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); return getAIRecordPage(newParams);
}; };
@ -252,11 +260,11 @@ const getTableList = (params: any) => {
const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
// changeColor(); // changeColor();
active.value === 0 active.value === 0
? (searchSn.value = (params as ResAiProjectPage).projectSn) ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "")
: (searchSn.value = (params as ResAiEngineerPage).engineeringSn); : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : "");
active.value === 0 active.value === 0
? (searchName.value = (params as ResAiProjectPage).projectName) ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "")
: (searchName.value = (params as ResAiEngineerPage).engineeringName); : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : "");
proTable.value.getTableList(); proTable.value.getTableList();
}; };

13
src/views/goverment/progressManagement/GanttchartChart/index.vue
View File

@ -232,6 +232,7 @@ const searchSn = ref("");
// 页面的项目名称和工程名称的div点击事件 // 页面的项目名称和工程名称的div点击事件
const onSearch = async (params: any) => { const onSearch = async (params: any) => {
console.log(params);
// const { result } = await getAIQuestionPage( // const { result } = await getAIQuestionPage(
// active.value === 0 // active.value === 0
// ? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize } // ? { 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); // pageable.value.total = Number(result.total);
active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn); active.value === 0 ? (searchSn.value = params ? params.projectSn : "") : (searchSn.value = params ? params.engineeringSn : "");
active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName); active.value === 0
? (searchName.value = params ? params.projectName : "")
: (searchName.value = params ? params.engineeringName : "");
getDataList(); getDataList();
}; };
// leftMenu页面的搜索按钮 // leftMenu页面的搜索按钮
@ -334,12 +337,12 @@ const getDataList = async () => {
const arr = dealArr(res.result); const arr = dealArr(res.result);
projects.value = arr; projects.value = arr;
} }
setTimeout(function () {
setGantts();
}, 300);
} else { } else {
projects.value = []; projects.value = [];
} }
setTimeout(function () {
setGantts();
}, 300);
}; };
const dealArr = arr => { const dealArr = arr => {
arr.map(item => { arr.map(item => {

7
src/views/goverment/progressManagement/divisionsAndISubItems/index.vue
View File

@ -366,7 +366,6 @@ const getDataList = async () => {
} else { } else {
tableData.value = []; tableData.value = [];
} }
console.log(res);
}; };
// 搜索用的项目sn或者工程sn // 搜索用的项目sn或者工程sn
const searchSn = ref(""); const searchSn = ref("");
@ -385,8 +384,10 @@ const onSearch = async (params: any) => {
// } // }
// ); // );
// pageable.value.total = Number(result.total); // pageable.value.total = Number(result.total);
active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn); active.value === 0 ? (searchSn.value = params ? params.projectSn : "") : (searchSn.value = params ? params.engineeringSn : "");
active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName); active.value === 0
? (searchName.value = params ? params.projectName : "")
: (searchName.value = params ? params.engineeringName : "");
getDataList(); getDataList();
}; };
// leftMenu页面的搜索按钮 // leftMenu页面的搜索按钮

18
src/views/goverment/progressManagement/investmentPayment/index.vue
View File

@ -294,10 +294,14 @@ const getTableList = (params: any) => {
newParams.contractTime_end = newParams.contractTime[1]; newParams.contractTime_end = newParams.contractTime[1];
delete newParams.contractTime; delete newParams.contractTime;
} }
if (active.value === 0) { if (searchSn.value) {
newParams.projectSn = searchSn.value; if (active.value === 0) {
newParams.projectSn = searchSn.value;
} else {
newParams.engineeringSn = searchSn.value;
}
} else { } else {
newParams.engineeringSn = searchSn.value; return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
} }
return payGovermentList(newParams); return payGovermentList(newParams);
}; };
@ -305,11 +309,11 @@ const getTableList = (params: any) => {
const onSearch = async (params: any) => { const onSearch = async (params: any) => {
console.log(params); console.log(params);
if (active.value === 0) { if (active.value === 0) {
searchSn.value = params.projectSn; searchSn.value = params ? params.projectSn : "";
searchName.value = params.projectName; searchName.value = params ? params.projectName : "";
} else { } else {
searchSn.value = params.engineeringSn; searchSn.value = params ? params.engineeringSn : "";
searchName.value = params.engineeringName; searchName.value = params ? params.engineeringName : "";
} }
proTable.value.getTableList(); proTable.value.getTableList();
}; };

16
src/views/goverment/progressManagement/panoramicPlan/index.vue
View File

@ -394,17 +394,23 @@ const getTableList = (params: any) => {
newParams.realCompleteTime_end = newParams.realCompleteTime[1]; newParams.realCompleteTime_end = newParams.realCompleteTime[1];
delete newParams.realCompleteTime; delete newParams.realCompleteTime;
} }
if (active.value === 0) { if (searchSn.value) {
newParams.projectSn = searchSn.value; if (active.value === 0) {
newParams.projectSn = searchSn.value;
} else {
newParams.engineeringSn = searchSn.value;
}
} else { } else {
newParams.engineeringSn = searchSn.value; return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
} }
return globalPlanGovermentList(newParams); return globalPlanGovermentList(newParams);
}; };
// 页面的项目名称和工程名称的div点击事件 // 页面的项目名称和工程名称的div点击事件
const onSearch = async (params: any) => { const onSearch = async (params: any) => {
active.value === 0 ? (searchSn.value = params.projectSn) : (searchSn.value = params.engineeringSn); active.value === 0 ? (searchSn.value = params ? params.projectSn : "") : (searchSn.value = params ? params.engineeringSn : "");
active.value === 0 ? (searchName.value = params.projectName) : (searchName.value = params.engineeringName); active.value === 0
? (searchName.value = params ? params.projectName : "")
: (searchName.value = params ? params.engineeringName : "");
proTable.value.getTableList(); proTable.value.getTableList();
}; };
// leftMenu页面的搜索按钮 // leftMenu页面的搜索按钮

18
src/views/goverment/progressManagement/planFinishSituation/index.vue
View File

@ -170,11 +170,11 @@ const columns: ColumnProps[] = [
const onSearch = async (params: any) => { const onSearch = async (params: any) => {
console.log(params); console.log(params);
if (active.value === 0) { if (active.value === 0) {
searchSn.value = params.projectSn; searchSn.value = params ? params.projectSn : "";
searchName.value = params.projectName; searchName.value = params ? params.projectName : "";
} else { } else {
searchSn.value = params.engineeringSn; searchSn.value = params ? params.engineeringSn : "";
searchName.value = params.engineeringName; searchName.value = params ? params.engineeringName : "";
} }
proTable.value.getTableList(); proTable.value.getTableList();
}; };
@ -259,10 +259,14 @@ const getTableList = (params: any) => {
newParams.contractTime_end = newParams.contractTime[1]; newParams.contractTime_end = newParams.contractTime[1];
delete newParams.contractTime; delete newParams.contractTime;
} }
if (active.value === 0) { if (searchSn.value) {
newParams.projectSn = searchSn.value; if (active.value === 0) {
newParams.projectSn = searchSn.value;
} else {
newParams.engineeringSn = searchSn.value;
}
} else { } else {
newParams.engineeringSn = searchSn.value; return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
} }
return applyTimeGovermentList(newParams); return applyTimeGovermentList(newParams);
}; };

15
src/views/goverment/unmannedVideo/accessSituation/index.vue
View File

@ -125,8 +125,8 @@ import { ref, reactive, onMounted, watch } from "vue";
import { import {
getUnmannedProjectPage, getUnmannedProjectPage,
getUnmannedEngineeringPage, getUnmannedEngineeringPage,
getUnmannedPage getUnmannedPage,
// addAIrecords, addAIrecords
// getAiMonitorDev // getAiMonitorDev
} from "@/api/modules/goverment"; } from "@/api/modules/goverment";
import LeftMenu from "@/components/LeftMenu/LeftMenu.vue"; import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
@ -326,12 +326,13 @@ const handSearch = async () => {
}; };
// 页面的项目名称和工程名称的div点击事件 // 页面的项目名称和工程名称的div点击事件
const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
console.log(params);
active.value === 0 active.value === 0
? (searchSn.value = (params as ResAiProjectPage).projectSn) ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "")
: (searchSn.value = (params as ResAiEngineerPage).engineeringSn); : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : "");
active.value === 0 active.value === 0
? (searchName.value = (params as ResAiProjectPage).projectName) ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "")
: (searchName.value = (params as ResAiEngineerPage).engineeringName); : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : "");
// 清空form // 清空form
form.value = { form.value = {
title: "", title: "",
@ -381,14 +382,12 @@ const getAIproPage = async () => {
const { result } = await getUnmannedProjectPage(pages.value); const { result } = await getUnmannedProjectPage(pages.value);
records.value = result.records; records.value = result.records;
pages.value.total = Number(result.total); pages.value.total = Number(result.total);
searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
}; };
// 获取工程名称分页 // 获取工程名称分页
const getAIengPage = async () => { const getAIengPage = async () => {
const { result } = await getUnmannedEngineeringPage(pages.value); const { result } = await getUnmannedEngineeringPage(pages.value);
records.value = result.records; records.value = result.records;
pages.value.total = +result.total; pages.value.total = +result.total;
searchSn.value = (records.value as ResAiProjectPage[])[0].engineeringSn;
}; };
// 这里监控名称的下拉框列表 // 这里监控名称的下拉框列表

16
src/views/goverment/unmannedVideo/alarmRecord/index.vue
View File

@ -249,8 +249,12 @@ const dataCallback = (data: any) => {
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList" // 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"
const getTableList = (params: any) => { const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params)); let newParams = JSON.parse(JSON.stringify(params));
active.value === 0 ? (newParams.projectSn = searchSn.value) : (newParams.engineeringSn = searchSn.value); if (searchSn.value) {
newParams.dname = searchParams.value.dname || ""; 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); return getDevicePage(newParams);
}; };
@ -263,11 +267,11 @@ const getTableList = (params: any) => {
const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => { const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
// changeColor(); // changeColor();
active.value === 0 active.value === 0
? (searchSn.value = (params as ResAiProjectPage).projectSn) ? (searchSn.value = params ? (params as ResAiProjectPage).projectSn : "")
: (searchSn.value = (params as ResAiEngineerPage).engineeringSn); : (searchSn.value = params ? (params as ResAiEngineerPage).engineeringSn : "");
active.value === 0 active.value === 0
? (searchName.value = (params as ResAiProjectPage).projectName) ? (searchName.value = params ? (params as ResAiProjectPage).projectName : "")
: (searchName.value = (params as ResAiEngineerPage).engineeringName); : (searchName.value = params ? (params as ResAiEngineerPage).engineeringName : "");
proTable.value.getTableList(); proTable.value.getTableList();
}; };

6
src/views/project/progressManagement/ganttChart/index.vue
View File

@ -302,12 +302,12 @@ const getDataList = async () => {
const arr = dealArr(res.result); const arr = dealArr(res.result);
projects.value = arr; projects.value = arr;
} }
setTimeout(function () {
setGantts();
}, 300);
} else { } else {
projects.value = []; projects.value = [];
} }
setTimeout(function () {
setGantts();
}, 300);
}; };
const dealArr = arr => { const dealArr = arr => {
arr.map(item => { arr.map(item => {