Merge remote-tracking branch 'origin/2024年1月24日测试' into 2024年1月24日测试

2024年2月1日V1.0.53.2
zhaoyu 2024-01-31 13:48:31 +08:00
commit 33c50697d6
24 changed files with 496 additions and 313 deletions

View File

@ -206,17 +206,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="四色图类型"> <!-- <el-form-item label="四色图类型">-->
<template> <!-- <template>-->
<el-radio v-model="form.FOURTYPE" label="1"></el-radio> <!-- <el-radio v-model="form.FOURTYPE" label="1"></el-radio>-->
<el-radio v-model="form.FOURTYPE" label="2">3D</el-radio> <!-- <el-radio v-model="form.FOURTYPE" label="2">3D</el-radio>-->
</template> <!-- </template>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
<el-row v-if="form.FOURTYPE=='1'"> <el-row v-if="form.FOURTYPE==='1'">
<el-col :span="24"> <el-col :span="24">
<div class="lh-1"> <div class="lh-1">
<el-form-item label="四色图"> <el-form-item label="四色图">
@ -258,7 +258,7 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-else-if="form.FOURTYPE=='2'"> <el-row v-else-if="form.FOURTYPE==='2'">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="四色图"> <el-form-item label="四色图">
<span v-if="form.FFILE">{{ form.FFILE.name }}</span> <span v-if="form.FFILE">{{ form.FFILE.name }}</span>
@ -1077,7 +1077,14 @@ export default {
// map.addOverlay(marker) // // map.addOverlay(marker) //
}, },
goBack() { goBack() {
this.$parent.activeName = 'corpView' this.$confirm('确定要退出吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.activeName = 'corpView'
}).catch(() => {
})
}, },
handleChangeIMGFour(file, fileList) { handleChangeIMGFour(file, fileList) {
const types = ['image/jpeg', 'image/jpg', 'image/png'] const types = ['image/jpeg', 'image/jpg', 'image/png']

View File

@ -45,6 +45,9 @@
<el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goDaoru"> <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goDaoru">
导入 导入
</el-button> </el-button>
<el-button v-waves type="info" icon="el-icon-download" @click="exportData">
导出数据
</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -166,6 +169,7 @@ export default {
directives: { waves }, directives: { waves },
data() { data() {
return { return {
config: config,
addBtnType: true, addBtnType: true,
listLoading: true, listLoading: true,
add: false, add: false,
@ -454,6 +458,35 @@ export default {
this.listLoading = false this.listLoading = false
}) })
this.listLoading = false this.listLoading = false
},
//
exportData() {
this.$confirm('确定要导出到excel吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log('开始')
this.listLoading = false
let pageData = ''
if (this.keySelect.FIRE_REGION_ID) {
pageData += '&FIRE_REGION_ID=' + this.keySelect.FIRE_REGION_ID
}
if (this.keySelect.FIRE_DEVICE_TYPE_ID) {
pageData += '&FIRE_DEVICE_TYPE_ID=' + this.keySelect.FIRE_DEVICE_TYPE_ID
}
if (this.keySelect.FIRE_POINT_NAME) {
pageData += '&FIRE_POINT_NAME=' + this.keySelect.FIRE_POINT_NAME
}
if (this.keySelect.FIRE_DEVICE_CODE) {
pageData += '&FIRE_DEVICE_CODE=' + this.keySelect.FIRE_DEVICE_CODE
}
window.open(this.config.httpurl + 'fireDevice/excelAll?' + pageData)
}).catch(() => {
console.log('报错')
this.listLoading = false
})
this.listLoading = false
} }
} }
} }

View File

@ -162,7 +162,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -177,7 +177,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -83,7 +83,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -98,7 +98,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -186,7 +186,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -201,7 +201,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -90,7 +90,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -105,7 +105,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -155,7 +155,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -171,7 +171,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -71,7 +71,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -86,7 +86,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -159,7 +159,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -174,7 +174,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -74,7 +74,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
@ -89,7 +89,7 @@ export default {
replyVarList: [], // REPLY replyVarList: [], // REPLY
replyListQuery: { replyListQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
replyTotal: 0, replyTotal: 0,
dialogFormHuifuShow: false, dialogFormHuifuShow: false,

View File

@ -142,7 +142,7 @@
</el-col> </el-col>
</td> </td>
</tr> </tr>
<tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' "> <tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' && HIDDENLEVEL != 'hiddenLevel1001'">
<td class="tbg">整改期限</td> <td class="tbg">整改期限</td>
<td> <td>
<el-col :span="24"> <el-col :span="24">
@ -150,7 +150,7 @@
</el-col> </el-col>
</td> </td>
</tr> </tr>
<tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != ''"> <tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' && HIDDENLEVEL != 'hiddenLevel1001'">
<td class="tbg">整改负责人</td> <td class="tbg">整改负责人</td>
<td> <td>
<el-col :span="12"> <el-col :span="12">
@ -175,7 +175,7 @@
<td class="tbg">隐患确认人</td> <td class="tbg">隐患确认人</td>
<td>{{ pd.conUserName }}</td> <td>{{ pd.conUserName }}</td>
</tr> </tr>
<tr> <tr v-if="HIDDENLEVEL != 'hiddenLevel1001'">
<td class="tbg">隐患确认时间</td> <td class="tbg">隐患确认时间</td>
<td> <td>
<el-col :span="24"> <el-col :span="24">
@ -635,6 +635,9 @@ export default {
} else { } else {
this.pd.STATE = '-2' this.pd.STATE = '-2'
} }
if (this.HIDDENLEVEL == 'hiddenLevel1001') { //
this.pd.STATE = '5'
}
if (this.pd.RECTIFICATIONDEPT == undefined) { if (this.pd.RECTIFICATIONDEPT == undefined) {
this.pd.RECTIFICATIONDEPT = '' this.pd.RECTIFICATIONDEPT = ''
} }

View File

@ -62,16 +62,13 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="隐患类型" prop="HIDDENTYPE"> <el-form-item label="隐患类型" prop="HIDDENTYPE">
<SelectTree <el-cascader
ref="deptTree_Select3" ref="deptTree_Select3"
:clearable="false"
:options="hiddenTypeList" :options="hiddenTypeList"
:props="defaultProps" :props="defaultProps"
v-model="condform.hiddenType" v-model="condform.hiddenType"
:canparent="false" collapse-tags
children-name="nodes" clearable/>
style="width: 100%;"
placeholder="请选择" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@ -297,7 +294,7 @@ export default {
{ ID: '16', NAME: '确认打回' }, { ID: '16', NAME: '确认打回' },
{ ID: '10', NAME: '验收打回' } { ID: '10', NAME: '验收打回' }
], ],
defaultProps: { value: 'id', children: 'nodes', label: 'name' }, defaultProps: { value: 'id', children: 'nodes', label: 'name', multiple: true, emitPath: false },
pickerOptions0: { disabledDate(time) { return time.getTime() < Date.now() - 8.64e6 } }, pickerOptions0: { disabledDate(time) { return time.getTime() < Date.now() - 8.64e6 } },
hiddenlevelList: [], // hiddenlevelList: [], //
hiddenPartList: [], // , hiddenPartList: [], // ,

View File

@ -15,6 +15,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="隐患来源">
<el-select v-model="SOURCE" placeholder="请选择">
<el-option v-for="item in sourceStateList" :key="item.id" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label-width="10px"> <el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery"> <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@ -110,6 +117,7 @@ export default {
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',
ISCHECK: '', ISCHECK: '',
SOURCE: '',
varList: [], varList: [],
sourceState: { sourceState: {
1: 'AI报警', 1: 'AI报警',
@ -117,6 +125,24 @@ export default {
4: '安全环保检查(监管端)', 4: '安全环保检查(监管端)',
5: '安全环保检查(企业端)' 5: '安全环保检查(企业端)'
}, },
sourceStateList: [
{
value: '1',
label: 'AI报警(监管端)'
},
{
value: '2',
label: 'AI报警(企业端)'
},
{
value: '4',
label: '安全环保检查(监管端)'
},
{
value: '5',
label: '安全环保检查(企业端)'
}
],
state: { state: {
1: '未整改', 1: '未整改',
2: '已整改', 2: '已整改',
@ -139,6 +165,7 @@ export default {
goKeyReset() { goKeyReset() {
this.KEYWORDS = '' this.KEYWORDS = ''
this.ISCHECK = '' this.ISCHECK = ''
this.SOURCE = ''
this.getQuery() this.getQuery()
}, },
// //
@ -149,7 +176,8 @@ export default {
{ {
KEYWORDS: this.KEYWORDS, KEYWORDS: this.KEYWORDS,
OUTSOURCED_ID: this.$parent.OUTSOURCED_ID, OUTSOURCED_ID: this.$parent.OUTSOURCED_ID,
ISCHECK: this.ISCHECK ISCHECK: this.ISCHECK,
SOURCE: this.SOURCE
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false

View File

@ -56,6 +56,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="企业辖区部门" class="is-required" prop="INVOLVING_CORPS_DEPART_ID"> <el-form-item label="企业辖区部门" class="is-required" prop="INVOLVING_CORPS_DEPART_ID">
<Treeselect <Treeselect
v-if="updateValue"
:multiple="true" :multiple="true"
:flat="true" :flat="true"
:default-expand-level="1" :default-expand-level="1"
@ -66,6 +67,8 @@
no-options-text="暂无数据" no-options-text="暂无数据"
no-children-text="暂无数据" no-children-text="暂无数据"
style="width: 100%;" style="width: 100%;"
@select="handleSelect"
@deselect="handleRemove"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -257,6 +260,7 @@ export default {
directives: { waves }, directives: { waves },
data() { data() {
return { return {
updateValue: true,
selectUsers: [], // selectUsers: [], //
chooseUserList: [], chooseUserList: [],
punishThePerson: [], punishThePerson: [],
@ -1199,6 +1203,52 @@ export default {
// resolve() // resolve()
}).catch((e) => { }).catch((e) => {
}) })
},
//
pullSelectedNodes(selectedItems) {
if (selectedItems.nodes && selectedItems.nodes.length > 0) {
for (let i = 0; i < selectedItems.nodes.length; i++) {
if (!this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) {
this.form.INVOLVING_CORPS_DEPART_ID.push(selectedItems.nodes[i].id)
}
this.pullSelectedNodes(selectedItems.nodes[i])
}
}
},
//
handleSelect(selectedItems) {
//
if (!this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) {
this.form.INVOLVING_CORPS_DEPART_ID.push(selectedItems.id)
}
this.pullSelectedNodes(selectedItems)
this.onClick()
},
//
removeSelectedNodes(selectedItems) {
if (selectedItems.nodes && selectedItems.nodes.length > 0) {
for (let i = 0; i < selectedItems.nodes.length; i++) {
if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) {
this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.nodes[i].id), 1)
}
this.removeSelectedNodes(selectedItems.nodes[i])
}
}
},
//
handleRemove(selectedItems) {
//
if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) {
this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.id), 1)
}
this.removeSelectedNodes(selectedItems)
this.onClick()
},
onClick() {
this.updateValue = false
this.$nextTick(() => {
this.updateValue = true
})
} }
} }
} }

View File

@ -76,6 +76,10 @@
<span v-if="pd.STATE == -2"></span> <span v-if="pd.STATE == -2"></span>
</td> </td>
</tr> </tr>
<tr>
<td class="bbg-transparent">具体位置</td>
<td colspan="3">{{ pd.LOCATION }}</td>
</tr>
<tr v-for="(item, index) in file9" :key="index"> <tr v-for="(item, index) in file9" :key="index">
<td class="bbg-transparent">安全管理协议{{ index + 1 }}</td> <td class="bbg-transparent">安全管理协议{{ index + 1 }}</td>
<td colspan="2">{{ item.FILE_NAME }}</td> <td colspan="2">{{ item.FILE_NAME }}</td>

View File

@ -277,9 +277,17 @@ export default {
'/riskunit/' + this.dialogType, '/riskunit/' + this.dialogType,
this.form this.form
).then((data) => { ).then((data) => {
this.listLoading = false if (data.result == 'success') {
this.dialogFormEdit = false this.listLoading = false
this.getList() this.dialogFormEdit = false
this.getList()
} else {
this.$message({
message: data.exception,
type: 'error'
})
this.listLoading = false
}
}).catch((e) => { }).catch((e) => {
this.listLoading = false this.listLoading = false
}) })

View File

@ -957,8 +957,15 @@ export default {
}, },
goBack() { goBack() {
this.$parent.INSPECTION_ID = '' this.$confirm('确定要退出吗', {
this.$parent.activeName = 'List' confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.INSPECTION_ID = ''
this.$parent.activeName = 'List'
}).catch(() => {
})
}, },
// //
getUserList(DEPARTMENT_ID) { getUserList(DEPARTMENT_ID) {

View File

@ -964,8 +964,15 @@ export default {
}, },
goBack() { goBack() {
this.$parent.INSPECTION_ID = '' this.$confirm(('确定要退出吗?'), {
this.$parent.activeName = 'List' confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$parent.INSPECTION_ID = ''
this.$parent.activeName = 'List'
}).catch(() => {
})
}, },
// //
getUserList(DEPARTMENT_ID) { getUserList(DEPARTMENT_ID) {

View File

@ -149,7 +149,7 @@
<el-button icon="el-icon-view" size="mini" @click="goDetail(row)"></el-button> <el-button icon="el-icon-view" size="mini" @click="goDetail(row)"></el-button>
<el-button type="success" icon="el-icon-view" size="mini" @click="checkFlow(row)"></el-button> <el-button type="success" icon="el-icon-view" size="mini" @click="checkFlow(row)"></el-button>
<el-button <el-button
v-show="edit && ( row.INSPECTION_STATUS == '-1')" v-show="edit && ( row.INSPECTION_STATUS == '-1') && loginUserId == row.INSPECTION_ORIGINATOR_ID"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"

View File

@ -65,7 +65,7 @@ export default {
edit: false, edit: false,
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
KEYWORDS: '', KEYWORDS: '',

View File

@ -101,7 +101,7 @@ export default {
socialPhotoFile: [], // socialPhotoFile: [], //
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
varList: [], varList: [],

View File

@ -98,7 +98,7 @@ export default {
socialPhotoFile: [], // socialPhotoFile: [], //
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
varList: [], varList: [],

View File

@ -104,7 +104,7 @@ export default {
socialPhotoFile: [], // socialPhotoFile: [], //
listQuery: { listQuery: {
page: 1, page: 1,
limit: 10 limit: 20
}, },
total: 0, total: 0,
varList: [], varList: [],

View File

@ -13,6 +13,8 @@
<script src="./js/ezuikit.js"></script> <script src="./js/ezuikit.js"></script>
<script src="./swiper-master/package/swiper-bundle.min.js"></script> <script src="./swiper-master/package/swiper-bundle.min.js"></script>
<script src="https://statics.ys7.com/openweb/common/scripts/jquery-39b5fb0510.cookie.js"></script> <script src="https://statics.ys7.com/openweb/common/scripts/jquery-39b5fb0510.cookie.js"></script>
<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
<script src="https://unpkg.com/element-ui/lib/index.js"></script>
<!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@4/dist/echarts.min.js"></script> <!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@4/dist/echarts.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-gl@1/dist/echarts-gl.min.js"></script> <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-gl@1/dist/echarts-gl.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-stat@1/dist/ecStat.min.js"></script> --> <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-stat@1/dist/ecStat.min.js"></script> -->
@ -140,32 +142,39 @@
本年隐患 本年隐患
</div> </div>
</div> </div>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="title"> <div class="task-text">
待处理 <div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.yearUncheck}}
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.yearUncheck}} <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
</div>
<div class="color-blue f22">
{{hdCount.yearChecked}}
</div>
</div> </div>
</div> </el-tooltip>
<div class="task-text">
<div class="title"> <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
已处理 <div class="task-text">
</div> <div class="title">
<div class="color-blue f22"> 隐患整改率
{{hdCount.yearChecked}} </div>
</div> <div class="color-org">
</div>
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
<span <span
class="f22">{{hdCount.yearTotal==0?0:((hdCount.yearChecked/hdCount.yearTotal*100).toFixed(2))}}</span> class="f22">{{hdCount.yearTotal==0?0:((hdCount.yearChecked/hdCount.yearTotal*100).toFixed(2))}}</span>
<span class="f14">%</span> <span class="f14">%</span>
</div>
</div> </div>
</div> </el-tooltip>
</div> </div>
<div class="task-item"> <div class="task-item">
<div class="task-textsp"> <div class="task-textsp">
@ -176,32 +185,38 @@
本季隐患 本季隐患
</div> </div>
</div> </div>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="title"> <div class="task-text">
待处理 <div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.quarterUncheck}}
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.quarterUncheck}} <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
</div>
<div class="color-blue f22">
{{hdCount.quarterChecked}}
</div>
</div> </div>
</div> </el-tooltip>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="title"> <div class="task-text">
已处理 <div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.quarterTotal==0?0:((hdCount.quarterChecked/hdCount.quarterTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.quarterChecked}}
</div>
</div>
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.quarterTotal==0?0:((hdCount.quarterChecked/hdCount.quarterTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div>
</div> </div>
<div class="task-item"> <div class="task-item">
<div class="task-textsp"> <div class="task-textsp">
@ -212,32 +227,38 @@
本月隐患 本月隐患
</div> </div>
</div> </div>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="title"> <div class="task-text">
待处理 <div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.monthUncheck}}
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.monthUncheck}} <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
</div>
<div class="color-blue f22">
{{hdCount.monthChecked}}
</div>
</div> </div>
</div> </el-tooltip>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="title"> <div class="task-text">
已处理 <div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.monthTotal==0?0:((hdCount.monthChecked/hdCount.monthTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.monthChecked}}
</div>
</div>
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.monthTotal==0?0:((hdCount.monthChecked/hdCount.monthTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div>
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
@ -250,32 +271,38 @@
本旬隐患 本旬隐患
</div> </div>
</div> </div>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="title"> <div class="task-text">
待处理 <div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.xunUncheck}}
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.xunUncheck}} <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
</div>
<div class="color-blue f22">
{{hdCount.xunChecked}}
</div>
</div> </div>
</div> </el-tooltip>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="title"> <div class="task-text">
已处理 <div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.xunTotal==0?0:((hdCount.xunChecked/hdCount.xunTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.xunChecked}}
</div>
</div>
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.xunTotal==0?0:((hdCount.xunChecked/hdCount.xunTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div>
</div> </div>
<div class="task-item"> <div class="task-item">
<div class="task-textsp"> <div class="task-textsp">
@ -286,32 +313,38 @@
本周隐患 本周隐患
</div> </div>
</div> </div>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="title"> <div class="task-text">
待处理 <div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.weekUncheck}}
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.weekUncheck}} <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
</div>
<div class="color-blue f22">
{{hdCount.weekChecked}}
</div>
</div> </div>
</div> </el-tooltip>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="title"> <div class="task-text">
已处理 <div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.weekTotal==0?0:((hdCount.weekChecked/hdCount.weekTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.weekChecked}}
</div>
</div>
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.weekTotal==0?0:((hdCount.weekChecked/hdCount.weekTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div>
</div> </div>
<div class="task-item"> <div class="task-item">
<div class="task-textsp"> <div class="task-textsp">
@ -322,32 +355,38 @@
本日隐患 本日隐患
</div> </div>
</div> </div>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="title"> <div class="task-text">
待处理 <div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.dayUncheck}}
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.dayUncheck}} <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
<div class="task-text">
<div class="title">
已处理
</div>
<div class="color-blue f22">
{{hdCount.dayChecked}}
</div>
</div> </div>
</div> </el-tooltip>
<div class="task-text"> <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="title"> <div class="task-text">
已处理 <div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.dayTotal==0?0:((hdCount.dayChecked/hdCount.dayTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div> </div>
<div class="color-blue f22"> </el-tooltip>
{{hdCount.dayChecked}}
</div>
</div>
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
<span
class="f22">{{hdCount.dayTotal==0?0:((hdCount.dayChecked/hdCount.dayTotal*100).toFixed(2))}}</span>
<span class="f14">%</span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -1821,135 +1860,135 @@ var vm = new Vue({
}, 2000) }, 2000)
}) })
// 周检查 // 周检查
$.ajax({ // $.ajax({
xhrFields: { // xhrFields: {
withCredentials: true // withCredentials: true
}, // },
type: 'POST', // type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount', // url: config.httpurl + 'checkrecord/goBiListCount',
data: { // data: {
COUNTTYPE: 'week', // COUNTTYPE: 'week',
tm: new Date().getTime() // tm: new Date().getTime()
}, // },
dataType: 'json', // dataType: 'json',
success: function(data) { // success: function(data) {
if (data.result == 'success') { // if (data.result == 'success') {
_this.listCountWeek = data.all // _this.listCountWeek = data.all
vm.$forceUpdate() // 强制刷新 // vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') { // } else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常 // showException('系统首页', '数据异常') // 显示异常
} // }
} // }
}).done().fail(function() { // }).done().fail(function() {
swal('登录失效!', '请求服务器无响应,稍后再试', 'warning') // swal('登录失效!', '请求服务器无响应,稍后再试', 'warning')
setTimeout(function() { // setTimeout(function() {
window.location.href = config.weburl + '#/login' // window.location.href = config.weburl + '#/login'
}, 2000) // }, 2000)
}) // })
// 旬检查 // 旬检查
$.ajax({ // $.ajax({
xhrFields: { // xhrFields: {
withCredentials: true // withCredentials: true
}, // },
type: 'POST', // type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount', // url: config.httpurl + 'checkrecord/goBiListCount',
data: { // data: {
COUNTTYPE: 'xun', // COUNTTYPE: 'xun',
tm: new Date().getTime() // tm: new Date().getTime()
}, // },
dataType: 'json', // dataType: 'json',
success: function(data) { // success: function(data) {
if (data.result == 'success') { // if (data.result == 'success') {
_this.listCountXun = data.all // _this.listCountXun = data.all
vm.$forceUpdate() // 强制刷新 // vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') { // } else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常 // showException('系统首页', '数据异常') // 显示异常
} // }
} // }
}).done().fail(function() { // }).done().fail(function() {
swal('登录失效!', '请求服务器无响应,稍后再试', 'warning') // swal('登录失效!', '请求服务器无响应,稍后再试', 'warning')
setTimeout(function() { // setTimeout(function() {
window.location.href = config.weburl + '#/login' // window.location.href = config.weburl + '#/login'
}, 2000) // }, 2000)
}) // })
// 月检查 // 月检查
$.ajax({ // $.ajax({
xhrFields: { // xhrFields: {
withCredentials: true // withCredentials: true
}, // },
type: 'POST', // type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount', // url: config.httpurl + 'checkrecord/goBiListCount',
data: { // data: {
COUNTTYPE: 'month', // COUNTTYPE: 'month',
tm: new Date().getTime() // tm: new Date().getTime()
}, // },
dataType: 'json', // dataType: 'json',
success: function(data) { // success: function(data) {
if (data.result == 'success') { // if (data.result == 'success') {
_this.listCountMonth = data.all // _this.listCountMonth = data.all
vm.$forceUpdate() // 强制刷新 // vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') { // } else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常 // showException('系统首页', '数据异常') // 显示异常
} // }
} // }
}).done().fail(function() { // }).done().fail(function() {
swal('登录失效!', '请求服务器无响应,稍后再试', 'warning') // swal('登录失效!', '请求服务器无响应,稍后再试', 'warning')
setTimeout(function() { // setTimeout(function() {
window.location.href = config.weburl + '#/login' // window.location.href = config.weburl + '#/login'
}, 2000) // }, 2000)
}) // })
// 季检查 // 季检查
$.ajax({ // $.ajax({
xhrFields: { // xhrFields: {
withCredentials: true // withCredentials: true
}, // },
type: 'POST', // type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount', // url: config.httpurl + 'checkrecord/goBiListCount',
data: { // data: {
COUNTTYPE: 'quarter', // COUNTTYPE: 'quarter',
tm: new Date().getTime() // tm: new Date().getTime()
}, // },
dataType: 'json', // dataType: 'json',
success: function(data) { // success: function(data) {
if (data.result == 'success') { // if (data.result == 'success') {
_this.listCountQuarter = data.all // _this.listCountQuarter = data.all
vm.$forceUpdate() // 强制刷新 // vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') { // } else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常 // showException('系统首页', '数据异常') // 显示异常
} // }
} // }
}).done().fail(function() { // }).done().fail(function() {
swal('登录失效!', '请求服务器无响应,稍后再试', 'warning') // swal('登录失效!', '请求服务器无响应,稍后再试', 'warning')
setTimeout(function() { // setTimeout(function() {
window.location.href = config.weburl + '#/login' // window.location.href = config.weburl + '#/login'
}, 2000) // }, 2000)
}) // })
// 年检查 // 年检查
$.ajax({ // $.ajax({
xhrFields: { // xhrFields: {
withCredentials: true // withCredentials: true
}, // },
type: 'POST', // type: 'POST',
url: config.httpurl + 'checkrecord/goBiListCount', // url: config.httpurl + 'checkrecord/goBiListCount',
data: { // data: {
COUNTTYPE: 'year', // COUNTTYPE: 'year',
tm: new Date().getTime() // tm: new Date().getTime()
}, // },
dataType: 'json', // dataType: 'json',
success: function(data) { // success: function(data) {
if (data.result == 'success') { // if (data.result == 'success') {
_this.listCountYear = data.all // _this.listCountYear = data.all
vm.$forceUpdate() // 强制刷新 // vm.$forceUpdate() // 强制刷新
} else if (data.result == 'exception') { // } else if (data.result == 'exception') {
showException('系统首页', '数据异常') // 显示异常 // showException('系统首页', '数据异常') // 显示异常
} // }
} // }
}).done().fail(function() { // }).done().fail(function() {
swal('登录失效!', '请求服务器无响应,稍后再试', 'warning') // swal('登录失效!', '请求服务器无响应,稍后再试', 'warning')
setTimeout(function() { // setTimeout(function() {
window.location.href = config.weburl + '#/login' // window.location.href = config.weburl + '#/login'
}, 2000) // }, 2000)
}) // })
}, },
// 退出系统 // 退出系统