guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '20240328-limingyu-0328测试内容' into pet

pull/11/head
limingyu 2024-03-30 09:25:28 +08:00
parent 7d8406e957 26170c5a98
commit c4a4559043
17 changed files with 845 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
src/views/check/checkrecord/components/checkdstart.vue
View File

@ -406,50 +406,56 @@
</el-col>
</el-row>
<el-row class="form-group input-group-sm">
<el-col :span="11">
<el-form-item label="隐患发现部门：">
<el-input v-model="myUserInfo.DEPARTMENTName" :disabled="true" placeholder="请输入内容"/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="隐患发现人：">
<el-input v-model="myUserInfo.USERNAME" :disabled="true" placeholder="请输入内容"/>
</el-form-item>
</el-col>
<el-col v-if="hiddenForm.HIDDENLEVEL !='jdyh001' && hiddenForm.HIDDENLEVEL !='hiddenLevel2002'" :span="2">
<el-form-item label-width="0px">
<el-button type="primary" style="margin-left:15px" @click="addFindOther">添加</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row v-for="(data,index) in findCreatorList" :key="index" class="form-group input-group-sm">
<el-col :span="11">
<el-form-item label="隐患发现部门：">
<SelectTree
ref="'deptTree'+index"
ref="deptTree"
:key="modelKey"
:clearable="false"
:options="treeData"
:props="defaultProps"
v-model="data.DEPARTMENT_ID"
style="width: 100%;"
v-model="myUserInfo.DEPARTMENT_ID"
placeholder="请选择隐患发现部门"
@change="updateFindOtherDep(data.DEPARTMENT_ID,index)"
@change="updateFindDep(myUserInfo.DEPARTMENT_ID)"
/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="隐患发现人：">
<el-select v-model="data.USER_ID" style="width: 100%;" clearable placeholder="请选择隐患发现人" @visible-change="$forceUpdate()">
<el-option v-for="item in findUserList[index]" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
<el-select v-model="myUserInfo.USER_ID" clearable placeholder="请选择隐患发现人" @visible-change="$forceUpdate()">
<el-option v-for="item in findUserList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label-width="0px">
<el-button type="danger" style="margin-left:15px" @click="remoFindOther">删除</el-button>
</el-form-item>
</el-col>
</el-row>
<!--<el-row v-for="(data,index) in findCreatorList" :key="index" class="form-group input-group-sm">-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="隐患发现部门：">-->
<!-- <SelectTree-->
<!-- ref="'deptTree'+index"-->
<!-- :clearable="false"-->
<!-- :options="treeData"-->
<!-- :props="defaultProps"-->
<!-- v-model="data.DEPARTMENT_ID"-->
<!-- style="width: 100%;"-->
<!-- placeholder="请选择隐患发现部门"-->
<!-- @change="updateFindOtherDep(data.DEPARTMENT_ID,index)"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="隐患发现人：">-->
<!-- <el-select v-model="data.USER_ID" style="width: 100%;" clearable placeholder="请选择隐患发现人" @visible-change="$forceUpdate()">-->
<!-- <el-option v-for="item in findUserList[index]" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <el-form-item label-width="0px">-->
<!-- <el-button type="danger" style="margin-left:15px" @click="remoFindOther">删除</el-button>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!--</el-row>-->
<el-row>
<el-col :span="24">
<el-form-item label="隐患发现时间：">
@ -679,7 +685,8 @@ export default {
}
},
editVector: '添加隐患',
addLoading: false
addLoading: false,
modelKey: 0
}
},
watch: {
@ -1511,7 +1518,8 @@ export default {
LISTMANAGER_ID: this.LISTMANAGER_ID,
HAVESCHEME: 0,
hiddenPartType: this.hiddenPartType,
findCreator: findCreator
findCreator: findCreator,
hiddenFindCreator: this.myUserInfo.USER_ID
// DISCOVERYTIME: this.hiddenForm.DISCOVERYTIME, // 隐患发现时间
// CONFIRM_USER: this.hiddenForm.CONFIRM_USER // 隐患确认人
}
@ -1730,11 +1738,17 @@ export default {
requestFN(
'/user/goEditMyInfo',
{}
).then((data) => {
).then(async(data) => {
// var o = { 'DEPARTMENT_ID': data.pd.DEPARTMENT_ID, 'USER_ID': data.pd.USER_ID }
this.myUserInfo.DEPARTMENT_ID = data.depname
// this.myUserInfo.DEPARTMENT_ID = data.depname
this.myUserInfo.DEPARTMENT_ID = data.pd.DEPARTMENT_ID
this.myUserInfo.DEPARTMENTName = data.pd.deptName
if (data.pd.DEPARTMENT_ID) {
await this.getFindUserListByDepId(data.pd.DEPARTMENT_ID)
}
this.modelKey++ // 为了重新渲染级联选择器
this.myUserInfo.USERNAME = data.pd.NAME
this.myUserInfo.USER_ID = data.pd.USER_ID
this.$forceUpdate()
}).catch((e) => {
this.addLoading = false
@ -1747,24 +1761,46 @@ export default {
remoFindOther(index) { // 删除隐患发现人员
this.findCreatorList.splice(index, 1)
},
updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门
this.findCreatorList[i].USER_ID = ''
this.getFindUserList(DEPARTMENT_ID, i)
updateFindDep(DEPARTMENT_ID) {
this.myUserInfo.USER_ID = ''
this.getFindUserListByDepId(DEPARTMENT_ID)
},
getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息
this.listLoading = true
requestFN(
'/user/listAll',
{
DEPARTMENT_ID: DEPARTMENT_ID,
tm: new Date().getTime()
}
).then((data) => {
this.$set(this.findUserList, index, data.userList)
}).catch((e) => {
this.listLoading = false
// updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门
// this.findCreatorList[i].USER_ID = ''
// this.getFindUserList(DEPARTMENT_ID, i)
// },
getFindUserListByDepId(DEPARTMENT_ID) {
return new Promise((resolve) => {
this.listLoading = true
requestFN(
'/user/listAll',
{
DEPARTMENT_ID: DEPARTMENT_ID,
tm: new Date().getTime()
}
).then((data) => {
this.findUserList = data.userList
this.$forceUpdate()
resolve()
}).catch((e) => {
this.listLoading = false
})
})
},
// getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息
// this.listLoading = true
// requestFN(
// '/user/listAll',
// {
// DEPARTMENT_ID: DEPARTMENT_ID,
// tm: new Date().getTime()
// }
// ).then((data) => {
// this.$set(this.findUserList, index, data.userList)
// }).catch((e) => {
// this.listLoading = false
// })
// },
updateConfirmDept() { // 根据选择的隐患确认部门显示隐患确认人
this.listLoading = true
requestFN(

8
src/views/check/listmanager/components/list.vue
View File

@ -300,7 +300,13 @@ export default {
goQrcode(row) {
this.dialogVisible = true
this.pd = Object.assign({}, row)
this.qrcodeStr = row.LISTMANAGER_ID
// this.qrcodeStr = row.LISTMANAGER_ID
const json = {
LISTMANAGER_ID: row.LISTMANAGER_ID,
MANAGER_TYPE: 'listManager'
}
const jsonStr = JSON.stringify(json)
this.qrcodeStr = jsonStr
},
// 判断按钮权限，用于是否显示按钮
hasButton: function() {

189
src/views/firefighting/checklist/components/edit.vue
View File

@ -23,30 +23,40 @@
<el-col :span="5">
<el-form-item label="负责部门：" prop="DEPARTMENT_ID">
<SelectTree
v-if="treeData.length !== 0"
v-if="treeData.length !== 0 && FIRE_CHECK_ID != ''"
ref="deptTree_Select"
:disable="FIRE_CHECK_ID !=''"
:clearable="false"
:options="treeData"
:props="defaultProps"
:key="form.UPDATE_DEPARTMENT_ID"
v-model="form.UPDATE_DEPARTMENT_ID"
placeholder="请选择部门"
@change="updateDeptChange"/>
<Treeselect
v-if="updateValue && FIRE_CHECK_ID == ''"
:multiple="true"
:flat="true"
:default-expand-level="1"
:options="treeData"
:normalizer="normalizer"
:disable="true"
:clearable="false"
v-model="form.DEPARTMENT_ID"
placeholder="请选择部门"/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="岗位：" prop="POST_ID">
<el-select
:disabled="FIRE_CHECK_ID !=''"
v-model="form.POST_ID"
placeholder="请选择">
<el-option v-for="item in postList" :key="item.POST_ID" :label="item.NAME" :value="item.POST_ID" />
</el-select>
placeholder="请选择部门"
no-options-text="暂无数据"
no-children-text="暂无数据"
style="width: 100%;"
@select="handleSelect"
@deselect="handleRemove"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="检查人：" prop="USER_ID">
<el-select
:disabled="FIRE_CHECK_ID !=''"
v-if="FIRE_CHECK_ID == ''"
ref="userTree_Select"
:key="userListChangeValue"
v-model="form.USER_ID"
multiple
clearable
@ -54,6 +64,16 @@
class="filter-item">
<el-option v-for="item in peopleList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
<el-select
v-if="FIRE_CHECK_ID != ''"
ref="userTree_Select"
:key="form.UPDATE_USER_ID"
v-model="form.UPDATE_USER_ID"
clearable
placeholder="请选择人员"
class="filter-item">
<el-option v-for="item in peopleList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
@ -343,8 +363,10 @@ export default {
FIRE_CHECK_TYPE: '',
POST_ID: [],
FIRE_CHECK_TYPE_NAME: '',
DEPARTMENT_ID: '',
DEPARTMENT_ID: [],
UPDATE_DEPARTMENT_ID: '',
USER_ID: [],
UPDATE_USER_ID: '',
DATA: ''
},
rules: {
@ -394,7 +416,17 @@ export default {
},
multipleSelectionAll: [], // 所有选中的数据包含跨页数据
multipleSelection: [], // 当前页选中的数据
accidentList: []
accidentList: [],
updateValue: true,
normalizer(node) {
return {
id: node.id,
label: node.name,
children: node.nodes,
isDisabled: node.pId === '0'
}
},
userListChangeValue: 0
}
},
watch: {
@ -420,21 +452,34 @@ export default {
if (newVal !== '') this.getDeviceByPointId(newVal)
}, immediate: false
},
'form.POST_ID': {
handler(newVal, oldVal) {
this.peopleList = []
this.form.USER_ID = []
if (this.form.POST_ID != '') this.getUserList()
}
},
// 'form.POST_ID': {
// handler(newVal, oldVal) {
// this.peopleList = []
// this.form.USER_ID = []
// if (this.form.POST_ID != '') this.getUserList()
// }
// },
'form.DEPARTMENT_ID': {
// 选择了负责部门 查询相关的点检
handler(newVal, oldVal) {
this.peopleList = []
if (newVal !== '') this.form.POST_ID = ''
if (newVal !== '') this.getList(newVal)
if (newVal !== '') this.getCheckList(newVal)
if (newVal !== '') this.getPostList(newVal)
// if (newVal !== '') this.form.POST_ID = ''
if (newVal.length !== 0) this.getList(newVal)
if (newVal.length !== 0) this.getCheckList(newVal)
// if (newVal !== '') this.getPostList(newVal)
if (newVal.length !== 0) this.getUserList()
},
immediate: false
},
'form.UPDATE_DEPARTMENT_ID': {
// 选择了负责部门 查询相关的点检
handler(newVal, oldVal) {
this.peopleList = []
// if (newVal !== '') this.form.POST_ID = ''
if (newVal.length !== 0) this.getList(newVal)
if (newVal.length !== 0) this.getCheckList(newVal)
// if (newVal !== '') this.getPostList(newVal)
if (newVal.length !== 0) this.getUserList()
},
immediate: false
}
@ -451,11 +496,18 @@ export default {
},
methods: {
getUserList() {
let DEPARTMENT_ID = ''
if (this.FIRE_CHECK_ID != '') {
DEPARTMENT_ID = this.form.UPDATE_DEPARTMENT_ID
} else {
DEPARTMENT_ID = this.form.DEPARTMENT_ID.toString()
}
requestFN(
'/user/listAll',
{
DEPARTMENT_ID: this.form.DEPARTMENT_ID,
POST_ID: this.form.POST_ID
DEPARTMENT_ID: DEPARTMENT_ID
// DEPARTMENT_ID: this.form.DEPARTMENT_ID,
// POST_ID: this.form.POST_ID
}
).then((data) => {
this.peopleList = data.userList
@ -526,12 +578,18 @@ export default {
},
// 部门列表树
async getTreeData() {
requestFN(
'/department/listTree',
{}
).then((data) => {
this.treeData = JSON.parse(data.zTreeNodes)
}).catch((e) => {
return new Promise((resolve, reject) => {
requestFN(
'/department/listTree',
{}
).then((data) => {
this.treeData = JSON.parse(data.zTreeNodes)
this.treeData.forEach((item) => {
item.isDisabled = true
})
resolve()
}).catch((e) => {
})
})
},
getList(DEPARTMENT_ID) {
@ -544,7 +602,7 @@ export default {
'/user/getDepartmentId',
{
KEYWORDS: this.KEYWORDS,
DEPARTMENT_ID: this.DEPARTMENT_ID
DEPARTMENT_ID: this.DEPARTMENT_ID.toString()
}
).then((data) => {
this.listLoading = false
@ -639,7 +697,7 @@ export default {
if (!this.FIRE_CHECK_ID) {
requestFN(
'/fireCheckList/getCheckList',
{ DEPARTMENT_ID: DEPARTMENT_ID }
{ DEPARTMENT_ID: DEPARTMENT_ID.toString() }
).then((data) => {
this.checkList = data.varList
this.checkListBackUp = data.varList
@ -923,13 +981,16 @@ export default {
).then((data) => {
this.form.FIRE_CHECK_STANDARD_NAME = data.checkListInfo.FIRE_CHECK_STANDARD_NAME
this.form.FIRE_CHECK_TYPE = data.checkListInfo.FIRE_CHECK_TYPE
this.form.DEPARTMENT_ID = data.checkListInfo.DEPARTMENT_ID
// this.form.DEPARTMENT_ID = data.checkListInfo.DEPARTMENT_ID
this.form.DEPARTMENT_ID.push(data.checkListInfo.DEPARTMENT_ID)
this.form.UPDATE_DEPARTMENT_ID = data.checkListInfo.DEPARTMENT_ID
this.$nextTick(() => {
this.form.POST_ID = data.checkListInfo.POST_ID
// this.form.POST_ID = data.checkListInfo.POST_ID
this.userList = []
this.getUserList()
const u = []
u.push(data.checkListInfo.USER_ID)
this.form.UPDATE_USER_ID = data.checkListInfo.USER_ID
this.$nextTick(() => {
this.form.USER_ID = u
this.checkListBackUp = data.checkStandardList
@ -968,6 +1029,56 @@ export default {
).then((data) => {
this.deviceTypeList = data.list
})
},
onClick() {
this.updateValue = false
this.$nextTick(() => {
this.updateValue = true
})
},
// 选择项时触发的事件
handleSelect(selectedItems) {
// 选择父节点时同时勾选全部子节点
if (!this.form.DEPARTMENT_ID.includes(selectedItems.id)) {
this.form.DEPARTMENT_ID.push(selectedItems.id)
}
this.pullSelectedNodes(selectedItems)
this.onClick()
},
// 将树节点的子节点全部添加到数组中
pullSelectedNodes(selectedItems) {
if (selectedItems.nodes && selectedItems.nodes.length > 0) {
for (let i = 0; i < selectedItems.nodes.length; i++) {
if (!this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) {
this.form.DEPARTMENT_ID.push(selectedItems.nodes[i].id)
}
this.pullSelectedNodes(selectedItems.nodes[i])
}
}
},
// 移除选中项时触发的事件
handleRemove(selectedItems) {
this.form.USER_ID = []
// 移除选中项时同时移除全部子节点
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()
},
// 将选中项的子节点全部移除
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])
}
}
},
updateDeptChange() {
this.form.UPDATE_USER_ID = ''
}
}
}

20
src/views/firefighting/device/components/list.vue
View File

@ -34,6 +34,16 @@
<el-input v-model="keySelect.FIRE_DEVICE_CODE" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="负责部门" label-width="110px">
<el-input v-model="keySelect.DEPARTMENT_NAME" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="负责人" label-width="110px">
<el-input v-model="keySelect.USER_NAME" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@ -183,7 +193,9 @@ export default {
FIRE_DEVICE_TYPE_ID: '',
FIRE_REGION_ID: '',
FIRE_POINT_NAME: '',
FIRE_DEVICE_CODE: ''
FIRE_DEVICE_CODE: '',
DEPARTMENT_NAME: '',
USER_NAME: ''
},
treeData: [],
typeData: [],
@ -284,7 +296,9 @@ export default {
FIRE_REGION_ID: this.keySelect.FIRE_REGION_ID,
FIRE_DEVICE_TYPE_ID: this.keySelect.FIRE_DEVICE_TYPE_ID,
FIRE_POINT_NAME: this.keySelect.FIRE_POINT_NAME,
FIRE_DEVICE_CODE: this.keySelect.FIRE_DEVICE_CODE
FIRE_DEVICE_CODE: this.keySelect.FIRE_DEVICE_CODE,
DEPARTMENT_NAME: this.keySelect.DEPARTMENT_NAME,
USER_NAME: this.keySelect.USER_NAME
}
).then((data) => {
this.listLoading = false
@ -299,6 +313,8 @@ export default {
this.keySelect.FIRE_DEVICE_TYPE_ID = ''
this.keySelect.FIRE_REGION_ID = ''
this.keySelect.FIRE_DEVICE_CODE = ''
this.keySelect.DEPARTMENT_NAME = ''
this.keySelect.USER_NAME = ''
this.getList()
},
getDict() {

143
src/views/firefighting/points/components/list.vue
View File

@ -13,6 +13,19 @@
<el-input v-model="FIRE_POINT_CODE" placeholder="请输入关键字"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="负责部门" label-width="110px">
<SelectTree
ref="deptTree_Select"
:key="selectForm.DEPARTMENT_ID"
:clearable="true"
:options="deptTreeData"
:props="defaultProps"
v-model="selectForm.DEPARTMENT_ID"
placeholder="请选择部门"
style="width: 100%;"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@ -78,6 +91,7 @@
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete">批量删除</el-button>
<el-button type="info" icon="el-icon-plus" @click="handleEditUser">批量修改负责人</el-button>
</div>
<pagination
:total="total"
@ -116,6 +130,22 @@
<el-button v-print="'#printTest'" type="primary">打 印</el-button>
</div>
</el-dialog>
<el-dialog v-loading ="listLoading" :visible.sync="dialogEditUser" title="批量修改负责人" width="800px">
<el-form ref="firefightingBatchEditDept" :model="dialogEditUserForm" :rules="dialogEditUserRules" label-width="150px">
<el-row>
<el-form-item label="负责部门" prop="USER_ID">
<el-select v-model="dialogEditUserForm.USER_ID" placeholder="请选择人员" class="filter-item" style="width: 80%;">
<el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogEditUser = false">取 消</el-button>
<el-button type="primary" @click="dialogEditUserConfirm">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
@ -153,6 +183,9 @@ export default {
KEYWORDS: '',
FIRE_POINT_NAME: '',
FIRE_POINT_CODE: '',
selectForm: {
DEPARTMENT_ID: ''
},
// 树形菜单
filterText: '',
varList: [],
@ -161,7 +194,17 @@ export default {
value: 'id',
children: 'nodes',
label: 'name'
}
},
editDataIds: [],
dialogEditUser: false,
dialogEditUserForm: {
USER_ID: ''
},
dialogEditUserRules: {
USER_ID: [{ required: true, message: '请选择负责人', trigger: 'change' }]
},
deptTreeData: [],
userList: []
}
},
watch: {
@ -173,12 +216,19 @@ export default {
created() {
this.getList()
this.hasButton()
this.getTreeData()
},
methods: {
handleShowQr(ROW) {
this.dialogFormShow = true
this.qrInfo = ROW
this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
// this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
const json = {
MANAGER_TYPE: 'fireListManager',
FIRE_POINT_ID: ROW.FIRE_POINT_ID
}
const jsonStr = JSON.stringify(json)
this.qrcodeStr = jsonStr
},
handleEdit(FIRE_POINT_ID) {
this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
@ -211,7 +261,8 @@ export default {
'/firePoint/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
FIRE_POINT_NAME: this.FIRE_POINT_NAME,
FIRE_POINT_CODE: this.FIRE_POINT_CODE
FIRE_POINT_CODE: this.FIRE_POINT_CODE,
DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID
}
).then((data) => {
this.listLoading = false
@ -224,6 +275,9 @@ export default {
}, goKeyReset() {
this.FIRE_POINT_NAME = ''
this.FIRE_POINT_CODE = ''
this.selectForm = {
DEPARTMENT_ID: ''
}
this.getList()
},
getDict() {
@ -263,6 +317,89 @@ export default {
this.listLoading = false
})
},
// 部门列表树
getTreeData() {
requestFN(
'/department/listTreeV2',
{}
).then((data) => {
this.deptTreeData = JSON.parse(data.zTreeNodes)
}).catch((e) => {
})
},
// 批量修改负责人
handleEditUser(row) {
this.editDataIds = []
if (row.FIRE_POINT_ID) {
this.editDataIds.push(row.FIRE_POINT_ID)
} else {
const selection = this.$refs.multipleTable.selection
if (!selection.length > 0) {
this.$message({
type: 'warning',
message: '请选择要修改的数据'
})
return
}
selection.forEach(item => {
this.editDataIds.push(item.FIRE_POINT_ID)
})
}
const selection = this.$refs.multipleTable.selection
const DEPARTMENT_ID = selection[0].DEPARTMENT_ID
if (selection.length > 1) {
let flag = false
selection.forEach(item => {
if (DEPARTMENT_ID !== item.DEPARTMENT_ID) {
this.$message({
type: 'warning',
message: '只能选择同一部门下的数据'
})
flag = true
}
})
if (flag) {
return
}
}
this.getUserList(DEPARTMENT_ID)
this.dialogEditUserForm = {
USER_ID: ''
}
this.dialogEditUser = true
},
getUserList(DEPARTMENT_ID) {
requestFN(
'/user/listAll',
{
DEPARTMENT_ID: DEPARTMENT_ID
}
).then((data) => {
this.userList = data.userList
}).catch((e) => {
})
},
dialogEditUserConfirm() {
this.$refs.firefightingBatchEditDept.validate((valid) => {
if (valid) {
this.listLoading = true
requestFN(
'/firePoint/batchEditFirePointUser',
{
DATA_IDS: this.editDataIds.join(','),
USER_ID: this.dialogEditUserForm.USER_ID
}
).then(() => {
this.$message({
message: '修改成功',
type: 'success'
})
this.dialogEditUser = false
this.getList()
}).catch(() => {})
}
})
},
handleDelete(row) {
const DATA_IDS = []
if (row.FIRE_POINT_ID) {

15
src/views/firefighting/region/components/edit.vue
View File

@ -42,6 +42,14 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="检查照片上传方式：" prop="PHOTO_UPLOAD_METHOD">
<el-radio v-model="form.PHOTO_UPLOAD_METHOD" label="1">相机照相</el-radio>
<el-radio v-model="form.PHOTO_UPLOAD_METHOD" label="2">相册获取</el-radio>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="ui-foot">
@ -73,7 +81,8 @@ export default {
FIRE_REGION_ID: '',
DEPARTMENT_ID: '',
REMAKE: '',
FIRE_REGION_CODE: ''
FIRE_REGION_CODE: '',
PHOTO_UPLOAD_METHOD: '' // 1相机 2相册
},
riskForm: {},
KEYWORDS: '',
@ -139,7 +148,8 @@ export default {
FIRE_REGION_CODE: this.form.FIRE_REGION_CODE,
DEPARTMENT_ID: this.form.DEPARTMENT_ID,
DEPARTMENT_ID_OLD: this.DEPARTMENT_ID_OLD,
REMAKE: this.form.REMAKE
REMAKE: this.form.REMAKE,
PHOTO_UPLOAD_METHOD: this.form.PHOTO_UPLOAD_METHOD
}
).then((data) => {
if (data.code != 0) {
@ -186,6 +196,7 @@ export default {
this.DEPARTMENT_ID_OLD = data.res.DEPARTMENT_ID
this.form.FIRE_REGION_ID = data.res.FIRE_REGION_ID
this.form.REMAKE = data.res.REMAKE
this.form.PHOTO_UPLOAD_METHOD = data.res.PHOTO_UPLOAD_METHOD.toString()
this.dialogFormVisible = false
}).catch((e) => {
this.dialogFormVisible = false

96
src/views/firefighting/region/components/list.vue
View File

@ -80,6 +80,7 @@
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-plus" @click="handelDelete">批量删除</el-button>
<el-button type="info" icon="el-icon-plus" @click="handelEditDept">批量修改负责部门</el-button>
</div>
<pagination
:total="total"
@ -89,7 +90,30 @@
</div>
</div>
</div>
<el-dialog v-loading ="listLoading" :visible.sync="dialogEditDept" title="批量修改负责部门" width="800px">
<el-form ref="firefightingBatchEditDept" :model="form" :rules="rule" label-width="150px">
<el-row>
<el-form-item label="负责部门" prop="DEPARTMENT_ID">
<SelectTree
v-if="deptTreeData.length !== 0"
ref="deptTree_Select"
:key="form.DEPARTMENT_ID"
:clearable="false"
:options="deptTreeData"
:props="defaultProps"
v-model="form.DEPARTMENT_ID"
style="width: 80%;"
placeholder="请选择部门"
/>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogEditDept = false">取 消</el-button>
<el-button type="primary" @click="dialogEditDeptConfirm">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
@ -128,7 +152,16 @@ export default {
value: 'id',
children: 'nodes',
label: 'name'
}
},
dialogEditDept: false,
form: {
DEPARTMENT_ID: ''
},
rule: {
DEPARTMENT_ID: [{ required: true, message: '负责部门不能为空', trigger: 'blur' }]
},
deptTreeData: [],
editDataIds: []
}
},
watch: {
@ -141,6 +174,7 @@ export default {
this.getList()
this.hasButton()
this.getTreeList()
this.getTreeData()
},
methods: {
filterNode(value, data) {
@ -162,6 +196,16 @@ export default {
this.$parent.FIRE_REGION_NAME = FIRE_REGION_ID
this.$parent.activeName = 'Subset'
},
// 部门列表树
getTreeData() {
requestFN(
'/department/listTreeV2',
{}
).then((data) => {
this.deptTreeData = JSON.parse(data.zTreeNodes)
}).catch((e) => {
})
},
handleClose(FIRE_REGION_ID, name) {
this.$confirm('确定要禁用[' + name + ']吗?', {
confirmButtonText: '确定',
@ -226,6 +270,56 @@ export default {
selectable(row, index) {
return row.ITEMCOUNT == 0
},
// 批量修改负责部门
handelEditDept(row) {
this.editDataIds = []
if (row.FIRE_REGION_ID) {
this.editDataIds.push(row.FIRE_REGION_ID)
} else {
const selection = this.$refs.multipleTable.selection
if (!selection.length > 0) {
this.$message({
type: 'warning',
message: '请选择要修改负责部门的数据'
})
return
}
selection.forEach(item => {
this.editDataIds.push(item.FIRE_REGION_ID)
})
}
this.dialogEditDept = true
this.form = {
DEPARTMENT_ID: ''
}
},
dialogEditDeptConfirm() {
this.$refs.firefightingBatchEditDept.validate((valid) => {
if (valid) {
this.listLoading = true
requestFN(
'/fireregion/batchEditDeptByIds',
{
DATA_IDS: this.editDataIds.join(','),
DEPARTMENT_ID: this.form.DEPARTMENT_ID
}
).then(() => {
this.$message({
message: '修改成功',
type: 'success'
})
this.$refs.multipleTable.clearSelection()
this.listLoading = false
this.dialogEditDept = false
this.varList = []
this.listQuery.page = 1
this.getList()
}).catch((e) => {
this.listLoading = false
})
}
})
},
// 批量删除
handelDelete(row) {
const DATA_IDS = []

2
src/views/hidden/confirm/components/detail.vue
View File

@ -65,7 +65,7 @@
</div>
<div class="ui-height" />
<div class="ui-foot">
<el-button type="primary" @click="goConfirm">提 交</el-button>
<el-button v-once type="primary" @click="goConfirm">提 交</el-button>
<el-button v-if="pd.SOURCE != '5' && pd.SOURCE != '4'" type="primary" @click="goreject">打 回</el-button>
<el-button plain type="info" @click="back">返 回</el-button>
</div>

5
src/views/hidden/ignore/components/detail.vue
View File

@ -47,8 +47,9 @@
</tr>
<tr>
<td class="tbg">隐患级别</td>
<td v-if="pd.editLevelName">{{ pd.editLevelName }}</td>
<td v-else>{{ pd.HIDDENLEVELNAME }}</td>
<!-- <td v-if="pd.editLevelName">{{ pd.editLevelName }}</td>-->
<!-- <td v-else>{{ pd.HIDDENLEVELNAME }}</td>-->
<td>{{ pd.HIDDENLEVELNAME }}</td>
</tr>
<tr>
<td class="tbg">隐患类型</td>

96
src/views/hidden/list/components/edit.vue
View File

@ -163,46 +163,28 @@
</el-dialog>
</el-form-item>
<el-row class="form-group input-group-sm">
<el-col :span="11">
<el-form-item label="隐患发现部门">
<el-input v-model="myUserInfo.DEPARTMENT_ID" :disabled="true" placeholder="请输入内容"/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="隐患发现人">
<el-input v-model="myUserInfo.USERNAME" :disabled="true" placeholder="请输入内容"/>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button type="primary" style="margin-left:15px" @click="addFindOther">添加</el-button>
</el-col>
</el-row>
<el-row v-for="(data,index) in findCreatorList" :key="index" class="form-group input-group-sm">
<el-col :span="11">
<el-form-item label="隐患发现部门">
<SelectTree
ref="'deptTree'+index"
ref="deptTree"
:key="modelKey"
:clearable="false"
:options="treeData"
:props="defaultProps"
v-model="data.DEPARTMENT_ID"
v-model="myUserInfo.DEPARTMENT_ID"
placeholder="请选择隐患发现部门"
@change="updateFindOtherDep(data.DEPARTMENT_ID,index)"
@change="updateFindDep(myUserInfo.DEPARTMENT_ID)"
/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="隐患发现人">
<el-select v-model="data.USER_ID" clearable placeholder="请选择隐患发现人" @visible-change="$forceUpdate()">
<el-option v-for="item in findUserList[index]" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
<el-select v-model="myUserInfo.USER_ID" clearable placeholder="请选择隐患发现人" @visible-change="$forceUpdate()">
<el-option v-for="item in findUserList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button type="danger" style="margin-left:15px" @click="remoFindOther(index)">删除</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="隐患发现时间">
@ -360,7 +342,8 @@ export default {
confirmUserList: [], // 隐患确认人
isClearRectificationor: true, // 是否清空整改人
iframeSrc: '',
dialogMap: false
dialogMap: false,
modelKey: 0
}
},
watch: {
@ -506,9 +489,13 @@ export default {
requestFN(
'/user/goEditMyInfo',
{}
).then((data) => {
this.myUserInfo.DEPARTMENT_ID = data.deptname
this.myUserInfo.USERNAME = data.pd.NAME
).then(async(data) => {
this.myUserInfo.DEPARTMENT_ID = data.pd.DEPARTMENT_ID
this.modelKey++ // 为了触发级联选择器重新渲染
if (data.pd.DEPARTMENT_ID) {
await this.getFindUserListByDepId(data.pd.DEPARTMENT_ID)
}
this.myUserInfo.USER_ID = data.pd.USER_ID
this.$forceUpdate()
}).catch((e) => {
@ -555,6 +542,7 @@ export default {
}
this.pd.findCreator = findCreator
this.pd.hiddenPartType = this.hiddenPartType
this.pd.hiddenFindCreator = this.myUserInfo.USER_ID
this.$refs.form.validate(valid => {
if (this.pd.HIDDEN_ID) {
if (valid) {
@ -810,24 +798,46 @@ export default {
remoFindOther(index) { // 删除隐患发现人员
this.findCreatorList.splice(index, 1)
},
updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门
this.findCreatorList[i].USER_ID = ''
this.getFindUserList(DEPARTMENT_ID, i)
// updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门
// this.findCreatorList[i].USER_ID = ''
// this.getFindUserList(DEPARTMENT_ID, i)
// },
updateFindDep(DEPARTMENT_ID) {
this.myUserInfo.USER_ID = ''
this.getFindUserListByDepId(DEPARTMENT_ID)
},
getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息
this.listLoading = true
requestFN(
'/user/listAll',
{
DEPARTMENT_ID: DEPARTMENT_ID,
tm: new Date().getTime()
}
).then((data) => {
this.$set(this.findUserList, index, data.userList)
}).catch((e) => {
this.listLoading = false
getFindUserListByDepId(DEPARTMENT_ID) {
return new Promise((resolve) => {
this.listLoading = true
requestFN(
'/user/listAll',
{
DEPARTMENT_ID: DEPARTMENT_ID,
tm: new Date().getTime()
}
).then((data) => {
this.findUserList = data.userList
this.$forceUpdate()
resolve()
}).catch((e) => {
this.listLoading = false
})
})
},
// getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息
// this.listLoading = true
// requestFN(
// '/user/listAll',
// {
// DEPARTMENT_ID: DEPARTMENT_ID,
// tm: new Date().getTime()
// }
// ).then((data) => {
// this.$set(this.findUserList, index, data.userList)
// }).catch((e) => {
// this.listLoading = false
// })
// },
updateConfirmDept() { // 根据选择的隐患确认部门显示隐患确认人
this.pd.CONFIRM_USER = ''
this.listLoading = true

35
src/views/hiddenApi/publicMethod/detail.vue
View File

@ -393,6 +393,27 @@
</table>
</template>
</div>
<div v-show="returnInformation != ''" class="print-break">
<div class="level-line" />
<div class="level-title">
<h1>验收打回信息</h1>
</div>
<table class="table-ui">
<tr>
<td class="tbg">验收打回意见</td>
<td>{{ returnInformation.EXAMINE }}</td>
</tr>
<tr>
<td class="tbg">验收人</td>
<td>{{ returnInformation.CREATORNAME }}</td>
</tr>
<tr>
<td class="tbg">验收时间</td>
<td>{{ returnInformation.CREATTIME }}</td>
</tr>
</table>
</div>
</div>
<div class="ui-height" />
@ -488,7 +509,8 @@ export default {
},
dialogVideoVisible: false,
dialogViewPdf: false,
hiddenExamineList: []
hiddenExamineList: [],
returnInformation: ''
}
},
@ -510,6 +532,17 @@ export default {
var vm = this
vm.pd = data.hidden// 隐患信息
this.hiddenExamineList = data.hiddenExa // 特殊处置审核信息 隐患记录
// 找出hiddenExamineList中验收打回日期最新的一条
if (this.hiddenExamineList.length > 0) {
for (let i = 0; i < this.hiddenExamineList.length; i++) {
if (this.hiddenExamineList[i].TYPE === 3) {
this.returnInformation = this.hiddenExamineList[i]
if (this.returnInformation != '' && new Date(this.hiddenExamineList[i].CREATTIME).getTime() > new Date(this.returnInformation.CREATTIME).getTime()) {
this.returnInformation = this.hiddenExamineList[i]
}
}
}
}
vm.hs = data.hs // 查询整改方案
vm.checkList = data.checkList // 验收信息
this.hImgs = data.hImgs // 图片

9
src/views/hotwork/hotwork/components/list.vue
View File

@ -94,7 +94,8 @@
<!-- <el-button :disabled="row.STATE !='11'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'apply')">申请</el-button>-->
<!-- <el-button :disabled="row.STATE !='-2'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'repulse')">打回</el-button>-->
<el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
<!--<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>-->
<el-button v-if="row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685'" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -204,7 +205,8 @@ export default {
HOT_WORK_POSITION: '',
UNIT_LEADER_DEPARTMENT_ID: ''
},
loginUserID: ''
loginUserID: '',
loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER
}
},
created() {
@ -335,7 +337,8 @@ export default {
requestFN(
'/hotworkapplication/delete',
{
HOTWORKAPPLICATION_ID: id
HOTWORKAPPLICATION_ID: id,
loginUserId: this.loginUserID
}
).then(() => {
this.$message({

34
src/views/keyprojects/inspection/components/record-list.vue
View File

@ -54,9 +54,10 @@
</template>
</el-table-column>
<el-table-column prop="HIDDEN_COUNT" label="检查隐患数" />
<el-table-column label="操作" align="center" width="100">
<el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}">
<el-button icon="el-icon-view" size="mini" @click="goDetail(row.KEYPROJECTCHECK_ID)">查看</el-button>
<el-button v-if="row.INSPECTION_STATUS == '0' && row.CREATOR == loginUserId" type="danger" icon="el-icon-view" size="mini" @click="goDelete(row.KEYPROJECTCHECK_ID)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -78,6 +79,7 @@ export default {
directives: { waves },
data() {
return {
loginUserId: JSON.parse(sessionStorage.getItem('user')).USER_ID,
listLoading: true,
listQuery: {
page: 1,
@ -132,6 +134,36 @@ export default {
this.$parent.KEYPROJECTCHECK_ID = ID
this.$parent.activeName = 'Info'
},
goDelete(ID) {
this.$confirm('是否删除该安全环保检查及以下隐患?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.listLoading = true
requestFN(
'/keyprojectcheck/goDelete',
{
KEYPROJECTCHECK_ID: ID
}
).then((data) => {
this.$message({
type: 'success',
message: '删除成功!'
})
this.listLoading = false
this.getList()
}).catch((e) => {
this.$message({
type: 'info',
message: '删除失败!'
})
this.listLoading = false
})
}).catch(() => {
console.log('取消删除')
})
},
back() {
this.$parent.activeName = 'List'
this.$parent.OUTSOURCED_ID = ''

35
src/views/safetyenvironmental/archive/components/info.vue
View File

@ -75,9 +75,10 @@
<td>{{ item.HIDDENDESCR }}</td>
<td class="tbg">隐患部位</td>
<td>{{ item.HIDDENPART_NAME?item.HIDDENPART_NAME:item.HIDDENPART }}</td>
<td width="200">
<td width="300">
<el-button icon="el-icon-view" size="mini" @click="goView(item.HIDDEN_ID)">查看</el-button>
<el-button type="success" icon="el-icon-view" size="mini" @click="checkFlow(item)">流程图</el-button>
<el-button v-if="pd.INSPECTION_STATUS == '0' || pd.INSPECTION_STATUS =='2'" type="danger" icon="el-icon-view" size="mini" @click="goDelete(item)">删除</el-button>
</td>
</tr>
</tbody>
@ -144,8 +145,8 @@
:preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
style="width: 100px; height: 100px"/>
</td>
<td class="tbg">确认时间：</td>
<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>
<!--<td class="tbg">确认时间：</td>-->
<!--<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>-->
</tr>
</table>
</div>
@ -308,6 +309,34 @@ export default {
checkFlow(item) {
this.$refs.flowChart.init(item)
},
goDelete(item) {
this.$confirm('确定要删除此隐患吗？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
requestFN(
'/hiddenApi/deleteHiddenForSafetyenvironmental',
{
HIDDEN_ID: item.HIDDEN_ID,
tm: new Date().getTime()
}
).then((res) => {
if (res.result === 'success') {
this.$message({
message: '删除成功',
type: 'success'
})
} else {
this.$message({
message: res.codeMsg,
type: 'error'
})
}
this.getData()
}).catch((e) => {})
}).catch(() => {})
},
goBack() {
this.$parent.INSPECTION_ID = ''
this.$parent.activeName = 'List'

4
src/views/safetyenvironmental/inspection/components/info.vue
View File

@ -182,8 +182,8 @@
:preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
style="width: 100px; height: 100px"/>
</td>
<td class="tbg">确认时间：</td>
<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>
<!--<td class="tbg">确认时间：</td>-->
<!--<td>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</td>-->
</tr>
</table>
</div>

2
src/views/security_commitment/promise/components/list.vue
View File

@ -45,7 +45,7 @@
<el-button type="success" icon="el-icon-view" size="mini" @click="goView(row.PROMISE_ID)">查看</el-button>
<el-button v-if="row.ISDELETE === 1" type="success" icon="el-icon-check" size="mini" @click="goEnableOrDisable(0,row.PROMISE_ID)">启用</el-button>
<el-button v-if="row.ISDELETE === 0" type="danger" icon="el-icon-close" size="mini" @click="goEnableOrDisable(1,row.PROMISE_ID)">禁用</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="handleDelete(row.PROMISE_ID)">删除</el-button>
<el-button v-if="row.IS_REGULATORY === 1" type="danger" icon="el-icon-delete" plain @click="handleDelete(row.PROMISE_ID)">删除</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="goAddOrEdit(row.PROMISE_ID)">编辑</el-button>
</template>
</el-table-column>

310
static/bi/index.html
View File

@ -13,6 +13,8 @@
<script src="./js/ezuikit.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>
<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-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> -->
@ -140,32 +142,38 @@
本年隐患
</div>
</div>
<div class="task-text">
<div class="title">
待处理
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.yearUncheck}}
</div>
</div>
<div class="color-blue f22">
{{hdCount.yearUncheck}}
</el-tooltip>
<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 class="task-text">
<div class="title">
已处理
</div>
<div class="color-blue f22">
{{hdCount.yearChecked}}
</div>
</div>
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<div class="task-text">
<div class="title">
隐患整改率
</div>
<div class="color-org">
<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>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -176,32 +184,38 @@
本季隐患
</div>
</div>
<div class="task-text">
<div class="title">
待处理
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.quarterUncheck}}
</div>
</div>
<div class="color-blue f22">
{{hdCount.quarterUncheck}}
</el-tooltip>
<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 class="task-text">
<div class="title">
已处理
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<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 class="color-blue f22">
{{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>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -212,32 +226,38 @@
本月隐患
</div>
</div>
<div class="task-text">
<div class="title">
待处理
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.monthUncheck}}
</div>
</div>
<div class="color-blue f22">
{{hdCount.monthUncheck}}
</el-tooltip>
<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 class="task-text">
<div class="title">
已处理
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<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 class="color-blue f22">
{{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>
</el-tooltip>
</div>
</div>
<div class="swiper-slide">
@ -250,32 +270,38 @@
本旬隐患
</div>
</div>
<div class="task-text">
<div class="title">
待处理
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.xunUncheck}}
</div>
</div>
<div class="color-blue f22">
{{hdCount.xunUncheck}}
</el-tooltip>
<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 class="task-text">
<div class="title">
已处理
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<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 class="color-blue f22">
{{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>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -286,32 +312,38 @@
本周隐患
</div>
</div>
<div class="task-text">
<div class="title">
待处理
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.weekUncheck}}
</div>
</div>
<div class="color-blue f22">
{{hdCount.weekUncheck}}
</el-tooltip>
<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 class="task-text">
<div class="title">
已处理
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<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 class="color-blue f22">
{{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>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -322,32 +354,38 @@
本日隐患
</div>
</div>
<div class="task-text">
<div class="title">
待处理
<el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
<div class="task-text">
<div class="title">
待处理
</div>
<div class="color-blue f22">
{{hdCount.dayUncheck}}
</div>
</div>
<div class="color-blue f22">
{{hdCount.dayUncheck}}
</el-tooltip>
<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 class="task-text">
<div class="title">
已处理
</el-tooltip>
<el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
<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 class="color-blue f22">
{{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>
</el-tooltip>
</div>
</div>
</div>