From 631d029ec573c20c6a48a61d311d9390749e1fb3 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期三, 06 四月 2022 16:35:39 +0800 Subject: [PATCH] fix --- /dev/null | 6 --- src/views/safetyproduction/checklistself.vue | 23 +++++++++-- src/views/safetyproduction/feature.vue | 32 +++++++++++++++ src/views/contingencyplan/index.vue | 15 +++++++ 4 files changed, 63 insertions(+), 13 deletions(-) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <profile version="1.0"> - <option name="myName" value="Project Default" /> - <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" /> - </profile> -</component> \ No newline at end of file diff --git a/src/views/contingencyplan/index.vue b/src/views/contingencyplan/index.vue index 817bd15..ae5a316 100644 --- a/src/views/contingencyplan/index.vue +++ b/src/views/contingencyplan/index.vue @@ -7,7 +7,7 @@ <el-input v-model="listQuery.filter.name"></el-input> </el-form-item> </el-col> - <el-col :span="4" style="text-align: center"> + <el-col :span="5" style="text-align: center"> <el-button type="primary" class="btns" icon="el-icon-search" @click="find()" >搜索</el-button > @@ -18,6 +18,12 @@ class="btns" >新增</el-button > + <el-button + type="primary" + class="btns" + @click="reset()" + >重置</el-button + > </el-col> </el-row> </el-form> @@ -161,6 +167,13 @@ }, methods: { + reset(){ + this.listQuery.filter={} + this.listQuery.pageIndex=1 + this.listQuery.pageSize=10 + this.emergencyPlan(); + }, + downLoadFile(fileUrl){ return this.$confirm(`确定下载该文件?`,'提示',{ confirmButtonText:'确定', diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue index 1c02df8..47fa993 100644 --- a/src/views/safetyproduction/checklistself.vue +++ b/src/views/safetyproduction/checklistself.vue @@ -9,13 +9,13 @@ </el-col> <el-col :span="9"> <el-form-item label="检查时间"> - + <el-col :span="11"> <el-date-picker style="width:100%" v-model="listQuery.filter.inspectionStartTime" type="date" - format="yyyy-MM-dd" + format="yyyy-MM-dd" placeholder="选择开始日期" > </el-date-picker> @@ -26,7 +26,7 @@ v-model="listQuery.filter.inspectionEndTime" style="width:100%" type="date" - format="yyyy-MM-dd" + format="yyyy-MM-dd" placeholder="选择结束日期" > </el-date-picker> @@ -38,7 +38,7 @@ <el-input v-model="listQuery.filter.inspectorName"></el-input> </el-form-item> </el-col> - <el-col :span="4" style="text-align: center"> + <el-col :span="5" style="text-align: center"> <el-button type="primary" icon="el-icon-search" @@ -53,6 +53,12 @@ @click="jump()" >新增</el-button > + <el-button + type="primary" + class="btns" + @click="reset()" + >重置</el-button + > </el-col> </el-row> </el-form> @@ -132,6 +138,13 @@ this.safetySelfInspectionL(); }, methods: { + reset(){ + this.listQuery.filter={} + this.listQuery.pageIndex=1 + this.listQuery.pageSize=10 + this.safetySelfInspectionL(); + }, + async safetySelfInspectionL() { var res = await safetySelfInspectionList(this.listQuery).then((res) => { if (res.data.code == 200) { @@ -206,4 +219,4 @@ background-color: #034ea2; border: 1px solid #034ea2; } -</style> \ No newline at end of file +</style> diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue index eee259b..09b4b5b 100644 --- a/src/views/safetyproduction/feature.vue +++ b/src/views/safetyproduction/feature.vue @@ -7,7 +7,24 @@ <el-input v-model="listQuery.filter.name"></el-input> </el-form-item> </el-col> - <el-col :span="4" style="text-align: center"> + <el-col :span="5"> + <el-form-item label="要素类型"> + <el-select + v-model="listQuery.filter.type" + placeholder="请选择" + style="width: 100%" + > + <el-option + v-for="item in options" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="6" style="text-align: center"> <el-button type="primary" icon="el-icon-search" @click="find()" class="btns" >搜索</el-button > @@ -18,6 +35,12 @@ @click="handleClick('', '新增')" >新增</el-button > + <el-button + type="primary" + class="btns" + @click="reset()" + >重置</el-button + > </el-col> </el-row> </el-form> @@ -208,6 +231,13 @@ this.elementManagementL(); }, methods: { + reset(){ + this.listQuery.filter={} + this.listQuery.pageIndex=1 + this.listQuery.pageSize=10 + this.elementManagementL(); + }, + async elementManagementL() { var res = await elementManagementList(this.listQuery); if (res.data.code == 200) { -- Gitblit v1.9.2