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^2
songwenxuan 2024-01-31 14:56:54 +08:00
parent 6e151129c5 afa82bcd14
commit 0866882e55
30 changed files with 591 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/BI/index.vue
View File

@ -212,11 +212,11 @@
</div> </div>
<div v-for="(item,index) in safetyEnvironmentalInspectionList" :key="index"> <div v-for="(item,index) in safetyEnvironmentalInspectionList" :key="index">
<span>{{ <span>{{
item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE item.INSPECTION_PLACE.length > 6 ? item.INSPECTION_PLACE.substr(0, 6) + '...' : item.INSPECTION_PLACE
}}</span> }}</span>
<span>{{ <span>{{
item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START item.INSPECTION_TIME_START.length > 10 ? item.INSPECTION_TIME_START.substr(0, 10) + '...' : item.INSPECTION_TIME_START
}}</span> }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -507,7 +507,7 @@ export default {
count3 = item.count count3 = item.count
} }
}) })
this.safetyEnvironmentalInspectionList = data.insList.length > 4 ? data.insList.splice(0,4) : data.insList this.safetyEnvironmentalInspectionList = data.insList.length > 4 ? data.insList.splice(0, 4) : data.insList
this.initEcharts4(count1, count2, count3) this.initEcharts4(count1, count2, count3)
}) })
}, },
@ -553,9 +553,9 @@ export default {
// } // }
if (item.HIDDENLEVEL == 'hiddenLevel1004') { // 轻微隐患 if (item.HIDDENLEVEL == 'hiddenLevel1004') { // 轻微隐患
yinhuanCount[0] = item.count yinhuanCount[0] = item.count
}else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患 } else if (item.HIDDENLEVEL == 'hiddenLevel1002') { // 一般隐患
yinhuanCount[1] = item.count yinhuanCount[1] = item.count
} else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患 } else if (item.HIDDENLEVEL == 'jdyh001') { // 较大隐患
yinhuanCount[2] = item.count yinhuanCount[2] = item.count
} else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患 } else if (item.HIDDENLEVEL == 'hiddenLevel2002') { // 重大隐患
yinhuanCount[3] = item.count yinhuanCount[3] = item.count

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'

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

@ -2,78 +2,93 @@
<div class="app-container"> <div class="app-container">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <el-row>
<el-form-item label="隐患来源"> <el-col :span="4">
<el-select v-model="form.SOURCE" placeholder="隐患来源" clearable style="width: 100%"> <el-form-item label="隐患来源">
<el-option :value="1" label="隐患快报"/> <el-select v-model="form.SOURCE" placeholder="隐患来源" clearable style="width: 100%">
<el-option :value="2" label="清单排查"/> <el-option :value="1" label="隐患快报"/>
<el-option :value="4" label="安全环保检查(监管端)"/> <el-option :value="2" label="清单排查"/>
<el-option :value="5" label="安全环保检查(企业端)"/> <el-option :value="4" label="安全环保检查(监管端)"/>
</el-select> <el-option :value="5" label="安全环保检查(企业端)"/>
</el-form-item> </el-select>
</el-col> </el-form-item>
<el-col :span="4"> </el-col>
<el-form-item label="隐患描述"> <el-col :span="4">
<el-input v-model="form.HIDDENDESCR"/> <el-form-item label="隐患描述">
</el-form-item> <el-input v-model="form.HIDDENDESCR"/>
</el-col> </el-form-item>
<el-col :span="4"> </el-col>
<el-form-item label="隐患发现人"> <el-col :span="4">
<el-input v-model="form.HIDDENFIND_NAME"/> <el-form-item label="隐患发现人">
</el-form-item> <el-input v-model="form.HIDDENFIND_NAME"/>
</el-col> </el-form-item>
<el-col :span="4"> </el-col>
<el-form-item label="隐患部位"> <el-col :span="4">
<SelectTree <el-form-item label="隐患部位">
ref="deptTree_Select" <SelectTree
:clearable="false" ref="deptTree_Select"
:options="hiddenPartList" :clearable="false"
:props="defaultProps" :options="hiddenPartList"
v-model="form.HIDDENPART" :props="defaultProps"
style="width: 100%;" v-model="form.HIDDENPART"
placeholder="请选择" /> style="width: 100%;"
</el-form-item> placeholder="请选择" />
</el-col> </el-form-item>
<el-col :span="4"> </el-col>
<el-form-item label="隐患级别"> <el-col :span="4">
<el-select v-model="form.HIDDENLEVEL" placeholder="请选择" style="width: 100%;"> <el-form-item label="隐患级别">
<el-option <el-select v-model="form.HIDDENLEVEL" placeholder="请选择" style="width: 100%;">
v-for="item in hiddenlevelList" <el-option
:key="item.value" v-for="item in hiddenlevelList"
:label="item.label" :key="item.value"
:value="item.value" :label="item.label"
/> :value="item.value"
</el-select> />
</el-form-item> </el-select>
</el-col> </el-form-item>
<el-col :span="4"> </el-col>
<el-form-item label="隐患状态"> </el-row>
<el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%"> <el-row>
<el-option :value="1" label="未整改"/> <el-col :span="4">
<el-option :value="2" label="已整改"/> <el-form-item label="隐患状态">
<el-option :value="4" label="已验收"/> <el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%">
<el-option :value="-1" label="已过期"/> <el-option :value="1" label="未整改"/>
<el-option :value="-2" label="待确认"/> <el-option :value="2" label="已整改"/>
<el-option :value="16" label="确认打回"/> <el-option :value="4" label="已验收"/>
<el-option :value="10" label="验收打回"/> <el-option :value="-1" label="已过期"/>
</el-select> <el-option :value="-2" label="待确认"/>
</el-form-item> <el-option :value="16" label="确认打回"/>
</el-col> <el-option :value="10" label="验收打回"/>
<el-col :span="4"> </el-select>
<el-form-item label="确认人"> </el-form-item>
<el-input v-model="form.CONFIRM_USER"/> </el-col>
</el-form-item> <el-col :span="4">
</el-col> <el-form-item label="确认人">
<el-col :span="4"> <el-input v-model="form.CONFIRM_USER"/>
<el-form-item label="整改负责人"> </el-form-item>
<el-input v-model="form.RECTIFICATION_USER"/> </el-col>
</el-form-item> <el-col :span="4">
</el-col> <el-form-item label="隐患类型" prop="HIDDENTYPE">
<el-col :span="4"> <el-cascader
<el-form-item label="验收人"> ref="deptTree_Select3"
<el-input v-model="form.CHECK_USER"/> :options="hiddenTypeList"
</el-form-item> :props="defaultProps2"
</el-col> v-model="form.HIDDEN_TYPE"
collapse-tags
clearable/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="整改负责人">
<el-input v-model="form.RECTIFICATION_USER"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="验收人">
<el-input v-model="form.CHECK_USER"/>
</el-form-item>
</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
} }
} }

2
src/views/keyproject_evaluation/personnel_evaluation_status/components/hidden_list.vue
View File

@ -247,7 +247,7 @@ export default {
console.log(data.varList) console.log(data.varList)
if (data.varList) { if (data.varList) {
this.varList = data.varList this.varList = data.varList
}else { } else {
this.varList = [] this.varList = []
} }
this.total = data.page.totalResult this.total = data.page.totalResult

4
src/views/keyprojects/outsourced/components/edit.vue
View File

@ -612,7 +612,7 @@ export default {
immediate: false immediate: false
}, },
//'form.ENDTIME': { // 'form.ENDTIME': {
// handler: function() { // handler: function() {
// // eslint-disable-next-line no-unused-vars // // eslint-disable-next-line no-unused-vars
// var time = formatDate(new Date(), 'YYYY-MM-DD') // var time = formatDate(new Date(), 'YYYY-MM-DD')
@ -622,7 +622,7 @@ export default {
// this.form.STATE = '2' // this.form.STATE = '2'
// } // }
// } // }
//}, // },
TRAINING_TIME: function(newData, oldData) { TRAINING_TIME: function(newData, oldData) {
if (!newData) { if (!newData) {
this.TRAINING_TIME = ['', ''] this.TRAINING_TIME = ['', '']

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>

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

@ -141,7 +141,7 @@ import TiandiMap from '../../../components/TianMap/TiandiMap'
import Platformvideo from '../platformelectronic/components/platformvideo.vue' import Platformvideo from '../platformelectronic/components/platformvideo.vue'
import SelectTree from '@/components/SelectTree' import SelectTree from '@/components/SelectTree'
export default { export default {
components: { Pagination, TiandiMap ,Platformvideo,SelectTree}, components: { Pagination, TiandiMap, Platformvideo, SelectTree },
directives: { waves }, directives: { waves },
data() { data() {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
@ -163,10 +163,10 @@ export default {
dialogFormMap: false, dialogFormMap: false,
corpList: [], corpList: [],
form: { form: {
CORPINFO_ID:'', CORPINFO_ID: '',
bianjiequyu:[], bianjiequyu: [],
PLATFORMELECTRONIC_ID:'', PLATFORMELECTRONIC_ID: '',
LONGITUDEANDLATITUDE:'', LONGITUDEANDLATITUDE: '',
VIDEOMANAGER_ID: '', VIDEOMANAGER_ID: '',
VIDEO_RESOURCES_ID: '', VIDEO_RESOURCES_ID: '',
VIDEO_TYPE: 1, VIDEO_TYPE: 1,
@ -176,7 +176,7 @@ export default {
PLATFORMVIDEOMANAGEMENT_ID: '', PLATFORMVIDEOMANAGEMENT_ID: '',
LATITUDE: '', LATITUDE: '',
LONGITUDE: '', LONGITUDE: '',
SUOSHUQUYU:'' SUOSHUQUYU: ''
}, },
rules: { rules: {
CORPINFO_ID: [ CORPINFO_ID: [
@ -189,20 +189,20 @@ export default {
{ required: true, message: '请选择摄像头', trigger: 'blur' } { required: true, message: '请选择摄像头', trigger: 'blur' }
] ]
}, },
dialogForm : false, dialogForm: false,
msg:'add' , msg: 'add',
defaultProps: { defaultProps: {
value: 'id', value: 'id',
children: 'nodes', children: 'nodes',
label: 'name' label: 'name'
}, },
quyuList :[], quyuList: [],
shexiangtouForm:{}, shexiangtouForm: {},
statusList: [ statusList: [
{ id: '0', name: '请选择' }, { id: '0', name: '请选择' },
{ id: '1', name: '油管区' }, { id: '1', name: '油管区' },
{ id: '2', name: '码头区' } { id: '2', name: '码头区' }
], ]
} }
}, },
async created() { async created() {
@ -225,7 +225,7 @@ export default {
this.KEYWORDS = '' this.KEYWORDS = ''
this.getQuery() this.getQuery()
}, },
getquyuList(){ //获取区域字典信息 getquyuList() { // 获取区域字典信息
requestFN( requestFN(
'/dictionaries/listSelectTree', '/dictionaries/listSelectTree',
{ {
@ -235,7 +235,7 @@ export default {
this.quyuList = JSON.parse(data.zTreeNodes) this.quyuList = JSON.parse(data.zTreeNodes)
}) })
}, },
getCorpList() { //获取所有的企业信息 getCorpList() { // 获取所有的企业信息
requestFN( requestFN(
'/corpinfo/listAll', '/corpinfo/listAll',
{} {}
@ -245,12 +245,12 @@ export default {
}) })
}, },
getAllList() { //获取公司的所有摄像头 getAllList() { // 获取公司的所有摄像头
return new Promise(resolve => { return new Promise(resolve => {
requestFN( requestFN(
'/platformelectronic/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, '/platformelectronic/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{ {
KEYWORDS:this.KEYWORDS KEYWORDS: this.KEYWORDS
} }
).then((data) => { ).then((data) => {
this.varList = data.varList this.varList = data.varList
@ -268,16 +268,16 @@ export default {
this.dialogForm = true this.dialogForm = true
// this.$refs.platformvideo.init() // this.$refs.platformvideo.init()
}, },
resetForm(){ resetForm() {
this.shexiangtouForm.LONGITUDE = '' this.shexiangtouForm.LONGITUDE = ''
this.shexiangtouForm.LATITUDE = '' this.shexiangtouForm.LATITUDE = ''
this.shexiangtouForm.SUOSHUQUYU = '' this.shexiangtouForm.SUOSHUQUYU = ''
this.form.LONGITUDEANDLATITUDE = '' this.form.LONGITUDEANDLATITUDE = ''
this.shexiangtouForm = {} this.shexiangtouForm = {}
this.form= { this.form = {
CORPINFO_ID:'', CORPINFO_ID: '',
bianjiequyu:'', bianjiequyu: '',
LONGITUDEANDLATITUDE:'', LONGITUDEANDLATITUDE: '',
VIDEOMANAGER_ID: '', VIDEOMANAGER_ID: '',
VIDEO_RESOURCES_ID: '', VIDEO_RESOURCES_ID: '',
VIDEO_TYPE: 1, VIDEO_TYPE: 1,
@ -290,7 +290,7 @@ export default {
} }
}, },
upload(){ upload() {
var _this = this var _this = this
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
@ -323,14 +323,14 @@ export default {
selectVideo(row) { selectVideo(row) {
this.$refs.platformvideo.init() this.$refs.platformvideo.init()
}, },
goEdit(row){ goEdit(row) {
this.dialogForm = true this.dialogForm = true
this.listLoading = true this.listLoading = true
return new Promise(resolve => { return new Promise(resolve => {
requestFN( requestFN(
'/platformelectronic/goEdit', '/platformelectronic/goEdit',
{ {
PLATFORMELECTRONIC_ID :row.PLATFORMELECTRONIC_ID PLATFORMELECTRONIC_ID: row.PLATFORMELECTRONIC_ID
} }
).then((data) => { ).then((data) => {
this.shexiangtouForm = data.pd this.shexiangtouForm = data.pd
@ -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) => {
@ -370,8 +370,8 @@ export default {
REGIONNAME: row.regionName, REGIONNAME: row.regionName,
REGIONPATH: row.regionPath, REGIONPATH: row.regionPath,
REGIONPATHNAM: row.regionPathName, REGIONPATHNAM: row.regionPathName,
VIDEONAME : row.name, VIDEONAME: row.name,
CODE:row.indexCode CODE: row.indexCode
} }
this.$set(this.form, 'VIDEONAME', row.name) this.$set(this.form, 'VIDEONAME', row.name)
this.$set(this.form, 'CODE', row.indexCode) this.$set(this.form, 'CODE', row.indexCode)
@ -381,7 +381,7 @@ export default {
}, },
// 获取列表 // 获取列表
setPosition() { setPosition() {
if(this.shexiangtouForm.PLATFORMELECTRONIC_ID != null){ if (this.shexiangtouForm.PLATFORMELECTRONIC_ID != null) {
} }
this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE this.shexiangtouForm.LONGITUDE = this.form.LONGITUDE
@ -423,10 +423,10 @@ export default {
}, },
handleMap(row) { handleMap(row) {
if(row != null){ if (row != null) {
this.form.LONGITUDE = row.LONGITUDE this.form.LONGITUDE = row.LONGITUDE
this.form.LATITUDE = row.LATITUDE this.form.LATITUDE = row.LATITUDE
this.shexiangtouForm =row this.shexiangtouForm = row
} }
this.dialogFormMap = true this.dialogFormMap = true
this.$nextTick(() => { this.$nextTick(() => {

2
src/views/keyprojects/platformvideo/index.vue
View File

@ -307,7 +307,7 @@ export default {
{ {
PLATFORMVIDEOMANAGEMENT_ID: row.PLATFORMVIDEOMANAGEMENT_ID PLATFORMVIDEOMANAGEMENT_ID: row.PLATFORMVIDEOMANAGEMENT_ID
} }
).then(async (res) => { ).then(async(res) => {
// this.dialogVideoHLS = true // this.dialogVideoHLS = true
this.getList() this.getList()
await this.getAllList() await this.getAllList()

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>

16
src/views/map/components/menjin.vue
View File

@ -209,13 +209,13 @@ export default {
GANGKOU: this.gangkou GANGKOU: this.gangkou
} }
).then((data) => { ).then((data) => {
this.block1OptionsList[0].count1 = data.pd.PERSON_IN this.block1OptionsList[0].count1 = data.pd.PERSON_IN
this.block1OptionsList[0].count2 = data.pd.PERSON_OUT this.block1OptionsList[0].count2 = data.pd.PERSON_OUT
this.block1OptionsList[0].count3 = data.pd.PERSON_IN - data.pd.PERSON_OUT this.block1OptionsList[0].count3 = data.pd.PERSON_IN - data.pd.PERSON_OUT
this.block1OptionsList[1].count1 = data.pd.CAR_IN this.block1OptionsList[1].count1 = data.pd.CAR_IN
this.block1OptionsList[1].count2 = data.pd.CAR_OUT this.block1OptionsList[1].count2 = data.pd.CAR_OUT
this.block1OptionsList[1].count3 = data.pd.CAR_IN - data.pd.CAR_OUT this.block1OptionsList[1].count3 = data.pd.CAR_IN - data.pd.CAR_OUT
this.block1OptionsList[2].count1 = data.pd.CAMERA this.block1OptionsList[2].count1 = data.pd.CAMERA
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)
}) })
@ -281,7 +281,7 @@ export default {
}) })
}, },
loadRecord(index) { loadRecord(index) {
this.getDoorWayRecords(index) this.getDoorWayRecords(index)
}, },
block3OptionsClick(index) { block3OptionsClick(index) {
this.block3List = [] this.block3List = []

14
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
}, },
@ -199,15 +199,15 @@ export default {
GANGKOU: this.gangkou GANGKOU: this.gangkou
} }
).then((data) => { ).then((data) => {
/*this.block1OptionsList[0].count1 = data.onlinePerGate /* this.block1OptionsList[0].count1 = data.onlinePerGate
this.block1OptionsList[0].count2 = data.offlinePerGate this.block1OptionsList[0].count2 = data.offlinePerGate
this.block1OptionsList[1].count1 = data.onlineCarGate this.block1OptionsList[1].count1 = data.onlineCarGate
this.block1OptionsList[1].count2 = data.offlineCarGate this.block1OptionsList[1].count2 = data.offlineCarGate
this.block1OptionsList[2].count1 = data.cameraCount*/ this.block1OptionsList[2].count1 = data.cameraCount*/
this.block1OptionsList[0].count1 = data.onlinePerGate+data.offlinePerGate this.block1OptionsList[0].count1 = data.onlinePerGate + data.offlinePerGate
//this.block1OptionsList[0].count2 = // this.block1OptionsList[0].count2 =
this.block1OptionsList[1].count1 = data.onlineCarGate+data.offlineCarGate this.block1OptionsList[1].count1 = data.onlineCarGate + data.offlineCarGate
//this.block1OptionsList[1].count2 = // this.block1OptionsList[1].count2 =
this.block1OptionsList[2].count1 = data.cameraCount this.block1OptionsList[2].count1 = data.cameraCount
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)

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>

114
src/views/map/dialog/blindboardCfdD.vue
View File

@ -170,68 +170,68 @@
</template> </template>
<script> <script>
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
import moment from 'moment/moment' import moment from 'moment/moment'
export default { export default {
props: { props: {
id: { id: {
type: String, type: String,
default() { default() {
return '' return ''
}
},
type: {
type: String,
default() {
return ''
}
} }
}, },
data() { type: {
return { type: String,
config: config, default() {
info: {}, return ''
ImgList: [], }
boardList: [], }
imgList: [], },
imgList1: [], data() {
measuresList: [], return {
pd: [] config: config,
info: {},
ImgList: [],
boardList: [],
imgList: [],
imgList1: [],
measuresList: [],
pd: []
}
},
created() {
this.getData()
},
methods: {
formatTime(date, column) {
if (date) {
return dateformat(date, 'YYYY年MM月DD日HH时mm分')
} else {
return ''
} }
}, },
created() { formatDate(date, column) {
this.getData() if (date) {
return dateformat(date, 'YYYY-MM-DD')
} else {
return ''
}
}, },
methods: { getRowKey(row) {
formatTime(date, column) { return row.BLINDBOARD_ID
if (date) { },
return dateformat(date, 'YYYY年MM月DD日HH时mm分') getData() {
} else { this.listLoading = true
return '' requestFN(
'/map/Eight/getByIdCfdD',
{
id: this.id,
TYPE: this.type,
BLINDBOARD_ID: this.id
} }
}, ).then((data) => {
formatDate(date, column) { this.listLoading = false
if (date) {
return dateformat(date, 'YYYY-MM-DD')
} else {
return ''
}
},
getRowKey(row) {
return row.BLINDBOARD_ID
},
getData() {
this.listLoading = true
requestFN(
'/map/Eight/getByIdCfdD',
{
id: this.id,
TYPE: this.type,
BLINDBOARD_ID: this.id
}
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map this.pd = data.pd // 参数map
this.imgList = data.imgList this.imgList = data.imgList
this.imgList1 = data.imgList1 this.imgList1 = data.imgList1
@ -241,11 +241,11 @@
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2]
}).catch((e) => { }).catch((e) => {
this.listLoading = false this.listLoading = false
}) })
}
} }
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>

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

@ -43,10 +43,10 @@
<td colspan="2"> <td colspan="2">
<span>{{ pd.PART_WEIGHT }}t</span> <span>{{ pd.PART_WEIGHT }}t</span>
<span style="margin-left: 20px;"> <span style="margin-left: 20px;">
{{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }} {{ pd.WORK_LEVEL == '1' ? '一级作业级别' : '' }}
{{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }} {{ pd.WORK_LEVEL == '2' ? '二级作业级别' : '' }}
{{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }} {{ pd.WORK_LEVEL == '3' ? '三级作业级别' : '' }}
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>

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>

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

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container print-work"> <div class="app-container print-work">
<div class="level-title"> <div class="level-title">
<h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}</h1> <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}</h1>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<div id="main4"/> <div id="main4"/>
@ -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: {
@ -123,60 +123,60 @@ export default {
axisTick: { axisTick: {
show: true, show: true,
splitNumber: 5, splitNumber: 5,
lineStyle:{ lineStyle: {
color:'#fff' color: '#fff'
} }
}, },
splitLine: { splitLine: {
length: 10, length: 10,
lineStyle: { lineStyle: {
width: 5, width: 5,
color:'#fff' color: '#fff'
} }
}, },
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'
} }
}, },
pointer: { pointer: {
show: true, show: true,
length:'80%', length: '80%',
width:5 width: 5
}, },
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) {
level = '东南' level = '东南'
} else if (param > 180 && param < 270) { } else if (param > 180 && param < 270) {
level = '西南' level = '西南'
@ -191,45 +191,44 @@ 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: {
fontSize: 14, fontSize: 14,
color:'#fff' color: '#fff'
} }
}, },
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: [
@ -424,7 +423,7 @@ export default {
min: 0, min: 0,
max: 30, max: 30,
splitNumber: 10, splitNumber: 10,
center:['50%', '55%'], center: ['50%', '55%'],
radius: '73%', radius: '73%',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -436,7 +435,7 @@ export default {
distance: -20, distance: -20,
length: 20, length: 20,
lineStyle: { lineStyle: {
width:2, width: 2,
color: '#0F2D5B' color: '#0F2D5B'
} }
}, },
@ -465,7 +464,7 @@ export default {
min: 0, min: 0,
max: 30, max: 30,
splitNumber: 10, splitNumber: 10,
center:['50%', '55%'], center: ['50%', '55%'],
radius: '65%', radius: '65%',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -481,17 +480,17 @@ export default {
silent: true, silent: true,
pointer: { pointer: {
length: '85%', length: '85%',
width:4, width: 4,
itemStyle: { itemStyle: {
color: 'inherit', color: 'inherit',
borderWidth: 1, borderWidth: 1,
borderColor:'inherit', // '#0D3778', borderColor: 'inherit', // '#0D3778',
shadowColor: 'inherit', shadowColor: 'inherit',
shadowBlur: 1 shadowBlur: 1
} }
}, },
axisTick: { axisTick: {
show:false, show: false,
distance: -20, distance: -20,
length: 5, length: 5,
lineStyle: { lineStyle: {
@ -502,24 +501,24 @@ export default {
distance: -20, distance: -20,
length: 20, length: 20,
lineStyle: { lineStyle: {
width:2, width: 2,
color: '#0F2D5B' color: '#0F2D5B'
} }
}, },
axisLabel: { axisLabel: {
show: false show: false
}, },
title: { // 仪表盘标题。 title: { // 仪表盘标题。
show: true, // 是否显示标题,默认 true。 show: true, // 是否显示标题,默认 true。
offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。 offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
color: '#ccc', // 文字的颜色,默认 #333。 color: '#ccc', // 文字的颜色,默认 #333。
fontSize: 15 // 文字的字体大小,默认 15。 fontSize: 15 // 文字的字体大小,默认 15。
}, },
detail: { detail: {
valueAnimation: true, valueAnimation: true,
offsetCenter: [0, '70%'], offsetCenter: [0, '70%'],
formatter: '{value}', formatter: '{value}',
color: 'inherit', // 文字的颜色,默认 #333。 color: 'inherit', // 文字的颜色,默认 #333。
fontSize: 20 fontSize: 20
}, },
data: [{ data: [{

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

@ -14,7 +14,7 @@
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent">部门</td> <td class="bbg-transparent">部门</td>
<td >{{ info?info.DEPARTMENT_NAME:'' }}</td> <td >{{ info?info.DEPARTMENT_NAME:'' }}</td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent">岗位</td> <td class="bbg-transparent">岗位</td>
@ -81,18 +81,18 @@ export default {
return '' return ''
} }
}, },
type: { type: {
type: String, type: String,
default() { default() {
return '' return ''
} }
}, },
infoname: { infoname: {
type: String, type: String,
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {

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

@ -6,7 +6,7 @@
<table class="table-ui"> <table class="table-ui">
<tr> <tr>
<td class="bbg-transparent">姓名</td> <td class="bbg-transparent">姓名</td>
<td >{{ info?info.NAME:'' }}</td> <td >{{ info?info.NAME:'' }}</td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent">工号</td> <td class="bbg-transparent">工号</td>
@ -65,7 +65,7 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {

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

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container print-work"> <div class="app-container print-work">
<div class="level-title"> <div class="level-title">
<h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}</h1> <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}</h1>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<div id="main4"/> <div id="main4"/>
@ -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: {
@ -123,60 +123,60 @@ export default {
axisTick: { axisTick: {
show: true, show: true,
splitNumber: 5, splitNumber: 5,
lineStyle:{ lineStyle: {
color:'#fff' color: '#fff'
} }
}, },
splitLine: { splitLine: {
length: 10, length: 10,
lineStyle: { lineStyle: {
width: 5, width: 5,
color:'#fff' color: '#fff'
} }
}, },
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'
} }
}, },
pointer: { pointer: {
show: true, show: true,
length:'80%', length: '80%',
width:5 width: 5
}, },
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) {
level = '东南' level = '东南'
} else if (param > 180 && param < 270) { } else if (param > 180 && param < 270) {
level = '西南' level = '西南'
@ -191,45 +191,44 @@ 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: {
fontSize: 14, fontSize: 14,
color:'#fff' color: '#fff'
} }
}, },
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: [
@ -424,7 +423,7 @@ export default {
min: 0, min: 0,
max: 30, max: 30,
splitNumber: 10, splitNumber: 10,
center:['50%', '55%'], center: ['50%', '55%'],
radius: '73%', radius: '73%',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -436,7 +435,7 @@ export default {
distance: -20, distance: -20,
length: 20, length: 20,
lineStyle: { lineStyle: {
width:2, width: 2,
color: '#0F2D5B' color: '#0F2D5B'
} }
}, },
@ -465,7 +464,7 @@ export default {
min: 0, min: 0,
max: 30, max: 30,
splitNumber: 10, splitNumber: 10,
center:['50%', '55%'], center: ['50%', '55%'],
radius: '65%', radius: '65%',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -481,17 +480,17 @@ export default {
silent: true, silent: true,
pointer: { pointer: {
length: '85%', length: '85%',
width:4, width: 4,
itemStyle: { itemStyle: {
color: 'inherit', color: 'inherit',
borderWidth: 1, borderWidth: 1,
borderColor:'inherit', // '#0D3778', borderColor: 'inherit', // '#0D3778',
shadowColor: 'inherit', shadowColor: 'inherit',
shadowBlur: 1 shadowBlur: 1
} }
}, },
axisTick: { axisTick: {
show:false, show: false,
distance: -20, distance: -20,
length: 5, length: 5,
lineStyle: { lineStyle: {
@ -502,24 +501,24 @@ export default {
distance: -20, distance: -20,
length: 20, length: 20,
lineStyle: { lineStyle: {
width:2, width: 2,
color: '#0F2D5B' color: '#0F2D5B'
} }
}, },
axisLabel: { axisLabel: {
show: false show: false
}, },
title: { // 仪表盘标题。 title: { // 仪表盘标题。
show: true, // 是否显示标题,默认 true。 show: true, // 是否显示标题,默认 true。
offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。 offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
color: '#ccc', // 文字的颜色,默认 #333。 color: '#ccc', // 文字的颜色,默认 #333。
fontSize: 15 // 文字的字体大小,默认 15。 fontSize: 15 // 文字的字体大小,默认 15。
}, },
detail: { detail: {
valueAnimation: true, valueAnimation: true,
offsetCenter: [0, '70%'], offsetCenter: [0, '70%'],
formatter: '{value}', formatter: '{value}',
color: 'inherit', // 文字的颜色,默认 #333。 color: 'inherit', // 文字的颜色,默认 #333。
fontSize: 20 fontSize: 20
}, },
data: [{ data: [{

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

@ -48,7 +48,7 @@ export default {
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
this.player = new Aliplayer({ this.player = new Aliplayer({
'id': 'aLiVideoPlayer', 'id': 'aLiVideoPlayer',
'source': res.data.url? res.data.url.replace('http://192.168.0.253:83', 'http://60.2.209.238:8992/videoApi') : '', 'source': res.data.url ? res.data.url.replace('http://192.168.0.253:83', 'http://60.2.209.238:8992/videoApi') : '',
'width': '100%', 'width': '100%',
'height': '500px', 'height': '500px',
'autoplay': true, 'autoplay': true,

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

@ -95,18 +95,17 @@ export default {
this.info.TEMPERATURE = data.pd.TEMPERATURE || '-' this.info.TEMPERATURE = data.pd.TEMPERATURE || '-'
this.info.WINDSPEED = data.pd.WINDSPEED || '-' this.info.WINDSPEED = data.pd.WINDSPEED || '-'
this.info.WINDDIRECTION = data.pd.WINDDIRECTION || '-' this.info.WINDDIRECTION = data.pd.WINDDIRECTION || '-'
this.$nextTick(()=>{ this.$nextTick(() => {
if(data.pd.WINDDIRECTION != '-'){ if (data.pd.WINDDIRECTION != '-') {
console.log(this.info.WINDDIRECTION) console.log(this.info.WINDDIRECTION)
this.initEcharts1(data) this.initEcharts1(data)
this.info.WINDDIRECTION = this.calculateWindDirection(this.info.WINDDIRECTION) this.info.WINDDIRECTION = this.calculateWindDirection(this.info.WINDDIRECTION)
console.log(this.info.WINDDIRECTION) console.log(this.info.WINDDIRECTION)
} }
if(data.pd.TEMPERATURE != '-'){ if (data.pd.TEMPERATURE != '-') {
this.initEcharts2(data) this.initEcharts2(data)
} }
if(data.pd.WINDSPEED != '-'){ if (data.pd.WINDSPEED != '-') {
this.initEcharts3(data) this.initEcharts3(data)
} }
}) })

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

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container print-work"> <div class="app-container print-work">
<div class="level-title"> <div class="level-title">
<h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}</h1> <h1>{{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}</h1>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<div id="main4"/> <div id="main4"/>
@ -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: {
@ -123,60 +123,60 @@ export default {
axisTick: { axisTick: {
show: true, show: true,
splitNumber: 5, splitNumber: 5,
lineStyle:{ lineStyle: {
color:'#fff' color: '#fff'
} }
}, },
splitLine: { splitLine: {
length: 10, length: 10,
lineStyle: { lineStyle: {
width: 5, width: 5,
color:'#fff' color: '#fff'
} }
}, },
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'
} }
}, },
pointer: { pointer: {
show: true, show: true,
length:'80%', length: '80%',
width:5 width: 5
}, },
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) {
level = '东南' level = '东南'
} else if (param > 180 && param < 270) { } else if (param > 180 && param < 270) {
level = '西南' level = '西南'
@ -191,45 +191,44 @@ 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: {
fontSize: 14, fontSize: 14,
color:'#fff' color: '#fff'
} }
}, },
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: [
@ -424,7 +423,7 @@ export default {
min: 0, min: 0,
max: 30, max: 30,
splitNumber: 10, splitNumber: 10,
center:['50%', '55%'], center: ['50%', '55%'],
radius: '73%', radius: '73%',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -436,7 +435,7 @@ export default {
distance: -20, distance: -20,
length: 20, length: 20,
lineStyle: { lineStyle: {
width:2, width: 2,
color: '#0F2D5B' color: '#0F2D5B'
} }
}, },
@ -465,7 +464,7 @@ export default {
min: 0, min: 0,
max: 30, max: 30,
splitNumber: 10, splitNumber: 10,
center:['50%', '55%'], center: ['50%', '55%'],
radius: '65%', radius: '65%',
axisLine: { axisLine: {
lineStyle: { lineStyle: {
@ -481,17 +480,17 @@ export default {
silent: true, silent: true,
pointer: { pointer: {
length: '85%', length: '85%',
width:4, width: 4,
itemStyle: { itemStyle: {
color: 'inherit', color: 'inherit',
borderWidth: 1, borderWidth: 1,
borderColor:'inherit', // '#0D3778', borderColor: 'inherit', // '#0D3778',
shadowColor: 'inherit', shadowColor: 'inherit',
shadowBlur: 1 shadowBlur: 1
} }
}, },
axisTick: { axisTick: {
show:false, show: false,
distance: -20, distance: -20,
length: 5, length: 5,
lineStyle: { lineStyle: {
@ -502,24 +501,24 @@ export default {
distance: -20, distance: -20,
length: 20, length: 20,
lineStyle: { lineStyle: {
width:2, width: 2,
color: '#0F2D5B' color: '#0F2D5B'
} }
}, },
axisLabel: { axisLabel: {
show: false show: false
}, },
title: { // 仪表盘标题。 title: { // 仪表盘标题。
show: true, // 是否显示标题,默认 true。 show: true, // 是否显示标题,默认 true。
offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。 offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
color: '#ccc', // 文字的颜色,默认 #333。 color: '#ccc', // 文字的颜色,默认 #333。
fontSize: 15 // 文字的字体大小,默认 15。 fontSize: 15 // 文字的字体大小,默认 15。
}, },
detail: { detail: {
valueAnimation: true, valueAnimation: true,
offsetCenter: [0, '70%'], offsetCenter: [0, '70%'],
formatter: '{value}', formatter: '{value}',
color: 'inherit', // 文字的颜色,默认 #333。 color: 'inherit', // 文字的颜色,默认 #333。
fontSize: 20 fontSize: 20
}, },
data: [{ data: [{

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>

128
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,64 +523,70 @@ export default {
}, },
// 人员 // 人员
getUserList(DEPARTMENT_ID, POST_ID, index, type, list) { getUserList(DEPARTMENT_ID, POST_ID, index, type, list) {
if (type !== 'created') { return new Promise((resolve) => {
let flag = false if (type !== 'created') {
for (let i = 0; i < this.form[list].length; i++) { let flag = false
if (this.form[list][i].POST_ID === POST_ID) { for (let i = 0; i < this.form[list].length; i++) {
flag = true if (this.form[list][i].POST_ID === POST_ID) {
break flag = true
break
}
}
if (flag) {
this.$message.warning('不能选择相同的岗位')
return
} else {
this.form[list][index].POST_ID = POST_ID
} }
} }
if (flag) { requestFN(
this.$message.warning('不能选择相同的岗位') '/corppromise/userlistAll',
return {
} else { DEPARTMENT_ID,
this.form[list][index].POST_ID = POST_ID POST_ID
} }
} ).then((data) => {
requestFN( this.form[list][index].userList = data.userList
'/corppromise/userlistAll', if (type !== 'created') {
{ this.form[list][index].USER_ID = ''
DEPARTMENT_ID, }
POST_ID resolve()
} }).catch((e) => {
).then((data) => { })
this.form[list][index].userList = data.userList
if (type !== 'created') {
this.form[list][index].USER_ID = ''
}
}).catch((e) => {
}) })
}, },
// 人员 // 人员
getUserList1({ id: DEPARTMENT_ID }, index, type, list) { getUserList1({ id: DEPARTMENT_ID }, index, type, list) {
if (type !== 'created') { return new Promise((resolve) => {
let flag = false if (type !== 'created') {
for (let i = 0; i < this.form[list].length; i++) { let flag = false
if (this.form[list][i].DEPARTMENT_ID === DEPARTMENT_ID) { for (let i = 0; i < this.form[list].length; i++) {
flag = true if (this.form[list][i].DEPARTMENT_ID === DEPARTMENT_ID) {
break flag = true
break
}
}
if (flag) {
this.$message.warning('不能选择相同的部门')
this.$refs.Treeselect[index].clear()
return
} else {
this.form[list][index].DEPARTMENT_ID = DEPARTMENT_ID
} }
} }
if (flag) { requestFN(
this.$message.warning('不能选择相同的部门') '/user/listAll',
this.$refs.Treeselect[index].clear() {
return DEPARTMENT_ID
} else { }
this.form[list][index].DEPARTMENT_ID = DEPARTMENT_ID ).then((data) => {
} this.form[list][index].userList = data.userList
} if (type !== 'created') {
requestFN( this.form[list][index].USER_ID = ''
'/user/listAll', }
{ resolve()
DEPARTMENT_ID }).catch((e) => {
} })
).then((data) => {
this.form[list][index].userList = data.userList
if (type !== 'created') {
this.form[list][index].USER_ID = ''
}
}).catch((e) => {
}) })
}, },
addPeople() { addPeople() {

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>

1
src/views/xgf/flow/components/flowStep.vue
View File

@ -81,7 +81,6 @@ export default {
).then((data) => { ).then((data) => {
this.list = data.flow.info this.list = data.flow.info
this.step = data.flow.STEP this.step = data.flow.STEP
this.step = data.flow.endFlag
if (data.flow.endFlag === '1') { if (data.flow.endFlag === '1') {
this.title = '审批中' this.title = '审批中'
} }

11
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>
@ -173,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)
}) })
@ -210,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 = ''
} }
} }
} }

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

@ -42,8 +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 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="handleShowStep(row)">审批详情</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(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>