From 9b8a1c406875d2de47ecb830be534065e6bb838b Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 25 三月 2022 12:41:10 +0800
Subject: [PATCH] 1.隐患路径 2.logo图片
---
src/views/doublePreventAction/hiddenDanger/rectify/index.vue | 212 +++++++++++
src/views/doublePreventAction/hiddenDanger/report/components/personSelect.vue | 0
src/views/doublePreventAction/hiddenDanger/statistics/index.vue | 234 ++++++++++++
src/views/doublePreventAction/hiddenDanger/report/components/reportDialog.vue | 2
src/views/doublePreventAction/hiddenDanger/rectify/components/rectifyDialog.vue | 0
src/views/doublePreventAction/hiddenDanger/index.vue | 15
/dev/null | 159 --------
src/views/doublePreventAction/hiddenDanger/components/reportView.vue | 0
src/assets/zhongtai_logo.jpg | 0
src/views/doublePreventAction/hiddenDanger/report/index.vue | 261 +++++++++++++
src/views/layout/components/Institute.vue | 13
src/views/doublePreventAction/hiddenDanger/accept/components/acceptDialog.vue | 0
src/views/doublePreventAction/hiddenDanger/accept/index.vue | 215 +++++++++++
13 files changed, 944 insertions(+), 167 deletions(-)
diff --git a/src/assets/zhongtai_logo.jpg b/src/assets/zhongtai_logo.jpg
new file mode 100644
index 0000000..714ee07
--- /dev/null
+++ b/src/assets/zhongtai_logo.jpg
Binary files differ
diff --git a/src/views/hiddenDanger/acceptDialog/acceptDialog.vue b/src/views/doublePreventAction/hiddenDanger/accept/components/acceptDialog.vue
similarity index 100%
rename from src/views/hiddenDanger/acceptDialog/acceptDialog.vue
rename to src/views/doublePreventAction/hiddenDanger/accept/components/acceptDialog.vue
diff --git a/src/views/doublePreventAction/hiddenDanger/accept/index.vue b/src/views/doublePreventAction/hiddenDanger/accept/index.vue
new file mode 100644
index 0000000..d143877
--- /dev/null
+++ b/src/views/doublePreventAction/hiddenDanger/accept/index.vue
@@ -0,0 +1,215 @@
+<template>
+ <div class="app-container">
+ <div style="margin: 15px">
+ <span class="span-filter-label">单号</span>
+ <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
+ <span class="span-filter-label">隐患等级</span>
+ <el-select v-model="filter.filter.level" clearable @clear="clearLevel" placeholder="请选择">
+ <el-option
+ v-for="item in levels"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+ <span class="span-filter-label">整改人</span>
+ <el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
+ <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
+ @click="queryHandle"/>
+ </div>
+ <div class="table_content">
+ <el-table
+ v-loading="listLoading"
+ :key="tableKey"
+ :data="tableData"
+ border
+ fit
+ highlight-current-row
+ style="width: 100%;"
+ >
+ <el-table-column type="index" label="序号" align="center" width="80"/>
+ <el-table-column label="单号" prop="code" align="center" />
+ <el-table-column label="状态" prop="status" align="center" >
+ <template slot-scope="scope">
+ <span >{{scope.row.status}}</span>
+ <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患等级" prop="level" align="center" >
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="上报人" prop="requestor" align="center" />
+ <el-table-column label="上报时间" prop="createtime" align="center" />
+ <el-table-column label="整改人" prop="rectifier" align="center" />
+ <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
+ <template slot-scope="scope">
+ <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="整改时间" prop="rectifytime" align="center" />
+
+
+ <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
+ <el-button type="text" @click="acceptHandle(scope.row)" v-if="scope.row.status === '整改待验收'">验收</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <br>
+ <el-pagination
+ v-show="recordTotal>0"
+ :current-page="filter.pageIndex"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="filter.pageSize"
+ :total="recordTotal"
+ layout="total, sizes, prev, pager, next, jumper"
+ background
+ style="float:right;"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+
+ <report-view ref="reportView"></report-view>
+ <accept-dialog ref="acceptDialog" @refresh="hiddenDangerList"></accept-dialog>
+
+
+ <div style="clear: both;"></div>
+ </div>
+</template>
+
+<script>
+ import { checkBtnPermission} from "@/utils/permission";
+ import { hiddenDangerAcceptList} from '@/api/hiddenDanger';
+ import reportView from "../components/reportView";
+ import acceptDialog from "./components/acceptDialog";
+
+ export default {
+ name: "confirm",
+ components: {
+ reportView,
+ acceptDialog,
+ },
+ data() {
+ return {
+ recordTotal: 0,
+ tableKey: 0,
+ tableData:[],
+ listLoading: true,
+ levels:[
+ {"key":"URGENT","value":"紧急"},
+ {"key":"COMMON","value":"一般"},
+ ],
+ dataForm: {
+ id:'',
+ note: '',
+ level:'',
+ rejectnote:'',
+ },
+ filter:{
+ pageIndex:1,
+ pageSize:10,
+ filter:{
+ code:'',
+ level:null,
+ rectifierName:'',
+ }
+ }
+ }
+ },
+ created() {
+ this.hiddenDangerList();
+ },
+
+ methods: {
+ queryHandle: function () {
+ this.filter.pageIndex = 1
+ this.hiddenDangerList()
+ },
+
+
+ viewHandle: function (row) {
+ this.$refs.reportView.showDialog("查看",row)
+ },
+
+ acceptHandle(row){
+ this.$refs.acceptDialog.showDialog(row)
+ } ,
+
+ handleSizeChange: function (val) {
+ this.filter.pageSize = val
+ this.filter.pageIndex = 1
+ this.hiddenDangerList()
+ },
+ handleCurrentChange: function (val) {
+ this.filter.pageIndex = val
+ this.hiddenDangerList()
+ },
+ getBtnPermission(btnType) {
+ return checkBtnPermission(this.userType, btnType)
+ },
+
+ downloadHandle(fileurl){
+ window.open(fileurl, '_blank');
+ },
+
+
+ handleChange(file, fileList) {
+ this.fileList = fileList
+ },
+
+ hiddenDangerList(){
+ this.listLoading = true
+ hiddenDangerAcceptList(this.filter)
+ .then(res=>{
+ if (res.data.code === '200') {
+ this.tableData = res.data.result.records
+ this.recordTotal = res.data.result.total
+ }
+ else{
+ this.$message({message: res.data.message, type: 'warning'});
+ }
+ })
+ .catch(err=>{
+ console.log(err)
+ this.$message({message: '接口错误', type: 'warning'});
+ })
+ .finally(()=>{
+ this.listLoading = false
+ })
+ },
+ clearLevel(){
+ this.filter.filter.level = null
+ }
+
+
+ }
+ }
+</script>
+
+<style scoped>
+ .overdue{
+ color: red;
+ }
+ .overdue-img{
+ position: fixed;
+ background-color: #f56c6c;
+ border-radius: 4px;
+ color: #fff;
+ display: inline-block;
+ font-size: 12px;
+ height: 21px;
+ line-height: 18px;
+ text-align: center;
+ white-space: nowrap;
+ border: 1px solid #fff;
+ transform: scale(0.8);
+ padding: 1px 3px 0 3px;
+
+ }
+
+</style>
diff --git a/src/views/hiddenDanger/reportView/reportView.vue b/src/views/doublePreventAction/hiddenDanger/components/reportView.vue
similarity index 100%
rename from src/views/hiddenDanger/reportView/reportView.vue
rename to src/views/doublePreventAction/hiddenDanger/components/reportView.vue
diff --git a/src/views/doublePreventAction/hiddenDanger/index.vue b/src/views/doublePreventAction/hiddenDanger/index.vue
new file mode 100644
index 0000000..c7faae6
--- /dev/null
+++ b/src/views/doublePreventAction/hiddenDanger/index.vue
@@ -0,0 +1,15 @@
+<template>
+ <div>
+ <router-view/>
+ </div>
+</template>
+
+<script>
+ export default {
+ name: "index"
+ }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/hiddenDanger/rectifyDialog/rectifyDialog.vue b/src/views/doublePreventAction/hiddenDanger/rectify/components/rectifyDialog.vue
similarity index 100%
rename from src/views/hiddenDanger/rectifyDialog/rectifyDialog.vue
rename to src/views/doublePreventAction/hiddenDanger/rectify/components/rectifyDialog.vue
diff --git a/src/views/doublePreventAction/hiddenDanger/rectify/index.vue b/src/views/doublePreventAction/hiddenDanger/rectify/index.vue
new file mode 100644
index 0000000..71406d5
--- /dev/null
+++ b/src/views/doublePreventAction/hiddenDanger/rectify/index.vue
@@ -0,0 +1,212 @@
+<template>
+ <div class="app-container">
+ <div style="margin: 15px">
+
+ <span class="span-filter-label">单号</span>
+ <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
+
+ <span class="span-filter-label">隐患等级</span>
+ <el-select v-model="filter.filter.level" clearable @clear="clearLevel" placeholder="请选择">
+ <el-option
+ v-for="item in levels"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+
+ <span class="span-filter-label">上报人</span>
+ <el-input style="width: 160px" v-model="filter.filter.requestorName"></el-input>
+ <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
+ @click="queryHandle"/>
+ </div>
+ <div class="table_content">
+ <el-table
+ v-loading="listLoading"
+ :key="tableKey"
+ :data="tableData"
+ border
+ fit
+ highlight-current-row
+ style="width: 100%;"
+ >
+ <el-table-column type="index" label="序号" align="center" width="80"/>
+ <el-table-column label="单号" prop="code" align="center" />
+ <el-table-column label="状态" prop="status" align="center" >
+ <template slot-scope="scope">
+ <span >{{scope.row.status}}</span>
+ <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患等级" prop="level" align="center" >
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="上报人" prop="requestor" align="center" />
+ <el-table-column label="整改人" prop="rectifier" align="center" />
+ <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
+ <template slot-scope="scope">
+ <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="创建时间" prop="createtime" align="center" />
+ <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
+ <el-button type="text" @click="rectifyHandle(scope.row)" v-if="scope.row.status === '待整改' || scope.row.status === '驳回待整改'">整改</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <br>
+ <el-pagination
+ v-show="recordTotal>0"
+ :current-page="filter.pageIndex"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="filter.pageSize"
+ :total="recordTotal"
+ layout="total, sizes, prev, pager, next, jumper"
+ background
+ style="float:right;"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+
+ <report-view ref="reportView"></report-view>
+ <rectify-dialog ref="rectifyDialog" @refresh = "hiddenDangerList"></rectify-dialog>
+
+ <div style="clear: both;"></div>
+ </div>
+</template>
+
+<script>
+ import { checkBtnPermission} from "@/utils/permission";
+ import { hiddenDangerRectifyList } from '@/api/hiddenDanger';
+ import reportView from "../components/reportView";
+ import rectifyDialog from "./components/rectifyDialog";
+
+ export default {
+ name: "rectify",
+ components: {
+ reportView,
+ rectifyDialog,
+ },
+ data() {
+ return {
+ recordTotal: 0,
+ tableKey: 0,
+ tableData:[],
+ listLoading: false,
+ levels:[
+ {"key":"URGENT","value":"紧急"},
+ {"key":"COMMON","value":"一般"},
+ ],
+ dataForm: {
+ id:'',
+ note: '',
+ level:'',
+ rectifynote:'',
+ rectifydeadline:'',
+ rectifymeasure:''
+ },
+ filter:{
+ pageIndex:1,
+ pageSize:10,
+ filter:{
+ code:'',
+ requestorName:'',
+ level:null,
+ }
+ }
+ }
+ },
+ created() {
+ this.hiddenDangerList();
+
+ },
+ methods: {
+ queryHandle: function () {
+ this.filter.pageIndex = 1
+ this.hiddenDangerList()
+ },
+ viewHandle (row) {
+ this.$refs.reportView.showDialog("查看",row)
+ },
+ rectifyHandle(row){
+ this.$refs.rectifyDialog.show(row)
+ },
+
+ handleSizeChange: function (val) {
+ this.filter.pageSize = val
+ this.filter.pageIndex = 1
+ this.hiddenDangerList()
+ },
+ handleCurrentChange: function (val) {
+ this.filter.pageIndex = val
+ this.hiddenDangerList()
+ },
+ getBtnPermission(btnType) {
+ return checkBtnPermission(this.userType, btnType)
+ },
+
+
+ downloadHandle(fileurl){
+ window.open(fileurl, '_blank');
+ },
+
+
+
+ hiddenDangerList(){
+ this.listLoading = true
+ hiddenDangerRectifyList(this.filter)
+ .then(res=>{
+ if (res.data.code === '200') {
+ this.tableData = res.data.result.records
+ this.recordTotal = res.data.result.total
+ }
+ else{
+ this.$message({message: res.data.message, type: 'warning'});
+ }
+
+ })
+ .catch(err=>{
+ console.log(err)
+ this.$message({message: '接口错误', type: 'warning'});
+
+ })
+ .finally(()=>{
+ this.listLoading = false
+ })
+ },
+ clearLevel(){
+ this.filter.filter.level = null
+ }
+
+ }
+ }
+</script>
+
+<style scoped>
+
+ .overdue{
+ color: red;
+ }
+ .overdue-img{
+ position: fixed;
+ background-color: #f56c6c;
+ border-radius: 4px;
+ color: #fff;
+ display: inline-block;
+ font-size: 12px;
+ height: 21px;
+ line-height: 18px;
+ text-align: center;
+ white-space: nowrap;
+ border: 1px solid #fff;
+ transform: scale(0.8);
+ padding: 1px 3px 0 3px;
+
+ }
+</style>
diff --git a/src/views/hiddenDanger/personSelect/personSelect.vue b/src/views/doublePreventAction/hiddenDanger/report/components/personSelect.vue
similarity index 100%
rename from src/views/hiddenDanger/personSelect/personSelect.vue
rename to src/views/doublePreventAction/hiddenDanger/report/components/personSelect.vue
diff --git a/src/views/hiddenDanger/reportDialog/reportDialog.vue b/src/views/doublePreventAction/hiddenDanger/report/components/reportDialog.vue
similarity index 98%
rename from src/views/hiddenDanger/reportDialog/reportDialog.vue
rename to src/views/doublePreventAction/hiddenDanger/report/components/reportDialog.vue
index f241e67..a45846c 100644
--- a/src/views/hiddenDanger/reportDialog/reportDialog.vue
+++ b/src/views/doublePreventAction/hiddenDanger/report/components/reportDialog.vue
@@ -98,7 +98,7 @@
</template>
<script>
- import personSelect from '../personSelect/personSelect'
+ import personSelect from './personSelect'
import { hiddenDangerReport } from '@/api/hiddenDanger';
import {getToken} from "@/utils/auth";
export default {
diff --git a/src/views/doublePreventAction/hiddenDanger/report/index.vue b/src/views/doublePreventAction/hiddenDanger/report/index.vue
new file mode 100644
index 0000000..ceddc9a
--- /dev/null
+++ b/src/views/doublePreventAction/hiddenDanger/report/index.vue
@@ -0,0 +1,261 @@
+<template>
+ <div class="app-container">
+ <div style="margin: 10px">
+ <span class="span-filter-label">单号</span>
+ <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
+ <span class="span-filter-label">状态</span>
+ <el-select
+ v-model="filter.filter.status"
+ class="filter-item"
+ clearable
+ @clear="clearStatus"
+ style="width:150px;margin-bottom: 10px">
+ <el-option
+ v-for="item in reportStatus"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+ <span class="span-filter-label">隐患等级</span>
+ <el-select v-model="filter.filter.level"
+ clearable
+ @clear="clearLevel"
+ placeholder="请选择">
+ <el-option
+ v-for="item in levels"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+
+ <span class="span-filter-label">整改人</span>
+ <el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
+
+
+ <el-button class="filter-item" style="margin-left: 10px;" type="primary"
+ icon="el-icon-plus" @click="showCreateHandle">新增
+ </el-button>
+ <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
+ @click="queryHandle"/>
+ </div>
+ <div class="table_content">
+ <el-table
+ v-loading="listLoading"
+ :key="tableKey"
+ :data="tableData"
+ border
+ fit
+ highlight-current-row
+ style="width: 100%;"
+ >
+ <el-table-column type="index" label="序号" align="center" width="80"/>
+ <el-table-column label="单号" prop="code" align="center" />
+ <el-table-column label="状态" prop="status" align="center" >
+ <template slot-scope="scope">
+ <span >{{scope.row.status}}</span>
+ <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患等级" prop="level" align="center" >
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="上报人" prop="requestor" align="center" />
+ <el-table-column label="上报时间" prop="createtime" align="center" />
+ <el-table-column label="整改人" prop="rectifier" align="center" />
+
+ <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
+ <template slot-scope="scope">
+ <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="整改时间" prop="rectifytime" align="center" >
+ </el-table-column>
+ <el-table-column label="验收时间" prop="accepttime" align="center" >
+ </el-table-column>
+ <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <br>
+ <el-pagination
+ v-show="recordTotal>0"
+ :current-page="filter.pageIndex"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="filter.pageSize"
+ :total="recordTotal"
+ layout="total, sizes, prev, pager, next, jumper"
+ background
+ style="float:right;"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+ </div>
+ <div style="clear: both;"></div>
+ <report-view ref="reportView" ></report-view>
+ <report-dialog ref="reportDialog" @refresh="hiddenDangerList"></report-dialog>
+
+ </div>
+</template>
+
+<script>
+ import { checkBtnPermission} from "@/utils/permission";
+ import {hiddenDangerReportList} from '@/api/hiddenDanger';
+ import reportView from '../components/reportView'
+ import reportDialog from './components/reportDialog'
+
+ export default {
+ name: "report",
+ components: {
+ reportView,
+ reportDialog,
+ },
+ data() {
+ return {
+ recordTotal: 0,
+ tableKey: 0,
+ tableData:[],
+ listLoading: true,
+ levels:[
+ {"key":"URGENT","value":"紧急"},
+ {"key":"COMMON","value":"一般"},
+ ],
+ reportStatus:[
+ {"key":"TORECTIFY","value":"待整改"},
+ {"key":"TOACCEPT","value":"整改待验收"},
+ {"key":"REJECTED","value":"驳回待整改"},
+ {"key":"COMPLETED","value":"已完成"},
+ ],
+ dataForm: {
+ rectifydeadline:'',
+ rectifymeasure:'',
+ rectifier:'',
+ rectifierid:'',
+ note: '',
+ level:''
+ },
+ isSupervision: '',
+ filter:{
+ pageIndex:1,
+ pageSize:10,
+ filter:{
+ code:'',
+ status:null,
+ level:null,
+ rectifierName:'',
+ }
+ },
+
+ }
+ },
+ created() {
+ this.hiddenDangerList();
+ },
+ methods: {
+ queryHandle: function () {
+ this.filter.pageIndex = 1
+ this.hiddenDangerList()
+ },
+ resetDataForm() {
+ this.dataForm= {
+ rectifydeadline:'',
+ rectifymeasure:'',
+ rectifier:'',
+ rectifierid:'',
+ note: '',
+ level:''
+ }
+ },
+ showCreateHandle() {
+ this.$refs.reportDialog.show()
+ },
+ viewHandle: function (row) {
+ this.$refs.reportView.showDialog("查看",row)
+
+ },
+ handleSizeChange: function (val) {
+ this.filter.pageIndex = 1
+ this.filter.pageSize = val
+ this.hiddenDangerList()
+ },
+ handleCurrentChange: function (val) {
+ this.filter.pageIndex = val
+ this.hiddenDangerList()
+ },
+ getBtnPermission(btnType) {
+ return checkBtnPermission(this.userType, btnType)
+ },
+
+
+ downloadHandle(fileurl){
+ window.open(fileurl, '_blank')
+ },
+
+
+ hiddenDangerList(){
+ this.listLoading = true
+ hiddenDangerReportList(this.filter)
+ .then(res=>{
+ if (res.data.code === '200') {
+ this.tableData = res.data.result.records
+ this.recordTotal = res.data.result.total
+ }
+ else{
+ this.$message({message: res.data.message, type: 'warning'});
+ }
+ })
+ .catch(err=>{
+ console.log(err)
+ this.$message({message: '接口错误', type: 'warning'});
+ })
+ .finally(()=>{
+ this.listLoading = false
+ })
+
+ },
+
+
+ clearStatus(){
+ this.filter.filter.status = null
+ },
+ clearLevel(){
+ this.filter.filter.level = null
+ }
+
+ }
+ }
+</script>
+
+<style >
+ .span-filter-label{
+ font-size: 15px;
+ color: #606266;
+ margin-right: 4px;
+ margin-left: 7px;
+ }
+ .overdue{
+ color: red;
+ }
+ .overdue-img{
+ position: fixed;
+ background-color: #f56c6c;
+ border-radius: 4px;
+ color: #fff;
+ display: inline-block;
+ font-size: 12px;
+ height: 21px;
+ line-height: 18px;
+ text-align: center;
+ white-space: nowrap;
+ border: 1px solid #fff;
+ transform: scale(0.8);
+ padding: 1px 3px 0 3px;
+
+ }
+</style>
diff --git a/src/views/doublePreventAction/hiddenDanger/statistics/index.vue b/src/views/doublePreventAction/hiddenDanger/statistics/index.vue
new file mode 100644
index 0000000..cc78177
--- /dev/null
+++ b/src/views/doublePreventAction/hiddenDanger/statistics/index.vue
@@ -0,0 +1,234 @@
+<template>
+ <div class="app-container">
+ <div style="margin: 10px">
+
+ <span class="span-filter-label">单号</span>
+ <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
+ <span class="span-filter-label" >状态</span>
+ <el-select
+ v-model="filter.filter.status"
+ clearable @clear="clearStatus"
+ class="filter-item"
+ style="width:120px;margin-bottom: 10px">
+ <el-option
+ v-for="item in reportStatus"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+ <span class="span-filter-label">隐患等级</span>
+ <el-select v-model="filter.filter.level"
+ clearable @clear="clearLevel"
+ style="width: 100px"
+ >
+ <el-option
+ v-for="item in levels"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+
+ <span class="span-filter-label">上报人</span>
+ <el-input style="width: 140px" v-model="filter.filter.requestorName" ></el-input>
+ <span class="span-filter-label">整改人</span>
+ <el-input style="width: 140px" v-model="filter.filter.rectifierName"></el-input>
+ <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
+ @click="queryHandle"/>
+ </div>
+ <div class="table_content" v-loading="listLoading">
+ <el-table
+ :data="showData"
+ border
+ fit
+ highlight-current-row
+ style="width: 100%;position: relative;top: -7px"
+ >
+ <el-table-column label="待整改数" prop="2rectifynum" align="center" />
+ <el-table-column label="完成数量" prop="completednum" align="center"/>
+ <el-table-column label="驳回总数" prop="rejectnum" align="center" />
+ <el-table-column label="上报总数" prop="reportnum" align="center" />
+ <el-table-column label="待验收数" prop="2acceptnum" align="center" />
+ </el-table>
+ <el-table
+ :key="tableKey"
+ :data="tableData"
+ border
+ fit
+ highlight-current-row
+ style="width: 100%;"
+ >
+ <el-table-column type="index" label="序号" align="center" width="80"/>
+ <el-table-column label="单号" prop="code" align="center" />
+ <el-table-column label="状态" prop="status" align="center" >
+ <template slot-scope="scope">
+ <span >{{scope.row.status}}</span>
+ <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="隐患等级" prop="level" align="center" >
+ <template slot-scope="scope">
+ <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="上报人" prop="requestor" align="center" />
+ <el-table-column label="上报时间" prop="createtime" align="center" />
+ <el-table-column label="整改人" prop="rectifier" align="center" />
+ <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
+ <template slot-scope="scope">
+ <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="整改时间" prop="rectifytime" align="center" />
+ <el-table-column label="验收时间" prop="accepttime" align="center" />
+
+
+ <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <br>
+
+ <el-pagination
+ v-show="recordTotal>0"
+ :current-page="filter.pageIndex"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="filter.pageSize"
+ :total="recordTotal"
+ layout="total, sizes, prev, pager, next, jumper"
+ background
+ style="float:right;"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ />
+
+
+ <br>
+ </div>
+ <div style="clear: both;"></div>
+ <report-view ref="reportView" ></report-view>
+
+ </div>
+</template>
+
+<script>
+ import { hiddenDangerStatisticsList} from '@/api/hiddenDanger';
+ import reportView from "../components/reportView";
+ export default {
+ name: 'statistics',
+ components:{
+ reportView
+ },
+ data(){
+ return {
+ listLoading : true,
+ tableKey: 0,
+ tableData:[],
+ showData:[],
+ levels:[
+ {"key":"URGENT","value":"紧急"},
+ {"key":"COMMON","value":"一般"},
+ ],
+ reportStatus:[
+ {"key":"TORECTIFY","value":"待整改"},
+ {"key":"TOACCEPT","value":"整改待验收"},
+ {"key":"REJECTED","value":"驳回待整改"},
+ {"key":"COMPLETED","value":"已完成"},
+ ],
+ recordTotal:0,
+ filter:{
+ pageIndex:1,
+ pageSize:10,
+ filter:{
+ code:'',
+ status:null,
+ level:null,
+ requestorName:'',
+ rectifierName:'',
+ }
+ }
+
+ }},
+ created(){
+ this.hiddenDangerStatisticsList()
+ },
+ methods:{
+ handleSizeChange: function (val) {
+ this.filter.pageSize = val
+ this.filter.pageIndex = 1
+ this.hiddenDangerStatisticsList()
+ },
+ handleCurrentChange: function (val) {
+ this.filter.pageIndex = val
+ this.hiddenDangerStatisticsList()
+ },
+ queryHandle(){
+ this.filter.pageIndex = 1
+ this.hiddenDangerStatisticsList()
+ },
+ viewHandle(row){
+ this.$refs.reportView.showDialog('查看',row)
+ },
+
+ hiddenDangerStatisticsList() {
+ this.listLoading = true
+ hiddenDangerStatisticsList(this.filter)
+ .then(res=>{
+ if (res.data.code === '200') {
+ this.tableData = res.data.result.records
+ this.recordTotal = res.data.result.total
+ this.showData = [(res.data.result.extension)]
+ }
+ else{
+ this.$message({ message: res.data.message, type: 'warning'});
+ }
+
+ })
+ .catch(err=>{
+ console.log(err)
+ this.$message({ message: '接口错误', type: 'warning'});
+ })
+ .finally(()=>{
+ this.listLoading = false
+ })
+ },
+ clearLevel(){
+ this.filter.filter.level = null
+ },
+ clearStatus(){
+ this.filter.filter.status = null
+ }
+
+
+ }
+ }
+</script>
+
+
+<style scoped>
+
+ .overdue{
+ color: red;
+ }
+ .overdue-img{
+ position: fixed;
+ background-color: #f56c6c;
+ border-radius: 4px;
+ color: #fff;
+ display: inline-block;
+ font-size: 12px;
+ height: 21px;
+ line-height: 18px;
+ text-align: center;
+ white-space: nowrap;
+ border: 1px solid #fff;
+ transform: scale(0.8);
+ padding: 1px 3px 0 3px;
+
+ }
+
+</style>
diff --git a/src/views/hiddenDanger/accept.vue b/src/views/hiddenDanger/accept.vue
deleted file mode 100644
index d8e28cf..0000000
--- a/src/views/hiddenDanger/accept.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
- <div class="app-container">
- <div style="margin: 15px">
- <span class="span-filter-label">单号</span>
- <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
- <span class="span-filter-label">隐患等级</span>
- <el-select v-model="filter.filter.level" clearable @clear="clearLevel" placeholder="请选择">
- <el-option
- v-for="item in levels"
- :key="item.key"
- :label="item.value"
- :value="item.key">
- </el-option>
- </el-select>
- <span class="span-filter-label">整改人</span>
- <el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
- <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
- @click="queryHandle"/>
- </div>
- <div class="table_content">
- <el-table
- v-loading="listLoading"
- :key="tableKey"
- :data="tableData"
- border
- fit
- highlight-current-row
- style="width: 100%;"
- >
- <el-table-column type="index" label="序号" align="center" width="80"/>
- <el-table-column label="单号" prop="code" align="center" />
- <el-table-column label="状态" prop="status" align="center" >
- <template slot-scope="scope">
- <span >{{scope.row.status}}</span>
- <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
- </template>
- </el-table-column>
- <el-table-column label="隐患等级" prop="level" align="center" >
- <template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="上报人" prop="requestor" align="center" />
- <el-table-column label="上报时间" prop="createtime" align="center" />
- <el-table-column label="整改人" prop="rectifier" align="center" />
- <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
- <template slot-scope="scope">
- <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
- </span>
- </template>
- </el-table-column>
- <el-table-column label="整改时间" prop="rectifytime" align="center" />
-
-
- <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
- <el-button type="text" @click="acceptHandle(scope.row)" v-if="scope.row.status === '整改待验收'">验收</el-button>
- </template>
- </el-table-column>
- </el-table>
- <br>
- <el-pagination
- v-show="recordTotal>0"
- :current-page="filter.pageIndex"
- :page-sizes="[10, 20, 30, 50]"
- :page-size="filter.pageSize"
- :total="recordTotal"
- layout="total, sizes, prev, pager, next, jumper"
- background
- style="float:right;"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
-
- <report-view ref="reportView"></report-view>
- <accept-dialog ref="acceptDialog" @refresh="hiddenDangerList"></accept-dialog>
-
-
- <div style="clear: both;"></div>
- </div>
-</template>
-
-<script>
-import { checkBtnPermission} from "@/utils/permission";
-import { hiddenDangerAcceptList} from '@/api/hiddenDanger';
-import reportView from "./reportView/reportView";
-import acceptDialog from "./acceptDialog/acceptDialog";
-
-export default {
- name: "confirm",
- components: {
- reportView,
- acceptDialog,
- },
- data() {
- return {
- recordTotal: 0,
- tableKey: 0,
- tableData:[],
- listLoading: true,
- levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
- ],
- dataForm: {
- id:'',
- note: '',
- level:'',
- rejectnote:'',
- },
- filter:{
- pageIndex:1,
- pageSize:10,
- filter:{
- code:'',
- level:null,
- rectifierName:'',
- }
- }
- }
- },
- created() {
- this.hiddenDangerList();
- },
-
- methods: {
- queryHandle: function () {
- this.filter.pageIndex = 1
- this.hiddenDangerList()
- },
-
-
- viewHandle: function (row) {
- this.$refs.reportView.showDialog("查看",row)
- },
-
- acceptHandle(row){
- this.$refs.acceptDialog.showDialog(row)
- } ,
-
- handleSizeChange: function (val) {
- this.filter.pageSize = val
- this.filter.pageIndex = 1
- this.hiddenDangerList()
- },
- handleCurrentChange: function (val) {
- this.filter.pageIndex = val
- this.hiddenDangerList()
- },
- getBtnPermission(btnType) {
- return checkBtnPermission(this.userType, btnType)
- },
-
- downloadHandle(fileurl){
- window.open(fileurl, '_blank');
- },
-
-
- handleChange(file, fileList) {
- this.fileList = fileList
- },
-
- hiddenDangerList(){
- this.listLoading = true
- hiddenDangerAcceptList(this.filter)
- .then(res=>{
- if (res.data.code === '200') {
- this.tableData = res.data.result.records
- this.recordTotal = res.data.result.total
- }
- else{
- this.$message({message: res.data.message, type: 'warning'});
- }
- })
- .catch(err=>{
- console.log(err)
- this.$message({message: '接口错误', type: 'warning'});
- })
- .finally(()=>{
- this.listLoading = false
- })
- },
- clearLevel(){
- this.filter.filter.level = null
- }
-
-
- }
-}
-</script>
-
-<style scoped>
- .overdue{
- color: red;
- }
- .overdue-img{
- position: fixed;
- background-color: #f56c6c;
- border-radius: 4px;
- color: #fff;
- display: inline-block;
- font-size: 12px;
- height: 21px;
- line-height: 18px;
- text-align: center;
- white-space: nowrap;
- border: 1px solid #fff;
- transform: scale(0.8);
- padding: 1px 3px 0 3px;
-
- }
-
-</style>
diff --git a/src/views/hiddenDanger/rectify.vue b/src/views/hiddenDanger/rectify.vue
deleted file mode 100644
index d429abe..0000000
--- a/src/views/hiddenDanger/rectify.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<template>
- <div class="app-container">
- <div style="margin: 15px">
-
- <span class="span-filter-label">单号</span>
- <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
-
- <span class="span-filter-label">隐患等级</span>
- <el-select v-model="filter.filter.level" clearable @clear="clearLevel" placeholder="请选择">
- <el-option
- v-for="item in levels"
- :key="item.key"
- :label="item.value"
- :value="item.key">
- </el-option>
- </el-select>
-
- <span class="span-filter-label">上报人</span>
- <el-input style="width: 160px" v-model="filter.filter.requestorName"></el-input>
- <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
- @click="queryHandle"/>
- </div>
- <div class="table_content">
- <el-table
- v-loading="listLoading"
- :key="tableKey"
- :data="tableData"
- border
- fit
- highlight-current-row
- style="width: 100%;"
- >
- <el-table-column type="index" label="序号" align="center" width="80"/>
- <el-table-column label="单号" prop="code" align="center" />
- <el-table-column label="状态" prop="status" align="center" >
- <template slot-scope="scope">
- <span >{{scope.row.status}}</span>
- <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
- </template>
- </el-table-column>
- <el-table-column label="隐患等级" prop="level" align="center" >
- <template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="上报人" prop="requestor" align="center" />
- <el-table-column label="整改人" prop="rectifier" align="center" />
- <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
- <template slot-scope="scope">
- <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
- </span>
- </template>
- </el-table-column>
- <el-table-column label="创建时间" prop="createtime" align="center" />
- <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
- <el-button type="text" @click="rectifyHandle(scope.row)" v-if="scope.row.status === '待整改' || scope.row.status === '驳回待整改'">整改</el-button>
- </template>
- </el-table-column>
- </el-table>
- <br>
- <el-pagination
- v-show="recordTotal>0"
- :current-page="filter.pageIndex"
- :page-sizes="[10, 20, 30, 50]"
- :page-size="filter.pageSize"
- :total="recordTotal"
- layout="total, sizes, prev, pager, next, jumper"
- background
- style="float:right;"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
-
- <report-view ref="reportView"></report-view>
- <rectify-dialog ref="rectifyDialog" @refresh = "hiddenDangerList"></rectify-dialog>
-
- <div style="clear: both;"></div>
- </div>
-</template>
-
-<script>
-import { checkBtnPermission} from "@/utils/permission";
-import { hiddenDangerRectifyList } from '@/api/hiddenDanger';
-import reportView from "./reportView/reportView";
-import rectifyDialog from "./rectifyDialog/rectifyDialog";
-
-export default {
- name: "rectify",
- components: {
- reportView,
- rectifyDialog,
- },
- data() {
- return {
- recordTotal: 0,
- tableKey: 0,
- tableData:[],
- listLoading: false,
- levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
- ],
- dataForm: {
- id:'',
- note: '',
- level:'',
- rectifynote:'',
- rectifydeadline:'',
- rectifymeasure:''
- },
- filter:{
- pageIndex:1,
- pageSize:10,
- filter:{
- code:'',
- requestorName:'',
- level:null,
- }
- }
- }
- },
- created() {
- this.hiddenDangerList();
-
- },
- methods: {
- queryHandle: function () {
- this.filter.pageIndex = 1
- this.hiddenDangerList()
- },
- viewHandle (row) {
- this.$refs.reportView.showDialog("查看",row)
- },
- rectifyHandle(row){
- this.$refs.rectifyDialog.show(row)
- },
-
- handleSizeChange: function (val) {
- this.filter.pageSize = val
- this.filter.pageIndex = 1
- this.hiddenDangerList()
- },
- handleCurrentChange: function (val) {
- this.filter.pageIndex = val
- this.hiddenDangerList()
- },
- getBtnPermission(btnType) {
- return checkBtnPermission(this.userType, btnType)
- },
-
-
- downloadHandle(fileurl){
- window.open(fileurl, '_blank');
- },
-
-
-
- hiddenDangerList(){
- this.listLoading = true
- hiddenDangerRectifyList(this.filter)
- .then(res=>{
- if (res.data.code === '200') {
- this.tableData = res.data.result.records
- this.recordTotal = res.data.result.total
- }
- else{
- this.$message({message: res.data.message, type: 'warning'});
- }
-
- })
- .catch(err=>{
- console.log(err)
- this.$message({message: '接口错误', type: 'warning'});
-
- })
- .finally(()=>{
- this.listLoading = false
- })
- },
- clearLevel(){
- this.filter.filter.level = null
- }
-
- }
-}
-</script>
-
-<style scoped>
-
- .overdue{
- color: red;
- }
- .overdue-img{
- position: fixed;
- background-color: #f56c6c;
- border-radius: 4px;
- color: #fff;
- display: inline-block;
- font-size: 12px;
- height: 21px;
- line-height: 18px;
- text-align: center;
- white-space: nowrap;
- border: 1px solid #fff;
- transform: scale(0.8);
- padding: 1px 3px 0 3px;
-
- }
-</style>
diff --git a/src/views/hiddenDanger/report.vue b/src/views/hiddenDanger/report.vue
deleted file mode 100644
index 5211bbb..0000000
--- a/src/views/hiddenDanger/report.vue
+++ /dev/null
@@ -1,261 +0,0 @@
-<template>
- <div class="app-container">
- <div style="margin: 10px">
- <span class="span-filter-label">单号</span>
- <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
- <span class="span-filter-label">状态</span>
- <el-select
- v-model="filter.filter.status"
- class="filter-item"
- clearable
- @clear="clearStatus"
- style="width:150px;margin-bottom: 10px">
- <el-option
- v-for="item in reportStatus"
- :key="item.key"
- :label="item.value"
- :value="item.key">
- </el-option>
- </el-select>
- <span class="span-filter-label">隐患等级</span>
- <el-select v-model="filter.filter.level"
- clearable
- @clear="clearLevel"
- placeholder="请选择">
- <el-option
- v-for="item in levels"
- :key="item.key"
- :label="item.value"
- :value="item.key">
- </el-option>
- </el-select>
-
- <span class="span-filter-label">整改人</span>
- <el-input style="width: 160px" v-model="filter.filter.rectifierName"></el-input>
-
-
- <el-button class="filter-item" style="margin-left: 10px;" type="primary"
- icon="el-icon-plus" @click="showCreateHandle">新增
- </el-button>
- <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
- @click="queryHandle"/>
- </div>
- <div class="table_content">
- <el-table
- v-loading="listLoading"
- :key="tableKey"
- :data="tableData"
- border
- fit
- highlight-current-row
- style="width: 100%;"
- >
- <el-table-column type="index" label="序号" align="center" width="80"/>
- <el-table-column label="单号" prop="code" align="center" />
- <el-table-column label="状态" prop="status" align="center" >
- <template slot-scope="scope">
- <span >{{scope.row.status}}</span>
- <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
- </template>
- </el-table-column>
- <el-table-column label="隐患等级" prop="level" align="center" >
- <template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="上报人" prop="requestor" align="center" />
- <el-table-column label="上报时间" prop="createtime" align="center" />
- <el-table-column label="整改人" prop="rectifier" align="center" />
-
- <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
- <template slot-scope="scope">
- <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
- </span>
- </template>
- </el-table-column>
- <el-table-column label="整改时间" prop="rectifytime" align="center" >
- </el-table-column>
- <el-table-column label="验收时间" prop="accepttime" align="center" >
- </el-table-column>
- <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
- </template>
- </el-table-column>
- </el-table>
- <br>
- <el-pagination
- v-show="recordTotal>0"
- :current-page="filter.pageIndex"
- :page-sizes="[10, 20, 30, 50]"
- :page-size="filter.pageSize"
- :total="recordTotal"
- layout="total, sizes, prev, pager, next, jumper"
- background
- style="float:right;"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
- <div style="clear: both;"></div>
- <report-view ref="reportView" ></report-view>
- <report-dialog ref="reportDialog" @refresh="hiddenDangerList"></report-dialog>
-
- </div>
-</template>
-
-<script>
-import { checkBtnPermission} from "@/utils/permission";
-import {hiddenDangerReportList} from '@/api/hiddenDanger';
-import reportView from './reportView/reportView'
-import reportDialog from './reportDialog/reportDialog'
-
-export default {
- name: "report",
- components: {
- reportView,
- reportDialog,
- },
- data() {
- return {
- recordTotal: 0,
- tableKey: 0,
- tableData:[],
- listLoading: true,
- levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
- ],
- reportStatus:[
- {"key":"TORECTIFY","value":"待整改"},
- {"key":"TOACCEPT","value":"整改待验收"},
- {"key":"REJECTED","value":"驳回待整改"},
- {"key":"COMPLETED","value":"已完成"},
- ],
- dataForm: {
- rectifydeadline:'',
- rectifymeasure:'',
- rectifier:'',
- rectifierid:'',
- note: '',
- level:''
- },
- isSupervision: '',
- filter:{
- pageIndex:1,
- pageSize:10,
- filter:{
- code:'',
- status:null,
- level:null,
- rectifierName:'',
- }
- },
-
- }
- },
- created() {
- this.hiddenDangerList();
- },
- methods: {
- queryHandle: function () {
- this.filter.pageIndex = 1
- this.hiddenDangerList()
- },
- resetDataForm() {
- this.dataForm= {
- rectifydeadline:'',
- rectifymeasure:'',
- rectifier:'',
- rectifierid:'',
- note: '',
- level:''
- }
- },
- showCreateHandle() {
- this.$refs.reportDialog.show()
- },
- viewHandle: function (row) {
- this.$refs.reportView.showDialog("查看",row)
-
- },
- handleSizeChange: function (val) {
- this.filter.pageIndex = 1
- this.filter.pageSize = val
- this.hiddenDangerList()
- },
- handleCurrentChange: function (val) {
- this.filter.pageIndex = val
- this.hiddenDangerList()
- },
- getBtnPermission(btnType) {
- return checkBtnPermission(this.userType, btnType)
- },
-
-
- downloadHandle(fileurl){
- window.open(fileurl, '_blank')
- },
-
-
- hiddenDangerList(){
- this.listLoading = true
- hiddenDangerReportList(this.filter)
- .then(res=>{
- if (res.data.code === '200') {
- this.tableData = res.data.result.records
- this.recordTotal = res.data.result.total
- }
- else{
- this.$message({message: res.data.message, type: 'warning'});
- }
- })
- .catch(err=>{
- console.log(err)
- this.$message({message: '接口错误', type: 'warning'});
- })
- .finally(()=>{
- this.listLoading = false
- })
-
- },
-
-
- clearStatus(){
- this.filter.filter.status = null
- },
- clearLevel(){
- this.filter.filter.level = null
- }
-
- }
-}
-</script>
-
-<style >
- .span-filter-label{
- font-size: 15px;
- color: #606266;
- margin-right: 4px;
- margin-left: 7px;
- }
- .overdue{
- color: red;
- }
- .overdue-img{
- position: fixed;
- background-color: #f56c6c;
- border-radius: 4px;
- color: #fff;
- display: inline-block;
- font-size: 12px;
- height: 21px;
- line-height: 18px;
- text-align: center;
- white-space: nowrap;
- border: 1px solid #fff;
- transform: scale(0.8);
- padding: 1px 3px 0 3px;
-
- }
-</style>
diff --git a/src/views/hiddenDanger/statistics.vue b/src/views/hiddenDanger/statistics.vue
deleted file mode 100644
index 8effa42..0000000
--- a/src/views/hiddenDanger/statistics.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
- <div class="app-container">
- <div style="margin: 10px">
-
- <span class="span-filter-label">单号</span>
- <el-input style="width: 140px" v-model="filter.filter.code" ></el-input>
- <span class="span-filter-label" >状态</span>
- <el-select
- v-model="filter.filter.status"
- clearable @clear="clearStatus"
- class="filter-item"
- style="width:120px;margin-bottom: 10px">
- <el-option
- v-for="item in reportStatus"
- :key="item.key"
- :label="item.value"
- :value="item.key">
- </el-option>
- </el-select>
- <span class="span-filter-label">隐患等级</span>
- <el-select v-model="filter.filter.level"
- clearable @clear="clearLevel"
- style="width: 100px"
- >
- <el-option
- v-for="item in levels"
- :key="item.key"
- :label="item.value"
- :value="item.key">
- </el-option>
- </el-select>
-
- <span class="span-filter-label">上报人</span>
- <el-input style="width: 140px" v-model="filter.filter.requestorName" ></el-input>
- <span class="span-filter-label">整改人</span>
- <el-input style="width: 140px" v-model="filter.filter.rectifierName"></el-input>
- <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search"
- @click="queryHandle"/>
- </div>
- <div class="table_content" v-loading="listLoading">
- <el-table
- :data="showData"
- border
- fit
- highlight-current-row
- style="width: 100%;position: relative;top: -7px"
- >
- <el-table-column label="待整改数" prop="2rectifynum" align="center" />
- <el-table-column label="完成数量" prop="completednum" align="center"/>
- <el-table-column label="驳回总数" prop="rejectnum" align="center" />
- <el-table-column label="上报总数" prop="reportnum" align="center" />
- <el-table-column label="待验收数" prop="2acceptnum" align="center" />
- </el-table>
- <el-table
- :key="tableKey"
- :data="tableData"
- border
- fit
- highlight-current-row
- style="width: 100%;"
- >
- <el-table-column type="index" label="序号" align="center" width="80"/>
- <el-table-column label="单号" prop="code" align="center" />
- <el-table-column label="状态" prop="status" align="center" >
- <template slot-scope="scope">
- <span >{{scope.row.status}}</span>
- <span v-if="new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'" class="overdue-img">逾期</span>
- </template>
- </el-table-column>
- <el-table-column label="隐患等级" prop="level" align="center" >
- <template slot-scope="scope">
- <el-tag :type="scope.row.level == '紧急'?'danger':'warning'">{{scope.row.level}}</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="上报人" prop="requestor" align="center" />
- <el-table-column label="上报时间" prop="createtime" align="center" />
- <el-table-column label="整改人" prop="rectifier" align="center" />
- <el-table-column label="整改期限" prop="rectifydeadline" align="center" >
- <template slot-scope="scope">
- <span v-bind:class="{'overdue':new Date(scope.row.rectifydeadline) < new Date() && scope.row.status !== '已完成'}">{{scope.row.rectifydeadline}}
- </span>
- </template>
- </el-table-column>
- <el-table-column label="整改时间" prop="rectifytime" align="center" />
- <el-table-column label="验收时间" prop="accepttime" align="center" />
-
-
- <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button type="text" @click="viewHandle(scope.row)">查看</el-button>
- </template>
- </el-table-column>
- </el-table>
- <br>
-
- <el-pagination
- v-show="recordTotal>0"
- :current-page="filter.pageIndex"
- :page-sizes="[10, 20, 30, 50]"
- :page-size="filter.pageSize"
- :total="recordTotal"
- layout="total, sizes, prev, pager, next, jumper"
- background
- style="float:right;"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
-
-
- <br>
- </div>
- <div style="clear: both;"></div>
- <report-view ref="reportView" ></report-view>
-
- </div>
-</template>
-
-<script>
- import { hiddenDangerStatisticsList} from '@/api/hiddenDanger';
- import reportView from './reportView/reportView'
- export default {
- name: 'statistics',
- components:{
- reportView
- },
- data(){
- return {
- listLoading : true,
- tableKey: 0,
- tableData:[],
- showData:[],
- levels:[
- {"key":"URGENT","value":"紧急"},
- {"key":"COMMON","value":"一般"},
- ],
- reportStatus:[
- {"key":"TORECTIFY","value":"待整改"},
- {"key":"TOACCEPT","value":"整改待验收"},
- {"key":"REJECTED","value":"驳回待整改"},
- {"key":"COMPLETED","value":"已完成"},
- ],
- recordTotal:0,
- filter:{
- pageIndex:1,
- pageSize:10,
- filter:{
- code:'',
- status:null,
- level:null,
- requestorName:'',
- rectifierName:'',
- }
- }
-
- }},
- created(){
- this.hiddenDangerStatisticsList()
- },
- methods:{
- handleSizeChange: function (val) {
- this.filter.pageSize = val
- this.filter.pageIndex = 1
- this.hiddenDangerStatisticsList()
- },
- handleCurrentChange: function (val) {
- this.filter.pageIndex = val
- this.hiddenDangerStatisticsList()
- },
- queryHandle(){
- this.filter.pageIndex = 1
- this.hiddenDangerStatisticsList()
- },
- viewHandle(row){
- this.$refs.reportView.showDialog('查看',row)
- },
-
- hiddenDangerStatisticsList() {
- this.listLoading = true
- hiddenDangerStatisticsList(this.filter)
- .then(res=>{
- if (res.data.code === '200') {
- this.tableData = res.data.result.records
- this.recordTotal = res.data.result.total
- this.showData = [(res.data.result.extension)]
- }
- else{
- this.$message({ message: res.data.message, type: 'warning'});
- }
-
- })
- .catch(err=>{
- console.log(err)
- this.$message({ message: '接口错误', type: 'warning'});
- })
- .finally(()=>{
- this.listLoading = false
- })
- },
- clearLevel(){
- this.filter.filter.level = null
- },
- clearStatus(){
- this.filter.filter.status = null
- }
-
-
- }
- }
-</script>
-
-
-<style scoped>
-
- .overdue{
- color: red;
- }
- .overdue-img{
- position: fixed;
- background-color: #f56c6c;
- border-radius: 4px;
- color: #fff;
- display: inline-block;
- font-size: 12px;
- height: 21px;
- line-height: 18px;
- text-align: center;
- white-space: nowrap;
- border: 1px solid #fff;
- transform: scale(0.8);
- padding: 1px 3px 0 3px;
-
- }
-
-</style>
diff --git a/src/views/hiddenDanger/taskSelect/taskSelect.vue b/src/views/hiddenDanger/taskSelect/taskSelect.vue
deleted file mode 100644
index 696064f..0000000
--- a/src/views/hiddenDanger/taskSelect/taskSelect.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
- <el-dialog
- :visible.sync="dialogVisible"
- append-to-body
- :close-on-click-modal="false"
- width="75%"
- >
- <div class="app-container">
- <div class="filter-container">
- <div style="display: block;padding-top: 10px;padding-bottom: 10px">
- <div class="basic_search" style="margin-left:10px">
- <span>作业编号：</span>
- <el-input style="width:200px" v-model="listQuery.filter.taskcode">
- </el-input>
- </div>
- <el-button type="primary" icon="el-icon-search" @click="queryHandle" />
- </div>
- </div>
- <div class="table_content">
- <el-table
- v-loading="listLoading"
- :key="tableKey"
- :data="tableData"
- border
- fit
- highlight-current-row
- style="width: 100%;"
- >
- <el-table-column label="序号" type="index" align="center" width="60"/>
- <el-table-column label="作业编号" align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.code }}</span>
- </template>
- </el-table-column>
-
- <el-table-column label="负责人" align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.director }}</span>
- </template>
- </el-table-column>
-
- <el-table-column label="作业内容" align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.area }}</span>
- </template>
- </el-table-column>
-
- <el-table-column label="开始时间" align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.starttime }}</span>
- </template>
- </el-table-column>
-
- <el-table-column label="结束时间" align="center">
- <template slot-scope="scope">
- <span>{{ scope.row.endtime }}</span>
- </template>
- </el-table-column>
-
- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button type="text" @click="selectOne(scope.row)">选择</el-button>
- </template>
- </el-table-column>
- </el-table>
- <br>
- <el-pagination
- v-show="recordTotal>0"
- :current-page="currentPage"
- :page-sizes="[10, 20, 30, 50]"
- :page-size="pageSize"
- :total="recordTotal"
- layout="total, sizes, prev, pager, next, jumper"
- background
- style="float:right;"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- </div>
- </div>
- </el-dialog>
-</template>
-
-<script>
- import {computePageCount} from "../../../utils";
- import { getSelectTask } from '@/api/hiddenDanger';
- import Cookies from 'js-cookie'
- export default {
- name: "taskSelect",
- data(){
- return{
- tableKey:0,
- listLoading:false,
- pageSize: 10,
- recordTotal: 0,
- currentPage: 1,
- pageTotal: 0,
- searchContent:'',
- listQuery:{
- filter: {
- taskcode:""
- },
- pageIndex: 1,
- pageSize:10
- },
- dialogVisible:false,
- tableData:[],
- }
- },
- created(){
- },
- methods:{
- queryHandle(){
- this.getTaskData();
- },
- handleSizeChange(val) {
- this.pageSize = val
- this.listQuery.pageSize = val
- this.getTaskData()
- },
- handleCurrentChange(val) {
- this.currentPage = val
- this.listQuery.pageIndex = val
- this.getTaskData()
- },
- showTask(){
- this.dialogVisible = true
- this.getTaskData()
- },
- selectOne(value){
- this.$emit('getInfo',value)
- this.dialogVisible = false
- },
- async getTaskData(){
- let res = await getSelectTask(this.listQuery)
- if(res.data.code === '200'){
- this.recordTotal = res.data.result.total
- this.pageSize = res.data.result.size
- this.pageTotal = computePageCount(res.data.result.total, res.data.result.size)
- this.currentPage = res.data.result.current
- this.tableData = res.data.result.records
- }else{
- this.$message({
- message:res.data.message,
- type:'warning'
- })
- }
- this.listLoading = false
- },
-
- }
- }
-</script>
-
-<style scoped>
- .basic_search{
- display:inline-block;
- }
-</style>
diff --git a/src/views/layout/components/Institute.vue b/src/views/layout/components/Institute.vue
index 87edb35..b752140 100644
--- a/src/views/layout/components/Institute.vue
+++ b/src/views/layout/components/Institute.vue
@@ -18,7 +18,7 @@
<script>
import { mapGetters } from 'vuex'
import pathToRegexp from 'path-to-regexp'
-const imgUrl = require('@/assets/logo.png')
+const imgUrl = require('@/assets/zhongtai_logo.jpg')
export default {
data() {
return {
@@ -86,12 +86,11 @@
}
}
.app-breadcrumb img{
- height:50px;
- width:50px;
- border:none;
- vertical-align: middle;
- margin-right:20px;
- margin-left:20px;
+ height: 62px;
+ width: 260px;
+ border: none;
+ vertical-align: middle;
+ margin-right: 20px;
}
.app-breadcrumb h1{
margin:0;
--
Gitblit v1.9.2