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-08 17:39:16 +08:00
parent da699ca909
commit f37a62f26c
19 changed files with 238 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/modules/enterpriseApi.ts
View File

@ -386,10 +386,14 @@ export const equipEdit = (params: FormData) => {
export const equipDelete = (params: any) => {
return http.post(BASEURL + `/ent/unmannedDevice/delete`, params);
};
// 分页列表查询工程信息
// 分页列表查询工程影像信息
export const getengineeringPage = (params: User.ReqUserParams) => {
return http.post<ResPage<User.ResUserList>>(BASEURL + `/ent/unmannedVideo/engineeringPage`, params);
};
// 分页列表查询工程设备信息
export const getengineeringEquipPage = (params: User.ReqUserParams) => {
return http.post<ResPage<User.ResUserList>>(BASEURL + `/ent/unmannedDevice/engineeringPage`, params);
};
// 分部分项
// 分部分项全部数据

6
src/views/enterprise/qualitySupervision/index.vue
View File

@ -220,8 +220,14 @@ onMounted(() => {
}
}
.table {
height: calc(100% - 133px);
position: relative;
z-index: 500;
:deep() {
.table-main {
height: calc(100% - 82px);
}
}
}
}
</style>

6
src/views/enterprise/safetySupervision/index.vue
View File

@ -220,8 +220,14 @@ onMounted(() => {
}
}
.table {
height: calc(100% - 133px);
position: relative;
z-index: 500;
:deep() {
.table-main {
height: calc(100% - 82px);
}
}
}
}
</style>

14
src/views/enterprise/unmannedVideo/equipList/index.vue
View File

@ -17,7 +17,7 @@
<div class="leftMenu_item">
<div class="video">
<img src="@/assets/images/leftTab/设备列表.png" alt="" />
<span class="middleSize">影像视频数：{{ data.deviceNum }}</span>
<span class="middleSize">接入无人机总数：{{ data.deviceNum }}</span>
</div>
</div>
</div>
@ -108,7 +108,7 @@ import { ColumnProps } from "@/components/ProTable/interface";
import { useHandleData } from "@/hooks/useHandleData";
import ProTable from "@/components/ProTable/index.vue";
import { jxj_User } from "@/api/types";
import { equipList, equipAdd, equipEdit, equipDelete, getengineeringPage } from "@/api/modules/enterpriseApi";
import { equipList, equipAdd, equipEdit, equipDelete, getengineeringEquipPage } from "@/api/modules/enterpriseApi";
import { Delete } from "@element-plus/icons-vue";
import { GlobalStore } from "@/stores";
@ -240,7 +240,7 @@ const onSearchInput = async (params: string) => {
const { result } = await getAIprojectPage({ projectName: params, ...pages.value });
records.value = result.records;
} else {
const { result } = await getengineeringPage({ engineeringName: params, ...pages.value });
const { result } = await getengineeringEquipPage({ engineeringName: params, ...pages.value });
records.value = result.records;
}
};
@ -250,7 +250,7 @@ const onCurChange = async (params: number) => {
const { result } = await getAIprojectPage({ ...pages.value, pageNo: params });
records.value = result.records;
} else {
const { result } = await getengineeringPage({ ...pages.value, pageNo: params });
const { result } = await getengineeringEquipPage({ ...pages.value, pageNo: params });
records.value = result.records;
pages.value.total = +result.total;
}
@ -270,6 +270,7 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => {
const res = await equipAdd(form);
ElMessage.success("保存成功");
visible.value = false;
getAIengPage();
}
proTable.value.getTableList();
} else {
@ -315,10 +316,10 @@ const getTableList = (params: any) => {
};
const handleAddItem = (index: number, row: any) => {
ruleFormRef.value?.resetFields();
if (index === 1) {
title.value = "新增设备";
formData.value = reactive({});
ruleFormRef.value?.resetFields();
} else {
title.value = "编辑设备";
formData.value = reactive({ ...row });
@ -330,10 +331,11 @@ const handleAddItem = (index: number, row: any) => {
const deleteAccount = async (params: jxj_User.ResUserList) => {
await useHandleData(equipDelete, { id: params.id }, `删除【${params.dname}】`);
proTable.value.getTableList();
getAIengPage();
};
// 获取工程名称分页
const getAIengPage = async () => {
const { result } = await getengineeringPage(pages.value);
const { result } = await getengineeringEquipPage(pages.value);
records.value = result.records;
pages.value.total = +result.total;
};

69
src/views/enterprise/unmannedVideo/videoData/index.vue
View File

@ -17,7 +17,7 @@
<div class="leftMenu_item">
<div class="video">
<img src="@/assets/images/leftTab/设备列表.png" alt="" />
<span class="middleSize">影像视频数：{{ data.deviceNum }}</span>
<span class="middleSize">影像视频数：{{ data.videoNum }}</span>
</div>
</div>
</div>
@ -29,7 +29,7 @@
<el-form-item label="标题">
<el-input v-model="form.title" placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="创建时间">
<el-form-item label="上传时间">
<el-date-picker
v-model="form.createTime"
type="daterange"
@ -38,12 +38,11 @@
end-placeholder="结束日期"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
@change="onDatePicker"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button style="background-color: #ffb750; color: #fff">刷新</el-button>
<el-button style="background-color: #ffb750; color: #fff" @click="refresh">刷新</el-button>
<el-button class="addButtonStyle" @click="addVideoData">新增</el-button>
</el-form-item>
</el-form>
@ -232,16 +231,16 @@ const beforeUpload = file => {
};
// 页面的项目名称和工程名称的div点击事件
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 }
: {
engineeringSn: (params as ResAiEngineerPage).engineeringSn,
pageNo: pageable.value.pageNo,
pageSize: pageable.value.pageSize
}
);
pageable.value.total = Number(result.total);
// const { result } = await getAIQuestionPage(
// active.value === 0
// ? { projectSn: (params as ResAiProjectPage).projectSn, pageNo: pageable.value.pageNo, pageSize: pageable.value.pageSize }
// : {
// engineeringSn: (params as ResAiEngineerPage).engineeringSn,
// pageNo: pageable.value.pageNo,
// pageSize: pageable.value.pageSize
// }
// );
// pageable.value.total = Number(result.total);
active.value === 0
? (searchSn.value = (params as ResAiProjectPage).projectSn)
: (searchSn.value = (params as ResAiEngineerPage).engineeringSn);
@ -277,7 +276,19 @@ const onCurChange = async (params: number) => {
const deleteAccount = async (params: jxj_User.ResUserList) => {
await useHandleData(videoDataDelete, { id: params.id }, `删除`);
getVideoData();
getAIengPage();
};
// 刷新
const refresh = () => {
form.value = {
title: "",
createTime: "",
startTime: "",
endTime: ""
};
getVideoData();
};
// 查询
const handleSearch = () => {
console.log(666);
getVideoData();
@ -290,20 +301,19 @@ const handleEditItem = (index: number, row: any) => {
visible.value = true;
};
const getVideoData = async () => {
const res = await videoList({ ...pageable.value, ...form.value });
let requestData = {
...pageable.value,
...form.value,
startTime: form.value.createTime ? form.value.createTime[0] : "",
endTime: form.value.createTime ? form.value.createTime[1] : "",
engineeringSn: searchSn.value ? searchSn.value : ""
};
delete requestData.createTime;
const res = await videoList(requestData);
videoData.value.records = res.result.records;
console.log(videoData.value);
console.log(res);
};
const handleExceed: UploadProps["onExceed"] = files => {
// console.log(1111);
// upload.value!.clearFiles();
// const file = files[0] as UploadRawFile;
// file.uid = genFileId();
// // fileList.value = file;
// upload.value!.handleStart(file);
// upload.value?.submit();
};
const uploadSuccess = (response: any) => {
ElMessage.success("上传成功");
@ -345,6 +355,7 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => {
ElMessage.success("保存成功");
visible.value = false;
getVideoData();
getAIengPage();
}
} else {
console.log("error submit!", fields);
@ -358,11 +369,6 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => {
};
// 页面的分页
const handleCurrentChange = async (page: number) => {};
// form日期选择后改变入参
const onDatePicker = () => {
form.value.startTime = form.value.createTime[0];
form.value.endTime = form.value.createTime[1];
};
// 获取工程名称分页
const getAIengPage = async () => {
const { result } = await getengineeringPage(pages.value);
@ -370,11 +376,10 @@ const getAIengPage = async () => {
pages.value.total = +result.total;
};
onMounted(async () => {
getVideoData();
await getAIengPage();
searchSn.value = (records.value as ResAiProjectPage[])[0].engineeringSn;
searchName.value = (records.value as ResAiProjectPage[])[0].engineeringName;
onSearch(records.value[0]);
searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;
searchName.value = (records.value as ResAiProjectPage[])[0].projectName;
});
</script>

16
src/views/goverment/qualitySupervision/checkStore/index.vue
View File

@ -2,12 +2,12 @@
<div class="store-box">
<div class="menu-content">
<div class="top-search">
<el-input placeholder="请输入检查项" v-model="bigForm.name" @input="getBigData" />
<el-input placeholder="请输入检查项" v-model="bigForm.name" @input="searchSelect" />
<!-- <span>质量检测库--大项</span> -->
<el-button type="primary" @click="opeateBigItem(1)">增加大项</el-button>
</div>
<div class="big-option">
<el-tree :data="bigData" :highlight-current="true" node-key="id" default-expand-all :expand-on-click-node="false">
<el-tree :data="bigSearchData" :highlight-current="true" node-key="id" default-expand-all :expand-on-click-node="false">
<template #default="{ node, data }">
<span class="custom-tree-node" @click.capture="selectTree(data)">
<span>{{ data.name }}</span>
@ -100,6 +100,7 @@ const formSmallData = ref({
});
const bigVisible = ref(false);
const smallVisible = ref(false);
const bigSearchData = ref([]);
const bigData = ref([
{
id: 1,
@ -186,6 +187,16 @@ const selectTree = data => {
treeData.value = data;
proTable.value.getTableList();
};
const searchSelect = () => {
if (bigForm.value.name) {
bigSearchData.value = bigData.value.filter(item => {
console.log(item.name);
return item.name == bigForm.value.name;
});
} else {
bigSearchData.value = bigData.value;
}
};
// 删除大项
const deleteBigItem = async (params: jxj_User.ResUserList) => {
await useHandleData(bigStoreDelete, { id: params.id }, `删除【${params.name}】`);
@ -255,6 +266,7 @@ const getBigData = async () => {
// 大项列表
const { result } = await bigStore({ name: bigForm.value.name, type: 2 });
bigData.value = result;
bigSearchData.value = result;
};
// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"

40
src/views/goverment/qualitySupervision/components/orderAdd.vue
View File

@ -75,10 +75,10 @@
<el-date-picker
v-model="basicData.deadline"
style="width: 180px; height: 26px"
type="datetime"
type="date"
placeholder="请选择日期"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:disabledDate="disabledDate"
/></el-col>
<el-col :span="8">
@ -511,9 +511,9 @@ const selectedMemberList = ref([]); // 选中的检查人员列表
const selectedSmallList = ref([]); // 选中的小项列表
// 设置日期的禁用状态
const disabledDate = date => {
let todayTime = new Date().getTime();
let toTodayTime = new Date().getTime() - 24 * 60 * 60 * 1000;
let dateTime = date.getTime();
if (dateTime < todayTime) {
if (dateTime < toTodayTime) {
return true;
} else {
return false;
@ -583,18 +583,23 @@ const addDangerRecord = () => {
};
const confirmMemberSelected = () => {
let selectedtext = "";
let selectedId = "";
selectedMemberList.value = noConfirmMemberList.value;
if (selectedMemberList.value.length > 0) {
for (let i = 0; i < selectedMemberList.value.length; i++) {
if (i == selectedMemberList.value.length - 1) {
selectedtext += selectedMemberList.value[i].realName;
selectedId += selectedMemberList.value[i].userId;
} else {
selectedtext += selectedMemberList.value[i].realName + ",";
selectedId += selectedMemberList.value[i].userId + ",";
}
}
basicData.value.selectedMember = selectedtext;
basicData.value.inspectUser = selectedId;
} else {
basicData.value.selectedMember = "";
basicData.value.inspectUser = "";
}
memberVisible.value = false;
};
@ -637,7 +642,8 @@ const getEngieerData = async () => {
let requestData = {
engineeringName: projectForm.value.name,
pageSize: -1,
pageNo: -1
pageNo: -1,
examineState: 3
};
const res = await getEngineeringApproveList(requestData);
projectTableData.value = res.result.records;
@ -646,7 +652,9 @@ const getEngieerData = async () => {
const getProjectData = async () => {
// 项目列表
let requestData = {
projectName: projectForm.value.name
projectName: projectForm.value.name,
pageSize: -1,
pageNo: -1
};
const res = await AIproList(requestData);
projectTableData.value = res.result;
@ -779,12 +787,28 @@ const allSubmit = async () => {
ElMessage.error("请选择整改期限");
return;
}
if (basicData.value.opSignature.length == 0) {
ElMessage.error("请上传施工单位责任人签名");
return;
}
if (basicData.value.supervisorSignature.length == 0) {
ElMessage.error("请上传监理单位责任人签名");
return;
}
if (basicData.value.inspectSignature.length == 0) {
ElMessage.error("请上传检查人员责任人签名");
return;
}
if (basicData.value.otherSignature.length == 0) {
ElMessage.error("请上传其他单位责任人签名");
return;
}
if (recordData.value.length == 0) {
ElMessage.error("请添加隐患问题");
return;
}
recordData.value.map(item => {
item.image = JSON.stringify(item.image);
item.image = item.image && item.length > 0 ? JSON.stringify(item.image) : null;
});
let requestData = {
...basicData.value,

10
src/views/goverment/qualitySupervision/components/transformInfo.vue
View File

@ -33,8 +33,9 @@
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
>
<span class="row-span" v-if="basicData?.engineeringName">工程名称：{{ basicData?.engineeringName }}</span>
<span class="row-span" v-else-if="basicData?.projectName">项目名称：{{ basicData?.projectName }}</span>
</el-col>
<el-col :span="8">
<span class="row-span">检查人员：{{ basicData?.inspectUserName }}</span></el-col
>
@ -411,10 +412,15 @@ onMounted(() => {});
.row {
margin-top: 14px;
.row-span {
display: inline-block;
width: 100%;
font-size: 12px;
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
> span {
font-weight: 400;
color: #008bff;

6
src/views/goverment/qualitySupervision/index.vue
View File

@ -233,8 +233,14 @@ onMounted(() => {
}
}
.table {
height: calc(100% - 133px);
position: relative;
z-index: 500;
:deep() {
.table-main {
height: calc(100% - 82px);
}
}
}
}
</style>

16
src/views/goverment/safetySupervision/checkStore/index.vue
View File

@ -2,12 +2,12 @@
<div class="store-box">
<div class="menu-content">
<div class="top-search">
<el-input placeholder="请输入检查项" v-model="bigForm.name" @input="getBigData" />
<el-input placeholder="请输入检查项" v-model="bigForm.name" @input="searchSelect" />
<!-- <span>安全检测库--大项</span> -->
<el-button type="primary" @click="opeateBigItem(1)">增加大项</el-button>
</div>
<div class="big-option">
<el-tree :data="bigData" :highlight-current="true" node-key="id" default-expand-all :expand-on-click-node="false">
<el-tree :data="bigSearchData" :highlight-current="true" node-key="id" default-expand-all :expand-on-click-node="false">
<template #default="{ node, data }">
<span class="custom-tree-node" @click.capture="selectTree(data)">
<span>{{ data.name }}</span>
@ -100,6 +100,7 @@ const formSmallData = ref({
});
const bigVisible = ref(false);
const smallVisible = ref(false);
const bigSearchData = ref([]);
const bigData = ref([]);
const bigForm = ref({
name: ""
@ -165,6 +166,16 @@ const selectTree = data => {
treeData.value = data;
proTable.value.getTableList();
};
const searchSelect = () => {
if (bigForm.value.name) {
bigSearchData.value = bigData.value.filter(item => {
console.log(item.name);
return item.name == bigForm.value.name;
});
} else {
bigSearchData.value = bigData.value;
}
};
// 删除大项
const deleteBigItem = async (params: jxj_User.ResUserList) => {
await useHandleData(bigStoreDelete, { id: params.id }, `删除【${params.name}】`);
@ -234,6 +245,7 @@ const getBigData = async () => {
// 大项列表
const { result } = await bigStore({ name: bigForm.value.name, type: 1 });
bigData.value = result;
bigSearchData.value = result;
};
// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"

40
src/views/goverment/safetySupervision/components/orderAdd.vue
View File

@ -75,10 +75,10 @@
<el-date-picker
v-model="basicData.deadline"
style="width: 180px; height: 26px"
type="datetime"
type="date"
placeholder="请选择日期"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:disabledDate="disabledDate"
/></el-col>
<el-col :span="8">
@ -509,9 +509,9 @@ const selectedMemberList = ref([]); // 选中的检查人员列表
const selectedSmallList = ref([]); // 选中的小项列表
// 设置日期的禁用状态
const disabledDate = date => {
let todayTime = new Date().getTime();
let toTodayTime = new Date().getTime() - 24 * 60 * 60 * 1000;
let dateTime = date.getTime();
if (dateTime < todayTime) {
if (dateTime < toTodayTime) {
return true;
} else {
return false;
@ -581,18 +581,23 @@ const addDangerRecord = () => {
};
const confirmMemberSelected = () => {
let selectedtext = "";
let selectedId = "";
selectedMemberList.value = noConfirmMemberList.value;
if (selectedMemberList.value.length > 0) {
for (let i = 0; i < selectedMemberList.value.length; i++) {
if (i == selectedMemberList.value.length - 1) {
selectedtext += selectedMemberList.value[i].realName;
selectedId += selectedMemberList.value[i].userId;
} else {
selectedtext += selectedMemberList.value[i].realName + ",";
selectedId += selectedMemberList.value[i].userId + ",";
}
}
basicData.value.selectedMember = selectedtext;
basicData.value.inspectUser = selectedId;
} else {
basicData.value.selectedMember = "";
basicData.value.inspectUser = "";
}
memberVisible.value = false;
};
@ -635,7 +640,8 @@ const getEngieerData = async () => {
let requestData = {
engineeringName: projectForm.value.name,
pageSize: -1,
pageNo: -1
pageNo: -1,
examineState: 3
};
const res = await getEngineeringApproveList(requestData);
projectTableData.value = res.result.records;
@ -644,7 +650,9 @@ const getEngieerData = async () => {
const getProjectData = async () => {
// 项目列表
let requestData = {
projectName: projectForm.value.name
projectName: projectForm.value.name,
pageSize: -1,
pageNo: -1
};
const res = await AIproList(requestData);
projectTableData.value = res.result;
@ -761,12 +769,28 @@ const allSubmit = async () => {
ElMessage.error("请选择整改期限");
return;
}
if (basicData.value.opSignature.length == 0) {
ElMessage.error("请上传施工单位责任人签名");
return;
}
if (basicData.value.supervisorSignature.length == 0) {
ElMessage.error("请上传监理单位责任人签名");
return;
}
if (basicData.value.inspectSignature.length == 0) {
ElMessage.error("请上传检查人员责任人签名");
return;
}
if (basicData.value.otherSignature.length == 0) {
ElMessage.error("请上传其他单位责任人签名");
return;
}
if (recordData.value.length == 0) {
ElMessage.error("请添加隐患问题");
return;
}
recordData.value.map(item => {
item.image = JSON.stringify(item.image);
item.image = item.image && item.length > 0 ? JSON.stringify(item.image) : null;
});
let requestData = {
...basicData.value,

10
src/views/goverment/safetySupervision/components/transformInfo.vue
View File

@ -33,8 +33,9 @@
</span>
</el-col>
<el-col :span="8">
<span class="row-span">工程名称：{{ basicData?.engineeringName }}</span></el-col
>
<span class="row-span" v-if="basicData?.engineeringName">工程名称：{{ basicData?.engineeringName }}</span>
<span class="row-span" v-if="basicData?.projectName">项目名称：{{ basicData?.projectName }}</span>
</el-col>
<el-col :span="8">
<span class="row-span">检查人员：{{ basicData?.inspectUserName }}</span></el-col
>
@ -419,10 +420,15 @@ onMounted(() => {});
.row {
margin-top: 14px;
.row-span {
display: inline-block;
width: 100%;
font-size: 12px;
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
> span {
font-weight: 400;
color: #008bff;

6
src/views/goverment/safetySupervision/index.vue
View File

@ -232,8 +232,14 @@ onMounted(() => {
}
}
.table {
height: calc(100% - 133px);
position: relative;
z-index: 500;
:deep() {
.table-main {
height: calc(100% - 82px);
}
}
}
}
</style>

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

@ -31,9 +31,9 @@
<!-- <el-select class="select" clearable v-model="form.code" placeholder="请输入">
<el-option v-for="item in nameList" :key="item.code" :label="item.name" :value="item.code" />
</el-select> -->
<el-input v-model="form.title" placeholder="请输入" clearable />
<el-input style="width: 200px" v-model="form.title" placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="创建时间">
<el-form-item label="上传时间">
<el-date-picker
v-model="form.createTime"
type="daterange"
@ -49,7 +49,7 @@
<el-button type="primary" @click="handSearch">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" @click="handleCurrentChange(1)">刷新</el-button>
<el-button type="warning" @click="refresh">刷新</el-button>
</el-form-item>
</el-form>
<!-- </div> -->
@ -309,7 +309,16 @@ const onDatePicker = () => {
form.value.startTime = form.value.createTime[0];
form.value.endTime = form.value.createTime[1];
};
// 刷新
const refresh = () => {
form.value = {
title: "",
createTime: "",
startTime: "",
endTime: ""
};
handSearch();
};
// 页面的form搜索 这里
const handSearch = async () => {
const res = await getUnmannedPage(

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

@ -28,15 +28,13 @@
<div class="right_container">
<el-form :model="form" :inline="true" @submit.prevent class="form" ref="FormRef">
<el-form-item label="设备名称">
<el-select class="select" clearable v-model="form.code" placeholder="请输入">
<el-option v-for="item in nameList" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-input style="width: 200px" v-model="searchParams.dname" clearable placeholder="请输入" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handSearch">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" @click="handleCurrentChange(1)">刷新</el-button>
<el-button type="warning" @click="handSearch">刷新</el-button>
</el-form-item>
</el-form>
<ProTable
@ -135,8 +133,9 @@ import { ColumnProps } from "@/components/ProTable/interface";
import { getDeviceProjectPage, getDeviceEngineeringPage, getAIQuestionPage, getDevicePage } from "@/api/modules/goverment";
import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
import { json } from "stream/consumers";
const searchParams = ref({
dname: ""
});
const proTable = ref();
const active = ref(0);
@ -229,7 +228,9 @@ watch(
}
}
);
const handSearch = () => {
proTable.value.getTableList();
};
// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
const dataCallback = (data: any) => {
@ -246,6 +247,7 @@ const dataCallback = (data: any) => {
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 || "";
return getDevicePage(newParams);
};

6
src/views/project/qualitySupervision/index.vue
View File

@ -221,8 +221,14 @@ onMounted(() => {
}
}
.table {
height: calc(100% - 133px);
position: relative;
z-index: 500;
:deep() {
.table-main {
height: calc(100% - 82px);
}
}
}
}
</style>

6
src/views/project/safetySupervision/index.vue
View File

@ -218,8 +218,14 @@ onMounted(() => {
}
}
.table {
height: calc(100% - 133px);
position: relative;
z-index: 500;
:deep() {
.table-main {
height: calc(100% - 82px);
}
}
}
}
</style>

2
src/views/project/unmannedVideo/equipList/index.vue
View File

@ -241,10 +241,10 @@ const getTableList = (params: any) => {
};
const handleAddItem = (index: number, row: any) => {
ruleFormRef.value?.resetFields();
if (index === 1) {
title.value = "新增设备";
formData.value = reactive({});
ruleFormRef.value?.resetFields();
} else {
title.value = "编辑设备";
formData.value = reactive({ ...row });

31
src/views/project/unmannedVideo/videoData/index.vue
View File

@ -6,7 +6,7 @@
<el-form-item label="标题">
<el-input v-model="form.title" placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="创建时间">
<el-form-item label="上传时间">
<el-date-picker
v-model="form.createTime"
type="daterange"
@ -15,12 +15,11 @@
end-placeholder="结束日期"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
@change="onDatePicker"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button style="background-color: #ffb750; color: #fff">刷新</el-button>
<el-button style="background-color: #ffb750; color: #fff" @click="refresh">刷新</el-button>
<el-button class="addButtonStyle" @click="addVideoData">新增</el-button>
</el-form-item>
</el-form>
@ -194,6 +193,17 @@ const deleteAccount = async (params: jxj_User.ResUserList) => {
await useHandleData(videoDataDelete, { id: params.id }, `删除`);
getVideoData();
};
// 刷新
const refresh = () => {
form.value = {
title: "",
createTime: "",
startTime: "",
endTime: ""
};
getVideoData();
};
// 查询
const handleSearch = () => {
console.log(666);
getVideoData();
@ -206,7 +216,14 @@ const handleEditItem = (index: number, row: any) => {
visible.value = true;
};
const getVideoData = async () => {
const res = await videoList({ ...pageable.value, ...form.value });
let requestData = {
...pageable.value,
...form.value,
startTime: form.value.createTime ? form.value.createTime[0] : "",
endTime: form.value.createTime ? form.value.createTime[1] : ""
};
delete requestData.createTime;
const res = await videoList(requestData);
videoData.value.records = res.result.records;
console.log(videoData.value);
console.log(res);
@ -271,15 +288,9 @@ const confirm = async (formEl: FormInstance | undefined, form: any) => {
};
// 页面的分页
const handleCurrentChange = async (page: number) => {};
// form日期选择后改变入参
const onDatePicker = () => {
form.value.startTime = form.value.createTime[0];
form.value.endTime = form.value.createTime[1];
};
onMounted(async () => {
getVideoData();
getNameData();
});
</script>