@@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null
let myChart5 = null
-let myChart6 = null
+const 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: {
@@ -123,60 +123,60 @@ export default {
axisTick: {
show: true,
splitNumber: 5,
- lineStyle:{
- color:'#fff'
+ lineStyle: {
+ color: '#fff'
}
},
splitLine: {
length: 10,
lineStyle: {
width: 5,
- color:'#fff'
+ color: '#fff'
}
},
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: "",
- color:'#fff'
+ fontWeight: '',
+ color: '#fff'
}
},
pointer: {
show: true,
- length:'80%',
- width:5
+ length: '80%',
+ width: 5
},
detail: {
formatter: function(param) {
- var level = '';
- if (param > 0 && param < 90){
+ var level = ''
+ if (param > 0 && param < 90) {
level = '东北'
- } else if (param > 90 && param < 180){
+ } else if (param > 90 && param < 180) {
level = '东南'
} else if (param > 180 && param < 270) {
level = '西南'
@@ -191,45 +191,44 @@ export default {
} else if (param == 180) {
level = '正南'
}
- return "当前风向:"+level + "(" + param + "°)";
+ return '当前风向:' + level + '(' + param + '°)'
},
offsetCenter: [0, 190],
textStyle: {
fontSize: 14,
- color:'#fff'
+ color: '#fff'
}
},
data: [data.pd.WINDDIRECTION]
}
- };
+ }
myChart4.setOption(option)
},
initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5'))
- var value = data.pd.TEMPERATURE;
- var kd = [];
-// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
+ 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用于表示负值
+ // 因为柱状初始化为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: {
@@ -238,18 +237,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,
@@ -263,7 +262,7 @@ export default {
}, {
show: false,
min: -110,
- max: 100,
+ max: 100
}],
series: [{
@@ -276,7 +275,7 @@ export default {
itemStyle: {
normal: {
color: mercuryColor,
- barBorderRadius: 0,
+ barBorderRadius: 0
}
},
label: {
@@ -285,11 +284,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'
}
}
},
@@ -304,7 +303,7 @@ export default {
itemStyle: {
normal: {
color: '#ffffff',
- barBorderRadius: 50,
+ barBorderRadius: 50
}
},
z: 1
@@ -318,7 +317,7 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- barBorderRadius: 50,
+ barBorderRadius: 50
}
},
z: 0
@@ -332,7 +331,7 @@ export default {
itemStyle: {
normal: {
color: mercuryColor,
- opacity: 1,
+ opacity: 1
}
},
z: 2
@@ -346,7 +345,7 @@ export default {
itemStyle: {
normal: {
color: '#ffffff',
- opacity: 1,
+ opacity: 1
}
},
z: 1
@@ -360,7 +359,7 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- opacity: 1,
+ opacity: 1
}
},
z: 0
@@ -379,12 +378,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 ''
}
}
}
@@ -396,12 +395,12 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- barBorderRadius: 10,
+ barBorderRadius: 10
}
},
z: 0
}]
- };
+ }
myChart5.setOption(option)
},
initEcharts3(data) {
@@ -414,7 +413,7 @@ export default {
textStyle: {
fontWeight: 'normal',
fontSize: 16,
- color: "#fff"
+ color: '#fff'
}
},
series: [
@@ -424,7 +423,7 @@ export default {
min: 0,
max: 30,
splitNumber: 10,
- center:['50%', '55%'],
+ center: ['50%', '55%'],
radius: '73%',
axisLine: {
lineStyle: {
@@ -436,7 +435,7 @@ export default {
distance: -20,
length: 20,
lineStyle: {
- width:2,
+ width: 2,
color: '#0F2D5B'
}
},
@@ -465,7 +464,7 @@ export default {
min: 0,
max: 30,
splitNumber: 10,
- center:['50%', '55%'],
+ center: ['50%', '55%'],
radius: '65%',
axisLine: {
lineStyle: {
@@ -481,17 +480,17 @@ export default {
silent: true,
pointer: {
length: '85%',
- width:4,
+ width: 4,
itemStyle: {
color: 'inherit',
borderWidth: 1,
- borderColor:'inherit', // '#0D3778',
+ borderColor: 'inherit', // '#0D3778',
shadowColor: 'inherit',
shadowBlur: 1
}
},
axisTick: {
- show:false,
+ show: false,
distance: -20,
length: 5,
lineStyle: {
@@ -502,24 +501,24 @@ export default {
distance: -20,
length: 20,
lineStyle: {
- width:2,
+ width: 2,
color: '#0F2D5B'
}
},
axisLabel: {
show: false
},
- title: { // 仪表盘标题。
- show: true, // 是否显示标题,默认 true。
- offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
- color: '#ccc', // 文字的颜色,默认 #333。
- fontSize: 15 // 文字的字体大小,默认 15。
+ title: { // 仪表盘标题。
+ show: true, // 是否显示标题,默认 true。
+ offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+ color: '#ccc', // 文字的颜色,默认 #333。
+ fontSize: 15 // 文字的字体大小,默认 15。
},
detail: {
valueAnimation: true,
offsetCenter: [0, '70%'],
formatter: '{value}',
- color: 'inherit', // 文字的颜色,默认 #333。
+ color: 'inherit', // 文字的颜色,默认 #333。
fontSize: 20
},
data: [{
diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index aca7806..3f011a6 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -15,6 +15,7 @@
+
@@ -97,7 +98,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'
@@ -181,7 +182,7 @@ export default {
name: {
type: String,
default: ''
- },
+ }
},
methods: {
closeDialog() {
diff --git a/src/views/map/dialog/peoplePositionCfdD.vue b/src/views/map/dialog/peoplePositionCfdD.vue
index c76bec9..584a23e 100644
--- a/src/views/map/dialog/peoplePositionCfdD.vue
+++ b/src/views/map/dialog/peoplePositionCfdD.vue
@@ -14,7 +14,7 @@
| 部门 |
- {{ info?info.DEPARTMENT_NAME:'' }} |
+ {{ info?info.DEPARTMENT_NAME:'' }} |
| 岗位 |
@@ -81,18 +81,18 @@ export default {
return ''
}
},
- type: {
- type: String,
- default() {
- return ''
- }
- },
- infoname: {
- type: String,
- default() {
- return ''
- }
- },
+ type: {
+ type: String,
+ default() {
+ return ''
+ }
+ },
+ infoname: {
+ type: String,
+ default() {
+ return ''
+ }
+ }
},
data() {
return {
diff --git a/src/views/map/dialog/peoplePositionOne.vue b/src/views/map/dialog/peoplePositionOne.vue
index b8c23ad..292b967 100644
--- a/src/views/map/dialog/peoplePositionOne.vue
+++ b/src/views/map/dialog/peoplePositionOne.vue
@@ -6,7 +6,7 @@
| 姓名 |
- {{ info?info.NAME:'' }} |
+ {{ info?info.NAME:'' }} |
| 工号 |
@@ -65,7 +65,7 @@ export default {
default() {
return ''
}
- },
+ }
},
data() {
return {
diff --git a/src/views/map/dialog/temperaturestation.vue b/src/views/map/dialog/temperaturestation.vue
index 29342b9..8c93751 100644
--- a/src/views/map/dialog/temperaturestation.vue
+++ b/src/views/map/dialog/temperaturestation.vue
@@ -1,7 +1,7 @@
-
{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}
+ {{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}
@@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null
let myChart5 = null
-let myChart6 = null
+const 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: {
@@ -123,60 +123,60 @@ export default {
axisTick: {
show: true,
splitNumber: 5,
- lineStyle:{
- color:'#fff'
+ lineStyle: {
+ color: '#fff'
}
},
splitLine: {
length: 10,
lineStyle: {
width: 5,
- color:'#fff'
+ color: '#fff'
}
},
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: "",
- color:'#fff'
+ fontWeight: '',
+ color: '#fff'
}
},
pointer: {
show: true,
- length:'80%',
- width:5
+ length: '80%',
+ width: 5
},
detail: {
formatter: function(param) {
- var level = '';
- if (param > 0 && param < 90){
+ var level = ''
+ if (param > 0 && param < 90) {
level = '东北'
- } else if (param > 90 && param < 180){
+ } else if (param > 90 && param < 180) {
level = '东南'
} else if (param > 180 && param < 270) {
level = '西南'
@@ -191,45 +191,44 @@ export default {
} else if (param == 180) {
level = '正南'
}
- return "当前风向:"+level + "(" + param + "°)";
+ return '当前风向:' + level + '(' + param + '°)'
},
offsetCenter: [0, 190],
textStyle: {
fontSize: 14,
- color:'#fff'
+ color: '#fff'
}
},
data: [data.pd.WINDDIRECTION]
}
- };
+ }
myChart4.setOption(option)
},
initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5'))
- var value = data.pd.TEMPERATURE;
- var kd = [];
-// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
+ 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用于表示负值
+ // 因为柱状初始化为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: {
@@ -238,18 +237,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,
@@ -263,7 +262,7 @@ export default {
}, {
show: false,
min: -110,
- max: 100,
+ max: 100
}],
series: [{
@@ -276,7 +275,7 @@ export default {
itemStyle: {
normal: {
color: mercuryColor,
- barBorderRadius: 0,
+ barBorderRadius: 0
}
},
label: {
@@ -285,11 +284,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'
}
}
},
@@ -304,7 +303,7 @@ export default {
itemStyle: {
normal: {
color: '#ffffff',
- barBorderRadius: 50,
+ barBorderRadius: 50
}
},
z: 1
@@ -318,7 +317,7 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- barBorderRadius: 50,
+ barBorderRadius: 50
}
},
z: 0
@@ -332,7 +331,7 @@ export default {
itemStyle: {
normal: {
color: mercuryColor,
- opacity: 1,
+ opacity: 1
}
},
z: 2
@@ -346,7 +345,7 @@ export default {
itemStyle: {
normal: {
color: '#ffffff',
- opacity: 1,
+ opacity: 1
}
},
z: 1
@@ -360,7 +359,7 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- opacity: 1,
+ opacity: 1
}
},
z: 0
@@ -379,12 +378,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 ''
}
}
}
@@ -396,12 +395,12 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- barBorderRadius: 10,
+ barBorderRadius: 10
}
},
z: 0
}]
- };
+ }
myChart5.setOption(option)
},
initEcharts3(data) {
@@ -414,7 +413,7 @@ export default {
textStyle: {
fontWeight: 'normal',
fontSize: 16,
- color: "#fff"
+ color: '#fff'
}
},
series: [
@@ -424,7 +423,7 @@ export default {
min: 0,
max: 30,
splitNumber: 10,
- center:['50%', '55%'],
+ center: ['50%', '55%'],
radius: '73%',
axisLine: {
lineStyle: {
@@ -436,7 +435,7 @@ export default {
distance: -20,
length: 20,
lineStyle: {
- width:2,
+ width: 2,
color: '#0F2D5B'
}
},
@@ -465,7 +464,7 @@ export default {
min: 0,
max: 30,
splitNumber: 10,
- center:['50%', '55%'],
+ center: ['50%', '55%'],
radius: '65%',
axisLine: {
lineStyle: {
@@ -481,17 +480,17 @@ export default {
silent: true,
pointer: {
length: '85%',
- width:4,
+ width: 4,
itemStyle: {
color: 'inherit',
borderWidth: 1,
- borderColor:'inherit', // '#0D3778',
+ borderColor: 'inherit', // '#0D3778',
shadowColor: 'inherit',
shadowBlur: 1
}
},
axisTick: {
- show:false,
+ show: false,
distance: -20,
length: 5,
lineStyle: {
@@ -502,24 +501,24 @@ export default {
distance: -20,
length: 20,
lineStyle: {
- width:2,
+ width: 2,
color: '#0F2D5B'
}
},
axisLabel: {
show: false
},
- title: { // 仪表盘标题。
- show: true, // 是否显示标题,默认 true。
- offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
- color: '#ccc', // 文字的颜色,默认 #333。
- fontSize: 15 // 文字的字体大小,默认 15。
+ title: { // 仪表盘标题。
+ show: true, // 是否显示标题,默认 true。
+ offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+ color: '#ccc', // 文字的颜色,默认 #333。
+ fontSize: 15 // 文字的字体大小,默认 15。
},
detail: {
valueAnimation: true,
offsetCenter: [0, '70%'],
formatter: '{value}',
- color: 'inherit', // 文字的颜色,默认 #333。
+ color: 'inherit', // 文字的颜色,默认 #333。
fontSize: 20
},
data: [{
diff --git a/src/views/map/dialog/video_play_cfd.vue b/src/views/map/dialog/video_play_cfd.vue
index 69812ca..0e79142 100644
--- a/src/views/map/dialog/video_play_cfd.vue
+++ b/src/views/map/dialog/video_play_cfd.vue
@@ -48,7 +48,7 @@ export default {
// eslint-disable-next-line no-undef
this.player = new Aliplayer({
'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%',
'height': '500px',
'autoplay': true,
diff --git a/src/views/map/dialog/weatherstation.vue b/src/views/map/dialog/weatherstation.vue
index bacf71d..15f1de7 100644
--- a/src/views/map/dialog/weatherstation.vue
+++ b/src/views/map/dialog/weatherstation.vue
@@ -95,18 +95,17 @@ export default {
this.info.TEMPERATURE = data.pd.TEMPERATURE || '-'
this.info.WINDSPEED = data.pd.WINDSPEED || '-'
this.info.WINDDIRECTION = data.pd.WINDDIRECTION || '-'
- this.$nextTick(()=>{
- if(data.pd.WINDDIRECTION != '-'){
+ this.$nextTick(() => {
+ if (data.pd.WINDDIRECTION != '-') {
console.log(this.info.WINDDIRECTION)
this.initEcharts1(data)
- this.info.WINDDIRECTION = this.calculateWindDirection(this.info.WINDDIRECTION)
+ this.info.WINDDIRECTION = this.calculateWindDirection(this.info.WINDDIRECTION)
console.log(this.info.WINDDIRECTION)
}
- if(data.pd.TEMPERATURE != '-'){
+ if (data.pd.TEMPERATURE != '-') {
this.initEcharts2(data)
}
- if(data.pd.WINDSPEED != '-'){
-
+ if (data.pd.WINDSPEED != '-') {
this.initEcharts3(data)
}
})
diff --git a/src/views/map/dialog/windspeedstation.vue b/src/views/map/dialog/windspeedstation.vue
index 29342b9..8c93751 100644
--- a/src/views/map/dialog/windspeedstation.vue
+++ b/src/views/map/dialog/windspeedstation.vue
@@ -1,7 +1,7 @@
-
{{ info.EQUIPMENTNAME }}：实时监测数据 {{info.OPERATTIME}}
+ {{ info.EQUIPMENTNAME }}：实时监测数据 {{ info.OPERATTIME }}
@@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null
let myChart5 = null
-let myChart6 = null
+const 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: {
@@ -123,60 +123,60 @@ export default {
axisTick: {
show: true,
splitNumber: 5,
- lineStyle:{
- color:'#fff'
+ lineStyle: {
+ color: '#fff'
}
},
splitLine: {
length: 10,
lineStyle: {
width: 5,
- color:'#fff'
+ color: '#fff'
}
},
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: "",
- color:'#fff'
+ fontWeight: '',
+ color: '#fff'
}
},
pointer: {
show: true,
- length:'80%',
- width:5
+ length: '80%',
+ width: 5
},
detail: {
formatter: function(param) {
- var level = '';
- if (param > 0 && param < 90){
+ var level = ''
+ if (param > 0 && param < 90) {
level = '东北'
- } else if (param > 90 && param < 180){
+ } else if (param > 90 && param < 180) {
level = '东南'
} else if (param > 180 && param < 270) {
level = '西南'
@@ -191,45 +191,44 @@ export default {
} else if (param == 180) {
level = '正南'
}
- return "当前风向:"+level + "(" + param + "°)";
+ return '当前风向:' + level + '(' + param + '°)'
},
offsetCenter: [0, 190],
textStyle: {
fontSize: 14,
- color:'#fff'
+ color: '#fff'
}
},
data: [data.pd.WINDDIRECTION]
}
- };
+ }
myChart4.setOption(option)
},
initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5'))
- var value = data.pd.TEMPERATURE;
- var kd = [];
-// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
+ 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用于表示负值
+ // 因为柱状初始化为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: {
@@ -238,18 +237,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,
@@ -263,7 +262,7 @@ export default {
}, {
show: false,
min: -110,
- max: 100,
+ max: 100
}],
series: [{
@@ -276,7 +275,7 @@ export default {
itemStyle: {
normal: {
color: mercuryColor,
- barBorderRadius: 0,
+ barBorderRadius: 0
}
},
label: {
@@ -285,11 +284,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'
}
}
},
@@ -304,7 +303,7 @@ export default {
itemStyle: {
normal: {
color: '#ffffff',
- barBorderRadius: 50,
+ barBorderRadius: 50
}
},
z: 1
@@ -318,7 +317,7 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- barBorderRadius: 50,
+ barBorderRadius: 50
}
},
z: 0
@@ -332,7 +331,7 @@ export default {
itemStyle: {
normal: {
color: mercuryColor,
- opacity: 1,
+ opacity: 1
}
},
z: 2
@@ -346,7 +345,7 @@ export default {
itemStyle: {
normal: {
color: '#ffffff',
- opacity: 1,
+ opacity: 1
}
},
z: 1
@@ -360,7 +359,7 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- opacity: 1,
+ opacity: 1
}
},
z: 0
@@ -379,12 +378,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 ''
}
}
}
@@ -396,12 +395,12 @@ export default {
itemStyle: {
normal: {
color: borderColor,
- barBorderRadius: 10,
+ barBorderRadius: 10
}
},
z: 0
}]
- };
+ }
myChart5.setOption(option)
},
initEcharts3(data) {
@@ -414,7 +413,7 @@ export default {
textStyle: {
fontWeight: 'normal',
fontSize: 16,
- color: "#fff"
+ color: '#fff'
}
},
series: [
@@ -424,7 +423,7 @@ export default {
min: 0,
max: 30,
splitNumber: 10,
- center:['50%', '55%'],
+ center: ['50%', '55%'],
radius: '73%',
axisLine: {
lineStyle: {
@@ -436,7 +435,7 @@ export default {
distance: -20,
length: 20,
lineStyle: {
- width:2,
+ width: 2,
color: '#0F2D5B'
}
},
@@ -465,7 +464,7 @@ export default {
min: 0,
max: 30,
splitNumber: 10,
- center:['50%', '55%'],
+ center: ['50%', '55%'],
radius: '65%',
axisLine: {
lineStyle: {
@@ -481,17 +480,17 @@ export default {
silent: true,
pointer: {
length: '85%',
- width:4,
+ width: 4,
itemStyle: {
color: 'inherit',
borderWidth: 1,
- borderColor:'inherit', // '#0D3778',
+ borderColor: 'inherit', // '#0D3778',
shadowColor: 'inherit',
shadowBlur: 1
}
},
axisTick: {
- show:false,
+ show: false,
distance: -20,
length: 5,
lineStyle: {
@@ -502,24 +501,24 @@ export default {
distance: -20,
length: 20,
lineStyle: {
- width:2,
+ width: 2,
color: '#0F2D5B'
}
},
axisLabel: {
show: false
},
- title: { // 仪表盘标题。
- show: true, // 是否显示标题,默认 true。
- offsetCenter: [0, '95%'], //相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
- color: '#ccc', // 文字的颜色,默认 #333。
- fontSize: 15 // 文字的字体大小,默认 15。
+ title: { // 仪表盘标题。
+ show: true, // 是否显示标题,默认 true。
+ offsetCenter: [0, '95%'], // 相对于仪表盘中心的偏移位置，数组第一项是水平方向的偏移，第二项是垂直方向的偏移。可以是绝对的数值，也可以是相对于仪表盘半径的百分比。
+ color: '#ccc', // 文字的颜色,默认 #333。
+ fontSize: 15 // 文字的字体大小,默认 15。
},
detail: {
valueAnimation: true,
offsetCenter: [0, '70%'],
formatter: '{value}',
- color: 'inherit', // 文字的颜色,默认 #333。
+ color: 'inherit', // 文字的颜色,默认 #333。
fontSize: 20
},
data: [{
diff --git a/src/views/map/dialog/xfControl.vue b/src/views/map/dialog/xfControl.vue
index 7dd8aa7..6e965b9 100644
--- a/src/views/map/dialog/xfControl.vue
+++ b/src/views/map/dialog/xfControl.vue
@@ -47,8 +47,8 @@
- ![]()
- ![]()
+ ![]()
+ ![]()
@@ -109,8 +109,8 @@
- ![]()
- ![]()
+ ![]()
+ ![]()
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 09ea1e4..01370cc 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -39,7 +39,7 @@
:corp-info-id="CORP_INFO_ID"
:gangkou="gangkouActive"/>
@@ -48,13 +48,13 @@
:corp-info-id="CORP_INFO_ID"
:area="area"
:gangkou="gangkouActive"/>
-
-
@@ -250,6 +250,7 @@ import caofeidianIndex from './components/caofeidian_index.vue'
import czksIndex from './components/czks_index.vue'
import menjinCzks from './components/menjinCzks.vue'
import renyuanCzks from './components/renyuanCzks.vue'
+import renyuanCmt from './components/renyuanCmt.vue'
import menjin from './components/menjin.vue'
import menjinCfd from './components/menjinCfd.vue'
import menjinCmt from './components/menjinCmt.vue'
@@ -258,7 +259,6 @@ import anquan from './components/anquan.vue'
import anquanCfd from './components/anquanCfd.vue'
import qixiang from './components/qixiang.vue'
import renyuan from './components/renyuan.vue'
-import renyuanCmt from './components/renyuanCmt.vue'
import bianjieruqin from './components/bianjieruqin.vue'
import renyuanCfd from './components/renyuanCfd.vue'
import zhongda from './components/zhongda.vue'
@@ -280,9 +280,6 @@ let drag = null
let ry_drag = null
var tiandituTk = 'e8a16137fd226a62a23cc7ba5c9c78ce'
var subdomains = ['0', '1', '2', '3', '4', '5', '6', '7']
-var PI = 3.1415926535897932384626
-var a = 6378245.0 // 卫星椭球坐标投影到平面地图坐标系的投影因子。
-var ee = 0.00669342162296594323 // 椭球的偏心率。//判断是否在国内，在中国国内的经纬度才需要做偏移
// 沧州矿石人员定位数组
let czksPerLocArr = []
const Cesium = window.Cesium
@@ -301,6 +298,7 @@ export default {
czksIndex,
menjinCzks,
renyuanCzks,
+ renyuanCmt,
// navigation,
gangkouIndex,
fengongsiIndex,
@@ -313,7 +311,6 @@ export default {
anquan,
qixiang,
renyuan,
- renyuanCmt,
renyuanCfd,
zhongda,
layoutDialog,
@@ -1154,58 +1151,58 @@ export default {
},
keepalive(token) {
// 第二套方案
- // requestFN(
- // '/map/loginOrKeepAlive',
- // {
- // }
- // ).then((data) => {
- //
- // })
+ requestFN(
+ '/map/loginOrKeepAlive',
+ {
+ }
+ ).then((data) => {
+
+ })
},
ysVideoInit() {
// 第二套方案
- // var _this = this
- // requestFN(
- // '/map/loginOrKeepAlive',
- // {
- // }
- // ).then((data) => {
- // const token = data.token
- // var nbsp = String.fromCharCode(160)
- // var arr = []
- // arr.length = 40
- // const str = arr.fill(nbsp).join('')
- // const voidPath = imosPlayer.getUniqueID()
- // window.voidPath = voidPath
- // document.title = document.title + str + new Date().getTime()
- // _this.keepalive(token)
- // setInterval(_this.keepalive, 30000, token)
- //
- // window.videoWindow = 0
- // imosPlayer.setLinkPort('8093')
- // imosPlayer
- // .init({
- // ip: '172.14.0.54',
- // token: token,
- // title: document.title,
- // voidListenerPath: '\\' + voidPath
- // })
- // .then(async(resr) => {
- // if (resr.ErrCode === 0) {
- // // imosPlayer.setLiveNetLinkMode(liveNetProtocol, liveByMS)
- // // imosPlayer.setReplayNetLinkMode(replayNetProtocol, replayByMS)
- //
- // // eslint-disable-next-line no-alert
- // console.info('登录成功')
- // } else {
- // // eslint-disable-next-line no-alert
- // console.info(resr.ErrMsg)
- // }
- // })
- // .catch((err) => {
- // console.error(err)
- // })
- // })
+ var _this = this
+ requestFN(
+ '/map/loginOrKeepAlive',
+ {
+ }
+ ).then((data) => {
+ const token = data.token
+ var nbsp = String.fromCharCode(160)
+ var arr = []
+ arr.length = 40
+ const str = arr.fill(nbsp).join('')
+ const voidPath = imosPlayer.getUniqueID()
+ window.voidPath = voidPath
+ document.title = document.title + str + new Date().getTime()
+ _this.keepalive(token)
+ setInterval(_this.keepalive, 30000, token)
+
+ window.videoWindow = 0
+ imosPlayer.setLinkPort('8093')
+ imosPlayer
+ .init({
+ ip: '172.14.0.54',
+ token: token,
+ title: document.title,
+ voidListenerPath: '\\' + voidPath
+ })
+ .then(async(resr) => {
+ if (resr.ErrCode === 0) {
+ // imosPlayer.setLiveNetLinkMode(liveNetProtocol, liveByMS)
+ // imosPlayer.setReplayNetLinkMode(replayNetProtocol, replayByMS)
+
+ // eslint-disable-next-line no-alert
+ console.info('登录成功')
+ } else {
+ // eslint-disable-next-line no-alert
+ console.info(resr.ErrMsg)
+ }
+ })
+ .catch((err) => {
+ console.error(err)
+ })
+ })
},
// keepalive(token) {
// axios({
@@ -1407,8 +1404,9 @@ export default {
this.dialog.infoname = infoname
return
}
- if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1' && point_type !== 'peoplePosition') {
- const { label, point_type, data_id, infoname,name, code } = pick.id._monitoItems.data
+ if (this.gangkouActive === '00005' && point_id.substring(0, 1) !== '1') {
+ // if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
+ const { label, point_type, data_id, infoname, name, code } = pick.id._monitoItems.data
this.dialog.visible = true
this.dialog.title = label
this.dialog.type = point_type.substring(3) + this.gangkouActive
@@ -1419,19 +1417,6 @@ export default {
console.log(this.dialog)
return
}
- if (this.gangkouActive === '00005' && point_type === 'peoplePosition') {
- const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data
- console.log(pick.id._monitoItems.data)
- this.dialog.visible = true
- this.dialog.title = label
- this.dialog.type = point_type+'00005'
- console.log(this.dialog.type)
- this.dialog.id = id
- this.dialog.name = name
- this.dialog.infoname = infoname
- this.dialog.corpInfoId = corpInfoId
- return
- }
if (point_type.indexOf('标记点') !== -1) {
const { label, point_type, data_id, corpInfoId, dialog_width, infoname } = pick.id._monitoItems.data
this.dialog.visible = true
@@ -1941,7 +1926,6 @@ export default {
},
bottomOptionsItemsClick(pindex, index, label, urlType, pointUrl, dialog_width) {
- var _this = this
if (this.bottomOptionsList[pindex].list[index].check || this.gangkouActive === '00004' && this.cfdBottomOptionsList[pindex].list[index].check) {
// 取消选中
// 沧州矿石人员定位关闭
@@ -2045,12 +2029,11 @@ export default {
} else {
point.infoname = varList[i].NAME
}
- //曹煤炭数据
+ // 曹煤炭数据
if (this.gangkouActive === '00005') {
point.name = varList[i].MAP_POINT_NAME
point.infoname = varList[i].MAP_POINT_NAME
}
- console.log(point)
points.push(point)
}
if (this.gangkouActive === '00004' && urlType === 'carPosition') {
@@ -2072,13 +2055,6 @@ export default {
} else {
this.dragEntity(points, pindex, index)
}
- // 人员定位开启实时获取定位websocket
- if (this.gangkouActive === '00005' && urlType === 'peoplePosition') {
- if (!this.fwebsocket.url) {
- this.cmtinitNinePerLocWebsocket()
- }
- }
- _this.dragEntity(points, pindex, index)
}).catch((e) => {
console.log(e)
})
@@ -2487,71 +2463,6 @@ export default {
}
}
},
- // 曹煤炭人员定位websocket
- cmtinitNinePerLocWebsocket() {
- const _this = this
- console.info(config.perRealTimeLocUrl)
- if (window.WebSocket) {
- this.fwebsocket = new WebSocket(encodeURI('ws://' + config.cmtperRealTimeLocUrl)) // oladress在main.jsp页面定义
- this.fwebsocket.onopen = () => {
- console.info('人员定位监听成功')
- }
- this.fwebsocket.onerror = function() {
- console.info('连接失败')
- }
- this.fwebsocket.onclose = function() {
- console.info('onclose')
- }
- this.fwebsocket.onmessage = function(message) {
- const mockData = JSON.parse(message.data)
- console.log(mockData)
-
- // 将地图上的点与最新的定位人员点进行对比 删除地图上多的点
- const ninePerLoc = _this.ninePerLocArr.filter(item => {
- const index = mockData.findIndex(item1 => {
- return item.id.toString() === item1.cardno.toString()
- })
- return index !== -1
- })
-
- // 将地图上剩余的点与最新的定位人员点进行对比 更新地图上已存在的点 新增地图上之前没有的点
- for (const item of mockData) {
- console.log(item)
- const wgs84 = _this.gcj02towgs84(parseFloat(item.longitude), parseFloat(item.latitude))
- item.longitude = wgs84[0]
- item.latitude = wgs84[1]
- const index = ninePerLoc.findIndex(item1 => {
- return item1.id.toString() === item.cardno.toString()
- })
-
- const pointColor = _this.isPointxyWithinTheArea(_this.pointBox, item.longitude, item.latitude)
- if (index !== -1) {
- ninePerLoc[index].x = item.longitude
- ninePerLoc[index].y = item.latitude
- ninePerLoc[index].icon_type = 'img4_0' + pointColor
- ry_drag.getPosition(ninePerLoc[index])
- } else {
- const perLoc = {
- id: item.cardno,
- name: item.name,
- x: item.longitude,
- y: item.latitude,
- point_type: 'peoplePosition',
- icon_type: 'img4_0' + pointColor
- }
- ninePerLoc.push(perLoc)
- ry_drag.delEntity(perLoc)
- ry_drag.addEntity(perLoc)
- var qianzhui = 'person'
- _this.allOrientationPoint[qianzhui + item.cardno] = item.cardno
- // qianzhui 前缀是点位的前缀，用于区分不同类型的点（如一公司人员、二公司人员），删除时，可根据点位前缀进行删除点
- }
- }
- // 最后更新ninePerLocArr
- _this.ninePerLocArr = ninePerLoc
- }
- }
- },
/* 一公司人员定位 mqtt务必使用4.2.1版本*/
// 九公司人员定位websocket
initNinePerLocWebsocket() {
@@ -2860,7 +2771,6 @@ export default {
point.empNo = data.empNo || '' // 工号
point.cardNo = data.cardNo || '' // 卡号
point.gangkou = this.gangkouActive
- console.log(point)
return point
},
// 查询当前所有点位是否在区域内
@@ -2920,42 +2830,7 @@ export default {
}
})
},
- gcj02towgs84(lng, lat) {
- if (this.out_of_china(lng, lat)) {
- return [lng, lat]
- } else {
- var dlat = this.transformlat(lng - 105.0, lat - 35.0)
- var dlng = this.transformlng(lng - 105.0, lat - 35.0)
- var radlat = lat / 180.0 * PI
- var magic = Math.sin(radlat)
- magic = 1 - ee * magic * magic
- var sqrtmagic = Math.sqrt(magic)
- dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI)
- dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI)
- const mglat = lat + dlat
- const mglng = lng + dlng
- return [lng * 2 - mglng, lat * 2 - mglat]
- }
- },
- out_of_china(lng, lat) {
- return (lng < 72.004 || lng > 137.8347 || (lat < 0.8293 || lat > 55.8271 || false))
- },
- // 转化经度
- transformlng(lng, lat) {
- var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
- ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0
- ret += ((20.0 * Math.sin(lng * PI) + 40.0 * Math.sin((lng / 3.0) * PI)) * 2.0) / 3.0
- ret += ((150.0 * Math.sin((lng / 12.0) * PI) + 300.0 * Math.sin((lng / 30.0) * PI)) * 2.0) / 3.0
- return ret
- },
- // 转化纬度
- transformlat(lng, lat) {
- var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
- ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0
- ret += ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) / 3.0
- ret += ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) * 2.0) / 3.0
- return ret
- },
+
// 重新加载人员定位点位信息
localtionReload(pindex, index) {
var _this = this
@@ -3116,8 +2991,8 @@ export default {
}
this.bottomClickDisable = false
done()
- },
- },
+ }
+ }
}
diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue
index 76bede6..2f76f94 100644
--- a/src/views/safetyenvironmental/inspection/components/add.vue
+++ b/src/views/safetyenvironmental/inspection/components/add.vue
@@ -22,6 +22,7 @@
:options="treeData"
:props="defaultProps"
v-model="form.INSPECTED_DEPARTMENT_ID"
+ @change="changeCurrentDeptId(form.INSPECTED_DEPARTMENT_ID)"
placeholder="请选择被检查单位"
style="width: 300px" />
@@ -68,8 +69,8 @@
- 检查人员 添加
-
+ 检查人员 添加
+
@@ -82,7 +83,8 @@
v-model="item.INSPECTION_DEPARTMENT_ID"
placeholder="请选择检查人员部门"
style="width: 300px"
- @change="updateInspecteDept(item.INSPECTION_DEPARTMENT_ID,index)"/>
+ @visible-change=""
+ @change="updateInspecteDept(item.INSPECTION_DEPARTMENT_ID,index,item)"/>
@@ -348,6 +350,7 @@ export default {
},
pd: [],
switchInspectionType: 'select',
+ CURRENT_INSPECTED_DEPARTMENT_ID: '', //当前被检查单位
form: {
INSPECTION_SUBJECT: '', // 检查标题
INSPECTION_SOURCE: '4', // 检查来源（4-监管端 5-企业端）
@@ -480,6 +483,12 @@ export default {
handleAdd() {
this.dialogType = 'add'
},
+ changeCurrentDeptId(id) {
+ this.form.inspectorList = []
+ this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '', USER_SIDE: '' })
+ this.INSPECTOR_List.push([])
+ this.CURRENT_INSPECTED_DEPARTMENT_ID = id
+ },
changeSwitch(type) {
if (type === 'InspectionType') {
this.form.INSPECTION_TYPE = ''
@@ -498,10 +507,46 @@ export default {
this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: '', INSPECTION_DEPARTMENT_ID: '', INSPECTION_USER_ID: '', USER_SIDE: '' })
this.INSPECTOR_List.push([])
},
- updateInspecteDept(DEPARTMENT_ID, i) {
- this.form.inspectorList[i].INSPECTION_USER_ID = ''
- this.form.inspectorList[i].USER_SIDE = ''
- this.getInspectorList(DEPARTMENT_ID, i)
+ updateInspecteDept(id,i,item) {
+ // 获取人员列表
+ if (id) {
+ requestFN(
+ '/corpDepartment/checkDept',
+ {
+ DEPARTMENT_ID: this.CURRENT_INSPECTED_DEPARTMENT_ID,
+ id: id
+ }
+ ).then((data) => {
+ if (data.message!=null) {
+ this.INSPECTION_DEPARTMENT_ID = ''
+ this.INSPECTOR_List = []
+ this.INSPECTION_USER_ID = ''
+ this.$message.error(data.message)
+ }else {
+ // 获取人员列表
+ if (id) {
+ requestFN(
+ '/user/listAllManageAndCorp',
+ {
+ DEPARTMENT_ID: id
+ }
+ ).then((data) => {
+ this.INSPECTOR_List[i] = data.userList
+ this.$forceUpdate()
+ }).catch((e) => {
+ })
+ }
+ this.form.inspectorList[i].INSPECTION_USER_ID = ''
+ this.form.inspectorList[i].USER_SIDE = ''
+ this.$message.success('检查人员部门选择成功')
+ this.getInspectorList(DEPARTMENT_ID, i)
+ }
+ }).catch((e) => {
+ })
+ }
+ this.form.inspectorList = []
+ this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: item.INSPECTION_INSPECTOR_ID, INSPECTION_DEPARTMENT_ID: item.INSPECTION_DEPARTMENT_ID, INSPECTION_USER_ID: '', USER_SIDE: item.USER_SIDE })
+ this.INSPECTOR_List.push([])
},
// 获取人员列表
getInspectorList(DEPARTMENT_ID, i) {
@@ -509,6 +554,7 @@ export default {
requestFN(
'/user/listAllManageAndCorp',
{
+ CURRENT_INSPECTED_DEPARTMENT_ID: this.CURRENT_INSPECTED_DEPARTMENT_ID,
DEPARTMENT_ID: DEPARTMENT_ID,
NOMAIN: '1'
}
diff --git a/src/views/security_commitment/promise_book_issued/components/add.vue b/src/views/security_commitment/promise_book_issued/components/add.vue
index a9e0c71..67edbf3 100644
--- a/src/views/security_commitment/promise_book_issued/components/add.vue
+++ b/src/views/security_commitment/promise_book_issued/components/add.vue
@@ -408,9 +408,15 @@ export default {
{
PROMISE_ID: this.$parent.PROMISE_ID
}
- ).then((data) => {
+ ).then(async(data) => {
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
for (let i = 0; i < data.people.length; i++) {
this.form.people.push({
@@ -426,15 +432,15 @@ export default {
for (let j = 0; j < this.form.people.length; j++) {
if (this.form.DISTRIBUTIONOBJECT === '1') {
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.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 {
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.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++) {
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.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) {
- if (type !== 'created') {
- let flag = false
- for (let i = 0; i < this.form[list].length; i++) {
- if (this.form[list][i].POST_ID === POST_ID) {
- flag = true
- break
+ return new Promise((resolve) => {
+ if (type !== 'created') {
+ let flag = false
+ for (let i = 0; i < this.form[list].length; i++) {
+ if (this.form[list][i].POST_ID === POST_ID) {
+ flag = true
+ break
+ }
+ }
+ if (flag) {
+ this.$message.warning('不能选择相同的岗位')
+ return
+ } else {
+ this.form[list][index].POST_ID = POST_ID
}
}
- if (flag) {
- this.$message.warning('不能选择相同的岗位')
- return
- } else {
- this.form[list][index].POST_ID = POST_ID
- }
- }
- requestFN(
- '/corppromise/userlistAll',
- {
- DEPARTMENT_ID,
- POST_ID
- }
- ).then((data) => {
- this.form[list][index].userList = data.userList
- if (type !== 'created') {
- this.form[list][index].USER_ID = ''
- }
- }).catch((e) => {
+ requestFN(
+ '/corppromise/userlistAll',
+ {
+ DEPARTMENT_ID,
+ POST_ID
+ }
+ ).then((data) => {
+ this.form[list][index].userList = data.userList
+ if (type !== 'created') {
+ this.form[list][index].USER_ID = ''
+ }
+ resolve()
+ }).catch((e) => {
+ })
})
},
// 人员
getUserList1({ id: DEPARTMENT_ID }, index, type, list) {
- if (type !== 'created') {
- let flag = false
- for (let i = 0; i < this.form[list].length; i++) {
- if (this.form[list][i].DEPARTMENT_ID === DEPARTMENT_ID) {
- flag = true
- break
+ return new Promise((resolve) => {
+ if (type !== 'created') {
+ let flag = false
+ for (let i = 0; i < this.form[list].length; i++) {
+ if (this.form[list][i].DEPARTMENT_ID === DEPARTMENT_ID) {
+ 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) {
- this.$message.warning('不能选择相同的部门')
- this.$refs.Treeselect[index].clear()
- return
- } else {
- this.form[list][index].DEPARTMENT_ID = DEPARTMENT_ID
- }
- }
- requestFN(
- '/user/listAll',
- {
- DEPARTMENT_ID
- }
- ).then((data) => {
- this.form[list][index].userList = data.userList
- if (type !== 'created') {
- this.form[list][index].USER_ID = ''
- }
- }).catch((e) => {
+ requestFN(
+ '/user/listAll',
+ {
+ DEPARTMENT_ID
+ }
+ ).then((data) => {
+ this.form[list][index].userList = data.userList
+ if (type !== 'created') {
+ this.form[list][index].USER_ID = ''
+ }
+ resolve()
+ }).catch((e) => {
+ })
})
},
addPeople() {
diff --git a/src/views/security_commitment/promise_book_issued/components/see.vue b/src/views/security_commitment/promise_book_issued/components/see.vue
index b9cdf62..a38c235 100644
--- a/src/views/security_commitment/promise_book_issued/components/see.vue
+++ b/src/views/security_commitment/promise_book_issued/components/see.vue
@@ -23,7 +23,8 @@
| {{ form.PROMISE_TERM_END }} |
- 承诺人
+ 承诺人
+ 受状人
| {{ '单位' + (index + 1) }} |
@@ -36,7 +37,8 @@
{{ item.USERNAME && item.USERNAME.join('、') }} |
- 被承诺人
+ 被承诺人
+ 发状人
| {{ '部门' + (index + 1) }} |
@@ -45,7 +47,8 @@
{{ item.USERNAME && item.USERNAME.join('、') }} |
- 承诺内容
+ 承诺内容
+ 责任状内容
| 正文 |
diff --git a/src/views/xgf/flow/components/entrust.vue b/src/views/xgf/flow/components/entrust.vue
index 799927c..a712c10 100644
--- a/src/views/xgf/flow/components/entrust.vue
+++ b/src/views/xgf/flow/components/entrust.vue
@@ -53,7 +53,7 @@ export default {
visible: false,
loading: false,
form: {
- STATUS: null,
+ STATUS: '1',
APPOINT_CORP_ID: '',
APPOINT_CORP_NAME: '',
APPOINT_DEPARTMENT_ID: null,
diff --git a/src/views/xgf/flow/components/flowInfo.vue b/src/views/xgf/flow/components/flowInfo.vue
new file mode 100644
index 0000000..cabc7cd
--- /dev/null
+++ b/src/views/xgf/flow/components/flowInfo.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+ {{ item.STEP_NAME }}
+
+
+
+
+ 审批人：{{ item.APPROVER_NAME }}
+
+
+ 审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
+
+
+ 审批人归属公司：{{ item.APPROVER_CORPINFO_NAME }}
+
+
+ 审批时间：{{ item.APPROVER_TIME }}
+
+
+ 审批意见：{{ item.APPROVER_OPINION }}
+
+
+ 审批结束
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/xgf/flow/components/flowInfoList.vue b/src/views/xgf/flow/components/flowInfoList.vue
new file mode 100644
index 0000000..3b55422
--- /dev/null
+++ b/src/views/xgf/flow/components/flowInfoList.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue
new file mode 100644
index 0000000..33be87a
--- /dev/null
+++ b/src/views/xgf/flow/components/flowStep.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+ 审批节点
+
+
+
+
+ 审批人：{{ item.APPOINT_USER_NAME }}
+
+
+ 审批人公司：{{ item.APPOINT_CORP_NAME }}
+
+
+ 审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }}
+
+
+ 审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }}
+
+
+ 审批时间：{{ item.APPOINT_TIME }}
+
+
+ 审批意见：{{ item.APPOINT_OPINION }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 5b1469e..b8ced0b 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -5,7 +5,7 @@
-
+
@@ -132,6 +132,7 @@ export default {
this.$message.success('推送成功')
this.visible = false
this.$emit('refresh', '')
+ this.handleClose()
})
.catch((e) => {
console.log(e)
@@ -172,6 +173,7 @@ export default {
}
).then((data) => {
this.peopleList = data.userList
+ this.form.user = ''
}).catch((e) => {
console.log(e)
})
@@ -209,6 +211,14 @@ export default {
list: [],
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 = ''
}
}
}
diff --git a/src/views/xgf/peopleList/components/list.vue b/src/views/xgf/peopleList/components/list.vue
index a96ceb0..03a58ef 100644
--- a/src/views/xgf/peopleList/components/list.vue
+++ b/src/views/xgf/peopleList/components/list.vue
@@ -42,6 +42,8 @@
详情
+ 审批详情
+ 审批流程
审批
委托制单单位审批
电子合格证
@@ -58,6 +60,8 @@
+
+
@@ -71,9 +75,11 @@ import user from './user.vue'
import SendUtil from './sendUtil.vue'
import UserInfo from '../../flow_audit/userInfo.vue'
import Entrust from './entrust.vue'
+import FlowStep from '../../flow/components/flowStep.vue'
+import FlowInfoList from '../../flow/components/flowInfoList.vue'
export default {
- components: { Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user },
+ components: { FlowInfoList, FlowStep, Entrust, UserInfo, SendUtil, Pagination, apply, vueQr, user },
directives: { waves },
data() {
return {
@@ -146,12 +152,10 @@ export default {
getList() {
this.listLoading = true
requestFN(
- '/xgf/user/getAppointApproveList?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
+ '/xgf/user/getRecord?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS,
- STATUS: '1',
- EMPLOY_FLAG: '1',
- CHECK_STATUS: '1'
+ Step: '1'
}
).then((data) => {
this.listLoading = false
@@ -165,6 +169,12 @@ export default {
handleShow(row) {
this.$refs.userInfos.init(row)
},
+ handleShowStep(row) {
+ this.$refs.step.init(row)
+ },
+ handleShowFlow(row) {
+ this.$refs.flowInfoList.init(row)
+ },
approve(row) {
this.$refs.sendUtil.init(row)
},