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

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

2024年2月1日V1.0.53
zhaoyu 2024-01-31 15:04:12 +08:00
parent 01223db7d8 0866882e55
commit 5d5aff5e9c
38 changed files with 1026 additions and 758 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/styles/element-ui.scss
View File

@ -90,13 +90,14 @@
.el-dialog__title{ .el-dialog__title{
font-size: 16px; font-size: 16px;
} }
//当使用card时（class="box-card a"）这样写class样式就对了
.el-card{
&:not(.a){
// card样式修正 // card样式修正
.el-card__header { .el-card__header {
padding: 12px 20px; padding: 12px 20px;
color: #000; color: #000;
} &::before{
.el-card__header::before{
content: ''; content: '';
position: absolute; position: absolute;
left: 0; left: 0;
@ -104,3 +105,7 @@
width: 6px; width: 6px;
background-color: #1890ff; background-color: #1890ff;
} }
}
}
}

2
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
View File

@ -84,7 +84,7 @@
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div> </div>
<div style="height: 50px"></div> <div style="height: 50px"/>
</div> </div>
</template> </template>
<script> <script>

18
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/index.vue
View File

@ -14,8 +14,8 @@
<script> <script>
import List from './components/list' import List from './components/list'
import Detail from './components/detail' import Detail from './components/detail'
import ListCfd from "./components/list_cfd" import ListCfd from './components/list_cfd'
import DetailCfd from "./components/detail_cfd" import DetailCfd from './components/detail_cfd'
export default { export default {
components: { components: {
List: List, List: List,
@ -23,13 +23,6 @@ export default {
ListCfd: ListCfd, ListCfd: ListCfd,
DetailCfd: DetailCfd DetailCfd: DetailCfd
}, },
created() {
if (this.CORPINFO_ID == '035958e685cf4850bc40151c5e0617a6') {
this.activeName = 'ListCfd'
} else {
this.activeName = 'List'
}
},
data() { data() {
return { return {
activeName: 'List', activeName: 'List',
@ -49,6 +42,13 @@ export default {
} }
} }
}, },
created() {
if (this.CORPINFO_ID == '035958e685cf4850bc40151c5e0617a6') {
this.activeName = 'ListCfd'
} else {
this.activeName = 'List'
}
},
methods: { methods: {
goBack() { goBack() {
this.$parent.activeName = 'CorpInfo' this.$parent.activeName = 'CorpInfo'

7
src/views/firefighting/fireReport/index.vue
View File

@ -1,5 +1,10 @@
<template> <template>
<component :is="parentObj.activeName"/> <div>
<FireControlRoom v-if="parentObj.activeName === 'FireControlRoom'"/>
<FirePumpRoom v-if="parentObj.activeName === 'FirePumpRoom'"/>
<FireResources v-if="parentObj.activeName === 'FireResources'"/>
<List v-show="parentObj.activeName === 'List'"/>
</div>
</template> </template>
<script> <script>
import List from './components/list' import List from './components/list'

25
src/views/hidden/commonly/commonly/components/companiesList.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="隐患来源"> <el-form-item label="隐患来源">
@ -46,6 +47,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="隐患状态"> <el-form-item label="隐患状态">
<el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%"> <el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%">
@ -64,6 +67,17 @@
<el-input v-model="form.CONFIRM_USER"/> <el-input v-model="form.CONFIRM_USER"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="隐患类型" prop="HIDDENTYPE">
<el-cascader
ref="deptTree_Select3"
:options="hiddenTypeList"
:props="defaultProps2"
v-model="form.HIDDEN_TYPE"
collapse-tags
clearable/>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="整改负责人"> <el-form-item label="整改负责人">
<el-input v-model="form.RECTIFICATION_USER"/> <el-input v-model="form.RECTIFICATION_USER"/>
@ -74,6 +88,7 @@
<el-input v-model="form.CHECK_USER"/> <el-input v-model="form.CHECK_USER"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="隐患发现时间"> <el-form-item label="隐患发现时间">
<el-date-picker <el-date-picker
@ -209,7 +224,7 @@ export default {
varList: [], varList: [],
treeData: [], treeData: [],
hiddenPartList: [], hiddenPartList: [],
hiddenTypeList: [], hiddenTypeList: [],//隐患类型
hiddenlevelList: [ hiddenlevelList: [
{ {
value: 'hiddenLevel1004', value: 'hiddenLevel1004',
@ -230,6 +245,13 @@ export default {
children: 'nodes', children: 'nodes',
label: 'name' label: 'name'
}, },
defaultProps2: {
value: 'id',
children: 'nodes',
label: 'name',
multiple: true,
emitPath: false
},
form: { form: {
SOURCE: undefined, SOURCE: undefined,
HIDDENDESCR: '', HIDDENDESCR: '',
@ -243,6 +265,7 @@ export default {
CONFIRM_USER: '', CONFIRM_USER: '',
HIDDENFIND_NAME: '', HIDDENFIND_NAME: '',
CORPINFO_ID: '', CORPINFO_ID: '',
HIDDEN_TYPE: '',
HIDDEN_STATUS: undefined HIDDEN_STATUS: undefined
} }
} }

1
src/views/keyprojects/personnelmanagement/index.vue
View File

@ -82,7 +82,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page-btn-group"> <div class="page-btn-group">
<div> <div>
<el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button> <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>

4
src/views/keyprojects/platformelectronic/index.vue
View File

@ -202,7 +202,7 @@ export default {
{ id: '0', name: '请选择' }, { id: '0', name: '请选择' },
{ id: '1', name: '油管区' }, { id: '1', name: '油管区' },
{ id: '2', name: '码头区' } { id: '2', name: '码头区' }
], ]
} }
}, },
async created() { async created() {
@ -339,7 +339,7 @@ export default {
this.form.VIDEONAME = data.pd.NAME this.form.VIDEONAME = data.pd.NAME
this.form.CODE = data.pd.INDEXCODE this.form.CODE = data.pd.INDEXCODE
this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + "," +data.pd.LATITUDE this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + ',' + data.pd.LATITUDE
this.listLoading = false this.listLoading = false
resolve() resolve()
}).catch((e) => { }).catch((e) => {

2
src/views/map/components/caofeidian_index.vue
View File

@ -16,7 +16,7 @@
<div class="block3"> <div class="block3">
<layout-title title="人员定位信息"/> <layout-title title="人员定位信息"/>
<div class="options"> <div class="options">
<div v-for="(item,index) in block3OptionsList" :key="index" class="option" v-if="index === 2"> <div v-for="(item,index) in block3OptionsList" v-if="index === 2" :key="index" class="option">
<img :src="item.img" class="img_top" alt=""> <img :src="item.img" class="img_top" alt="">
<img class="img_bottom" src="../../../assets/map/gangkou_index/img1.png" alt=""> <img class="img_bottom" src="../../../assets/map/gangkou_index/img1.png" alt="">
<div class="label">{{ item.label }}</div> <div class="label">{{ item.label }}</div>

4
src/views/map/components/menjinCfd.vue
View File

@ -95,7 +95,7 @@ export default {
title: '人员闸机数', title: '人员闸机数',
img: require('../../../assets/map/menjin/ico1.png'), img: require('../../../assets/map/menjin/ico1.png'),
label1: '在线数', label1: '在线数',
count1: 0, count1: 0
// label2: '离线数', // label2: '离线数',
// count2: 0 // count2: 0
}, },
@ -103,7 +103,7 @@ export default {
title: '车辆闸机数', title: '车辆闸机数',
img: require('../../../assets/map/menjin/ico2.png'), img: require('../../../assets/map/menjin/ico2.png'),
label1: '在线数', label1: '在线数',
count1: 0, count1: 0
// label2: '离线数', // label2: '离线数',
// count2: 0 // count2: 0
}, },

4
src/views/map/components/qixiang.vue
View File

@ -19,11 +19,11 @@
<div class="title">{{ item.title }}</div> <div class="title">{{ item.title }}</div>
<div class="info"> <div class="info">
<div class="img"><img :src="item.img" alt=""></div> <div class="img"><img :src="item.img" alt=""></div>
<div class="count" v-if="item.title == '监测站数'"> <div v-if="item.title == '监测站数'" class="count">
<div>在线数：<count-to :start-val="0" :end-val="+item.onlinecount" :duration="3600"/></div> <div>在线数：<count-to :start-val="0" :end-val="+item.onlinecount" :duration="3600"/></div>
<div>离线数：<count-to :start-val="0" :end-val="+item.Offlinecount" :duration="3600"/></div> <div>离线数：<count-to :start-val="0" :end-val="+item.Offlinecount" :duration="3600"/></div>
</div> </div>
<div class="count" v-else> <div v-else class="count">
<div>在线数：-</div> <div>在线数：-</div>
<div>离线数：-</div> <div>离线数：-</div>
</div> </div>

5
src/views/map/components/renyuanCmt.vue
View File

@ -165,6 +165,11 @@ export default {
} }
}, },
mounted() { mounted() {
// this.obtainPersonnelData()
// this.personPositioningStatistics()
// this.startPersonnelDataTimer() // 定时获取
// this.obtainCarData()
// this.carPositioningStatistics()
}, },
destroyed() { destroyed() {
clearInterval(this.timer) // 关闭定时器 clearInterval(this.timer) // 关闭定时器

12
src/views/map/dialog/hotwork.vue
View File

@ -72,31 +72,31 @@
<tr> <tr>
<td class="bbg-transparent">动火单位(部门)负责人意见</td> <td class="bbg-transparent">动火单位(部门)负责人意见</td>
<td colspan="5"> <td colspan="5">
<img v-if="info.HOT_WORK_USER_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_USER_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.HOT_WORK_USER_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_USER_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent">现场管辖单位(部门)负责人意见</td> <td class="bbg-transparent">现场管辖单位(部门)负责人意见</td>
<td colspan="5"> <td colspan="5">
<img v-if="info.UNIT_LEADER_PRINCIPAL" v-viewer :src="config.fileUrl+info.UNIT_LEADER_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+info.UNIT_LEADER_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent">动火许可证签发单位意见</td> <td class="bbg-transparent">动火许可证签发单位意见</td>
<td colspan="5"> <td colspan="5">
<img v-if="info.ISSUING_PRINCIPAL" v-viewer :src="config.fileUrl+info.ISSUING_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.ISSUING_PRINCIPAL" :src="config.fileUrl+info.ISSUING_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent" rowspan="2">动火前管辖单位现场人员许可</td> <td class="bbg-transparent" rowspan="2">动火前管辖单位现场人员许可</td>
<td colspan="2"> <td colspan="2">
姓名： 姓名：
<img v-if="info.HOT_WORK_PERSON_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_PERSON_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.HOT_WORK_PERSON_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_PERSON_PRINCIPAL" width="50px" height="50px">
</td> </td>
<td class="bbg-transparent" rowspan="2">动火后管辖单位现场人员验收</td> <td class="bbg-transparent" rowspan="2">动火后管辖单位现场人员验收</td>
<td colspan="2"> <td colspan="2">
姓名： 姓名：
<img v-if="info.HOT_WORK_AFTER_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_AFTER_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.HOT_WORK_AFTER_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_AFTER_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
@ -116,7 +116,7 @@
<td>{{ item.userName }}</td> <td>{{ item.userName }}</td>
<td>{{ item.TIME }}</td> <td>{{ item.TIME }}</td>
<td> <td>
<img v-if="item.FILEPATH" v-viewer :src="config.fileUrl+item.FILEPATH" width="50px" height="50px"> <img v-viewer v-if="item.FILEPATH" :src="config.fileUrl+item.FILEPATH" width="50px" height="50px">
</td> </td>
</tr> </tr>
</table> </table>

111
src/views/map/dialog/humiditystation.vue
View File

@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null let myChart4 = null
let myChart5 = null let myChart5 = null
let myChart6 = null const myChart6 = null
export default { export default {
props: { props: {
id: { id: {
@ -46,12 +46,12 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {
config: config, config: config,
info: {}, info: {}
} }
}, },
mounted() { mounted() {
@ -73,7 +73,7 @@ export default {
'/map/getById', '/map/getById',
{ {
id: this.id, id: this.id,
TYPE: this.type, TYPE: this.type
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -96,7 +96,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: { series: {
@ -136,33 +136,33 @@ export default {
}, },
axisLabel: { axisLabel: {
formatter: function(e) { formatter: function(e) {
switch (e + "") { switch (e + '') {
case "0": case '0':
return "北"; return '北'
case "45": case '45':
return "东北"; return '东北'
case "135": case '135':
return "东南"; return '东南'
case "225": case '225':
return "西南" return '西南'
case "315": case '315':
return "西北"; return '西北'
case "360": case '360':
return "北"; return '北'
case "180": case '180':
return "南"; return '南'
case "90": case '90':
return "东"; return '东'
case "270": case '270':
return "西"; return '西'
default: default:
return e; return e
} }
}, },
distance: -60, distance: -60,
textStyle: { textStyle: {
fontSize: 14, fontSize: 14,
fontWeight: "", fontWeight: '',
color: '#fff' color: '#fff'
} }
}, },
@ -173,7 +173,7 @@ export default {
}, },
detail: { detail: {
formatter: function(param) { formatter: function(param) {
var level = ''; var level = ''
if (param > 0 && param < 90) { if (param > 0 && param < 90) {
level = '东北' level = '东北'
} else if (param > 90 && param < 180) { } else if (param > 90 && param < 180) {
@ -191,7 +191,7 @@ export default {
} else if (param == 180) { } else if (param == 180) {
level = '正南' level = '正南'
} }
return "当前风向:"+level + "(" + param + "°)"; return '当前风向:' + level + '(' + param + '°)'
}, },
offsetCenter: [0, 190], offsetCenter: [0, 190],
textStyle: { textStyle: {
@ -201,35 +201,34 @@ export default {
}, },
data: [data.pd.WINDDIRECTION] data: [data.pd.WINDDIRECTION]
} }
}; }
myChart4.setOption(option) myChart4.setOption(option)
}, },
initEcharts2(data) { initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5')) myChart5 = echarts.init(document.querySelector('#main5'))
var value = data.pd.TEMPERATURE; var value = data.pd.TEMPERATURE
var kd = []; var kd = []
// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据 // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
for (var i = 0, len = 130; i <= len; i++) { for (var i = 0, len = 130; i <= len; i++) {
if (i > 100 || i < 30) { if (i > 100 || i < 30) {
kd.push('0') kd.push('0')
} else { } else {
if (i % 5 === 0) { if (i % 5 === 0) {
kd.push('5'); kd.push('5')
} else { } else {
kd.push('3'); kd.push('3')
} }
} }
} }
// console.log(kd) // console.log(kd)
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
function getData(value) { function getData(value) {
return [Number(value) + 30]; return [Number(value) + 30]
} }
console.log(getData(value)) console.log(getData(value))
var data = getData(value + 30); var data = getData(value + 30)
var mercuryColor = '#fd4d49'; var mercuryColor = '#fd4d49'
var borderColor = '#fd4d49'; var borderColor = '#fd4d49'
const option = { const option = {
title: { title: {
@ -238,18 +237,18 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
yAxis: [{ yAxis: [{
show: false, show: false,
min: 0, min: 0,
max: 130, max: 130
}, { }, {
show: false, show: false,
data: [], data: [],
min: 0, min: 0,
max: 130, max: 130
}], }],
xAxis: [{ xAxis: [{
show: false, show: false,
@ -263,7 +262,7 @@ export default {
}, { }, {
show: false, show: false,
min: -110, min: -110,
max: 100, max: 100
}], }],
series: [{ series: [{
@ -276,7 +275,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
barBorderRadius: 0, barBorderRadius: 0
} }
}, },
label: { label: {
@ -285,11 +284,11 @@ export default {
position: 'top', position: 'top',
formatter: function(param) { formatter: function(param) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
return (((param.value * 100) - (30 * 100)) / 100) + '°C'; return (((param.value * 100) - (30 * 100)) / 100) + '°C'
}, },
textStyle: { textStyle: {
color: '#ccc', color: '#ccc',
fontSize: '10', fontSize: '10'
} }
} }
}, },
@ -304,7 +303,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 1 z: 1
@ -318,7 +317,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 0 z: 0
@ -332,7 +331,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
opacity: 1, opacity: 1
} }
}, },
z: 2 z: 2
@ -346,7 +345,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
opacity: 1, opacity: 1
} }
}, },
z: 1 z: 1
@ -360,7 +359,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
opacity: 1, opacity: 1
} }
}, },
z: 0 z: 0
@ -379,12 +378,12 @@ export default {
formatter: function(params) { formatter: function(params) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
if (params.dataIndex > 100 || params.dataIndex < 30) { if (params.dataIndex > 100 || params.dataIndex < 30) {
return ''; return ''
} else { } else {
if (params.dataIndex % 5 === 0) { if (params.dataIndex % 5 === 0) {
return params.dataIndex - 30; return params.dataIndex - 30
} else { } else {
return ''; return ''
} }
} }
} }
@ -396,12 +395,12 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 10, barBorderRadius: 10
} }
}, },
z: 0 z: 0
}] }]
}; }
myChart5.setOption(option) myChart5.setOption(option)
}, },
initEcharts3(data) { initEcharts3(data) {
@ -414,7 +413,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: [ series: [

5
src/views/map/dialog/index.vue
View File

@ -15,6 +15,7 @@
<mk-gate-machine-cmt v-if="type === 'CAR00005'||type ==='PERSON00005' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/> <mk-gate-machine-cmt v-if="type === 'CAR00005'||type ==='PERSON00005' " :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-cmt v-if="type === 'platcamera00005' || type === 'CAMERA00005'" :id="id" :type="type" :gangkou="gangkou"/>
<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-cmt v-if="type === 'CAMERA00005' || type === 'platcamera00005'" :id="id" :type="type" :gangkou="gangkou"/> <video-play-cmt v-if="type === 'CAMERA00005' || type === 'platcamera00005'" :id="id" :type="type" :gangkou="gangkou"/>
<video-play-plat v-if="type === 'platcamera'" :id="id" :type="type" :gangkou="gangkou" :corp-info-id="corpInfoId"/> <video-play-plat v-if="type === 'platcamera'" :id="id" :type="type" :gangkou="gangkou" :corp-info-id="corpInfoId"/>
@ -97,7 +98,7 @@ import peoplePositionCfdD from './peoplePositionCfdD.vue'
import peoplePositionCmt from './peoplePositionCmt.vue' import peoplePositionCmt from './peoplePositionCmt.vue'
import carPositionCfdD from './carPositionCfdD.vue' import carPositionCfdD from './carPositionCfdD.vue'
import peoplePositionOne from './peoplePositionOne.vue' import peoplePositionOne from './peoplePositionOne.vue'
import hotworkFirst from "./hotworkFirst"; import hotworkFirst from './hotworkFirst'
import peoplePositionYGS from './peoplePositionYGS.vue' import peoplePositionYGS from './peoplePositionYGS.vue'
import outSourceInfo from './outSourceInfo.vue' import outSourceInfo from './outSourceInfo.vue'
import outSourceVideoInfo from './outSourceVideoInfo.vue' import outSourceVideoInfo from './outSourceVideoInfo.vue'
@ -181,7 +182,7 @@ export default {
name: { name: {
type: String, type: String,
default: '' default: ''
}, }
}, },
methods: { methods: {
closeDialog() { closeDialog() {

2
src/views/map/dialog/peoplePositionCfdD.vue
View File

@ -92,7 +92,7 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {

2
src/views/map/dialog/peoplePositionOne.vue
View File

@ -65,7 +65,7 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {

111
src/views/map/dialog/temperaturestation.vue
View File

@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null let myChart4 = null
let myChart5 = null let myChart5 = null
let myChart6 = null const myChart6 = null
export default { export default {
props: { props: {
id: { id: {
@ -46,12 +46,12 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {
config: config, config: config,
info: {}, info: {}
} }
}, },
mounted() { mounted() {
@ -73,7 +73,7 @@ export default {
'/map/getById', '/map/getById',
{ {
id: this.id, id: this.id,
TYPE: this.type, TYPE: this.type
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -96,7 +96,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: { series: {
@ -136,33 +136,33 @@ export default {
}, },
axisLabel: { axisLabel: {
formatter: function(e) { formatter: function(e) {
switch (e + "") { switch (e + '') {
case "0": case '0':
return "北"; return '北'
case "45": case '45':
return "东北"; return '东北'
case "135": case '135':
return "东南"; return '东南'
case "225": case '225':
return "西南" return '西南'
case "315": case '315':
return "西北"; return '西北'
case "360": case '360':
return "北"; return '北'
case "180": case '180':
return "南"; return '南'
case "90": case '90':
return "东"; return '东'
case "270": case '270':
return "西"; return '西'
default: default:
return e; return e
} }
}, },
distance: -60, distance: -60,
textStyle: { textStyle: {
fontSize: 14, fontSize: 14,
fontWeight: "", fontWeight: '',
color: '#fff' color: '#fff'
} }
}, },
@ -173,7 +173,7 @@ export default {
}, },
detail: { detail: {
formatter: function(param) { formatter: function(param) {
var level = ''; var level = ''
if (param > 0 && param < 90) { if (param > 0 && param < 90) {
level = '东北' level = '东北'
} else if (param > 90 && param < 180) { } else if (param > 90 && param < 180) {
@ -191,7 +191,7 @@ export default {
} else if (param == 180) { } else if (param == 180) {
level = '正南' level = '正南'
} }
return "当前风向:"+level + "(" + param + "°)"; return '当前风向:' + level + '(' + param + '°)'
}, },
offsetCenter: [0, 190], offsetCenter: [0, 190],
textStyle: { textStyle: {
@ -201,35 +201,34 @@ export default {
}, },
data: [data.pd.WINDDIRECTION] data: [data.pd.WINDDIRECTION]
} }
}; }
myChart4.setOption(option) myChart4.setOption(option)
}, },
initEcharts2(data) { initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5')) myChart5 = echarts.init(document.querySelector('#main5'))
var value = data.pd.TEMPERATURE; var value = data.pd.TEMPERATURE
var kd = []; var kd = []
// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据 // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
for (var i = 0, len = 130; i <= len; i++) { for (var i = 0, len = 130; i <= len; i++) {
if (i > 100 || i < 30) { if (i > 100 || i < 30) {
kd.push('0') kd.push('0')
} else { } else {
if (i % 5 === 0) { if (i % 5 === 0) {
kd.push('5'); kd.push('5')
} else { } else {
kd.push('3'); kd.push('3')
} }
} }
} }
// console.log(kd) // console.log(kd)
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
function getData(value) { function getData(value) {
return [Number(value) + 30]; return [Number(value) + 30]
} }
console.log(getData(value)) console.log(getData(value))
var data = getData(value + 30); var data = getData(value + 30)
var mercuryColor = '#fd4d49'; var mercuryColor = '#fd4d49'
var borderColor = '#fd4d49'; var borderColor = '#fd4d49'
const option = { const option = {
title: { title: {
@ -238,18 +237,18 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
yAxis: [{ yAxis: [{
show: false, show: false,
min: 0, min: 0,
max: 130, max: 130
}, { }, {
show: false, show: false,
data: [], data: [],
min: 0, min: 0,
max: 130, max: 130
}], }],
xAxis: [{ xAxis: [{
show: false, show: false,
@ -263,7 +262,7 @@ export default {
}, { }, {
show: false, show: false,
min: -110, min: -110,
max: 100, max: 100
}], }],
series: [{ series: [{
@ -276,7 +275,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
barBorderRadius: 0, barBorderRadius: 0
} }
}, },
label: { label: {
@ -285,11 +284,11 @@ export default {
position: 'top', position: 'top',
formatter: function(param) { formatter: function(param) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
return (((param.value * 100) - (30 * 100)) / 100) + '°C'; return (((param.value * 100) - (30 * 100)) / 100) + '°C'
}, },
textStyle: { textStyle: {
color: '#ccc', color: '#ccc',
fontSize: '10', fontSize: '10'
} }
} }
}, },
@ -304,7 +303,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 1 z: 1
@ -318,7 +317,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 0 z: 0
@ -332,7 +331,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
opacity: 1, opacity: 1
} }
}, },
z: 2 z: 2
@ -346,7 +345,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
opacity: 1, opacity: 1
} }
}, },
z: 1 z: 1
@ -360,7 +359,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
opacity: 1, opacity: 1
} }
}, },
z: 0 z: 0
@ -379,12 +378,12 @@ export default {
formatter: function(params) { formatter: function(params) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
if (params.dataIndex > 100 || params.dataIndex < 30) { if (params.dataIndex > 100 || params.dataIndex < 30) {
return ''; return ''
} else { } else {
if (params.dataIndex % 5 === 0) { if (params.dataIndex % 5 === 0) {
return params.dataIndex - 30; return params.dataIndex - 30
} else { } else {
return ''; return ''
} }
} }
} }
@ -396,12 +395,12 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 10, barBorderRadius: 10
} }
}, },
z: 0 z: 0
}] }]
}; }
myChart5.setOption(option) myChart5.setOption(option)
}, },
initEcharts3(data) { initEcharts3(data) {
@ -414,7 +413,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: [ series: [

1
src/views/map/dialog/weatherstation.vue
View File

@ -106,7 +106,6 @@ export default {
this.initEcharts2(data) this.initEcharts2(data)
} }
if (data.pd.WINDSPEED != '-') { if (data.pd.WINDSPEED != '-') {
this.initEcharts3(data) this.initEcharts3(data)
} }
}) })

111
src/views/map/dialog/windspeedstation.vue
View File

@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null let myChart4 = null
let myChart5 = null let myChart5 = null
let myChart6 = null const myChart6 = null
export default { export default {
props: { props: {
id: { id: {
@ -46,12 +46,12 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {
config: config, config: config,
info: {}, info: {}
} }
}, },
mounted() { mounted() {
@ -73,7 +73,7 @@ export default {
'/map/getById', '/map/getById',
{ {
id: this.id, id: this.id,
TYPE: this.type, TYPE: this.type
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -96,7 +96,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: { series: {
@ -136,33 +136,33 @@ export default {
}, },
axisLabel: { axisLabel: {
formatter: function(e) { formatter: function(e) {
switch (e + "") { switch (e + '') {
case "0": case '0':
return "北"; return '北'
case "45": case '45':
return "东北"; return '东北'
case "135": case '135':
return "东南"; return '东南'
case "225": case '225':
return "西南" return '西南'
case "315": case '315':
return "西北"; return '西北'
case "360": case '360':
return "北"; return '北'
case "180": case '180':
return "南"; return '南'
case "90": case '90':
return "东"; return '东'
case "270": case '270':
return "西"; return '西'
default: default:
return e; return e
} }
}, },
distance: -60, distance: -60,
textStyle: { textStyle: {
fontSize: 14, fontSize: 14,
fontWeight: "", fontWeight: '',
color: '#fff' color: '#fff'
} }
}, },
@ -173,7 +173,7 @@ export default {
}, },
detail: { detail: {
formatter: function(param) { formatter: function(param) {
var level = ''; var level = ''
if (param > 0 && param < 90) { if (param > 0 && param < 90) {
level = '东北' level = '东北'
} else if (param > 90 && param < 180) { } else if (param > 90 && param < 180) {
@ -191,7 +191,7 @@ export default {
} else if (param == 180) { } else if (param == 180) {
level = '正南' level = '正南'
} }
return "当前风向:"+level + "(" + param + "°)"; return '当前风向:' + level + '(' + param + '°)'
}, },
offsetCenter: [0, 190], offsetCenter: [0, 190],
textStyle: { textStyle: {
@ -201,35 +201,34 @@ export default {
}, },
data: [data.pd.WINDDIRECTION] data: [data.pd.WINDDIRECTION]
} }
}; }
myChart4.setOption(option) myChart4.setOption(option)
}, },
initEcharts2(data) { initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5')) myChart5 = echarts.init(document.querySelector('#main5'))
var value = data.pd.TEMPERATURE; var value = data.pd.TEMPERATURE
var kd = []; var kd = []
// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据 // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
for (var i = 0, len = 130; i <= len; i++) { for (var i = 0, len = 130; i <= len; i++) {
if (i > 100 || i < 30) { if (i > 100 || i < 30) {
kd.push('0') kd.push('0')
} else { } else {
if (i % 5 === 0) { if (i % 5 === 0) {
kd.push('5'); kd.push('5')
} else { } else {
kd.push('3'); kd.push('3')
} }
} }
} }
// console.log(kd) // console.log(kd)
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
function getData(value) { function getData(value) {
return [Number(value) + 30]; return [Number(value) + 30]
} }
console.log(getData(value)) console.log(getData(value))
var data = getData(value + 30); var data = getData(value + 30)
var mercuryColor = '#fd4d49'; var mercuryColor = '#fd4d49'
var borderColor = '#fd4d49'; var borderColor = '#fd4d49'
const option = { const option = {
title: { title: {
@ -238,18 +237,18 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
yAxis: [{ yAxis: [{
show: false, show: false,
min: 0, min: 0,
max: 130, max: 130
}, { }, {
show: false, show: false,
data: [], data: [],
min: 0, min: 0,
max: 130, max: 130
}], }],
xAxis: [{ xAxis: [{
show: false, show: false,
@ -263,7 +262,7 @@ export default {
}, { }, {
show: false, show: false,
min: -110, min: -110,
max: 100, max: 100
}], }],
series: [{ series: [{
@ -276,7 +275,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
barBorderRadius: 0, barBorderRadius: 0
} }
}, },
label: { label: {
@ -285,11 +284,11 @@ export default {
position: 'top', position: 'top',
formatter: function(param) { formatter: function(param) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
return (((param.value * 100) - (30 * 100)) / 100) + '°C'; return (((param.value * 100) - (30 * 100)) / 100) + '°C'
}, },
textStyle: { textStyle: {
color: '#ccc', color: '#ccc',
fontSize: '10', fontSize: '10'
} }
} }
}, },
@ -304,7 +303,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 1 z: 1
@ -318,7 +317,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 0 z: 0
@ -332,7 +331,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
opacity: 1, opacity: 1
} }
}, },
z: 2 z: 2
@ -346,7 +345,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
opacity: 1, opacity: 1
} }
}, },
z: 1 z: 1
@ -360,7 +359,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
opacity: 1, opacity: 1
} }
}, },
z: 0 z: 0
@ -379,12 +378,12 @@ export default {
formatter: function(params) { formatter: function(params) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
if (params.dataIndex > 100 || params.dataIndex < 30) { if (params.dataIndex > 100 || params.dataIndex < 30) {
return ''; return ''
} else { } else {
if (params.dataIndex % 5 === 0) { if (params.dataIndex % 5 === 0) {
return params.dataIndex - 30; return params.dataIndex - 30
} else { } else {
return ''; return ''
} }
} }
} }
@ -396,12 +395,12 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 10, barBorderRadius: 10
} }
}, },
z: 0 z: 0
}] }]
}; }
myChart5.setOption(option) myChart5.setOption(option)
}, },
initEcharts3(data) { initEcharts3(data) {
@ -414,7 +413,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: [ series: [

8
src/views/map/dialog/xfControl.vue
View File

@ -47,8 +47,8 @@
</div> </div>
<el-carousel :interval="4000" type="card" height="200px"> <el-carousel :interval="4000" type="card" height="200px">
<el-carousel-item v-for="(image, index) in images" :key="index"> <el-carousel-item v-for="(image, index) in images" :key="index">
<img v-if="gangkou === '00004'" v-viewer :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-if="gangkou === '00004'" :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
<img v-else v-viewer :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-else :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
@ -109,8 +109,8 @@
</div> </div>
<el-carousel :interval="4000" type="card" height="200px"> <el-carousel :interval="4000" type="card" height="200px">
<el-carousel-item v-for="(image, index) in images" :key="index"> <el-carousel-item v-for="(image, index) in images" :key="index">
<img v-if="gangkou === '00004'" v-viewer :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-if="gangkou === '00004'" :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
<img v-else v-viewer :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-else :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>

247
src/views/map/index.vue
View File

@ -39,7 +39,7 @@
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<menjin <menjin
v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && gangkouActive !== '00005' && bottomOptionsIndex === 0" v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
@ -48,13 +48,13 @@
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<menjin-cmt <menjin-czks
v-if="gangkouActive && gangkouActive === '00005' && bottomOptionsIndex === 0" v-if="gangkouActive && gangkouActive === '00002' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
<menjin-czks <menjin-cmt
v-if="gangkouActive && gangkouActive === '00002' && bottomOptionsIndex === 0" v-if="gangkouActive && gangkouActive === '00005' && bottomOptionsIndex === 0"
:corp-info-id="CORP_INFO_ID" :corp-info-id="CORP_INFO_ID"
:area="area" :area="area"
:gangkou="gangkouActive"/> :gangkou="gangkouActive"/>
@ -250,6 +250,7 @@ import caofeidianIndex from './components/caofeidian_index.vue'
import czksIndex from './components/czks_index.vue' import czksIndex from './components/czks_index.vue'
import menjinCzks from './components/menjinCzks.vue' import menjinCzks from './components/menjinCzks.vue'
import renyuanCzks from './components/renyuanCzks.vue' import renyuanCzks from './components/renyuanCzks.vue'
import renyuanCmt from './components/renyuanCmt.vue'
import menjin from './components/menjin.vue' import menjin from './components/menjin.vue'
import menjinCfd from './components/menjinCfd.vue' import menjinCfd from './components/menjinCfd.vue'
import menjinCmt from './components/menjinCmt.vue' import menjinCmt from './components/menjinCmt.vue'
@ -258,7 +259,6 @@ import anquan from './components/anquan.vue'
import anquanCfd from './components/anquanCfd.vue' import anquanCfd from './components/anquanCfd.vue'
import qixiang from './components/qixiang.vue' import qixiang from './components/qixiang.vue'
import renyuan from './components/renyuan.vue' import renyuan from './components/renyuan.vue'
import renyuanCmt from './components/renyuanCmt.vue'
import bianjieruqin from './components/bianjieruqin.vue' import bianjieruqin from './components/bianjieruqin.vue'
import renyuanCfd from './components/renyuanCfd.vue' import renyuanCfd from './components/renyuanCfd.vue'
import zhongda from './components/zhongda.vue' import zhongda from './components/zhongda.vue'
@ -280,9 +280,6 @@ let drag = null
let ry_drag = null let ry_drag = null
var tiandituTk = 'e8a16137fd226a62a23cc7ba5c9c78ce' var tiandituTk = 'e8a16137fd226a62a23cc7ba5c9c78ce'
var subdomains = ['0', '1', '2', '3', '4', '5', '6', '7'] var subdomains = ['0', '1', '2', '3', '4', '5', '6', '7']
var PI = 3.1415926535897932384626
var a = 6378245.0 // 卫星椭球坐标投影到平面地图坐标系的投影因子。
var ee = 0.00669342162296594323 // 椭球的偏心率。//判断是否在国内，在中国国内的经纬度才需要做偏移
// 沧州矿石人员定位数组 // 沧州矿石人员定位数组
let czksPerLocArr = [] let czksPerLocArr = []
const Cesium = window.Cesium const Cesium = window.Cesium
@ -301,6 +298,7 @@ export default {
czksIndex, czksIndex,
menjinCzks, menjinCzks,
renyuanCzks, renyuanCzks,
renyuanCmt,
// navigation, // navigation,
gangkouIndex, gangkouIndex,
fengongsiIndex, fengongsiIndex,
@ -313,7 +311,6 @@ export default {
anquan, anquan,
qixiang, qixiang,
renyuan, renyuan,
renyuanCmt,
renyuanCfd, renyuanCfd,
zhongda, zhongda,
layoutDialog, layoutDialog,
@ -1154,58 +1151,58 @@ export default {
}, },
keepalive(token) { keepalive(token) {
// 第二套方案 // 第二套方案
// requestFN( requestFN(
// '/map/loginOrKeepAlive', '/map/loginOrKeepAlive',
// { {
// } }
// ).then((data) => { ).then((data) => {
//
// }) })
}, },
ysVideoInit() { ysVideoInit() {
// 第二套方案 // 第二套方案
// var _this = this var _this = this
// requestFN( requestFN(
// '/map/loginOrKeepAlive', '/map/loginOrKeepAlive',
// { {
// } }
// ).then((data) => { ).then((data) => {
// const token = data.token const token = data.token
// var nbsp = String.fromCharCode(160) var nbsp = String.fromCharCode(160)
// var arr = [] var arr = []
// arr.length = 40 arr.length = 40
// const str = arr.fill(nbsp).join('') const str = arr.fill(nbsp).join('')
// const voidPath = imosPlayer.getUniqueID() const voidPath = imosPlayer.getUniqueID()
// window.voidPath = voidPath window.voidPath = voidPath
// document.title = document.title + str + new Date().getTime() document.title = document.title + str + new Date().getTime()
// _this.keepalive(token) _this.keepalive(token)
// setInterval(_this.keepalive, 30000, token) setInterval(_this.keepalive, 30000, token)
//
// window.videoWindow = 0 window.videoWindow = 0
// imosPlayer.setLinkPort('8093') imosPlayer.setLinkPort('8093')
// imosPlayer imosPlayer
// .init({ .init({
// ip: '172.14.0.54', ip: '172.14.0.54',
// token: token, token: token,
// title: document.title, title: document.title,
// voidListenerPath: '\\' + voidPath voidListenerPath: '\\' + voidPath
// }) })
// .then(async(resr) => { .then(async(resr) => {
// if (resr.ErrCode === 0) { if (resr.ErrCode === 0) {
// // imosPlayer.setLiveNetLinkMode(liveNetProtocol, liveByMS) // imosPlayer.setLiveNetLinkMode(liveNetProtocol, liveByMS)
// // imosPlayer.setReplayNetLinkMode(replayNetProtocol, replayByMS) // imosPlayer.setReplayNetLinkMode(replayNetProtocol, replayByMS)
//
// // eslint-disable-next-line no-alert // eslint-disable-next-line no-alert
// console.info('登录成功') console.info('登录成功')
// } else { } else {
// // eslint-disable-next-line no-alert // eslint-disable-next-line no-alert
// console.info(resr.ErrMsg) console.info(resr.ErrMsg)
// } }
// }) })
// .catch((err) => { .catch((err) => {
// console.error(err) console.error(err)
// }) })
// }) })
}, },
// keepalive(token) { // keepalive(token) {
// axios({ // axios({
@ -1407,7 +1404,8 @@ export default {
this.dialog.infoname = infoname this.dialog.infoname = infoname
return return
} }
if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1' && point_type !== 'peoplePosition') { if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1') {
// if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
const { label, point_type, data_id, infoname, name, code } = pick.id._monitoItems.data const { label, point_type, data_id, infoname, name, code } = pick.id._monitoItems.data
this.dialog.visible = true this.dialog.visible = true
this.dialog.title = label this.dialog.title = label
@ -1419,19 +1417,6 @@ export default {
console.log(this.dialog) console.log(this.dialog)
return return
} }
if (this.gangkouActive === '00005' && point_type === 'peoplePosition') {
const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data
console.log(pick.id._monitoItems.data)
this.dialog.visible = true
this.dialog.title = label
this.dialog.type = point_type+'00005'
console.log(this.dialog.type)
this.dialog.id = id
this.dialog.name = name
this.dialog.infoname = infoname
this.dialog.corpInfoId = corpInfoId
return
}
if (point_type.indexOf('标记点') !== -1) { if (point_type.indexOf('标记点') !== -1) {
const { label, point_type, data_id, corpInfoId, dialog_width, infoname } = 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
@ -1941,7 +1926,6 @@ export default {
}, },
bottomOptionsItemsClick(pindex, index, label, urlType, pointUrl, dialog_width) { bottomOptionsItemsClick(pindex, index, label, urlType, pointUrl, dialog_width) {
var _this = this
if (this.bottomOptionsList[pindex].list[index].check || this.gangkouActive === '00004' && this.cfdBottomOptionsList[pindex].list[index].check) { if (this.bottomOptionsList[pindex].list[index].check || this.gangkouActive === '00004' && this.cfdBottomOptionsList[pindex].list[index].check) {
// 取消选中 // 取消选中
// 沧州矿石人员定位关闭 // 沧州矿石人员定位关闭
@ -2050,7 +2034,6 @@ export default {
point.name = varList[i].MAP_POINT_NAME point.name = varList[i].MAP_POINT_NAME
point.infoname = varList[i].MAP_POINT_NAME point.infoname = varList[i].MAP_POINT_NAME
} }
console.log(point)
points.push(point) points.push(point)
} }
if (this.gangkouActive === '00004' && urlType === 'carPosition') { if (this.gangkouActive === '00004' && urlType === 'carPosition') {
@ -2072,13 +2055,6 @@ export default {
} else { } else {
this.dragEntity(points, pindex, index) this.dragEntity(points, pindex, index)
} }
// 人员定位开启实时获取定位websocket
if (this.gangkouActive === '00005' && urlType === 'peoplePosition') {
if (!this.fwebsocket.url) {
this.cmtinitNinePerLocWebsocket()
}
}
_this.dragEntity(points, pindex, index)
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)
}) })
@ -2487,71 +2463,6 @@ export default {
} }
} }
}, },
// 曹煤炭人员定位websocket
cmtinitNinePerLocWebsocket() {
const _this = this
console.info(config.perRealTimeLocUrl)
if (window.WebSocket) {
this.fwebsocket = new WebSocket(encodeURI('ws://' + config.cmtperRealTimeLocUrl)) // oladress在main.jsp页面定义
this.fwebsocket.onopen = () => {
console.info('人员定位监听成功')
}
this.fwebsocket.onerror = function() {
console.info('连接失败')
}
this.fwebsocket.onclose = function() {
console.info('onclose')
}
this.fwebsocket.onmessage = function(message) {
const mockData = JSON.parse(message.data)
console.log(mockData)
// 将地图上的点与最新的定位人员点进行对比 删除地图上多的点
const ninePerLoc = _this.ninePerLocArr.filter(item => {
const index = mockData.findIndex(item1 => {
return item.id.toString() === item1.cardno.toString()
})
return index !== -1
})
// 将地图上剩余的点与最新的定位人员点进行对比 更新地图上已存在的点 新增地图上之前没有的点
for (const item of mockData) {
console.log(item)
const wgs84 = _this.gcj02towgs84(parseFloat(item.longitude), parseFloat(item.latitude))
item.longitude = wgs84[0]
item.latitude = wgs84[1]
const index = ninePerLoc.findIndex(item1 => {
return item1.id.toString() === item.cardno.toString()
})
const pointColor = _this.isPointxyWithinTheArea(_this.pointBox, item.longitude, item.latitude)
if (index !== -1) {
ninePerLoc[index].x = item.longitude
ninePerLoc[index].y = item.latitude
ninePerLoc[index].icon_type = 'img4_0' + pointColor
ry_drag.getPosition(ninePerLoc[index])
} else {
const perLoc = {
id: item.cardno,
name: item.name,
x: item.longitude,
y: item.latitude,
point_type: 'peoplePosition',
icon_type: 'img4_0' + pointColor
}
ninePerLoc.push(perLoc)
ry_drag.delEntity(perLoc)
ry_drag.addEntity(perLoc)
var qianzhui = 'person'
_this.allOrientationPoint[qianzhui + item.cardno] = item.cardno
// qianzhui 前缀是点位的前缀，用于区分不同类型的点（如一公司人员、二公司人员），删除时，可根据点位前缀进行删除点
}
}
// 最后更新ninePerLocArr
_this.ninePerLocArr = ninePerLoc
}
}
},
/* 一公司人员定位 mqtt务必使用4.2.1版本*/ /* 一公司人员定位 mqtt务必使用4.2.1版本*/
// 九公司人员定位websocket // 九公司人员定位websocket
initNinePerLocWebsocket() { initNinePerLocWebsocket() {
@ -2860,7 +2771,6 @@ export default {
point.empNo = data.empNo || '' // 工号 point.empNo = data.empNo || '' // 工号
point.cardNo = data.cardNo || '' // 卡号 point.cardNo = data.cardNo || '' // 卡号
point.gangkou = this.gangkouActive point.gangkou = this.gangkouActive
console.log(point)
return point return point
}, },
// 查询当前所有点位是否在区域内 // 查询当前所有点位是否在区域内
@ -2920,42 +2830,7 @@ export default {
} }
}) })
}, },
gcj02towgs84(lng, lat) {
if (this.out_of_china(lng, lat)) {
return [lng, lat]
} else {
var dlat = this.transformlat(lng - 105.0, lat - 35.0)
var dlng = this.transformlng(lng - 105.0, lat - 35.0)
var radlat = lat / 180.0 * PI
var magic = Math.sin(radlat)
magic = 1 - ee * magic * magic
var sqrtmagic = Math.sqrt(magic)
dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI)
dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI)
const mglat = lat + dlat
const mglng = lng + dlng
return [lng * 2 - mglng, lat * 2 - mglat]
}
},
out_of_china(lng, lat) {
return (lng < 72.004 || lng > 137.8347 || (lat < 0.8293 || lat > 55.8271 || false))
},
// 转化经度
transformlng(lng, lat) {
var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0
ret += ((20.0 * Math.sin(lng * PI) + 40.0 * Math.sin((lng / 3.0) * PI)) * 2.0) / 3.0
ret += ((150.0 * Math.sin((lng / 12.0) * PI) + 300.0 * Math.sin((lng / 30.0) * PI)) * 2.0) / 3.0
return ret
},
// 转化纬度
transformlat(lng, lat) {
var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0
ret += ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) / 3.0
ret += ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) * 2.0) / 3.0
return ret
},
// 重新加载人员定位点位信息 // 重新加载人员定位点位信息
localtionReload(pindex, index) { localtionReload(pindex, index) {
var _this = this var _this = this
@ -3116,8 +2991,8 @@ export default {
} }
this.bottomClickDisable = false this.bottomClickDisable = false
done() done()
}, }
}, }
} }
</script> </script>

54
src/views/safetyenvironmental/inspection/components/add.vue
View File

@ -22,6 +22,7 @@
:options="treeData" :options="treeData"
:props="defaultProps" :props="defaultProps"
v-model="form.INSPECTED_DEPARTMENT_ID" v-model="form.INSPECTED_DEPARTMENT_ID"
@change="changeCurrentDeptId(form.INSPECTED_DEPARTMENT_ID)"
placeholder="请选择被检查单位" placeholder="请选择被检查单位"
style="width: 300px" /> style="width: 300px" />
</el-form-item> </el-form-item>
@ -68,8 +69,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-divider content-position="left">检查人员 <el-button type="primary" size="mini" @click="addInspector">添加</el-button></el-divider> <el-divider v-if="CURRENT_INSPECTED_DEPARTMENT_ID !== null && CURRENT_INSPECTED_DEPARTMENT_ID !== '' " content-position="left">检查人员 <el-button type="primary" size="mini" @click="addInspector">添加</el-button></el-divider>
<el-form-item v-for="(item,index) in form.inspectorList" :key="index + (Math.random() + '').replace('.', '')" :label="(index+1)+'.'"> <el-form-item v-if="CURRENT_INSPECTED_DEPARTMENT_ID !== null && CURRENT_INSPECTED_DEPARTMENT_ID !== '' " v-for="(item,index) in form.inspectorList" :key="index + (Math.random() + '').replace('.', '')" :label="(index+1)+'.'">
<div class="uo-flex"> <div class="uo-flex">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@ -82,7 +83,8 @@
v-model="item.INSPECTION_DEPARTMENT_ID" v-model="item.INSPECTION_DEPARTMENT_ID"
placeholder="请选择检查人员部门" placeholder="请选择检查人员部门"
style="width: 300px" style="width: 300px"
@change="updateInspecteDept(item.INSPECTION_DEPARTMENT_ID,index)"/> @visible-change=""
@change="updateInspecteDept(item.INSPECTION_DEPARTMENT_ID,index,item)"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
@ -348,6 +350,7 @@ export default {
}, },
pd: [], pd: [],
switchInspectionType: 'select', switchInspectionType: 'select',
CURRENT_INSPECTED_DEPARTMENT_ID: '', //当前被检查单位
form: { form: {
INSPECTION_SUBJECT: '', // 检查标题 INSPECTION_SUBJECT: '', // 检查标题
INSPECTION_SOURCE: '4', // 检查来源（4-监管端 5-企业端） INSPECTION_SOURCE: '4', // 检查来源（4-监管端 5-企业端）
@ -480,6 +483,12 @@ export default {
handleAdd() { handleAdd() {
this.dialogType = 'add' this.dialogType = 'add'
}, },
changeCurrentDeptId(id) {
this.form.inspectorList = []
this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '', USER_SIDE: '' })
this.INSPECTOR_List.push([])
this.CURRENT_INSPECTED_DEPARTMENT_ID = id
},
changeSwitch(type) { changeSwitch(type) {
if (type === 'InspectionType') { if (type === 'InspectionType') {
this.form.INSPECTION_TYPE = '' this.form.INSPECTION_TYPE = ''
@ -498,10 +507,46 @@ export default {
this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '', USER_SIDE: '' }) this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '', USER_SIDE: '' })
this.INSPECTOR_List.push([]) this.INSPECTOR_List.push([])
}, },
updateInspecteDept(DEPARTMENT_ID, i) { updateInspecteDept(id,i,item) {
// 获取人员列表
if (id) {
requestFN(
'/corpDepartment/checkDept',
{
DEPARTMENT_ID: this.CURRENT_INSPECTED_DEPARTMENT_ID,
id: id
}
).then((data) => {
if (data.message!=null) {
this.INSPECTION_DEPARTMENT_ID = ''
this.INSPECTOR_List = []
this.INSPECTION_USER_ID = ''
this.$message.error(data.message)
}else {
// 获取人员列表
if (id) {
requestFN(
'/user/listAllManageAndCorp',
{
DEPARTMENT_ID: id
}
).then((data) => {
this.INSPECTOR_List[i] = data.userList
this.$forceUpdate()
}).catch((e) => {
})
}
this.form.inspectorList[i].INSPECTION_USER_ID = '' this.form.inspectorList[i].INSPECTION_USER_ID = ''
this.form.inspectorList[i].USER_SIDE = '' this.form.inspectorList[i].USER_SIDE = ''
this.$message.success('检查人员部门选择成功')
this.getInspectorList(DEPARTMENT_ID, i) this.getInspectorList(DEPARTMENT_ID, i)
}
}).catch((e) => {
})
}
this.form.inspectorList = []
this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: item.INSPECTION_INSPECTOR_ID, INSPECTION_DEPARTMENT_ID: item.INSPECTION_DEPARTMENT_ID, INSPECTION_USER_ID: '', USER_SIDE: item.USER_SIDE })
this.INSPECTOR_List.push([])
}, },
// 获取人员列表 // 获取人员列表
getInspectorList(DEPARTMENT_ID, i) { getInspectorList(DEPARTMENT_ID, i) {
@ -509,6 +554,7 @@ export default {
requestFN( requestFN(
'/user/listAllManageAndCorp', '/user/listAllManageAndCorp',
{ {
CURRENT_INSPECTED_DEPARTMENT_ID: this.CURRENT_INSPECTED_DEPARTMENT_ID,
DEPARTMENT_ID: DEPARTMENT_ID, DEPARTMENT_ID: DEPARTMENT_ID,
NOMAIN: '1' NOMAIN: '1'
} }

28
src/views/security_commitment/promise_book_issued/components/add.vue
View File

@ -408,9 +408,15 @@ export default {
{ {
PROMISE_ID: this.$parent.PROMISE_ID PROMISE_ID: this.$parent.PROMISE_ID
} }
).then((data) => { ).then(async(data) => {
const DETAIL = data.promistDetail.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID })) const DETAIL = data.promistDetail.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID }))
this.form = { ...data.varList, DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM, DETAIL, people: [], coverpeople: [] } this.form = {
...data.varList,
DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM,
DETAIL,
people: [],
coverpeople: []
}
this.isSelectTemplate = true this.isSelectTemplate = true
for (let i = 0; i < data.people.length; i++) { for (let i = 0; i < data.people.length; i++) {
this.form.people.push({ this.form.people.push({
@ -426,15 +432,15 @@ export default {
for (let j = 0; j < this.form.people.length; j++) { for (let j = 0; j < this.form.people.length; j++) {
if (this.form.DISTRIBUTIONOBJECT === '1') { if (this.form.DISTRIBUTIONOBJECT === '1') {
if (data.people[i].POST_ID === this.form.people[j].POST_ID) { if (data.people[i].POST_ID === this.form.people[j].POST_ID) {
this.form.people[j].USER_ID.push(data.people[i].USER_ID) this.form.people[j].USER_ID = data.people[i].USER_ID
this.form.people.splice(j + 1, 1) this.form.people.splice(j + 1, 1)
this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people') await this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people')
} }
} else { } else {
if (data.people[i].DEPARTMENT_ID === this.form.people[j].DEPARTMENT_ID) { if (data.people[i].DEPARTMENT_ID === this.form.people[j].DEPARTMENT_ID) {
this.form.people[j].USER_ID.push(data.people[i].USER_ID) this.form.people[j].USER_ID = data.people[i].USER_ID
this.form.people.splice(j + 1, 1) this.form.people.splice(j + 1, 1)
this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people') await this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people')
} }
} }
} }
@ -458,9 +464,9 @@ export default {
}) })
for (let j = 0; j < this.form.coverpeople.length; j++) { for (let j = 0; j < this.form.coverpeople.length; j++) {
if (data.coverpeople[i].DEPARTMENT_ID === this.form.coverpeople[j].DEPARTMENT_ID) { if (data.coverpeople[i].DEPARTMENT_ID === this.form.coverpeople[j].DEPARTMENT_ID) {
this.form.coverpeople[j].USER_ID.push(data.coverpeople[i].USER_ID) this.form.coverpeople[j].USER_ID = data.coverpeople[i].USER_ID
this.form.coverpeople.splice(j + 1, 1) this.form.coverpeople.splice(j + 1, 1)
this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople') await this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople')
} }
} }
} }
@ -517,6 +523,7 @@ export default {
}, },
// 人员 // 人员
getUserList(DEPARTMENT_ID, POST_ID, index, type, list) { getUserList(DEPARTMENT_ID, POST_ID, index, type, list) {
return new Promise((resolve) => {
if (type !== 'created') { if (type !== 'created') {
let flag = false let flag = false
for (let i = 0; i < this.form[list].length; i++) { for (let i = 0; i < this.form[list].length; i++) {
@ -543,11 +550,14 @@ export default {
if (type !== 'created') { if (type !== 'created') {
this.form[list][index].USER_ID = '' this.form[list][index].USER_ID = ''
} }
resolve()
}).catch((e) => { }).catch((e) => {
}) })
})
}, },
// 人员 // 人员
getUserList1({ id: DEPARTMENT_ID }, index, type, list) { getUserList1({ id: DEPARTMENT_ID }, index, type, list) {
return new Promise((resolve) => {
if (type !== 'created') { if (type !== 'created') {
let flag = false let flag = false
for (let i = 0; i < this.form[list].length; i++) { for (let i = 0; i < this.form[list].length; i++) {
@ -574,8 +584,10 @@ export default {
if (type !== 'created') { if (type !== 'created') {
this.form[list][index].USER_ID = '' this.form[list][index].USER_ID = ''
} }
resolve()
}).catch((e) => { }).catch((e) => {
}) })
})
}, },
addPeople() { addPeople() {
this.form.people.push( this.form.people.push(

9
src/views/security_commitment/promise_book_issued/components/see.vue
View File

@ -23,7 +23,8 @@
<td>{{ form.PROMISE_TERM_END }}</td> <td>{{ form.PROMISE_TERM_END }}</td>
</tr> </tr>
</table> </table>
<el-divider content-position="left">承诺人</el-divider> <el-divider v-if="form.TYPE != '1'" content-position="left">承诺人</el-divider>
<el-divider v-if="form.TYPE == '1'" content-position="left">受状人</el-divider>
<table class="table-ui"> <table class="table-ui">
<tr v-for="(item,index) in form.people" :key="item.id"> <tr v-for="(item,index) in form.people" :key="item.id">
<td v-if="form.RELEASE_PLATFORM === '1'" class="bbg">{{ '单位' + (index + 1) }}</td> <td v-if="form.RELEASE_PLATFORM === '1'" class="bbg">{{ '单位' + (index + 1) }}</td>
@ -36,7 +37,8 @@
<td>{{ item.USERNAME && item.USERNAME.join('、') }}</td> <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
</tr> </tr>
</table> </table>
<el-divider content-position="left">被承诺人</el-divider> <el-divider v-if="form.TYPE != '1'" content-position="left">被承诺人</el-divider>
<el-divider v-if="form.TYPE == '1'" content-position="left">发状人</el-divider>
<table class="table-ui"> <table class="table-ui">
<tr v-for="(item,index) in form.coverpeople" :key="item.id"> <tr v-for="(item,index) in form.coverpeople" :key="item.id">
<td class="bbg">{{ '部门' + (index + 1) }}</td> <td class="bbg">{{ '部门' + (index + 1) }}</td>
@ -45,7 +47,8 @@
<td>{{ item.USERNAME && item.USERNAME.join('、') }}</td> <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
</tr> </tr>
</table> </table>
<el-divider content-position="left">承诺内容</el-divider> <el-divider v-if="form.TYPE != '1'" content-position="left">承诺内容</el-divider>
<el-divider v-if="form.TYPE == '1'" content-position="left">责任状内容</el-divider>
<table class="table-ui"> <table class="table-ui">
<tr> <tr>
<td class="bbg">正文</td> <td class="bbg">正文</td>

2
src/views/xgf/flow/components/entrust.vue
View File

@ -53,7 +53,7 @@ export default {
visible: false, visible: false,
loading: false, loading: false,
form: { form: {
STATUS: null, STATUS: '1',
APPOINT_CORP_ID: '', APPOINT_CORP_ID: '',
APPOINT_CORP_NAME: '', APPOINT_CORP_NAME: '',
APPOINT_DEPARTMENT_ID: null, APPOINT_DEPARTMENT_ID: null,

83
src/views/xgf/flow/components/flowInfo.vue Normal file
View File

@ -0,0 +1,83 @@
<template>
<el-dialog
v-if="visible"
:visible.sync="visible"
:before-close="handleClose"
:append-to-body="appendToBody"
title="审批流程"
width="60%">
<el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
<el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT">
<template slot="description">
<el-card class="box-card a" style="width: 900px;">
<div slot="header" class="clearfix">
<span>{{ item.STEP_NAME }}</span>
</div>
<div>
<el-row>
<el-col v-if="item.APPROVER_NAME">
审批人：{{ item.APPROVER_NAME }}
</el-col>
<el-col>
审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
</el-col>
<el-col>
审批人归属公司：{{ item.APPROVER_CORPINFO_NAME }}
</el-col>
<el-col>
审批时间：{{ item.APPROVER_TIME }}
</el-col>
<el-col v-if="item.APPROVER_OPINION">
审批意见：{{ item.APPROVER_OPINION }}
</el-col>
<el-col v-if="item.END_FLAG === '1'" style="color: red; font-weight: bold;font-size: large">
审批结束
</el-col>
</el-row>
</div>
</el-card>
</template>
</el-step>
</el-steps>
<div slot="footer" class="dialog-footer">
<el-button @click="closeWindow">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
export default {
props: {
appendToBody: {
type: Boolean,
default: false
}
},
data() {
return {
visible: false,
loading: false,
list: [],
form: {
XGF_USER_ID: ''
}
}
},
methods: {
init(e) {
this.visible = true
this.loading = false
this.list = e.flow
},
handleClose() {
this.visible = false
this.$emit('finish', '')
},
closeWindow() {
this.handleClose()
}
}
}
</script>

87
src/views/xgf/flow/components/flowInfoList.vue Normal file
View File

@ -0,0 +1,87 @@
<template>
<el-dialog
v-if="visible"
:visible.sync="visible"
:before-close="handleClose"
:append-to-body="true"
title="审批流程"
width="60%">
<el-table
ref="multipleTable"
:data="list"
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
tooltip-effect="dark"
border
fit
highlight-current-row>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="CREATOR_TIME" label="审批流创建时间" align="center"/>
<el-table-column label="操作" align="center" width="250">
<template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="closeWindow">取 消</el-button>
</div>
<flow-info ref="flowInfo" append-to-body/>
</el-dialog>
</template>
<script>
import { requestFN } from '@/utils/request'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import FlowInfo from './flowInfo.vue'
export default {
components: {
FlowInfo,
Treeselect
},
props: {
corpInfo: {
type: String,
default: ''
}
},
data() {
return {
visible: false,
loading: false,
list: [],
form: {
XGF_USER_ID: ''
}
}
},
methods: {
init(e) {
this.visible = true
this.loading = false
this.form.XGF_USER_ID = e.XGF_USER_ID
this.getInfo()
},
getInfo() {
requestFN(
'/xgf/user/getApproveInfo', this.form
).then((data) => {
this.list = data.list
}).catch((e) => {
console.log(e)
})
},
handleShow(row) {
this.$refs.flowInfo.init(row)
},
handleClose() {
this.visible = false
this.$emit('finish', '')
},
closeWindow() {
this.handleClose()
}
}
}
</script>

108
src/views/xgf/flow/components/flowStep.vue Normal file
View File

@ -0,0 +1,108 @@
<template>
<el-dialog
v-if="visible"
:visible.sync="visible"
:v-loading="loading"
:before-close="handleClose"
:append-to-body="true"
:title="title"
width="60%">
<el-steps :space="200" :active="+step" direction="vertical" finish-status="success">
<el-step v-for="item in list" :key="item.INDEX" :value="item.INDEX" :title="item.INDEX">
<template slot="description">
<el-card class="box-card a" style="width: 900px;">
<div slot="header" class="clearfix">
<span>审批节点</span>
</div>
<div>
<el-row>
<el-col>
审批人：{{ item.APPOINT_USER_NAME }}
</el-col>
<el-col v-if="item.INDEX !== step">
审批人公司：{{ item.APPOINT_CORP_NAME }}
</el-col>
<el-col>
审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }}
</el-col>
<el-col v-if="item.INDEX !== step">
审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }}
</el-col>
<el-col v-if="item.INDEX !== step">
审批时间：{{ item.APPOINT_TIME }}
</el-col>
<el-col v-if="item.APPOINT_OPINION && item.INDEX !== step">
审批意见：{{ item.APPOINT_OPINION }}
</el-col>
</el-row>
</div>
</el-card>
</template>
</el-step>
</el-steps>
<div slot="footer" class="dialog-footer">
<el-button @click="closeWindow">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { requestFN } from '@/utils/request'
export default {
props: {
corpInfo: {
type: String,
default: ''
}
},
data() {
return {
visible: false,
loading: false,
list: [],
title: '审批流程',
form: {
XGF_USER_ID: ''
},
step: 0,
endFlag: ''
}
},
methods: {
init(e) {
this.form.XGF_USER_ID = e.XGF_USER_ID
this.getInfo()
},
getInfo() {
requestFN(
'/xgf/user/getApproveInfo', this.form
).then((data) => {
this.list = data.flow.info
this.step = data.flow.STEP
if (data.flow.endFlag === '1') {
this.title = '审批中'
}
if (data.flow.endFlag === '2') {
this.title = '审批结束'
}
if (data.flow.endFlag === '-2') {
this.title = '审批驳回'
}
this.visible = true
this.loading = false
}).catch((e) => {
console.log(e)
})
},
handleClose() {
this.visible = false
this.$emit('finish', '')
},
closeWindow() {
this.handleClose()
}
}
}
</script>

12
src/views/xgf/flow/components/sendUtil.vue
View File

@ -5,7 +5,7 @@
<el-row :gutter="12"> <el-row :gutter="12">
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="STATUS" label="是否通过: "> <el-form-item prop="STATUS" label="是否通过: ">
<el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择"> <el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择" @change="clearInfo">
<el-option label="是" value="1"/> <el-option label="是" value="1"/>
<el-option label="否" value="0"/> <el-option label="否" value="0"/>
</el-select> </el-select>
@ -132,6 +132,7 @@ export default {
this.$message.success('推送成功') this.$message.success('推送成功')
this.visible = false this.visible = false
this.$emit('refresh', '') this.$emit('refresh', '')
this.handleClose()
}) })
.catch((e) => { .catch((e) => {
console.log(e) console.log(e)
@ -172,6 +173,7 @@ export default {
} }
).then((data) => { ).then((data) => {
this.peopleList = data.userList this.peopleList = data.userList
this.form.user = ''
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)
}) })
@ -209,6 +211,14 @@ export default {
list: [], list: [],
tm: new Date().getTime() tm: new Date().getTime()
} }
},
clearInfo() {
this.form.APPOINT_DEPARTMENT_ID = null
this.form.APPOINT_DEPARTMENT_NAME = ''
this.form.APPOINT_USER_ID = null
this.form.APPOINT_USER_NAME = ''
this.form.OPINION = ''
this.form.user = ''
} }
} }
} }

20
src/views/xgf/peopleList/components/list.vue
View File

@ -42,6 +42,8 @@
<el-table-column label="操作" align="center" width="350"> <el-table-column label="操作" align="center" width="350">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button> <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
<el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button>
<el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
<el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button> <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
<el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button> <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button>
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button> <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
@ -58,6 +60,8 @@
<user-info ref="userInfos" append-to-body/> <user-info ref="userInfos" append-to-body/>
<send-util ref="sendUtil" append-to-body @refresh="getList"/> <send-util ref="sendUtil" append-to-body @refresh="getList"/>
<entrust ref="entrust" append-to-body @refresh="getList"/> <entrust ref="entrust" append-to-body @refresh="getList"/>
<flow-step ref="step" append-to-body/>
<flow-info-list ref="flowInfoList" />
</div> </div>
</template> </template>
@ -71,9 +75,11 @@ import user from './user.vue'
import SendUtil from './sendUtil.vue' import SendUtil from './sendUtil.vue'
import UserInfo from '../../flow_audit/userInfo.vue' import UserInfo from '../../flow_audit/userInfo.vue'
import Entrust from './entrust.vue' import Entrust from './entrust.vue'
import FlowStep from '../../flow/components/flowStep.vue'
import FlowInfoList from '../../flow/components/flowInfoList.vue'
export default { export default {
components: { Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user }, components: { FlowInfoList, FlowStep, Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user },
directives: { waves }, directives: { waves },
data() { data() {
return { return {
@ -146,12 +152,10 @@ export default {
getList() { getList() {
this.listLoading = true this.listLoading = true
requestFN( requestFN(
'/xgf/user/getAppointApproveList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/xgf/user/getRecord?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{ {
KEYWORDS: this.KEYWORDS, KEYWORDS: this.KEYWORDS,
STATUS: '1', Step: '1'
EMPLOY_FLAG: '1',
CHECK_STATUS: '1'
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -165,6 +169,12 @@ export default {
handleShow(row) { handleShow(row) {
this.$refs.userInfos.init(row) this.$refs.userInfos.init(row)
}, },
handleShowStep(row) {
this.$refs.step.init(row)
},
handleShowFlow(row) {
this.$refs.flowInfoList.init(row)
},
approve(row) { approve(row) {
this.$refs.sendUtil.init(row) this.$refs.sendUtil.init(row)
}, },