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

Revert "代码格式话" 

This reverts commit 9b7b066e9a.
2024年2月1日V1.0.53
liujun 2024-01-29 14:12:10 +08:00
parent abf0d8ff91
commit cfc10ada9d
29 changed files with 2905 additions and 2868 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -1,10 +1,5 @@
<template>
<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>
<component :is="parentObj.activeName"/>
</template>
<script>
import List from './components/list'

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

@ -82,6 +82,7 @@
</el-table-column>
</el-table>
<div class="page-btn-group">
<div>
<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: '1', name: '油管区' },
{ id: '2', name: '码头区' }
]
],
}
},
async created() {
@ -339,7 +339,7 @@ export default {
this.form.VIDEONAME = data.pd.NAME
this.form.CODE = data.pd.INDEXCODE
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
resolve()
}).catch((e) => {

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

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

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

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

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

@ -19,11 +19,11 @@
<div class="title">{{ item.title }}</div>
<div class="info">
<div class="img"><img :src="item.img" alt=""></div>
<div v-if="item.title == '监测站数'" class="count">
<div class="count" v-if="item.title == '监测站数'">
<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>
<div v-else class="count">
<div class="count" v-else>
<div>在线数：-</div>
<div>离线数：-</div>
</div>

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

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

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

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

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

@ -97,7 +97,7 @@ import peoplePositionCfdD from './peoplePositionCfdD.vue'
import peoplePositionCmt from './peoplePositionCmt.vue'
import carPositionCfdD from './carPositionCfdD.vue'
import peoplePositionOne from './peoplePositionOne.vue'
import hotworkFirst from './hotworkFirst'
import hotworkFirst from "./hotworkFirst";
import peoplePositionYGS from './peoplePositionYGS.vue'
import outSourceInfo from './outSourceInfo.vue'
import outSourceVideoInfo from './outSourceVideoInfo.vue'

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

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

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

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

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

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

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

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

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

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

4122
src/views/map/js/mapbox.js
View File

File diff suppressed because it is too large Load Diff

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

@ -59,7 +59,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="检查开始时间" prop="INSPECTION_TIME_START">
<el-date-picker v-model="form.INSPECTION_TIME_START" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" type="datetime" placeholder="选择检查开始时间" @blur="checkTime(form.INSPECTION_TIME_START)"/>
<el-date-picker v-model="form.INSPECTION_TIME_START" format="yyyy-MM-dd HH:mm" v-on:blur="checkTime(form.INSPECTION_TIME_START)" value-format="yyyy-MM-dd HH:mm" type="datetime" placeholder="选择检查开始时间"/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -472,7 +472,7 @@ export default {
methods: {
checkTime(data){
if (Date.parse(data)>new Date().getTime()){
this.$message.error('检查开始时间需小于当前时间')
this.$message.error("检查开始时间需小于当前时间")
this.$refs['form'].resetFields()
}
},

26
src/views/system/appment/index.vue
View File

@ -50,22 +50,22 @@
<el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='edit'?'修改':'新增'" width="600px">
<el-form ref="form" :rules="rules" :model="form" label-width="110px" style="width: 500px;">
<el-form-item label="菜单名称" prop="MENU_NAME">
<el-input id="MENU_NAME" ref="MENU_NAME" v-model="form.MENU_NAME" maxlength="255" placeholder="这里输入菜单名称..." title="菜单名称"/>
<el-input ref="MENU_NAME" id="MENU_NAME" v-model="form.MENU_NAME" maxlength="255" placeholder="这里输入菜单名称..." title="菜单名称"/>
</el-form-item>
<el-form-item label="菜单地址" prop="MENU_URL">
<el-input id="MENU_URL" ref="MENU_URL" v-model="form.MENU_URL" maxlength="255" placeholder="这里输入菜单地址..." title="菜单地址"/>
<el-input ref="MENU_URL" id="MENU_URL" v-model="form.MENU_URL" maxlength="255" placeholder="这里输入菜单地址..." title="菜单地址"/>
</el-form-item>
<el-form-item label="父节点id" prop="PARENT_ID">
<el-input id="PARENT_ID" ref="PARENT_ID" v-model="form.PARENT_ID" maxlength="255" placeholder="这里输入父节点id..." title="父节点id"/>
<el-input ref="PARENT_ID" id="PARENT_ID" v-model="form.PARENT_ID" maxlength="255" placeholder="这里输入父节点id..." title="父节点id"/>
</el-form-item>
<el-form-item label="排序" prop="MENU_ORDER">
<el-input id="MENU_ORDER" ref="MENU_ORDER" v-model.number="form.MENU_ORDER" maxlength="11" placeholder="这里输入排序..." title="排序"/>
<el-input ref="MENU_ORDER" id="MENU_ORDER" v-model.number="form.MENU_ORDER" maxlength="11" placeholder="这里输入排序..." title="排序"/>
</el-form-item>
<el-form-item label="企业id" prop="CORPINFO_ID">
<el-input id="CORPINFO_ID" ref="CORPINFO_ID" v-model="form.CORPINFO_ID" maxlength="255" placeholder="这里输入企业id..." title="企业id"/>
<el-input ref="CORPINFO_ID" id="CORPINFO_ID" v-model="form.CORPINFO_ID" maxlength="255" placeholder="这里输入企业id..." title="企业id"/>
</el-form-item>
<el-form-item label="删除状态" prop="IS_DELETE">
<el-input id="IS_DELETE" ref="IS_DELETE" v-model.number="form.IS_DELETE" maxlength="2" placeholder="这里输入删除状态..." title="删除状态"/>
<el-input ref="IS_DELETE" id="IS_DELETE" v-model.number="form.IS_DELETE" maxlength="2" placeholder="这里输入删除状态..." title="删除状态"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -102,7 +102,7 @@ export default {
PARENT_ID: '',//父节点id
MENU_ORDER: '',//排序
CORPINFO_ID: '',//企业id
IS_DELETE: ''// 删除状态
IS_DELETE: '',//删除状态
},
multipleSelectionAll: [], // 所有选中的数据包含跨页数据
multipleSelection: [], // 当前页选中的数据
@ -120,7 +120,7 @@ export default {
IS_DELETE: [
{ required: true, message: '删除状态不能为空', trigger: 'change' },
{ type: 'number', message: '删除状态必须为数字' }
]
],
}
}
},
@ -268,16 +268,16 @@ export default {
},
// 判断按钮权限，用于是否显示按钮
hasButton: function() {
var keys = 'appmenus:add,appmenus:del,appmenus:edit,toExcel'
var keys = 'appmenus:add,appmenus:del,appmenus:edit,toExcel';
requestFN(
'/head/hasButton',
{
keys: keys
}
).then((data) => {
this.add = data.appmenusfhadminadd // 新增权限
this.del = data.appmenusfhadmindel // 删除权限
this.edit = data.appmenusfhadminedit // 修改权限
this.add = data.appmenusfhadminadd; //新增权限
this.del = data.appmenusfhadmindel; //删除权限
this.edit = data.appmenusfhadminedit; //修改权限
}).catch((e) => {
this.listLoading = false
})
@ -292,7 +292,7 @@ export default {
PARENT_ID: '',//父节点id
MENU_ORDER: '',//排序
CORPINFO_ID: '',//企业id
IS_DELETE: ''// 删除状态
IS_DELETE: '',//删除状态
}
}
}

1
src/views/system/group/user/index.vue
View File

@ -625,6 +625,7 @@ export default {
this.pd.ROLE_ID = arrString
this.dialogFormEdit = true
await this.$nextTick()
},
handleEditStatus(row, type) {
const typeName = type == '1' ? '禁用' : '启用'