Compare commits
10 Commits
b5e5e2b0e8
...
54845b2422
| Author | SHA1 | Date |
|---|---|---|
mengfanliang
|
54845b2422 | |
 shanao
|
164f70a0a4 | |
|
shanao
|
a116151652 | |
|
mengfanliang
|
06920346f8 | |
shanao
|
a77e81bbf0 | |
|
shanao
|
7847b69c62 | |
|
mengfanliang
|
6dbdf598c7 | |
|
shanao
|
f921dd8c52 | |
|
wangpeng
|
f58761937f | |
guoyuepeng
|
071fe616ca |
|
|
@ -10,12 +10,10 @@
|
||||||
<script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.16.0/aliplayer-min.js"></script>
|
<script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.16.0/aliplayer-min.js"></script>
|
||||||
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
||||||
|
|
||||||
<script type="text/javascript" src="static/jswebrtc.min.js"></script>
|
|
||||||
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
<script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
|
||||||
<script type="text/javascript" src="./static/map/cesium91/CesiumUnminified/Cesium.js"></script>
|
<script type="text/javascript" src="./static/map/cesium91/CesiumUnminified/Cesium.js"></script>
|
||||||
<script type="text/javascript" src="./static/map/cesium91/CustomCesiumSDK.js"></script>
|
<script type="text/javascript" src="./static/map/cesium91/CustomCesiumSDK.js"></script>
|
||||||
<link href="./static/map/cesium91/CesiumUnminified/Widgets/widgets.css" rel="stylesheet"/>
|
<link href="./static/map/cesium91/CesiumUnminified/Widgets/widgets.css" rel="stylesheet"/>
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
|
|
@ -24,6 +24,7 @@ router.beforeEach((to, from, next) => {
|
||||||
router.addRoutes(accessRoutes)
|
router.addRoutes(accessRoutes)
|
||||||
next({ ...to, replace: true })
|
next({ ...to, replace: true })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.info(error)
|
||||||
next(`/login`)
|
next(`/login`)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -36,6 +37,7 @@ router.beforeEach((to, from, next) => {
|
||||||
router.addRoutes(accessRoutes)
|
router.addRoutes(accessRoutes)
|
||||||
next({ ...to, replace: true })
|
next({ ...to, replace: true })
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.info(error)
|
||||||
next(`/login`)
|
next(`/login`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
* @returns {Boolean}
|
* @returns {Boolean}
|
||||||
*/
|
*/
|
||||||
export function validText(str) {
|
export function validText(str) {
|
||||||
|
console.info(str)
|
||||||
if (str.trim().length < 1) {
|
if (str.trim().length < 1) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,12 +30,13 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
:disabled="isDisabled"
|
:disabled="isDisabled"
|
||||||
v-model="infoForm.incidentDate"
|
v-model="infoForm.incidentDate"
|
||||||
type="datetime"
|
type="date"
|
||||||
placeholder="选择事故发生时间"
|
placeholder="选择事故发生时间"
|
||||||
style="width: 100%;"
|
style="width: 100%;"
|
||||||
/>
|
format="yyyy-MM-dd HH:mm:ss"
|
||||||
|
value-format="yyyy-MM-dd HH:mm:ss"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label-width="formLabelWidth" label="直接经济损失（万元）" prop="directLoss">
|
<el-form-item :label-width="formLabelWidth" label="直接经济损失" prop="directLoss">
|
||||||
<el-input v-model="infoForm.directLoss" :disabled="isDisabled" type="number" autocomplete="off"/>
|
<el-input v-model="infoForm.directLoss" :disabled="isDisabled" type="number" autocomplete="off"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label-width="formLabelWidth" label="受伤人数" prop="injured">
|
<el-form-item :label-width="formLabelWidth" label="受伤人数" prop="injured">
|
||||||
|
|
@ -89,9 +90,11 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="infoForm.reportDate"
|
v-model="infoForm.reportDate"
|
||||||
:disabled="isDisabled"
|
:disabled="isDisabled"
|
||||||
type="datetime"
|
type="date"
|
||||||
placeholder="请选择报出日期"
|
placeholder="请选择报出日期"
|
||||||
style="width: 100%;"
|
style="width: 100%;"
|
||||||
|
format="yyyy-MM-dd HH:mm:ss"
|
||||||
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
@ -159,7 +162,8 @@ export default {
|
||||||
rules: {
|
rules: {
|
||||||
incidentNumber: [{ required: true, message: '事故案号不能为空', trigger: 'blur' }],
|
incidentNumber: [{ required: true, message: '事故案号不能为空', trigger: 'blur' }],
|
||||||
incidentName: [{ required: true, message: '事故名称不能为空', trigger: 'blur' }],
|
incidentName: [{ required: true, message: '事故名称不能为空', trigger: 'blur' }],
|
||||||
incidentType: [{ required: true, message: '事故类型不能为空', trigger: 'blur' }],
|
HIDDENTYPE: [{ required: true, message: '事故类型不能为空', trigger: 'blur' }],
|
||||||
|
incidentType: [{ required: true, message: '隐患类型不能为空', trigger: 'blur' }],
|
||||||
incidentLevel: [{ required: true, message: '事故级别不能为空', trigger: 'blur' }],
|
incidentLevel: [{ required: true, message: '事故级别不能为空', trigger: 'blur' }],
|
||||||
incidentNature: [{ required: true, message: '事故性质不能为空', trigger: 'blur' }],
|
incidentNature: [{ required: true, message: '事故性质不能为空', trigger: 'blur' }],
|
||||||
location: [{ required: true, message: '事故发生地点不能为空', trigger: 'blur' }],
|
location: [{ required: true, message: '事故发生地点不能为空', trigger: 'blur' }],
|
||||||
|
|
@ -335,26 +339,21 @@ export default {
|
||||||
* 表单确认按钮
|
* 表单确认按钮
|
||||||
*/
|
*/
|
||||||
confirm() {
|
confirm() {
|
||||||
this.$refs.form.validate(valid => {
|
const params = {
|
||||||
if (!valid) {
|
...this.infoForm,
|
||||||
return false
|
photos: this.infoForm.fileList[0].remotePathName
|
||||||
}
|
}
|
||||||
const params = {
|
delete params.fileList
|
||||||
...this.infoForm,
|
requestFN('/accident' + (this.tableName === '修改' ? '/update' : '/save'), params)
|
||||||
photos: this.infoForm.fileList[0].remotePathName
|
.then((response) => {
|
||||||
}
|
// 删除成功后的处理
|
||||||
delete params.fileList
|
this.$message.success(this.tableName + '成功')
|
||||||
requestFN('/accident' + (this.tableName === '修改' ? '/update' : '/save'), params)
|
this.infoForm = this.$options.data().infoForm
|
||||||
.then((response) => {
|
this.$parent.activeName = 'List'
|
||||||
// 删除成功后的处理
|
// eslint-disable-next-line handle-callback-err
|
||||||
this.$message.success(this.tableName + '成功')
|
}).catch((error) => {
|
||||||
this.infoForm = this.$options.data().infoForm
|
this.$message.error(this.tableName + '失败')
|
||||||
this.$parent.activeName = 'List'
|
})
|
||||||
// eslint-disable-next-line handle-callback-err
|
|
||||||
}).catch((error) => {
|
|
||||||
this.$message.error(this.tableName + '失败')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -4,22 +4,20 @@
|
||||||
<el-row :gutter="12">
|
<el-row :gutter="12">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="事故名称" prop="incidentName">
|
<el-form-item label="事故名称" prop="incidentName">
|
||||||
<el-input v-model="searchForm.incidentName" placeholder="请输入事故名称" class="filter-item"/>
|
<el-input v-model="searchForm.incidentName" placeholder="请输入隐患描述" class="filter-item"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="4">
|
||||||
<el-form-item label="发生时间" prop="incidentDates">
|
<el-form-item label="发生时间" prop="incidentDates">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="searchForm.incidentDates"
|
v-model="searchForm.incidentDates"
|
||||||
:default-time="['00:00:00', '23:59:59']"
|
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
format="yyyy-MM-dd"
|
format="yyyy-MM-dd HH:mm:ss"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
range-separator="-"
|
range-separator="-"
|
||||||
start-placeholder="开始日期"
|
start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期"
|
end-placeholder="结束日期" />
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
|
|
@ -27,14 +25,14 @@
|
||||||
<el-input v-model="searchForm.location" placeholder="请输入发生地点" />
|
<el-input v-model="searchForm.location" placeholder="请输入发生地点" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="3">
|
<el-col :span="4">
|
||||||
<el-form-item label="事故类型" prop="incidentType">
|
<el-form-item label="事故类型" prop="incidentType">
|
||||||
<el-select v-model="searchForm.incidentType" placeholder="请选择">
|
<el-select v-model="searchForm.incidentType" placeholder="请选择">
|
||||||
<el-option v-for="item in incidentTypes" :key="item.id" :label="item.name" :value="item.id" />
|
<el-option v-for="item in incidentTypes" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="3">
|
<el-col :span="4">
|
||||||
<el-form-item label="事故等级" prop="incidentLevel">
|
<el-form-item label="事故等级" prop="incidentLevel">
|
||||||
<el-select v-model="searchForm.incidentLevel" placeholder="请选择">
|
<el-select v-model="searchForm.incidentLevel" placeholder="请选择">
|
||||||
<el-option v-for="item in incidentLevels" :key="item.id" :label="item.name" :value="item.id" />
|
<el-option v-for="item in incidentLevels" :key="item.id" :label="item.name" :value="item.id" />
|
||||||
|
|
@ -53,6 +51,7 @@
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-button type="primary" icon="el-icon-circle-plus" @click="goView('', '新增')">新增</el-button>
|
<el-button type="primary" icon="el-icon-circle-plus" @click="goView('', '新增')">新增</el-button>
|
||||||
<el-button icon="el-icon-s-promotion" @click="handleAllExport">全部导出</el-button>
|
<el-button icon="el-icon-s-promotion" @click="handleAllExport">全部导出</el-button>
|
||||||
|
<el-button icon="el-icon-refresh-left" @click="handleRefresh">刷新</el-button>
|
||||||
<el-button type="danger" icon="el-icon-delete-solid" @click="handleBatchDel">批量删除</el-button>
|
<el-button type="danger" icon="el-icon-delete-solid" @click="handleBatchDel">批量删除</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -65,19 +64,14 @@
|
||||||
v-loading="listLoading"
|
v-loading="listLoading"
|
||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
:data="varList"
|
:data="varList"
|
||||||
|
border
|
||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
border
|
@selection-change="handleSelectionChange">
|
||||||
@selection-change="handleSelectionChange"
|
|
||||||
>
|
|
||||||
<el-table-column type="selection" width="55"/>
|
<el-table-column type="selection" width="55"/>
|
||||||
<el-table-column label="事故名称" prop="incidentName"/>
|
<el-table-column label="事故名称" prop="incidentName"/>
|
||||||
<el-table-column label="所属公司" prop="companyName"/>
|
<el-table-column label="所属公司" prop="companyName"/>
|
||||||
<el-table-column label="发生时间" prop="incidentDate">
|
<el-table-column label="发生时间" prop="incidentDate"/>
|
||||||
<template v-slot="{row}">
|
|
||||||
{{ formatDate(row.incidentDate,'YYYY-MM-DD HH:mm:ss') }}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="发生地点" prop="location"/>
|
<el-table-column label="发生地点" prop="location"/>
|
||||||
<el-table-column label="操作" width="300">
|
<el-table-column label="操作" width="300">
|
||||||
<template v-slot="{row}">
|
<template v-slot="{row}">
|
||||||
|
|
@ -99,7 +93,6 @@
|
||||||
<script>
|
<script>
|
||||||
import Pagination from '@/components/Pagination'
|
import Pagination from '@/components/Pagination'
|
||||||
import waves from '@/directive/waves'
|
import waves from '@/directive/waves'
|
||||||
import formatDate from '@/utils/dateformat'
|
|
||||||
import { requestFN } from '../../../../utils/request'
|
import { requestFN } from '../../../../utils/request'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|
@ -167,7 +160,7 @@ export default {
|
||||||
requestFN(url, { ...this.searchForm }).then((data) => {
|
requestFN(url, { ...this.searchForm }).then((data) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
this.varList = data.varList
|
this.varList = data.varList
|
||||||
this.listQuery.total = data.page.totalResult
|
this.total = data.page.totalResult
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
})
|
})
|
||||||
|
|
@ -178,14 +171,13 @@ export default {
|
||||||
*/
|
*/
|
||||||
handleReset() {
|
handleReset() {
|
||||||
this.searchForm = this.$options.data().searchForm
|
this.searchForm = this.$options.data().searchForm
|
||||||
this.searchList()
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 表格行选择器处理
|
* 表格行选择器处理
|
||||||
*/
|
*/
|
||||||
handleSelectionChange(val) {
|
handleSelectionChange(val) {
|
||||||
this.multipleSelection = val
|
this.multipleSelection.push(val)
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -272,7 +264,7 @@ export default {
|
||||||
// 获取选中的行数据
|
// 获取选中的行数据
|
||||||
const selectedRows = this.multipleSelection
|
const selectedRows = this.multipleSelection
|
||||||
// 如果没有选中任何行，则提示用户
|
// 如果没有选中任何行，则提示用户
|
||||||
if (this.multipleSelection === '' || selectedRows.length === 0) {
|
if (selectedRows.length === 0) {
|
||||||
this.$message.warning('请选择要删除的行')
|
this.$message.warning('请选择要删除的行')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -283,16 +275,15 @@ export default {
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
// 获取所有选中行的 ID
|
// 获取所有选中行的 ID
|
||||||
let ids = ''
|
const ids = selectedRows.map(row => row.id).join(',')
|
||||||
selectedRows.forEach(row => { ids += row.id + ',' })
|
|
||||||
// 发送批量删除请求
|
// 发送批量删除请求
|
||||||
const url = '/accident/delete/' + '' + ids
|
const url = '/accident/delete/' + '' + ids
|
||||||
requestFN(url).then((response) => {
|
requestFN(url).then((response) => {
|
||||||
// 删除成功后的处理
|
// 删除成功后的处理
|
||||||
this.$message.success('删除成功')
|
this.$message.success('删除成功')
|
||||||
this.searchList()
|
|
||||||
// eslint-disable-next-line handle-callback-err
|
// eslint-disable-next-line handle-callback-err
|
||||||
}).catch(() => {
|
}).catch((error) => {
|
||||||
this.$message.error('删除失败')
|
this.$message.error('删除失败')
|
||||||
})
|
})
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
|
@ -301,6 +292,7 @@ export default {
|
||||||
message: '已取消删除'
|
message: '已取消删除'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
this.searchList()
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -322,10 +314,6 @@ export default {
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.incidentLevels = JSON.parse(data.zTreeNodes)
|
this.incidentLevels = JSON.parse(data.zTreeNodes)
|
||||||
})
|
})
|
||||||
},
|
|
||||||
|
|
||||||
formatDate(date, format) {
|
|
||||||
return formatDate(date, format)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<div>
|
<div>
|
||||||
<List v-if="activeName === 'List'" ref="List" />
|
<List v-if="activeName === 'List'" ref="List" />
|
||||||
<Add v-if="activeName === 'AddOrEdit'" ref="AddOrEdit" />
|
<Add v-if="activeName === 'AddOrEdit'" ref="AddOrEdit" />
|
||||||
|
<!-- <Detail v-if="activeName==='Detail'"/>-->
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -13,6 +14,7 @@ export default {
|
||||||
components: {
|
components: {
|
||||||
List: List,
|
List: List,
|
||||||
Add: Add
|
Add: Add
|
||||||
|
// Detail: Detail
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
|
|
@ -368,7 +368,7 @@ export default {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID = data.pd.MAJORDANGERSOURCE_DISPOSAL_ID
|
this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID = data.pd.MAJORDANGERSOURCE_DISPOSAL_ID
|
||||||
this.disposal.DISPOSAL_TIME = data.pd.DISPOSAL_TIME
|
this.disposal.DISPOSAL_TIME = data.pd.DISPOSAL_TIME
|
||||||
|
console.info(this.disposal)
|
||||||
// this.dialogFormEdit = false
|
// this.dialogFormEdit = false
|
||||||
// this.hasDisposal = false
|
// this.hasDisposal = false
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
|
|
@ -414,7 +414,7 @@ export default {
|
||||||
this.uploadDisposalAfterFile()
|
this.uploadDisposalAfterFile()
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
this.disposal.DISPOSAL_STATUS = '1'
|
this.disposal.DISPOSAL_STATUS = '1'
|
||||||
|
console.info(this.disposal)
|
||||||
requestFN(
|
requestFN(
|
||||||
'/majordangersourcedisposal/' + methodName,
|
'/majordangersourcedisposal/' + methodName,
|
||||||
this.disposal
|
this.disposal
|
||||||
|
|
@ -423,6 +423,7 @@ export default {
|
||||||
this.dialogFormEdit = false
|
this.dialogFormEdit = false
|
||||||
this.hasDisposal = false
|
this.hasDisposal = false
|
||||||
this.resetDisposal()
|
this.resetDisposal()
|
||||||
|
console.info(this.disposal)
|
||||||
this.timer = setInterval(this.handleTimerOperation, 5000)
|
this.timer = setInterval(this.handleTimerOperation, 5000)
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
|
|
@ -442,7 +443,7 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// formData.append('FFILE', this.disposal.disposalBeforeFile)
|
// formData.append('FFILE', this.disposal.disposalBeforeFile)
|
||||||
|
console.info(this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
||||||
formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
||||||
formData.append('TYPE', 20)
|
formData.append('TYPE', 20)
|
||||||
this.uploadFileSubmit(formData, '处置前照片上传完成')
|
this.uploadFileSubmit(formData, '处置前照片上传完成')
|
||||||
|
|
@ -456,7 +457,7 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// formData.append('FFILE', this.disposal.disposalAfterFile)
|
// formData.append('FFILE', this.disposal.disposalAfterFile)
|
||||||
|
console.info(this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
||||||
formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
||||||
formData.append('TYPE', 21)
|
formData.append('TYPE', 21)
|
||||||
this.uploadFileSubmit(formData, '处置后照片上传完成')
|
this.uploadFileSubmit(formData, '处置后照片上传完成')
|
||||||
|
|
@ -466,7 +467,7 @@ export default {
|
||||||
'/imgfiles/add',
|
'/imgfiles/add',
|
||||||
formData
|
formData
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
|
console.info(str)
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -496,6 +496,9 @@ export default {
|
||||||
if (this.isClearRectificationor) {
|
if (this.isClearRectificationor) {
|
||||||
this.hiddenForm.RECTIFICATIONOR = ''
|
this.hiddenForm.RECTIFICATIONOR = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.info(this.isClearRectificationor)
|
||||||
|
console.info(this.hiddenForm.RECTIFICATIONOR)
|
||||||
this.getReUserList(newVal)
|
this.getReUserList(newVal)
|
||||||
this.isClearRectificationor = true
|
this.isClearRectificationor = true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -139,11 +139,11 @@
|
||||||
<i class="el-icon-plus"/>
|
<i class="el-icon-plus"/>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
<div style="margin-left:20px;line-height:1.6">
|
<div style="margin-left:20px;line-height:1.6">
|
||||||
<!-- <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
|
<div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
|
||||||
<div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
|
<div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
|
||||||
<div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
|
<div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
|
||||||
<div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div> -->
|
<div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
|
||||||
<!-- <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div> -->
|
<div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
@ -812,7 +812,7 @@ export default {
|
||||||
DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
|
DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
|
||||||
SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
|
SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
|
||||||
NATION: [{ required: false, trigger: 'blur' }],
|
NATION: [{ required: false, trigger: 'blur' }],
|
||||||
SEX: [{ required: false, trigger: 'blur' }],
|
SEX: [{ required: false, trigger: 'blur' }], // / dsfsdfsd
|
||||||
POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
|
POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
|
||||||
DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
|
DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
|
||||||
DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
|
DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@
|
||||||
</template>
|
</template>
|
||||||
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
|
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
|
||||||
<el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
|
<el-button v-show="del && row.ISMAIN=='0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.USER_ID, row.NAME, row.ISPUSH)">删除</el-button>
|
||||||
<!-- <el-button v-if="row.ISPUSH == '0'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>-->
|
<el-button v-if="row.ISPUSH == '0'" type="primary" icon="el-icon-position" size="mini" @click="goPush(row)">推送</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
@ -798,7 +798,7 @@ export default {
|
||||||
SHIFTDUTYTWO: this.SHIFTDUTYTWO,
|
SHIFTDUTYTWO: this.SHIFTDUTYTWO,
|
||||||
IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
|
IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER,
|
||||||
USER_ID: this.USER_ID,
|
USER_ID: this.USER_ID,
|
||||||
ISPUSH: '2'
|
ISPUSH: '1'
|
||||||
}
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
|
|
|
||||||
|
|
@ -139,11 +139,11 @@
|
||||||
<i class="el-icon-plus"/>
|
<i class="el-icon-plus"/>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
<div style="margin-left:20px;line-height:1.6">
|
<div style="margin-left:20px;line-height:1.6">
|
||||||
<!-- <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
|
<div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
|
||||||
<div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
|
<div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
|
||||||
<div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
|
<div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
|
||||||
<div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div> -->
|
<div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
|
||||||
<!-- <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div> -->
|
<div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
<el-tag v-else type="danger">否</el-tag>
|
<el-tag v-else type="danger">否</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="450">
|
<el-table-column label="操作" width="380">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
<el-button
|
<el-button
|
||||||
v-show="true"
|
v-show="true"
|
||||||
|
|
@ -97,14 +97,6 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleDelete(row)">删除
|
@click="handleDelete(row)">删除
|
||||||
</el-button>
|
</el-button>
|
||||||
<!-- 新增按钮：检查记录二维码 -->
|
|
||||||
<el-button
|
|
||||||
class="tiffany-btn"
|
|
||||||
icon="el-icon-document"
|
|
||||||
type="info"
|
|
||||||
size="mini"
|
|
||||||
@click="handleShowRecordQr(row)">检查记录二维码
|
|
||||||
</el-button>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
@ -151,22 +143,6 @@
|
||||||
<el-button v-print="'#printTest'" type="primary">打 印</el-button>
|
<el-button v-print="'#printTest'" type="primary">打 印</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog :visible.sync="dialogRecordFormShow" title="查看检查记录二维码" width="680px" class="top-dialog">
|
|
||||||
<div id="recordPrintTest" style="border: 1px solid #fff;">
|
|
||||||
<div class="level-title" style="margin-top:20px">
|
|
||||||
<h1>检查记录二维码</h1>
|
|
||||||
</div>
|
|
||||||
<div class="table-qrcode">
|
|
||||||
<vue-qr :text="recordQrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div slot="footer" class="dialog-footer">
|
|
||||||
<el-button @click="dialogRecordFormShow = false">关 闭</el-button>
|
|
||||||
<el-button v-print="'#recordPrintTest'" type="primary">打 印</el-button>
|
|
||||||
</div>
|
|
||||||
</el-dialog>
|
|
||||||
|
|
||||||
<el-dialog v-loading ="listLoading" :visible.sync="dialogEditUser" title="批量修改负责人" width="800px">
|
<el-dialog v-loading ="listLoading" :visible.sync="dialogEditUser" title="批量修改负责人" width="800px">
|
||||||
<el-form ref="firefightingBatchEditDept" :model="dialogEditUserForm" :rules="dialogEditUserRules" label-width="150px">
|
<el-form ref="firefightingBatchEditDept" :model="dialogEditUserForm" :rules="dialogEditUserRules" label-width="150px">
|
||||||
<el-row>
|
<el-row>
|
||||||
|
|
@ -181,6 +157,7 @@
|
||||||
<el-button @click="dialogEditUser = false">取 消</el-button>
|
<el-button @click="dialogEditUser = false">取 消</el-button>
|
||||||
<el-button type="primary" @click="dialogEditUserConfirm">确 定</el-button>
|
<el-button type="primary" @click="dialogEditUserConfirm">确 定</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -194,7 +171,9 @@ import waves from '@/directive/waves' // waves directive
|
||||||
import SelectTree from '@/components/SelectTree'
|
import SelectTree from '@/components/SelectTree'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|
||||||
components: { Pagination, SelectTree, vueQr },
|
components: { Pagination, SelectTree, vueQr },
|
||||||
|
|
||||||
directives: { waves },
|
directives: { waves },
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|
@ -202,9 +181,7 @@ export default {
|
||||||
addBtnType: true,
|
addBtnType: true,
|
||||||
listLoading: true,
|
listLoading: true,
|
||||||
dialogFormShow: false,
|
dialogFormShow: false,
|
||||||
dialogRecordFormShow: false,
|
|
||||||
qrcodeStr: '',
|
qrcodeStr: '',
|
||||||
recordQrcodeStr: '',
|
|
||||||
qrInfo: {},
|
qrInfo: {},
|
||||||
add: false,
|
add: false,
|
||||||
del: false,
|
del: false,
|
||||||
|
|
@ -269,36 +246,39 @@ export default {
|
||||||
handleShowQr(ROW) {
|
handleShowQr(ROW) {
|
||||||
this.dialogFormShow = true
|
this.dialogFormShow = true
|
||||||
this.qrInfo = ROW
|
this.qrInfo = ROW
|
||||||
|
// 2024-07-22 齐金城确认后，将代码还原，如果不还原则无法显示H5页面和。created by liu jun
|
||||||
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 = {
|
||||||
handleShowRecordQr(ROW) {
|
// MANAGER_TYPE: 'fireListManager',
|
||||||
this.dialogRecordFormShow = true
|
// FIRE_POINT_ID: ROW.FIRE_POINT_ID
|
||||||
const json = {
|
// }
|
||||||
MANAGER_TYPE: 'fireListManager',
|
// const jsonStr = JSON.stringify(json)
|
||||||
USER_ID: ROW.USER_ID,
|
// this.qrcodeStr = jsonStr
|
||||||
DEPARTMENT_ID: ROW.DEPARTMENT_ID
|
|
||||||
}
|
|
||||||
this.recordQrcodeStr = JSON.stringify(json)
|
|
||||||
},
|
},
|
||||||
handleEdit(FIRE_POINT_ID) {
|
handleEdit(FIRE_POINT_ID) {
|
||||||
this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
|
this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
|
||||||
this.$parent.activeName = 'Edit'
|
this.$parent.activeName = 'Edit'
|
||||||
},
|
},
|
||||||
selectable(row, index) {
|
selectable(row, index) {
|
||||||
|
// return row.DEVICE_COUNT == 0
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
getRowKey(row) {
|
getRowKey(row) {
|
||||||
return row.FIRE_POINT_ID
|
return row.FIRE_POINT_ID
|
||||||
},
|
},
|
||||||
|
// 添加
|
||||||
handleAdd() {
|
handleAdd() {
|
||||||
this.$parent.activeName = 'Edit'
|
this.$parent.activeName = 'Edit'
|
||||||
this.$parent.FIRE_POINT_ID = ''
|
this.$parent.FIRE_POINT_ID = ''
|
||||||
this.$parent.FIRE_POINT_CODE = ''
|
this.$parent.FIRE_POINT_CODE = ''
|
||||||
this.$parent.FIRE_POINT_NAME = ''
|
this.$parent.FIRE_POINT_NAME = ''
|
||||||
},
|
},
|
||||||
|
// 搜索
|
||||||
getQuery() {
|
getQuery() {
|
||||||
|
// this.$refs.multipleTable.clearSelection()
|
||||||
this.getList()
|
this.getList()
|
||||||
},
|
},
|
||||||
|
// 获取列表
|
||||||
getList(pid) {
|
getList(pid) {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
this.varList = []
|
this.varList = []
|
||||||
|
|
@ -319,8 +299,7 @@ export default {
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
})
|
})
|
||||||
},
|
}, goKeyReset() {
|
||||||
goKeyReset() {
|
|
||||||
this.FIRE_POINT_NAME = ''
|
this.FIRE_POINT_NAME = ''
|
||||||
this.FIRE_POINT_CODE = ''
|
this.FIRE_POINT_CODE = ''
|
||||||
this.IS_PUNCTUATION = ''
|
this.IS_PUNCTUATION = ''
|
||||||
|
|
@ -366,6 +345,7 @@ export default {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 部门列表树
|
||||||
getTreeData() {
|
getTreeData() {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/department/listTreeV2',
|
'/department/listTreeV2',
|
||||||
|
|
@ -375,6 +355,7 @@ export default {
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 批量修改负责人
|
||||||
handleEditUser(row) {
|
handleEditUser(row) {
|
||||||
this.editDataIds = []
|
this.editDataIds = []
|
||||||
if (row.FIRE_POINT_ID) {
|
if (row.FIRE_POINT_ID) {
|
||||||
|
|
@ -524,15 +505,15 @@ export default {
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped >
|
||||||
.returnBtn {
|
.returnBtn {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
.app-container {
|
.app-container {
|
||||||
display: flex;
|
display: flex; /**/
|
||||||
align-items: baseline;
|
align-items: baseline;
|
||||||
}
|
}
|
||||||
.table-qrcode {
|
.table-qrcode{
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
|
||||||
|
|
@ -81,8 +81,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="STATE" label="审核状态" >
|
<el-table-column prop="STATE" label="审核状态" >
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
<template v-if="row.IS_FORCED_END ===1">强制归档 </template>
|
{{ translate(row.STATE.toString(), statusList) }}
|
||||||
<template v-else > {{ translate(row.STATE.toString(), statusList) }} </template>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="examineUserName" label="审核人" >
|
<el-table-column prop="examineUserName" label="审核人" >
|
||||||
|
|
@ -90,12 +89,11 @@
|
||||||
{{ row.examineUserName || row.examineDeptName }}
|
{{ row.examineUserName || row.examineDeptName }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="300">
|
<el-table-column label="操作" align="center" width="200">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
<!-- <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 !='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 :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 icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
|
||||||
<el-button v-if="(row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.STATE != 11" type="primary" icon="el-icon-document" size="mini" @click="forcedEnd(row.HOTWORKAPPLICATION_ID,row.STATE)">强制结束</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') && row.STATE != 11" 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') && row.STATE != 11" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -186,7 +184,7 @@ export default {
|
||||||
{ id: '36', name: '安委会办公室待审批' },
|
{ id: '36', name: '安委会办公室待审批' },
|
||||||
{ id: '37', name: '安全总监待审批' },
|
{ id: '37', name: '安全总监待审批' },
|
||||||
{ id: '10', name: '延时监火' },
|
{ id: '10', name: '延时监火' },
|
||||||
{ id: '11', name: '归档' }, // 分成两部分 1.回档,2.强制回档 有字段表示
|
{ id: '11', name: '归档' },
|
||||||
{ id: '-1', name: '审核不通过' },
|
{ id: '-1', name: '审核不通过' },
|
||||||
{ id: '-2', name: '特级不通过' },
|
{ id: '-2', name: '特级不通过' },
|
||||||
{ id: '-3', name: '关闭归档' },
|
{ id: '-3', name: '关闭归档' },
|
||||||
|
|
@ -296,7 +294,6 @@ export default {
|
||||||
this.$parent.HOTWORKAPPLICATION_ID = id
|
this.$parent.HOTWORKAPPLICATION_ID = id
|
||||||
this.$parent.HOTWORKAPPLICATION_TYPE = type
|
this.$parent.HOTWORKAPPLICATION_TYPE = type
|
||||||
},
|
},
|
||||||
|
|
||||||
getDictTreeData() {
|
getDictTreeData() {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
|
|
@ -357,35 +354,6 @@ export default {
|
||||||
})
|
})
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
})
|
})
|
||||||
},
|
|
||||||
forcedEnd(id, STATE) { // 强制结束
|
|
||||||
this.$confirm('确定要强制结束吗?', {
|
|
||||||
confirmButtonText: '确定',
|
|
||||||
cancelButtonText: '取消',
|
|
||||||
type: 'warning'
|
|
||||||
}).then(() => {
|
|
||||||
this.listLoading = true
|
|
||||||
requestFN(
|
|
||||||
'/hotworkapplication/forcedEnd',
|
|
||||||
{
|
|
||||||
HOTWORKAPPLICATION_ID: id,
|
|
||||||
STATE: STATE,
|
|
||||||
loginUserId: this.loginUserID
|
|
||||||
}
|
|
||||||
).then(() => {
|
|
||||||
this.$message({
|
|
||||||
message: '结束成功',
|
|
||||||
type: 'success'
|
|
||||||
})
|
|
||||||
this.listLoading = false
|
|
||||||
this.varList = []
|
|
||||||
this.listQuery.page = 1
|
|
||||||
this.getList()
|
|
||||||
}).catch((e) => {
|
|
||||||
this.listLoading = false
|
|
||||||
})
|
|
||||||
}).catch(() => {
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,470 +0,0 @@
|
||||||
<template>
|
|
||||||
<div class="menjin">
|
|
||||||
<div class="block1">
|
|
||||||
<layout-title title="设备在线情况"/>
|
|
||||||
<div class="options">
|
|
||||||
<div v-for="(item,index) in block1OptionsList" :key="index" class="option">
|
|
||||||
<div class="title active">{{ item.title }}</div>
|
|
||||||
<div class="circular">
|
|
||||||
<img :src="item.img" alt="">
|
|
||||||
</div>
|
|
||||||
<div class="label">
|
|
||||||
{{ item.label1 }}：<count-to :start-val="0" :end-val="item.count1" :duration="3600"/>
|
|
||||||
</div>
|
|
||||||
<div v-if="item.label2" class="label">
|
|
||||||
{{ item.label2 }}：<count-to :start-val="0" :end-val="item.count2" :duration="3600"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="block4">
|
|
||||||
<layout-title title="区域进出记录"/>
|
|
||||||
<div class="content">
|
|
||||||
<div class="options">
|
|
||||||
<div
|
|
||||||
v-for="(item,index) in block4OptionsTabs"
|
|
||||||
:key="index"
|
|
||||||
:class="['title', {active:index === block4OptionsIndex}]"
|
|
||||||
@click="block4OptionsClick(index)"
|
|
||||||
>
|
|
||||||
{{ item }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div id="main1"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="block3">
|
|
||||||
<layout-title title="口门进出记录"/>
|
|
||||||
<div class="content">
|
|
||||||
<div class="options">
|
|
||||||
<div
|
|
||||||
v-for="(item,index) in block3OptionsList"
|
|
||||||
:key="index"
|
|
||||||
:class="['title', {active:index === block3OptionsIndex}]"
|
|
||||||
@click="block3OptionsClick(index)"
|
|
||||||
>
|
|
||||||
{{ item }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="table">
|
|
||||||
<div class="tr">
|
|
||||||
<div class="td">卡口名称</div>
|
|
||||||
<div class="td">{{ block3OptionsIndex===0 ? '人员':'车牌' }}</div>
|
|
||||||
<div class="td">时间</div>
|
|
||||||
<div class="td">状态</div>
|
|
||||||
</div>
|
|
||||||
<div v-for="(item,index) in block3List" :key="index" class="tr">
|
|
||||||
<div class="td line1">{{ item.DOORNAME }}</div>
|
|
||||||
<div class="td">{{ item.NAME }}</div>
|
|
||||||
<div class="td line1">{{ item.TIME.substring(11) }}</div>
|
|
||||||
<div class="td">{{ item.STATUS }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import layoutTitle from './title.vue'
|
|
||||||
import CountTo from 'vue-count-to'
|
|
||||||
import { requestFN } from '@/utils/request'
|
|
||||||
import * as echarts from 'echarts'
|
|
||||||
|
|
||||||
let myChart1
|
|
||||||
export default {
|
|
||||||
components: {
|
|
||||||
layoutTitle,
|
|
||||||
CountTo
|
|
||||||
},
|
|
||||||
props: {
|
|
||||||
corpInfoId: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
},
|
|
||||||
area: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
},
|
|
||||||
gangkou: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
block1OptionsList: [
|
|
||||||
{
|
|
||||||
title: '人员闸机数',
|
|
||||||
img: require('../../../assets/map/menjin/ico1.png'),
|
|
||||||
label1: '在线数',
|
|
||||||
count1: 0
|
|
||||||
// label2: '离线数',
|
|
||||||
// count2: 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '车辆闸机数',
|
|
||||||
img: require('../../../assets/map/menjin/ico2.png'),
|
|
||||||
label1: '在线数',
|
|
||||||
count1: 0
|
|
||||||
// label2: '离线数',
|
|
||||||
// count2: 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '摄像头数',
|
|
||||||
img: require('../../../assets/map/menjin/ico3.png'),
|
|
||||||
label1: '摄像头数',
|
|
||||||
count1: 0
|
|
||||||
}
|
|
||||||
],
|
|
||||||
block3OptionsList: ['人员闸机', '车辆闸机'],
|
|
||||||
block3OptionsIndex: 1,
|
|
||||||
block2List: [],
|
|
||||||
block3List: [],
|
|
||||||
block4OptionsTabs: ['人员', '车辆'],
|
|
||||||
block4OptionsIndex: 0,
|
|
||||||
block4OptionsList: []
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
this.getMachineCount() // 设备数
|
|
||||||
this.getEntryAndExitCount()// echar
|
|
||||||
this.listPerpleCarGateMachine('1') // 进出记录
|
|
||||||
window.onresize = function() {
|
|
||||||
myChart1 && myChart1.resize()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
destroyed() {
|
|
||||||
myChart1 = null
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
getEntryAndExitCount() {
|
|
||||||
requestFN(
|
|
||||||
'/mkmjRelation/getAllCarAndPeopleInfoCountByArea',
|
|
||||||
{ CORPINFO_ID: this.corpInfoId }
|
|
||||||
).then((data) => {
|
|
||||||
this.block4OptionsList = data.varList
|
|
||||||
this.initEcharts1(this.block4OptionsList)
|
|
||||||
}).catch((e) => {
|
|
||||||
})
|
|
||||||
},
|
|
||||||
initEcharts1(data) {
|
|
||||||
const xAxisData = []
|
|
||||||
const entryData = []
|
|
||||||
const exitData = []
|
|
||||||
for (let i = 0; i < data.length; i++) {
|
|
||||||
if (this.block4OptionsIndex === 0) {
|
|
||||||
if (data[i].TYPE === 'person') {
|
|
||||||
xAxisData.push(data[i].AREA_NAME)
|
|
||||||
console.log(data[i])
|
|
||||||
entryData.push(data[i].INPERSONCOUNT)
|
|
||||||
exitData.push(data[i].OUTPERSONCOUNT)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (this.block4OptionsIndex === 1) {
|
|
||||||
if (data[i].TYPE === 'car') {
|
|
||||||
xAxisData.push(data[i].AREA_NAME)
|
|
||||||
console.log(data[i])
|
|
||||||
entryData.push(data[i].INCARCOUNT)
|
|
||||||
exitData.push(data[i].OUTCARCOUNT)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
myChart1 && myChart1.dispose()
|
|
||||||
myChart1 = echarts.init(document.querySelector('#main1'))
|
|
||||||
const option = {
|
|
||||||
tooltip: {
|
|
||||||
trigger: 'axis',
|
|
||||||
axisPointer: { // 坐标轴指示器，坐标轴触发有效
|
|
||||||
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
grid: {
|
|
||||||
left: '2%',
|
|
||||||
right: '4%',
|
|
||||||
bottom: '8%',
|
|
||||||
top: '16%',
|
|
||||||
containLabel: true
|
|
||||||
},
|
|
||||||
legend: {
|
|
||||||
data: ['进', '出'],
|
|
||||||
right: 10,
|
|
||||||
top: 12,
|
|
||||||
textStyle: {
|
|
||||||
color: '#fff'
|
|
||||||
},
|
|
||||||
itemWidth: 12,
|
|
||||||
itemHeight: 10
|
|
||||||
},
|
|
||||||
xAxis: {
|
|
||||||
type: 'category',
|
|
||||||
data: xAxisData,
|
|
||||||
axisLine: {
|
|
||||||
lineStyle: {
|
|
||||||
color: 'white'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
axisLabel: {
|
|
||||||
textStyle: {
|
|
||||||
fontFamily: 'Microsoft YaHei'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
yAxis: {
|
|
||||||
type: 'value',
|
|
||||||
axisLine: {
|
|
||||||
show: false,
|
|
||||||
lineStyle: {
|
|
||||||
color: 'white'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
splitLine: {
|
|
||||||
show: true,
|
|
||||||
lineStyle: {
|
|
||||||
color: 'rgba(255,255,255,0.3)'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
axisLabel: {}
|
|
||||||
},
|
|
||||||
series: [{
|
|
||||||
name: '进',
|
|
||||||
type: 'bar',
|
|
||||||
barWidth: '15%',
|
|
||||||
itemStyle: {
|
|
||||||
normal: {
|
|
||||||
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
|
|
||||||
offset: 0,
|
|
||||||
color: '#8bd46e'
|
|
||||||
}, {
|
|
||||||
offset: 1,
|
|
||||||
color: '#09bcb7'
|
|
||||||
}]),
|
|
||||||
barBorderRadius: 12
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data: entryData
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: '出',
|
|
||||||
type: 'bar',
|
|
||||||
barWidth: '15%',
|
|
||||||
itemStyle: {
|
|
||||||
normal: {
|
|
||||||
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
|
|
||||||
offset: 0,
|
|
||||||
color: '#fccb05'
|
|
||||||
}, {
|
|
||||||
offset: 1,
|
|
||||||
color: '#f5804d'
|
|
||||||
}]),
|
|
||||||
barBorderRadius: 11
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
|
||||||
data: exitData
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
myChart1.setOption(option)
|
|
||||||
},
|
|
||||||
block4OptionsClick(index) {
|
|
||||||
console.log(index)
|
|
||||||
this.block4OptionsIndex = index
|
|
||||||
this.initEcharts1(this.block4OptionsList)
|
|
||||||
},
|
|
||||||
getMachineCount() {
|
|
||||||
requestFN(
|
|
||||||
'/map/getDoorCount',
|
|
||||||
{
|
|
||||||
CORPINFO_ID: this.corpInfoId
|
|
||||||
}
|
|
||||||
).then((data) => {
|
|
||||||
this.block1OptionsList[0].count1 = data.data.personMachineCount
|
|
||||||
this.block1OptionsList[1].count1 = data.data.carMachineCount
|
|
||||||
this.block1OptionsList[2].count1 = data.data.cameraCount
|
|
||||||
}).catch((e) => {
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
listPerpleCarGateMachine(type) {
|
|
||||||
requestFN(
|
|
||||||
'/map/getDoorRecord',
|
|
||||||
{
|
|
||||||
TYPE: type,
|
|
||||||
CORPINFO_ID: this.corpInfoId
|
|
||||||
}
|
|
||||||
).then((data) => {
|
|
||||||
this.block3List = data.varList.slice(0, 8)
|
|
||||||
}).catch((e) => {
|
|
||||||
})
|
|
||||||
},
|
|
||||||
block3OptionsClick(index) {
|
|
||||||
this.block3OptionsIndex = index
|
|
||||||
this.listPerpleCarGateMachine(index)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.menjin {
|
|
||||||
.title {
|
|
||||||
background-image: url("../../../assets/map/menjin/title_on.png");
|
|
||||||
background-size: 100% 100%;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
width: 113px;
|
|
||||||
height: 26px;
|
|
||||||
font-size: 14px;
|
|
||||||
line-height: 26px;
|
|
||||||
text-align: center;
|
|
||||||
color: #fff;
|
|
||||||
|
|
||||||
&.active {
|
|
||||||
background-image: url("../../../assets/map/menjin/title.png");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.block1 {
|
|
||||||
width: 410px;
|
|
||||||
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
|
|
||||||
|
|
||||||
.options {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
padding: 10px 15px;
|
|
||||||
border: 1px solid;
|
|
||||||
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
|
|
||||||
border-top: none;
|
|
||||||
|
|
||||||
.option {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
.circular {
|
|
||||||
margin-top: 5px;
|
|
||||||
background-image: url("../../../assets/map/menjin/img1.png");
|
|
||||||
background-size: 100% 100%;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
width: 50px;
|
|
||||||
height: 50px;
|
|
||||||
text-align: center;
|
|
||||||
padding-top: 13px;
|
|
||||||
|
|
||||||
img {
|
|
||||||
width: 30px;
|
|
||||||
height: 26px;
|
|
||||||
animation: scale 2s infinite;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.label {
|
|
||||||
margin-top: 5px;
|
|
||||||
font-size: 12px;
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.block4 {
|
|
||||||
margin-top: 10px;
|
|
||||||
width: 410px;
|
|
||||||
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
|
|
||||||
|
|
||||||
.content {
|
|
||||||
border: 1px solid;
|
|
||||||
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
|
|
||||||
border-top: none;
|
|
||||||
padding: 10px;
|
|
||||||
|
|
||||||
.options {
|
|
||||||
display: flex;
|
|
||||||
justify-content: flex-end;
|
|
||||||
|
|
||||||
.title {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#main1{
|
|
||||||
margin-top: 10px;
|
|
||||||
width: 100%;
|
|
||||||
height: 200px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.block3 {
|
|
||||||
margin-top: 10px;
|
|
||||||
width: 410px;
|
|
||||||
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
|
|
||||||
|
|
||||||
.content {
|
|
||||||
border: 1px solid;
|
|
||||||
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
|
|
||||||
border-top: none;
|
|
||||||
padding: 10px;
|
|
||||||
|
|
||||||
.options {
|
|
||||||
display: flex;
|
|
||||||
justify-content: flex-end;
|
|
||||||
|
|
||||||
.title {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.table {
|
|
||||||
margin-top: 5px;
|
|
||||||
|
|
||||||
.tr {
|
|
||||||
display: flex;
|
|
||||||
|
|
||||||
&:nth-child(odd) {
|
|
||||||
background-color: rgba(42, 86, 158, 0.53);
|
|
||||||
}
|
|
||||||
|
|
||||||
.td {
|
|
||||||
flex: 1;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 12px;
|
|
||||||
color: #fff;
|
|
||||||
padding: 5px;
|
|
||||||
|
|
||||||
&:nth-child(2) {
|
|
||||||
flex-basis: 20%;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.green {
|
|
||||||
color: #7ccf41;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.yellow {
|
|
||||||
color: #ffcb05;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes scale {
|
|
||||||
0% {
|
|
||||||
transform: scale(1);
|
|
||||||
}
|
|
||||||
50% {
|
|
||||||
transform: scale(0.8);
|
|
||||||
}
|
|
||||||
100% {
|
|
||||||
transform: scale(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.line1 {
|
|
||||||
width: 150px;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -1,207 +0,0 @@
|
||||||
<template>
|
|
||||||
<div>
|
|
||||||
{{ corpInfoId }}
|
|
||||||
{{ area }}
|
|
||||||
{{ gangkou }}
|
|
||||||
<menjin2 v-if="corpInfoId" :corp-info-id="corpInfoId" :area="area" :gangkou="gangkou"/>
|
|
||||||
<menjin v-else :corp-info-id="corpInfoId" :area="area" :gangkou="gangkou"/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import menjin from './menjin'
|
|
||||||
import menjin2 from './menjin2'
|
|
||||||
export default {
|
|
||||||
components: {
|
|
||||||
menjin,
|
|
||||||
menjin2
|
|
||||||
},
|
|
||||||
props: {
|
|
||||||
corpInfoId: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
},
|
|
||||||
area: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
},
|
|
||||||
gangkou: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.menjin {
|
|
||||||
.title {
|
|
||||||
background-image: url("../../../assets/map/menjin/title_on.png");
|
|
||||||
background-size: 100% 100%;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
width: 113px;
|
|
||||||
height: 26px;
|
|
||||||
font-size: 14px;
|
|
||||||
line-height: 26px;
|
|
||||||
text-align: center;
|
|
||||||
color: #fff;
|
|
||||||
|
|
||||||
&.active {
|
|
||||||
background-image: url("../../../assets/map/menjin/title.png");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.block1 {
|
|
||||||
width: 410px;
|
|
||||||
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
|
|
||||||
|
|
||||||
.options {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
padding: 10px 15px;
|
|
||||||
border: 1px solid;
|
|
||||||
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
|
|
||||||
border-top: none;
|
|
||||||
|
|
||||||
.option {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
.img{
|
|
||||||
width: 81px;
|
|
||||||
height: 93px;
|
|
||||||
img{
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.info{
|
|
||||||
margin-left: 10px;
|
|
||||||
font-size: 14px;
|
|
||||||
color: #fff;
|
|
||||||
div{
|
|
||||||
margin-top: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.block2 {
|
|
||||||
width: 410px;
|
|
||||||
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
|
|
||||||
margin-top: 10px;
|
|
||||||
|
|
||||||
.options {
|
|
||||||
padding: 10px 15px;
|
|
||||||
border: 1px solid;
|
|
||||||
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
|
|
||||||
border-top: none;
|
|
||||||
#main1{
|
|
||||||
width: 100%;
|
|
||||||
height: 300px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.block3 {
|
|
||||||
margin-top: 10px;
|
|
||||||
width: 410px;
|
|
||||||
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
|
|
||||||
|
|
||||||
.content {
|
|
||||||
border: 1px solid;
|
|
||||||
border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
|
|
||||||
border-top: none;
|
|
||||||
padding: 10px;
|
|
||||||
|
|
||||||
.options {
|
|
||||||
display: flex;
|
|
||||||
justify-content: flex-end;
|
|
||||||
|
|
||||||
.title {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.table {
|
|
||||||
margin-top: 5px;
|
|
||||||
.scroll {
|
|
||||||
max-height: 200px;
|
|
||||||
overflow-y: auto;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
|
||||||
width: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&::-webkit-scrollbar-thumb {
|
|
||||||
border-radius: 5px;
|
|
||||||
background: rgba(2, 30, 81, 0.851);
|
|
||||||
}
|
|
||||||
|
|
||||||
&::-webkit-scrollbar-track {
|
|
||||||
border-radius: 5px;
|
|
||||||
background: rgba(255, 255, 255, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.tr {
|
|
||||||
&:nth-child(odd) {
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.tr {
|
|
||||||
display: flex;
|
|
||||||
|
|
||||||
&:nth-child(odd) {
|
|
||||||
background-color: rgba(42, 86, 158, 0.53);
|
|
||||||
}
|
|
||||||
|
|
||||||
.td {
|
|
||||||
flex: 1;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 12px;
|
|
||||||
color: #fff;
|
|
||||||
padding: 5px;
|
|
||||||
|
|
||||||
&:nth-child(2) {
|
|
||||||
flex-basis: 20%;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:nth-child(3) {
|
|
||||||
flex: none;
|
|
||||||
flex-basis: 50px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.green {
|
|
||||||
color: #7ccf41;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.yellow {
|
|
||||||
color: #ffcb05;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes scale {
|
|
||||||
0% {
|
|
||||||
transform: scale(1);
|
|
||||||
}
|
|
||||||
50% {
|
|
||||||
transform: scale(0.8);
|
|
||||||
}
|
|
||||||
100% {
|
|
||||||
transform: scale(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.line1 {
|
|
||||||
width: 150px;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="corpInfoId !== '21590a00ea5e462e9ee44dd332dddc26'" class="block4">
|
<div class="block4">
|
||||||
<layout-title title="报警列表"/>
|
<layout-title title="报警列表"/>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<div class="table">
|
<div class="table">
|
||||||
|
|
@ -72,25 +72,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="corpInfoId === '21590a00ea5e462e9ee44dd332dddc26'" class="block4">
|
|
||||||
<layout-title title="报警列表"/>
|
|
||||||
<div class="content">
|
|
||||||
<div class="table">
|
|
||||||
<div class="tr">
|
|
||||||
<div class="td">报警类型</div>
|
|
||||||
<div class="td">报警时间</div>
|
|
||||||
<div class="td">触发人</div>
|
|
||||||
<div class="td">报警地点</div>
|
|
||||||
</div>
|
|
||||||
<div v-for="(item,index) in block4List" :key="index" class="tr">
|
|
||||||
<div class="td">{{ item.alarmName }}</div>
|
|
||||||
<div class="td">{{ item.alarmTime }}</div>
|
|
||||||
<div class="td">{{ item.foulUserName }}</div>
|
|
||||||
<div class="td">{{ item.place }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -192,59 +173,37 @@ export default {
|
||||||
},
|
},
|
||||||
getData() {
|
getData() {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/map/getAllDwMessage', { corpId: this.corpInfoId }
|
'/map/getAllDwMessage',
|
||||||
|
{ corpId: this.corpInfoId }
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
// 一公司人员定位系统（我知道这里写的拉但是没办法，一天要把功能改完，后续有缘人在重构吧）
|
this.block4List = data.alarmList.list
|
||||||
if (this.corpInfoId === '035958e685cf4850bc40151c5e0617a6') {
|
this.block1OptionsList = [
|
||||||
this.block4List = data.alarmList.list
|
{
|
||||||
this.block1OptionsList = [
|
title: '在线设备数',
|
||||||
{
|
img: require('../../../assets/map/renyuan/ico1.png'),
|
||||||
title: '在线设备数',
|
count: data.orthermessage.onlineDeviceNum
|
||||||
img: require('../../../assets/map/renyuan/ico1.png'),
|
},
|
||||||
count: data.orthermessage.onlineDeviceNum
|
{
|
||||||
},
|
title: '在线人员',
|
||||||
{
|
img: require('../../../assets/map/renyuan/img1ico1.png'),
|
||||||
title: '在线人员',
|
count: data.orthermessage.infoList.UwbBQ.num
|
||||||
img: require('../../../assets/map/renyuan/img1ico1.png'),
|
},
|
||||||
count: data.orthermessage.infoList.UwbBQ.num
|
{
|
||||||
},
|
title: '在线基站数',
|
||||||
{
|
img: require('../../../assets/map/renyuan/ico3.png'),
|
||||||
title: '在线基站数',
|
count: data.orthermessage.infoList.UwbJiZhan.num
|
||||||
img: require('../../../assets/map/renyuan/ico3.png'),
|
},
|
||||||
count: data.orthermessage.infoList.UwbJiZhan.num
|
{
|
||||||
},
|
title: '在线摄像头数',
|
||||||
{
|
img: require('../../../assets/map/renyuan/ico4.png'),
|
||||||
title: '在线摄像头数',
|
count: data.orthermessage.infoList.HKcamera.num
|
||||||
img: require('../../../assets/map/renyuan/ico4.png'),
|
},
|
||||||
count: data.orthermessage.infoList.HKcamera.num
|
{
|
||||||
},
|
title: '在线报警设备数',
|
||||||
{
|
img: require('../../../assets/map/renyuan/ico5.png'),
|
||||||
title: '在线报警设备数',
|
count: data.orthermessage.infoList.tklyr.num
|
||||||
img: require('../../../assets/map/renyuan/ico5.png'),
|
}
|
||||||
count: data.orthermessage.infoList.tklyr.num
|
]
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
if (this.corpInfoId === '21590a00ea5e462e9ee44dd332dddc26') {
|
|
||||||
this.block1OptionsList = [
|
|
||||||
{
|
|
||||||
title: '总设备数',
|
|
||||||
img: require('../../../assets/map/renyuan/img1ico1.png'),
|
|
||||||
count: data.orthermessage.onlineDeviceNum
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '在线人员数',
|
|
||||||
img: require('../../../assets/map/renyuan/img1ico1.png'),
|
|
||||||
count: data.orthermessage.lockNum
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: '离线人数',
|
|
||||||
img: require('../../../assets/map/renyuan/img1ico1.png'),
|
|
||||||
count: data.orthermessage.unLockNum
|
|
||||||
}
|
|
||||||
]
|
|
||||||
this.block4List = data.orthermessage.alarmList
|
|
||||||
}
|
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
this.$message.error(e)
|
this.$message.error(e)
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,7 @@ export default {
|
||||||
this.measuresList = data.measuresList
|
this.measuresList = data.measuresList
|
||||||
this.gasList = data.gasList
|
this.gasList = data.gasList
|
||||||
this.otherProtectiveMeasures = this.validStr(this.info.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.info.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
|
this.otherProtectiveMeasures = this.validStr(this.info.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.info.OTHER_PROTECTIVE_MEASURES.split(';_;') : []
|
||||||
|
console.info(this.otherProtectiveMeasures)
|
||||||
if (!this.info.WORK_OPERATOR_ID) {
|
if (!this.info.WORK_OPERATOR_ID) {
|
||||||
this.$set(this.info, 'WORK_OPERATOR_ID', [])
|
this.$set(this.info, 'WORK_OPERATOR_ID', [])
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -9,22 +9,13 @@
|
||||||
<windspeedstation v-if="type === '2da29f00852a4653ba3e760b9de57412'" :id="id" :type="type" :gangkou="gangkou"/>
|
<windspeedstation v-if="type === '2da29f00852a4653ba3e760b9de57412'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
|
<xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
|
<xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<mk-gate-machine
|
<mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'|| type ==='PERSON_MACHINE'|| type ==='CAR_MACHINE' "
|
|
||||||
:id="id"
|
|
||||||
:type="type"
|
|
||||||
:gangkou="gangkou"
|
|
||||||
:corp-id="corpInfoId"
|
|
||||||
:gate-video-id="GATE_VIDEO_ID"
|
|
||||||
:code = "code"
|
|
||||||
:video-type="videoType"
|
|
||||||
:name = "name" />
|
|
||||||
<mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
|
<mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
|
||||||
<zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>
|
<zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<video-play v-if="type === 'video'" :id="id" :type="type" :gangkou="gangkou" request-url="/api/homemajor/getVideoInfo"/>
|
<video-play v-if="type === 'video'" :id="id" :type="type" :gangkou="gangkou" request-url="/api/homemajor/getVideoInfo"/>
|
||||||
<video-play-cfd v-if="type === 'CAMERA00004' || type === 'platcamera00004'" :id="id" :type="type" :gangkou="gangkou"/>
|
<video-play-cfd v-if="type === 'CAMERA00004' || type === 'platcamera00004'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<video-play-plat v-if="type === 'platcamera'" :id="id" :type="type" :gangkou="gangkou"/>
|
<video-play-plat v-if="type === 'platcamera'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<!--秦港一公司 边界入侵 详细页面 start-->
|
<!--秦港一公司 边界入侵 详细页面 start-->
|
||||||
<video-play-bianjieruqin v-if="type === 'bianjieruqin'" :id="id" :type="type" :gangkou="gangkou"/>
|
<video-play-bianjieruqin v-if="type === 'bianjieruqin'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||||
<!--秦港一公司 边界入侵 详细页面 end-->
|
<!--秦港一公司 边界入侵 详细页面 end-->
|
||||||
<!--秦港一公司 八项作业 详细页面 start-->
|
<!--秦港一公司 八项作业 详细页面 start-->
|
||||||
|
|
@ -189,14 +180,6 @@ export default {
|
||||||
infoname: {
|
infoname: {
|
||||||
type: String,
|
type: String,
|
||||||
default: ''
|
default: ''
|
||||||
},
|
|
||||||
videoType: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
},
|
|
||||||
code: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div v-if="corpId == '035958e685cf4850bc40151c5e0617a6' " class="app-container print-work">
|
<div class="app-container print-work" style="width: 100%">
|
||||||
<div v-if= "type !== 'CAMERA'" class="level-title">\
|
<div v-if= "type !== 'CAMERA'" class="level-title">
|
||||||
<h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
|
<h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
|
||||||
</div>
|
</div>
|
||||||
<table v-if= "type !== 'CAMERA'" class="table-ui">
|
<table v-if= "type !== 'CAMERA'" class="table-ui">
|
||||||
|
|
@ -55,91 +55,14 @@
|
||||||
<video-play v-if="type === 'CAMERA' && info.GATEVIDEO_ID" :id="info.GATEVIDEO_ID" :type="type" :gangkou="gangkou"/>
|
<video-play v-if="type === 'CAMERA' && info.GATEVIDEO_ID" :id="info.GATEVIDEO_ID" :type="type" :gangkou="gangkou"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="app-container print-work">
|
|
||||||
<div v-if= "type !== 'CAMERA'" class="level-title">
|
|
||||||
<h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
|
|
||||||
</div>
|
|
||||||
<div v-if= "type !== 'CAMERA'" >
|
|
||||||
<table v-for="(item,index) in varList" :key="index" class="table-ui">
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">闸机名称</td>
|
|
||||||
<td colspan="5">{{ item.GATE_NAME }}</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">今日进</td>
|
|
||||||
<td width="80px">{{ item.CAR_IN }}</td>
|
|
||||||
<td class="bbg-transparent">今日出</td>
|
|
||||||
<td width="80px">{{ item.CAR_OUT }}</td>
|
|
||||||
<td class="bbg-transparent">当前滞留</td>
|
|
||||||
<td width="80px">{{ item.CAR_IN - item.CAR_OUT }}</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<table v-if= "type != 'CAMERA'" class="table-ui">
|
|
||||||
<tr v-if="carRecordAllList != null && carRecordAllList.length > 0">
|
|
||||||
<td colspan="6">
|
|
||||||
<table class="table-ui">
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">车牌</td>
|
|
||||||
<td class="bbg-transparent">时间</td>
|
|
||||||
<td class="bbg-transparent">闸机</td>
|
|
||||||
<td class="bbg-transparent">状态</td>
|
|
||||||
</tr>
|
|
||||||
<tr v-for="(item,index) in carRecordAllList" :key="index">
|
|
||||||
<td>{{ item.LICENSE_PLATE }}</td>
|
|
||||||
<td>{{ item.TIME }}</td>
|
|
||||||
<td>{{ item.COMING_REASON }}</td>
|
|
||||||
<td>{{ item.STATE == '0' ? '进港': '出港' }}</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr v-if="recordAllList != null && recordAllList.length > 0">
|
|
||||||
<td colspan="6">
|
|
||||||
<table class="table-ui">
|
|
||||||
<tr>
|
|
||||||
<td>卡号</td>
|
|
||||||
<td>人员姓名</td>
|
|
||||||
<td>刷卡时间</td>
|
|
||||||
<td>闸机</td>
|
|
||||||
<td>状态</td>
|
|
||||||
</tr>
|
|
||||||
<tr v-for="(item,index) in recordAllList" :key="index">
|
|
||||||
<td>{{ item.CARDTYPE }}</td>
|
|
||||||
<td>{{ item.USERNAME }}</td>
|
|
||||||
<td>{{ item.TIME }}</td>
|
|
||||||
<td>{{ item.EQUIPMENTNAME }}</td>
|
|
||||||
<td>
|
|
||||||
<span v-if="item.STATE == '0'">进</span>
|
|
||||||
<span v-if="item.STATE == '1'">出</span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
<div v-if= "type == 'CAMERA'" class="level-title">
|
|
||||||
<h1>摄像头名称：{{ name }}</h1>
|
|
||||||
</div>
|
|
||||||
<table v-if= "type == 'CAMERA'" class="table-ui">
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">编码</td>
|
|
||||||
<td >{{ code }}</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
<div class="video">
|
|
||||||
<video-play-gate v-if="type === 'CAMERA' && code" :id="code" :type="videoType" :gangkou="gangkou"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { requestFN } from '@/utils/request'
|
import { requestFN } from '@/utils/request'
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
import videoPlay from './video_play.vue'
|
import videoPlay from './video_play.vue'
|
||||||
import videoPlayGate from './video_play_gate.vue'
|
|
||||||
export default {
|
export default {
|
||||||
components: { videoPlay, videoPlayGate },
|
components: { videoPlay },
|
||||||
props: {
|
props: {
|
||||||
id: {
|
id: {
|
||||||
type: String,
|
type: String,
|
||||||
|
|
@ -156,53 +79,19 @@ export default {
|
||||||
gangkou: {
|
gangkou: {
|
||||||
type: String,
|
type: String,
|
||||||
default: ''
|
default: ''
|
||||||
},
|
|
||||||
corpId: {
|
|
||||||
type: String,
|
|
||||||
default() {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
GATE_VIDEO_ID: {
|
|
||||||
type: String,
|
|
||||||
default() {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
code: {
|
|
||||||
type: String,
|
|
||||||
default() {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
videoType: {
|
|
||||||
type: String,
|
|
||||||
default() {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
name: {
|
|
||||||
type: String,
|
|
||||||
default() {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
config: config,
|
config: config,
|
||||||
info: {},
|
info: {},
|
||||||
recordAllList: [],
|
recordAllList: []
|
||||||
varList: [],
|
|
||||||
carRecordAllList: []
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
created() {
|
created() {
|
||||||
if (this.type !== 'CAMERA') {
|
this.getData()
|
||||||
this.getData()
|
this.getListData()
|
||||||
this.getListData()
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
formatDate(date, format) {
|
formatDate(date, format) {
|
||||||
|
|
@ -217,10 +106,8 @@ export default {
|
||||||
'/map/getGatesInAndOutNumById',
|
'/map/getGatesInAndOutNumById',
|
||||||
{
|
{
|
||||||
GATE_AREA_ID: this.id,
|
GATE_AREA_ID: this.id,
|
||||||
GATE_VIDEO_ID: this.GATE_VIDEO_ID,
|
|
||||||
TYPE: this.type,
|
TYPE: this.type,
|
||||||
GANGKOU: this.gangkou,
|
GANGKOU: this.gangkou
|
||||||
CORPINFO_ID: this.corpId
|
|
||||||
}
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
Object.assign(this.info, data.pd)
|
Object.assign(this.info, data.pd)
|
||||||
|
|
@ -230,7 +117,6 @@ export default {
|
||||||
this.info.CAR_OUT = 0
|
this.info.CAR_OUT = 0
|
||||||
this.info.PERSON_IN = 0
|
this.info.PERSON_IN = 0
|
||||||
this.info.PERSON_OUT = 0
|
this.info.PERSON_OUT = 0
|
||||||
this.varList = data.pd.varList
|
|
||||||
for (let i = 0; i < data.pd.varList.length; i++) {
|
for (let i = 0; i < data.pd.varList.length; i++) {
|
||||||
if (data.pd.varList[i].TYPE == 'CAR_IN') {
|
if (data.pd.varList[i].TYPE == 'CAR_IN') {
|
||||||
this.info.CAR_IN = data.pd.varList[i].COUNT
|
this.info.CAR_IN = data.pd.varList[i].COUNT
|
||||||
|
|
@ -246,11 +132,6 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this.type == 'CAMERA') {
|
|
||||||
Object.assign(this.info, data.pd.info)
|
|
||||||
this.info.CODE = data.pd.video.EXTERNALINDEXCODE
|
|
||||||
this.info.VIDEONAME = data.pd.video.NAME
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
|
|
@ -261,14 +142,11 @@ export default {
|
||||||
'/map/getGatesInAndOutListById?showCount=10000¤tPage=1',
|
'/map/getGatesInAndOutListById?showCount=10000¤tPage=1',
|
||||||
{
|
{
|
||||||
GATE_AREA_ID: this.id,
|
GATE_AREA_ID: this.id,
|
||||||
GATE_VIDEO_ID: this.GATE_VIDEO_ID,
|
|
||||||
TYPE: this.type,
|
TYPE: this.type,
|
||||||
GANGKOU: this.gangkou,
|
GANGKOU: this.gangkou
|
||||||
CORPINFO_ID: this.corpId
|
|
||||||
}
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
this.recordAllList = data.recordAllList
|
this.recordAllList = data.recordAllList
|
||||||
this.carRecordAllList = data.carRecordAllList
|
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -126,6 +126,7 @@ export default {
|
||||||
this.ImgList = data.ImgList
|
this.ImgList = data.ImgList
|
||||||
this.measuresList = data.varList
|
this.measuresList = data.varList
|
||||||
this.gongdanList = data.data
|
this.gongdanList = data.data
|
||||||
|
console.info(this.gongdanList)
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -105,6 +105,7 @@ export default {
|
||||||
this.ImgList = data.ImgList
|
this.ImgList = data.ImgList
|
||||||
this.measuresList = data.varList
|
this.measuresList = data.varList
|
||||||
this.gongdanList = data.data
|
this.gongdanList = data.data
|
||||||
|
console.info(this.gongdanList)
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container print-work">
|
<div class="app-container print-work" style="width: 100%;">
|
||||||
<div class="level-title">
|
<div class="level-title">
|
||||||
<h1>人员信息</h1>
|
<h1>人员信息</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -29,12 +29,12 @@
|
||||||
<td>{{ otherInfo?otherInfo.postName:'' }}</td>
|
<td>{{ otherInfo?otherInfo.postName:'' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<!-- 一公司人员定位页面 -->
|
<table class="table-ui">
|
||||||
<table v-if="corpId === '035958e685cf4850bc40151c5e0617a6'" class="table-ui">
|
|
||||||
<tr>
|
<tr>
|
||||||
<td class="bbg-transparent">姓名</td>
|
<td class="bbg-transparent">姓名</td>
|
||||||
<td >{{ info?info.userName:'' }}</td>
|
<td >{{ info?info.userName:'' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td class="bbg-transparent">定位卡号:</td>
|
<td class="bbg-transparent">定位卡号:</td>
|
||||||
<td >{{ info?info.id:'' }}</td>
|
<td >{{ info?info.id:'' }}</td>
|
||||||
|
|
@ -48,25 +48,6 @@
|
||||||
<td>{{ info?info.departmentName:'' }}</td>
|
<td>{{ info?info.departmentName:'' }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<!-- 九公司人员定位页面 -->
|
|
||||||
<table v-if="corpId === '21590a00ea5e462e9ee44dd332dddc26'" class="table-ui">
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">姓名</td>
|
|
||||||
<td >{{ (info && info.name) ? info.name : '未绑定人员' }}</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">定位卡号:</td>
|
|
||||||
<td >{{ info?info.id:'' }}</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">定位卡电量</td>
|
|
||||||
<td >{{ info?info.battery:'' }}</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td class="bbg-transparent">公司</td>
|
|
||||||
<td>{{ info?info.corpName:'' }}</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,88 +0,0 @@
|
||||||
<template>
|
|
||||||
<div>
|
|
||||||
<div id="aLiVideoPlayer" class="prism-player"/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import { requestFN } from '@/utils/request'
|
|
||||||
|
|
||||||
export default {
|
|
||||||
props: {
|
|
||||||
id: {
|
|
||||||
type: String,
|
|
||||||
default() {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
type: {
|
|
||||||
type: String,
|
|
||||||
default() {
|
|
||||||
return ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
gangkou: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
},
|
|
||||||
requestUrl: {
|
|
||||||
type: String,
|
|
||||||
default: '/mkmjGateVideo/goAllVideo'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
hls: false,
|
|
||||||
player: null,
|
|
||||||
url: ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
beforeDestroy() {
|
|
||||||
this.player && this.player.dispose()
|
|
||||||
},
|
|
||||||
created() {
|
|
||||||
this.showVideo()
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
showVideo() {
|
|
||||||
requestFN(
|
|
||||||
'/platform/door/video/getHlsPath',
|
|
||||||
{
|
|
||||||
INDEXCODE: this.id
|
|
||||||
}
|
|
||||||
).then((res) => {
|
|
||||||
// for (let i = 0; i < data.videoList.length; i++) {
|
|
||||||
// if (data.videoList[0].HLSVIDEOURL) {
|
|
||||||
// this.url = data.videoList[0].GBSVIDEOURL
|
|
||||||
// this.hls = true
|
|
||||||
// } else {
|
|
||||||
this.hls = false
|
|
||||||
this.$nextTick(() => {
|
|
||||||
// eslint-disable-next-line no-undef
|
|
||||||
this.player = new Aliplayer({
|
|
||||||
'id': 'aLiVideoPlayer',
|
|
||||||
'source': res.data.url,
|
|
||||||
'width': '100%',
|
|
||||||
'height': '500px',
|
|
||||||
'autoplay': true,
|
|
||||||
'isLive': true,
|
|
||||||
'rePlay': false,
|
|
||||||
'playsinline': true,
|
|
||||||
'preload': true,
|
|
||||||
'controlBarVisibility': 'hover',
|
|
||||||
'useH5Prism': true
|
|
||||||
}, function(player) {
|
|
||||||
console.log('The player is created')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
@ -279,7 +279,7 @@ export default {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID = data.pd.MAJORDANGERSOURCE_DISPOSAL_ID
|
this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID = data.pd.MAJORDANGERSOURCE_DISPOSAL_ID
|
||||||
this.disposal.DISPOSAL_TIME = data.pd.DISPOSAL_TIME
|
this.disposal.DISPOSAL_TIME = data.pd.DISPOSAL_TIME
|
||||||
|
console.info(this.disposal)
|
||||||
// this.dialogFormEdit = false
|
// this.dialogFormEdit = false
|
||||||
// this.hasDisposal = false
|
// this.hasDisposal = false
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
|
|
@ -325,7 +325,7 @@ export default {
|
||||||
this.uploadDisposalAfterFile()
|
this.uploadDisposalAfterFile()
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
this.disposal.DISPOSAL_STATUS = '1'
|
this.disposal.DISPOSAL_STATUS = '1'
|
||||||
|
console.info(this.disposal)
|
||||||
requestFN(
|
requestFN(
|
||||||
'/majordangersourcedisposal/' + methodName,
|
'/majordangersourcedisposal/' + methodName,
|
||||||
this.disposal
|
this.disposal
|
||||||
|
|
@ -334,7 +334,7 @@ export default {
|
||||||
this.dialogFormEdit = false
|
this.dialogFormEdit = false
|
||||||
this.hasDisposal = false
|
this.hasDisposal = false
|
||||||
this.resetDisposal()
|
this.resetDisposal()
|
||||||
|
console.info(this.disposal)
|
||||||
this.timer = setInterval(this.handleTimerOperation, 5000)
|
this.timer = setInterval(this.handleTimerOperation, 5000)
|
||||||
}).catch((e) => {
|
}).catch((e) => {
|
||||||
this.listLoading = false
|
this.listLoading = false
|
||||||
|
|
@ -354,7 +354,7 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// formData.append('FFILE', this.disposal.disposalBeforeFile)
|
// formData.append('FFILE', this.disposal.disposalBeforeFile)
|
||||||
|
console.info(this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
||||||
formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID)
|
||||||
formData.append('TYPE', 20)
|
formData.append('TYPE', 20)
|
||||||
this.uploadFileSubmit(formData, '处置前照片上传完成')
|
this.uploadFileSubmit(formData, '处置前照片上传完成')
|
||||||
|
|
|
||||||
|
|
@ -182,18 +182,6 @@
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
<transition
|
|
||||||
enter-active-class="animate__animated animate__fadeInDown"
|
|
||||||
leave-active-class="animate__animated animate__fadeOutUp"
|
|
||||||
>
|
|
||||||
<div v-if="isPeopleTrajectory" class="people_trajectory">
|
|
||||||
<el-select v-model="peopleTrajectoryValue" popper-class="people_trajectory_select">
|
|
||||||
<el-option v-for="item in onePerLocArr" :key="item.id" :value="item.id" :label="item.id"/>
|
|
||||||
</el-select>
|
|
||||||
<el-button class="search_btn" @click="addTrajectory">搜索</el-button>
|
|
||||||
<el-button class="reset_btn" @click="()=>{removeTrajectory();peopleTrajectoryValue = ''}">重置</el-button>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
</div>
|
</div>
|
||||||
</transition>
|
</transition>
|
||||||
<div class="right_options">
|
<div class="right_options">
|
||||||
|
|
@ -215,8 +203,6 @@
|
||||||
:corp-info-id="dialog.corpInfoId"
|
:corp-info-id="dialog.corpInfoId"
|
||||||
:gangkou="gangkouActive"
|
:gangkou="gangkouActive"
|
||||||
:infoname="dialog.infoname"
|
:infoname="dialog.infoname"
|
||||||
:code="dialog.code"
|
|
||||||
:video-type="dialog.video_type"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -231,7 +217,7 @@ import { requestFN } from '@/utils/request'
|
||||||
import gangkouIndex from './components/gangkou_index.vue'
|
import gangkouIndex from './components/gangkou_index.vue'
|
||||||
import fengongsiIndex from './components/fengongsi_index.vue'
|
import fengongsiIndex from './components/fengongsi_index.vue'
|
||||||
import caofeidianIndex from './components/caofeidian_index.vue'
|
import caofeidianIndex from './components/caofeidian_index.vue'
|
||||||
import menjin from './components/menjin_index.vue'
|
import menjin from './components/menjin.vue'
|
||||||
import menjinCfd from './components/menjinCfd.vue'
|
import menjinCfd from './components/menjinCfd.vue'
|
||||||
import xiaofang from './components/xiaofang.vue'
|
import xiaofang from './components/xiaofang.vue'
|
||||||
import anquan from './components/anquan.vue'
|
import anquan from './components/anquan.vue'
|
||||||
|
|
@ -417,7 +403,7 @@ export default {
|
||||||
img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
|
img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
|
||||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
|
checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
|
||||||
type: 'PERSON',
|
type: 'PERSON',
|
||||||
containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
|
containAuthorization: [],
|
||||||
eliminateAuthorization: []
|
eliminateAuthorization: []
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -427,29 +413,9 @@ export default {
|
||||||
img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
|
img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
|
||||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
|
checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
|
||||||
type: 'CAR',
|
type: 'CAR',
|
||||||
containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
|
containAuthorization: [],
|
||||||
eliminateAuthorization: []
|
eliminateAuthorization: []
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: '人员闸机', // 杂货公司的人员
|
|
||||||
dialog_width: '800px',
|
|
||||||
check: false,
|
|
||||||
img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
|
|
||||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
|
|
||||||
type: 'PERSON_MACHINE',
|
|
||||||
containAuthorization: ['allCorp'],
|
|
||||||
eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '车辆闸机', // 杂货公司的车辆
|
|
||||||
dialog_width: '600px',
|
|
||||||
check: false,
|
|
||||||
img: require('../../assets/map/gangkou_index/buttom/ico2.png'),
|
|
||||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'),
|
|
||||||
type: 'CAR_MACHINE',
|
|
||||||
containAuthorization: ['allCorp'],
|
|
||||||
eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6']
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: '摄像头',
|
label: '摄像头',
|
||||||
dialog_width: '600px',
|
dialog_width: '600px',
|
||||||
|
|
@ -690,17 +656,26 @@ export default {
|
||||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico21_on.png'),
|
checkImg: require('../../assets/map/gangkou_index/buttom/ico21_on.png'),
|
||||||
containAuthorization: [],
|
containAuthorization: [],
|
||||||
eliminateAuthorization: []
|
eliminateAuthorization: []
|
||||||
},
|
|
||||||
{
|
|
||||||
label: '人员轨迹',
|
|
||||||
dialog_width: '1200px',
|
|
||||||
check: false,
|
|
||||||
type: 'peopleTrajectory',
|
|
||||||
img: require('../../assets/map/gangkou_index/buttom/ico29.png'),
|
|
||||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico29_on.png'),
|
|
||||||
containAuthorization: [],
|
|
||||||
eliminateAuthorization: []
|
|
||||||
}
|
}
|
||||||
|
// {
|
||||||
|
// label: '摄像头',
|
||||||
|
// dialog_width: '1200px',
|
||||||
|
// check: false,
|
||||||
|
// type: 'platcamera',
|
||||||
|
// img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
|
||||||
|
// checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
|
||||||
|
// containAuthorization: [],
|
||||||
|
// eliminateAuthorization: []
|
||||||
|
// }
|
||||||
|
// {
|
||||||
|
// label: '车辆定位',
|
||||||
|
// dialog_width: '1200px',
|
||||||
|
// check: false,
|
||||||
|
// img: require('../../assets/map/gangkou_index/buttom/ico22.png'),
|
||||||
|
// checkImg: require('../../assets/map/gangkou_index/buttom/ico22_on.png'),
|
||||||
|
// containAuthorization: [],
|
||||||
|
// eliminateAuthorization: []
|
||||||
|
// }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -1116,9 +1091,7 @@ export default {
|
||||||
longitude: '',
|
longitude: '',
|
||||||
latitude: ''
|
latitude: ''
|
||||||
},
|
},
|
||||||
trajectoryEntityCollection: {},
|
trajectoryEntityCollection: {}
|
||||||
isPeopleTrajectory: false,
|
|
||||||
peopleTrajectoryValue: ''
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
@ -1216,7 +1189,7 @@ export default {
|
||||||
}
|
}
|
||||||
const point_type = pick.id._monitoItems.data.point_type
|
const point_type = pick.id._monitoItems.data.point_type
|
||||||
if (point_type.indexOf('标记点') !== -1) {
|
if (point_type.indexOf('标记点') !== -1) {
|
||||||
const { label, point_type, data_id, corpInfoId, dialog_width, infoname, code, video_type, name } = pick.id._monitoItems.data
|
const { label, point_type, data_id, corpInfoId, dialog_width, infoname } = pick.id._monitoItems.data
|
||||||
this.dialog.visible = true
|
this.dialog.visible = true
|
||||||
this.dialog.title = label
|
this.dialog.title = label
|
||||||
this.dialog.type = point_type.substring(3)
|
this.dialog.type = point_type.substring(3)
|
||||||
|
|
@ -1224,9 +1197,6 @@ export default {
|
||||||
this.dialog.corpInfoId = corpInfoId
|
this.dialog.corpInfoId = corpInfoId
|
||||||
this.dialog.infoname = infoname
|
this.dialog.infoname = infoname
|
||||||
this.dialog.width = dialog_width || '50%'
|
this.dialog.width = dialog_width || '50%'
|
||||||
this.dialog.code = code
|
|
||||||
this.dialog.video_type = video_type
|
|
||||||
this.dialog.name = name
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.closeBubbles()
|
this.closeBubbles()
|
||||||
|
|
@ -1256,13 +1226,12 @@ export default {
|
||||||
}
|
}
|
||||||
}, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
|
}, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
|
||||||
},
|
},
|
||||||
addTrajectory() {
|
addTrajectory(point_id, corpInfoId) {
|
||||||
this.removeTrajectory()
|
|
||||||
requestFN(
|
requestFN(
|
||||||
'/map/getPersonTrace',
|
'/map/getPersonTrace',
|
||||||
{
|
{
|
||||||
id: this.peopleTrajectoryValue,
|
id: point_id,
|
||||||
corpId: this.CORP_INFO_ID
|
corpId: corpInfoId
|
||||||
}
|
}
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
if (data.list) {
|
if (data.list) {
|
||||||
|
|
@ -1702,7 +1671,6 @@ export default {
|
||||||
this.bottomOptionsList[i].list[j].check = false
|
this.bottomOptionsList[i].list[j].check = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.isPeopleTrajectory = false
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
clearAllBottomOptionsItemsEntityCollection() {
|
clearAllBottomOptionsItemsEntityCollection() {
|
||||||
|
|
@ -1789,26 +1757,12 @@ export default {
|
||||||
}
|
}
|
||||||
this.carLocArr = []
|
this.carLocArr = []
|
||||||
}
|
}
|
||||||
if (urlType === 'peopleTrajectory') {
|
|
||||||
this.isPeopleTrajectory = false
|
|
||||||
}
|
|
||||||
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
|
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
|
||||||
this.doUnSubscribe()
|
this.doUnSubscribe()
|
||||||
this.clearMqttPoint('+/UwbBQ/')
|
this.clearMqttPoint('+/UwbBQ/')
|
||||||
this.removeTrajectory()
|
this.removeTrajectory()
|
||||||
for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) {
|
|
||||||
if (this.bottomOptionsList[pindex].list[i].type === 'peopleTrajectory') {
|
|
||||||
if (this.bottomOptionsList[pindex].list[i].check) {
|
|
||||||
this.bottomOptionsList[pindex].list[i].check = false
|
|
||||||
this.isPeopleTrajectory = false
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' &&
|
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') {
|
||||||
this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' &&
|
|
||||||
urlType === 'peoplePosition') {
|
|
||||||
this.clearRYDWPoint('+/UwbBQ/')
|
this.clearRYDWPoint('+/UwbBQ/')
|
||||||
this.removeTrajectory()
|
this.removeTrajectory()
|
||||||
}
|
}
|
||||||
|
|
@ -1824,45 +1778,17 @@ export default {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
if (urlType === 'peopleTrajectory') {
|
|
||||||
let flag = false
|
|
||||||
for (let i = 0; i < this.bottomOptionsList[pindex].list.length; i++) {
|
|
||||||
if (this.bottomOptionsList[pindex].list[i].type === 'peoplePosition') {
|
|
||||||
if (!this.bottomOptionsList[pindex].list[i].check) {
|
|
||||||
flag = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flag) {
|
|
||||||
this.$message.warning('请先选择人员定位！！！')
|
|
||||||
return
|
|
||||||
} else {
|
|
||||||
this.isPeopleTrajectory = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.bottomOptionsList[pindex].list[index].check = true
|
this.bottomOptionsList[pindex].list[index].check = true
|
||||||
if (this.gangkouActive === '00004') {
|
if (this.gangkouActive === '00004') {
|
||||||
this.cfdBottomOptionsList[pindex].list[index].check = true
|
this.cfdBottomOptionsList[pindex].list[index].check = true
|
||||||
this.bottomOptionsList[pindex].list[index].check = false
|
this.bottomOptionsList[pindex].list[index].check = false
|
||||||
}
|
}
|
||||||
console.info('---------')
|
|
||||||
console.info('---------')
|
|
||||||
console.info(this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f')
|
|
||||||
console.info('---------')
|
|
||||||
console.info('---------')
|
|
||||||
|
|
||||||
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
|
if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
|
||||||
!this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
|
!this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
|
||||||
} else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' &&
|
} else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') {
|
||||||
urlType === 'peoplePosition') {
|
|
||||||
// websocket实时获取人员定位
|
// websocket实时获取人员定位
|
||||||
console.info('Assssssss')
|
|
||||||
this.initRYDWWebsocket('21590a00ea5e462e9ee44dd332dddc26')
|
this.initRYDWWebsocket('21590a00ea5e462e9ee44dd332dddc26')
|
||||||
} else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' && urlType === 'peoplePosition') {
|
|
||||||
// websocket实时获取人员定位
|
|
||||||
console.info('Assssssss')
|
|
||||||
this.initRYDWWebsocket('033549ed3bd648e49c8a65eb4993ec2f')
|
|
||||||
} else {
|
} else {
|
||||||
requestFN(
|
requestFN(
|
||||||
pointUrl,
|
pointUrl,
|
||||||
|
|
@ -1875,7 +1801,6 @@ export default {
|
||||||
).then(async(data) => {
|
).then(async(data) => {
|
||||||
const points = []
|
const points = []
|
||||||
const varList = this.filterNull(data.varList)
|
const varList = this.filterNull(data.varList)
|
||||||
console.info(data)
|
|
||||||
for (let i = 0; i < varList.length; i++) {
|
for (let i = 0; i < varList.length; i++) {
|
||||||
const point = {}
|
const point = {}
|
||||||
point.id = pindex + '_' + index + '_' + i
|
point.id = pindex + '_' + index + '_' + i
|
||||||
|
|
@ -1918,7 +1843,6 @@ export default {
|
||||||
}
|
}
|
||||||
points.push(point)
|
points.push(point)
|
||||||
}
|
}
|
||||||
console.info(points)
|
|
||||||
if (this.gangkouActive === '00004' && urlType === 'carPosition') {
|
if (this.gangkouActive === '00004' && urlType === 'carPosition') {
|
||||||
this.timerCfdCarDingwei()
|
this.timerCfdCarDingwei()
|
||||||
this.carLocArr = points
|
this.carLocArr = points
|
||||||
|
|
@ -2417,10 +2341,10 @@ export default {
|
||||||
_this.fwebsocket = new WebSocket(encodeURI(wsUrl))
|
_this.fwebsocket = new WebSocket(encodeURI(wsUrl))
|
||||||
_this.fwebsocket.onmessage = function(message) {
|
_this.fwebsocket.onmessage = function(message) {
|
||||||
console.info('接收消息')
|
console.info('接收消息')
|
||||||
const peopleList = JSON.parse(message.data)
|
const peopleList = JSON.parse(message.data).data.data
|
||||||
for (let i = 0; i < peopleList.length; i++) {
|
for (let i = 0; i < peopleList.length; i++) {
|
||||||
const item = peopleList[i]
|
const item = peopleList[i]
|
||||||
if ((!item)) continue
|
if ((!item) || (item.ts === 1)) continue
|
||||||
// 将地图上剩余的点与最新的定位人员点进行对比 更新地图上已存在的点 新增地图上之前没有的点
|
// 将地图上剩余的点与最新的定位人员点进行对比 更新地图上已存在的点 新增地图上之前没有的点
|
||||||
const index = _this.onePerLocArr.findIndex(item1 => {
|
const index = _this.onePerLocArr.findIndex(item1 => {
|
||||||
return item1.id.toString() === item.id.toString()
|
return item1.id.toString() === item.id.toString()
|
||||||
|
|
@ -2436,7 +2360,6 @@ export default {
|
||||||
} else {
|
} else {
|
||||||
const perLoc = {
|
const perLoc = {
|
||||||
id: item.id,
|
id: item.id,
|
||||||
name: item.name,
|
|
||||||
x: x,
|
x: x,
|
||||||
y: y,
|
y: y,
|
||||||
icon_type: 'img4_0' + pointColor,
|
icon_type: 'img4_0' + pointColor,
|
||||||
|
|
@ -2757,8 +2680,6 @@ export default {
|
||||||
if (containAuthorization.length === 0) return true
|
if (containAuthorization.length === 0) return true
|
||||||
if (containAuthorization.includes(CORP_INFO_ID)) {
|
if (containAuthorization.includes(CORP_INFO_ID)) {
|
||||||
return true
|
return true
|
||||||
} else if (containAuthorization.includes('allCorp') && CORP_INFO_ID) {
|
|
||||||
return true
|
|
||||||
} else {
|
} else {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
@ -3178,52 +3099,9 @@ export default {
|
||||||
transform: translateY(0);
|
transform: translateY(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.people_trajectory{
|
|
||||||
position: absolute;
|
|
||||||
top: -60px;
|
|
||||||
left: 0;
|
|
||||||
width: 400px;
|
|
||||||
padding: 10px;
|
|
||||||
background-image: linear-gradient(to right, rgb(31 62 129 / 57%) 0%, rgb(17 93 255 / 40%) 50%, rgb(31 62 129 / 57%) 100%);
|
|
||||||
.search_btn{
|
|
||||||
background-color: #1563e3;
|
|
||||||
color: #fff;
|
|
||||||
border-color: #1563e3;
|
|
||||||
}
|
|
||||||
.reset_btn{
|
|
||||||
background-color: #558be5;
|
|
||||||
color: #fff;
|
|
||||||
border-color: #558be5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
<style>
|
<style>
|
||||||
.cesium-viewer-toolbar, .cesium-viewer-fullscreenContainer, .cesium-infoBox-visible {
|
.cesium-viewer-toolbar, .cesium-viewer-fullscreenContainer, .cesium-infoBox-visible {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
.people_trajectory .el-input__inner{
|
|
||||||
background-color: #100693 !important;
|
|
||||||
border-color: #100693 !important;
|
|
||||||
color: #fff !important;
|
|
||||||
}
|
|
||||||
.people_trajectory_select{
|
|
||||||
background-color: #100693 !important;
|
|
||||||
border-color: #100693 !important;
|
|
||||||
}
|
|
||||||
.people_trajectory_select .el-select-dropdown__item{
|
|
||||||
color: #fff !important;
|
|
||||||
}
|
|
||||||
.people_trajectory_select .el-select-dropdown__item.hover{
|
|
||||||
background-color: #2111ec !important;
|
|
||||||
color: #fff !important;
|
|
||||||
}
|
|
||||||
.people_trajectory_select .popper__arrow{
|
|
||||||
border-top-color: #100693 !important;
|
|
||||||
border-bottom-color: #100693 !important;
|
|
||||||
}
|
|
||||||
.people_trajectory_select .popper__arrow::after{
|
|
||||||
border-top-color: #100693 !important;
|
|
||||||
border-bottom-color: #100693 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -111,46 +111,14 @@ export default class DragEntity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (value.point_type.indexOf('标记点') !== -1) {
|
if (value.point_type.indexOf('标记点') !== -1) {
|
||||||
if (value.label == '人员闸机') {
|
billboard = {
|
||||||
billboard = {
|
image: imgMap['img' + value.icon_type],
|
||||||
image: imgMap['img0_0' ],
|
height: 36,
|
||||||
height: 36,
|
width: 30,
|
||||||
width: 30,
|
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
||||||
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
||||||
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
||||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
||||||
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
|
||||||
}
|
|
||||||
} else if (value.label == '车辆闸机') {
|
|
||||||
billboard = {
|
|
||||||
image: imgMap['img0_1' ],
|
|
||||||
height: 36,
|
|
||||||
width: 30,
|
|
||||||
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
|
||||||
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
|
||||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
|
||||||
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
|
||||||
}
|
|
||||||
} else if (value.label == '摄像头') {
|
|
||||||
billboard = {
|
|
||||||
image: imgMap['img0_2' ],
|
|
||||||
height: 36,
|
|
||||||
width: 30,
|
|
||||||
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
|
||||||
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
|
||||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
|
||||||
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
billboard = {
|
|
||||||
image: imgMap['img' + value.icon_type],
|
|
||||||
height: 36,
|
|
||||||
width: 30,
|
|
||||||
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
|
||||||
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
|
||||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
|
||||||
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 曹妃甸使用
|
// 曹妃甸使用
|
||||||
|
|
|
||||||
|
|
@ -30,16 +30,6 @@ export default class DragEntity {
|
||||||
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
||||||
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
||||||
},
|
},
|
||||||
label: {
|
|
||||||
text: point.name ? point.name : point.id,
|
|
||||||
font: '13px sans-serif',
|
|
||||||
pixelOffset: new Cesium.Cartesian2(0, -55),
|
|
||||||
showBackground: true,
|
|
||||||
// eslint-disable-next-line new-cap
|
|
||||||
backgroundColor: new Cesium.Color.fromCssColorString('rgba(20, 58, 142, 1)'),
|
|
||||||
backgroundPadding: new Cesium.Cartesian2(7, 5),
|
|
||||||
disableDepthTestDistance: Number.POSITIVE_INFINITY
|
|
||||||
},
|
|
||||||
orientation: new Cesium.VelocityOrientationProperty(point.property),
|
orientation: new Cesium.VelocityOrientationProperty(point.property),
|
||||||
|
|
||||||
monitoItems: {
|
monitoItems: {
|
||||||
|
|
@ -53,9 +43,7 @@ export default class DragEntity {
|
||||||
this.viewer.clock.clockRange = Cesium.ClockRange.CLAMPED
|
this.viewer.clock.clockRange = Cesium.ClockRange.CLAMPED
|
||||||
this.viewer.clock.shouldAnimate = false
|
this.viewer.clock.shouldAnimate = false
|
||||||
}
|
}
|
||||||
delEntity(point) {
|
|
||||||
this.viewer.entities.remove(point)
|
|
||||||
}
|
|
||||||
getPosition(point) {
|
getPosition(point) {
|
||||||
if (this.viewer.clock.shouldAnimate === false) {
|
if (this.viewer.clock.shouldAnimate === false) {
|
||||||
this.viewer.clock.shouldAnimate = true
|
this.viewer.clock.shouldAnimate = true
|
||||||
|
|
|
||||||
|
|
@ -595,7 +595,7 @@ export default {
|
||||||
this.$refs.form.validate(valid => {
|
this.$refs.form.validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/hidden/finalcheck',
|
'/safetyenvironmental/V2/finalcheck',
|
||||||
{
|
{
|
||||||
HIDDEN_ID: this.HIDDEN_ID,
|
HIDDEN_ID: this.HIDDEN_ID,
|
||||||
FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR,
|
FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR,
|
||||||
|
|
|
||||||
|
|
@ -340,7 +340,7 @@ export default {
|
||||||
})
|
})
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
requestFN(
|
requestFN(
|
||||||
'/hidden/assign',
|
'/safetyenvironmental/V2/assign',
|
||||||
{ ...this.form,
|
{ ...this.form,
|
||||||
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
|
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
|
||||||
INSPECTION_ID: this.$parent.INSPECTION_ID
|
INSPECTION_ID: this.$parent.INSPECTION_ID
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,7 @@ export default {
|
||||||
getData() {
|
getData() {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/goShow',
|
'/safetyenvironmental/V2/goShow',
|
||||||
{
|
{
|
||||||
INSPECTION_ID: this.$parent.INSPECTION_ID
|
INSPECTION_ID: this.$parent.INSPECTION_ID
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -436,7 +436,7 @@ export default {
|
||||||
})
|
})
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
requestFN(
|
requestFN(
|
||||||
'/hidden/assign',
|
'/safetyenvironmental/V2/assign',
|
||||||
{ ...this.form,
|
{ ...this.form,
|
||||||
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
|
HIDDEN_STATUS: this.$parent.HIDDEN_STATUS,
|
||||||
INSPECTION_ID: this.$parent.INSPECTION_ID
|
INSPECTION_ID: this.$parent.INSPECTION_ID
|
||||||
|
|
|
||||||
|
|
@ -330,7 +330,7 @@ export default {
|
||||||
hiddenCount(INSPECTION_ID) {
|
hiddenCount(INSPECTION_ID) {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmentalexplain/hiddencount',
|
'/safetyenvironmental/V2/hiddencount',
|
||||||
{
|
{
|
||||||
INSPECTION_ID: INSPECTION_ID
|
INSPECTION_ID: INSPECTION_ID
|
||||||
}
|
}
|
||||||
|
|
@ -347,9 +347,10 @@ export default {
|
||||||
},
|
},
|
||||||
// 完成
|
// 完成
|
||||||
subCanvas(img64) {
|
subCanvas(img64) {
|
||||||
|
console.info('img64：' + img64)
|
||||||
this.form.INSPECTED_SITEUSER_SIGN_IMG = img64
|
this.form.INSPECTED_SITEUSER_SIGN_IMG = img64
|
||||||
this.$set(this.form, 'INSPECTED_SITEUSER_SIGN_TIME', formatDate(new Date(), 'YYYY-MM-DD HH:mm'))
|
this.$set(this.form, 'INSPECTED_SITEUSER_SIGN_TIME', formatDate(new Date(), 'YYYY-MM-DD HH:mm'))
|
||||||
|
console.info(this.form)
|
||||||
this.dialogWriteSign = false
|
this.dialogWriteSign = false
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,16 +13,16 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<!-- <el-row :gutter="20">-->
|
<el-row :gutter="20">
|
||||||
<!-- <el-col :span="12">-->
|
<el-col :span="12">
|
||||||
<!-- <el-form-item label="是否为相关方" prop="IS_XGF">-->
|
<el-form-item label="是否为相关方" prop="IS_XGF">
|
||||||
<!-- <el-radio-group id="IS_XGF" ref="IS_XGF" v-model="form.IS_XGF" @change="getXgfTreeData">-->
|
<el-radio-group id="IS_XGF" ref="IS_XGF" v-model="form.IS_XGF" @change="getXgfTreeData">
|
||||||
<!-- <el-radio :label="'1'" >是</el-radio>-->
|
<el-radio :label="'1'" >是</el-radio>
|
||||||
<!-- <el-radio :label="'0'" >否</el-radio>-->
|
<el-radio :label="'0'" >否</el-radio>
|
||||||
<!-- </el-radio-group>-->
|
</el-radio-group>
|
||||||
<!-- </el-form-item>-->
|
</el-form-item>
|
||||||
<!-- </el-col>-->
|
</el-col>
|
||||||
<!-- </el-row>-->
|
</el-row>
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="被检查单位" prop="INSPECTED_DEPARTMENT_ID">
|
<el-form-item label="被检查单位" prop="INSPECTED_DEPARTMENT_ID">
|
||||||
|
|
@ -96,7 +96,7 @@
|
||||||
<el-col :span="11">
|
<el-col :span="11">
|
||||||
<el-form-item label="检查人员" prop="INSPECTION_USER_ID">
|
<el-form-item label="检查人员" prop="INSPECTION_USER_ID">
|
||||||
<el-select v-model="item.INSPECTION_USER_ID" clearable placeholder="请选择检查人员" @change="changeHiddenUserList">
|
<el-select v-model="item.INSPECTION_USER_ID" clearable placeholder="请选择检查人员" @change="changeHiddenUserList">
|
||||||
<el-option v-for="data in INSPECTOR_List[index]" :key="data.USER_ID" :label="data.NAME" :value="data.USER_ID" />
|
<el-option v-for="data in INSPECTED_SITEUSER_List" :key="data.USER_ID" :label="data.NAME" :value="data.USER_ID" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -530,7 +530,7 @@ export default {
|
||||||
this.INSPECTED_SITEUSER_List = []
|
this.INSPECTED_SITEUSER_List = []
|
||||||
}
|
}
|
||||||
if (newVal != null && newVal != '') {
|
if (newVal != null && newVal != '') {
|
||||||
this.getUserList(newVal)
|
this.getXgfUserList(newVal)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
immediate: false
|
immediate: false
|
||||||
|
|
@ -600,9 +600,7 @@ export default {
|
||||||
updateInspecteDept(DEPARTMENT_ID, i) {
|
updateInspecteDept(DEPARTMENT_ID, i) {
|
||||||
// this.form.inspectorList[i].INSPECTION_USER_ID = ''
|
// this.form.inspectorList[i].INSPECTION_USER_ID = ''
|
||||||
// this.getInspectorList(DEPARTMENT_ID, i)
|
// this.getInspectorList(DEPARTMENT_ID, i)
|
||||||
// this.getXgfUserList(DEPARTMENT_ID)
|
this.getXgfUserList(DEPARTMENT_ID)
|
||||||
this.form.inspectorList[i].INSPECTION_USER_ID = ''
|
|
||||||
this.getInspectorList(DEPARTMENT_ID, i)
|
|
||||||
},
|
},
|
||||||
// 获取人员列表
|
// 获取人员列表
|
||||||
getInspectorList(DEPARTMENT_ID, i) {
|
getInspectorList(DEPARTMENT_ID, i) {
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,7 @@ export default {
|
||||||
getData() {
|
getData() {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/goShow',
|
'/safetyenvironmental/V2/goShow',
|
||||||
{
|
{
|
||||||
INSPECTION_ID: this.$parent.INSPECTION_ID
|
INSPECTION_ID: this.$parent.INSPECTION_ID
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -357,7 +357,7 @@ export default {
|
||||||
getList() {
|
getList() {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
'/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
|
||||||
{
|
{
|
||||||
...this.search,
|
...this.search,
|
||||||
INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
|
INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
|
||||||
|
|
@ -471,7 +471,7 @@ export default {
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.listLoading = true
|
this.listLoading = true
|
||||||
requestFN(
|
requestFN(
|
||||||
'/safetyenvironmental/hide',
|
'/safetyenvironmental/V2/hide',
|
||||||
{
|
{
|
||||||
INSPECTION_ID: id,
|
INSPECTION_ID: id,
|
||||||
hide: '1'
|
hide: '1'
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
<link rel="stylesheet" type="text/css" href="./css/style.css" />
|
<link rel="stylesheet" type="text/css" href="./css/style.css" />
|
||||||
<link rel="stylesheet" href="./swiper-master/package/swiper-bundle.min.css">
|
<link rel="stylesheet" href="./swiper-master/package/swiper-bundle.min.css">
|
||||||
<script src="./js/vue.js"></script>
|
<script src="./js/vue.js"></script>
|
||||||
<script type="text/javascript" src="./js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="./js/jquery-3.3.1.min.js"></script>
|
||||||
<script src="../config.js"></script>
|
<script src="../config.js"></script>
|
||||||
<script src="./js/sweetalert.min.js"></script>
|
<script src="./js/sweetalert.min.js"></script>
|
||||||
<script src="./js/ezuikit.js"></script>
|
<script src="./js/ezuikit.js"></script>
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -16,7 +16,7 @@
|
||||||
<script src="js/IndoorMap3d.js"></script>
|
<script src="js/IndoorMap3d.js"></script>
|
||||||
<script src="js/Theme.js"></script>
|
<script src="js/Theme.js"></script>
|
||||||
<link href="css/indoor3D.css" rel="stylesheet">
|
<link href="css/indoor3D.css" rel="stylesheet">
|
||||||
<script type="text/javascript" src="../js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../js/jquery-3.3.1.min.js"></script>
|
||||||
<script type="text/javascript" src="../js/pre-loader.js"></script>
|
<script type="text/javascript" src="../js/pre-loader.js"></script>
|
||||||
<!-- vue -->
|
<!-- vue -->
|
||||||
<script src="../js/vue.js"></script>
|
<script src="../js/vue.js"></script>
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@
|
||||||
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
||||||
</div>
|
</div>
|
||||||
-->
|
-->
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -373,7 +373,7 @@
|
||||||
<div style="padding: 0 20px;">
|
<div style="padding: 0 20px;">
|
||||||
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
|
<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@
|
||||||
|
|
||||||
|
|
||||||
<!--<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>-->
|
<!--<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>-->
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script src="../../assets/js/vant.min.js"></script>
|
<script src="../../assets/js/vant.min.js"></script>
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
<script type="text/javascript" src=".../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script src="../../assets/js/vant.min.js"></script>
|
<script src="../../assets/js/vant.min.js"></script>
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
<!--全局配置-->
|
<!--全局配置-->
|
||||||
<script src="../../../config.js"></script>
|
<script src="../../../config.js"></script>
|
||||||
<script src="../../assets/js/vant.min.js"></script>
|
<script src="../../assets/js/vant.min.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<style>
|
<style>
|
||||||
.wrapper {
|
.wrapper {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@
|
||||||
<div style="padding: 0 20px;">
|
<div style="padding: 0 20px;">
|
||||||
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
<!--全局配置-->
|
<!--全局配置-->
|
||||||
<script src="../../../config.js"></script>
|
<script src="../../../config.js"></script>
|
||||||
<script src="../../assets/js/vant.min.js"></script>
|
<script src="../../assets/js/vant.min.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<style>
|
<style>
|
||||||
.wrapper {
|
.wrapper {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
|
|
@ -321,7 +321,7 @@
|
||||||
<div style="padding: 0 20px;">
|
<div style="padding: 0 20px;">
|
||||||
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@
|
||||||
|
|
||||||
|
|
||||||
<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
|
<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
<div style="padding: 0 20px;margin-top:20px">
|
<div style="padding: 0 20px;margin-top:20px">
|
||||||
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript" src="../../../bi/js/jquery-3.7.1.min.js"></script>
|
<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
|
||||||
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
<script type="text/javascript" src="../../../bi/js/pre-loader.js"></script>
|
||||||
<script src="../../../bi/js/sweetalert.min.js"></script>
|
<script src="../../../bi/js/sweetalert.min.js"></script>
|
||||||
<script src="../../../request.js"></script>
|
<script src="../../../request.js"></script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue