|
@@ -32,14 +32,8 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item> -->
|
|
</el-form-item> -->
|
|
|
<el-form-item label="通知区域">
|
|
<el-form-item label="通知区域">
|
|
|
- <el-select v-model="queryParams.queryParam.type" clearable placeholder="选择通知区域" style="width: 170px">
|
|
|
|
|
- <el-option :value="1" label="公共区域" />
|
|
|
|
|
- <el-option :value="2" label="非公共区域" />
|
|
|
|
|
- </el-select>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- <el-form-item label="分组名称">
|
|
|
|
|
- <el-select v-model="queryParams.queryParam.userGroupId" placeholder="分组名称" style="width: 170px">
|
|
|
|
|
- <el-option v-for="group in groupList" :key="group.id" :label="group.name" :value="group.id" />
|
|
|
|
|
|
|
+ <el-select v-model="queryParams.queryParam.safetyAreaId" clearable placeholder="选择通知区域" style="width: 170px">
|
|
|
|
|
+ <el-option v-for="group in areaCheckListQueryList" :key="group.id" :label="group.nameFunction" :value="group.id" />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="计划日期">
|
|
<el-form-item label="计划日期">
|
|
@@ -52,6 +46,9 @@
|
|
|
style="width: 230px"
|
|
style="width: 230px"
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+ <el-form-item label="关键词">
|
|
|
|
|
+ <el-input v-model="queryParams.queryParam.keyWord" placeholder="关键词内容" style="width: 170px"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
|
|
|
|
|
<div>
|
|
<div>
|
|
@@ -129,6 +126,7 @@
|
|
|
safetyNoticeAdminExportIssuedObject,
|
|
safetyNoticeAdminExportIssuedObject,
|
|
|
safetyResponsibilityAdminDeleteIssuedObject,
|
|
safetyResponsibilityAdminDeleteIssuedObject,
|
|
|
safetyNoticeAdminScrap,
|
|
safetyNoticeAdminScrap,
|
|
|
|
|
+ areaCheckListQueryPage,
|
|
|
} from '@/api/production-safety/responsibility-implementation';
|
|
} from '@/api/production-safety/responsibility-implementation';
|
|
|
import { downloadByData } from '@/utils/file/download';
|
|
import { downloadByData } from '@/utils/file/download';
|
|
|
import { unformatAttachment } from '@/components/UploadFiles/utils';
|
|
import { unformatAttachment } from '@/components/UploadFiles/utils';
|
|
@@ -147,9 +145,17 @@
|
|
|
status: '',
|
|
status: '',
|
|
|
date: '',
|
|
date: '',
|
|
|
type: route.query.type || '',
|
|
type: route.query.type || '',
|
|
|
|
|
+ safetyAreaId: '',
|
|
|
|
|
+ keyWord: '',
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+ const queryParamsTow = reactive<any>({
|
|
|
|
|
+ pageNumber: 1,
|
|
|
|
|
+ pageSize: 9999,
|
|
|
|
|
+ queryParam: {},
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
const detailData = reactive({
|
|
const detailData = reactive({
|
|
|
createdAt: '',
|
|
createdAt: '',
|
|
|
createdByName: '',
|
|
createdByName: '',
|
|
@@ -162,6 +168,8 @@
|
|
|
total: 0,
|
|
total: 0,
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+ const areaCheckListQueryList = ref<any>([]);
|
|
|
|
|
+
|
|
|
const handleQueryUserGroupPage = () => {
|
|
const handleQueryUserGroupPage = () => {
|
|
|
queryUserGroupPage({
|
|
queryUserGroupPage({
|
|
|
pageNumber: 1,
|
|
pageNumber: 1,
|
|
@@ -254,11 +262,19 @@
|
|
|
status: '',
|
|
status: '',
|
|
|
date: '',
|
|
date: '',
|
|
|
userGroupId: '',
|
|
userGroupId: '',
|
|
|
|
|
+ safetyAreaId: '',
|
|
|
|
|
+ keyWord: '',
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
queryTableList();
|
|
queryTableList();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ const areaCheckListPost = () => {
|
|
|
|
|
+ areaCheckListQueryPage(queryParamsTow).then((res) => {
|
|
|
|
|
+ areaCheckListQueryList.value = res.records;
|
|
|
|
|
+ });
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
watch(
|
|
watch(
|
|
|
() => activeTab.value,
|
|
() => activeTab.value,
|
|
|
(a) => {
|
|
(a) => {
|
|
@@ -279,6 +295,9 @@
|
|
|
await handleQueryUserGroupPage();
|
|
await handleQueryUserGroupPage();
|
|
|
|
|
|
|
|
queryTableList();
|
|
queryTableList();
|
|
|
|
|
+
|
|
|
|
|
+ areaCheckListPost();
|
|
|
|
|
+
|
|
|
});
|
|
});
|
|
|
</script>
|
|
</script>
|
|
|
|
|
|