修改江西测试用例
This commit is contained in:
@@ -327,6 +327,332 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "Feature",
|
||||
"properties": {
|
||||
"adcode": 360100,
|
||||
"name": "南昌",
|
||||
"center": [115.892151, 28.676493],
|
||||
"centroid": [116.023468, 28.647424],
|
||||
"childrenNum": 9,
|
||||
"level": "city",
|
||||
"parent": { "adcode": 360000 },
|
||||
"subFeatureIndex": 0,
|
||||
"acroutes": [100000, 360000]
|
||||
},
|
||||
"geometry": {
|
||||
"type": "MultiPolygon",
|
||||
"coordinates": [
|
||||
[
|
||||
[
|
||||
[115.475552, 29.006186],
|
||||
[115.476092, 28.994019],
|
||||
[115.463427, 28.983943],
|
||||
[115.472067, 28.966376],
|
||||
[115.479872, 28.960979],
|
||||
[115.506233, 28.92253],
|
||||
[115.504073, 28.913769],
|
||||
[115.512173, 28.896632],
|
||||
[115.52258, 28.892278],
|
||||
[115.521402, 28.883074],
|
||||
[115.530581, 28.861742],
|
||||
[115.517818, 28.842501],
|
||||
[115.505791, 28.832741],
|
||||
[115.493764, 28.844155],
|
||||
[115.487333, 28.829433],
|
||||
[115.48969, 28.823091],
|
||||
[115.48213, 28.810847],
|
||||
[115.481639, 28.797058],
|
||||
[115.467943, 28.795017],
|
||||
[115.46647, 28.787459],
|
||||
[115.453756, 28.766107],
|
||||
[115.453167, 28.773225],
|
||||
[115.440109, 28.771184],
|
||||
[115.444871, 28.760589],
|
||||
[115.438686, 28.759982],
|
||||
[115.453167, 28.732333],
|
||||
[115.460187, 28.733271],
|
||||
[115.463672, 28.724881],
|
||||
[115.473392, 28.724605],
|
||||
[115.477025, 28.73156],
|
||||
[115.489052, 28.734762],
|
||||
[115.514824, 28.731781],
|
||||
[115.526654, 28.739508],
|
||||
[115.535589, 28.732995],
|
||||
[115.550905, 28.73294],
|
||||
[115.559495, 28.729408],
|
||||
[115.546094, 28.70821],
|
||||
[115.55385, 28.69518],
|
||||
[115.553703, 28.683694],
|
||||
[115.546879, 28.673257],
|
||||
[115.543738, 28.649341],
|
||||
[115.539761, 28.642767],
|
||||
[115.547076, 28.632325],
|
||||
[115.541676, 28.631497],
|
||||
[115.547076, 28.62122],
|
||||
[115.537454, 28.61155],
|
||||
[115.525673, 28.607737],
|
||||
[115.527538, 28.582479],
|
||||
[115.553457, 28.580213],
|
||||
[115.574811, 28.589554],
|
||||
[115.587329, 28.573524],
|
||||
[115.582126, 28.568273],
|
||||
[115.566319, 28.565675],
|
||||
[115.56303, 28.55904],
|
||||
[115.569411, 28.542342],
|
||||
[115.568626, 28.530287],
|
||||
[115.572406, 28.514525],
|
||||
[115.562343, 28.514746],
|
||||
[115.560133, 28.503075],
|
||||
[115.567791, 28.497875],
|
||||
[115.54575, 28.481333],
|
||||
[115.55115, 28.453832],
|
||||
[115.541823, 28.442763],
|
||||
[115.553408, 28.430475],
|
||||
[115.551003, 28.409715],
|
||||
[115.53873, 28.4075],
|
||||
[115.531661, 28.39255],
|
||||
[115.540645, 28.393325],
|
||||
[115.552721, 28.387179],
|
||||
[115.559348, 28.389061],
|
||||
[115.565926, 28.399139],
|
||||
[115.576529, 28.396758],
|
||||
[115.588311, 28.399139],
|
||||
[115.589931, 28.409161],
|
||||
[115.598522, 28.417299],
|
||||
[115.618108, 28.418019],
|
||||
[115.616685, 28.409161],
|
||||
[115.622085, 28.398032],
|
||||
[115.638824, 28.397257],
|
||||
[115.648249, 28.392771],
|
||||
[115.654582, 28.381253],
|
||||
[115.652324, 28.375604],
|
||||
[115.63853, 28.366133],
|
||||
[115.630332, 28.348407],
|
||||
[115.621986, 28.345582],
|
||||
[115.635535, 28.337549],
|
||||
[115.648888, 28.334446],
|
||||
[115.659, 28.34464],
|
||||
[115.669996, 28.346247],
|
||||
[115.672549, 28.337383],
|
||||
[115.694296, 28.354723],
|
||||
[115.690958, 28.362145],
|
||||
[115.668278, 28.363198],
|
||||
[115.674218, 28.374995],
|
||||
[115.681238, 28.374275],
|
||||
[115.686883, 28.363253],
|
||||
[115.692332, 28.367629],
|
||||
[115.707304, 28.367407],
|
||||
[115.721688, 28.360151],
|
||||
[115.727038, 28.350457],
|
||||
[115.757278, 28.368515],
|
||||
[115.76847, 28.361591],
|
||||
[115.77765, 28.362145],
|
||||
[115.790757, 28.376269],
|
||||
[115.801409, 28.380422],
|
||||
[115.800575, 28.398586],
|
||||
[115.814222, 28.40296],
|
||||
[115.836067, 28.392328],
|
||||
[115.847897, 28.381585],
|
||||
[115.863213, 28.343145],
|
||||
[115.859875, 28.312726],
|
||||
[115.872049, 28.303249],
|
||||
[115.879364, 28.286899],
|
||||
[115.908818, 28.315108],
|
||||
[115.916525, 28.302695],
|
||||
[115.922121, 28.314942],
|
||||
[115.929779, 28.315164],
|
||||
[115.940284, 28.30735],
|
||||
[115.957662, 28.300644],
|
||||
[115.960018, 28.292774],
|
||||
[115.949709, 28.2813],
|
||||
[115.966105, 28.275978],
|
||||
[115.973861, 28.278861],
|
||||
[115.979949, 28.291056],
|
||||
[115.994577, 28.287785],
|
||||
[115.99659, 28.281743],
|
||||
[116.021135, 28.283905],
|
||||
[116.044305, 28.295989],
|
||||
[116.073513, 28.289005],
|
||||
[116.083626, 28.275812],
|
||||
[116.098107, 28.264447],
|
||||
[116.101151, 28.249477],
|
||||
[116.111362, 28.246095],
|
||||
[116.116025, 28.237167],
|
||||
[116.130408, 28.23029],
|
||||
[116.142386, 28.229125],
|
||||
[116.155788, 28.223136],
|
||||
[116.16428, 28.208659],
|
||||
[116.163004, 28.195734],
|
||||
[116.167717, 28.188799],
|
||||
[116.182002, 28.180587],
|
||||
[116.209001, 28.178423],
|
||||
[116.225495, 28.158558],
|
||||
[116.229815, 28.160278],
|
||||
[116.233202, 28.188854],
|
||||
[116.244198, 28.201836],
|
||||
[116.274388, 28.218199],
|
||||
[116.294957, 28.225243],
|
||||
[116.306837, 28.219253],
|
||||
[116.312875, 28.225631],
|
||||
[116.314789, 28.243045],
|
||||
[116.330154, 28.24554],
|
||||
[116.352147, 28.232619],
|
||||
[116.35627, 28.22663],
|
||||
[116.359265, 28.207605],
|
||||
[116.370555, 28.211044],
|
||||
[116.37625, 28.221472],
|
||||
[116.376053, 28.233229],
|
||||
[116.395885, 28.244819],
|
||||
[116.412281, 28.247703],
|
||||
[116.444926, 28.249089],
|
||||
[116.459948, 28.248035],
|
||||
[116.466967, 28.25236],
|
||||
[116.480271, 28.293716],
|
||||
[116.496667, 28.303637],
|
||||
[116.50241, 28.312559],
|
||||
[116.505405, 28.326966],
|
||||
[116.502459, 28.348075],
|
||||
[116.520573, 28.378152],
|
||||
[116.53638, 28.392938],
|
||||
[116.559845, 28.407057],
|
||||
[116.55906, 28.419901],
|
||||
[116.56549, 28.43684],
|
||||
[116.559649, 28.444977],
|
||||
[116.559011, 28.468164],
|
||||
[116.551402, 28.484321],
|
||||
[116.554887, 28.496879],
|
||||
[116.532306, 28.523263],
|
||||
[116.509381, 28.544775],
|
||||
[116.497697, 28.552682],
|
||||
[116.473938, 28.58364],
|
||||
[116.465789, 28.600719],
|
||||
[116.462746, 28.615142],
|
||||
[116.44311, 28.635972],
|
||||
[116.449393, 28.653649],
|
||||
[116.447871, 28.665028],
|
||||
[116.441293, 28.667789],
|
||||
[116.446742, 28.690817],
|
||||
[116.446497, 28.701198],
|
||||
[116.429708, 28.717429],
|
||||
[116.412281, 28.724053],
|
||||
[116.392204, 28.727807],
|
||||
[116.379931, 28.744034],
|
||||
[116.380471, 28.750105],
|
||||
[116.363192, 28.741219],
|
||||
[116.355337, 28.754188],
|
||||
[116.339629, 28.750325],
|
||||
[116.32014, 28.73846],
|
||||
[116.323969, 28.753581],
|
||||
[116.319846, 28.76699],
|
||||
[116.301781, 28.785804],
|
||||
[116.287103, 28.7879],
|
||||
[116.274241, 28.800091],
|
||||
[116.253967, 28.798547],
|
||||
[116.246407, 28.801801],
|
||||
[116.240026, 28.82458],
|
||||
[116.245818, 28.831859],
|
||||
[116.245867, 28.841288],
|
||||
[116.238111, 28.851433],
|
||||
[116.240026, 28.860805],
|
||||
[116.250236, 28.869019],
|
||||
[116.259907, 28.871279],
|
||||
[116.278954, 28.866373],
|
||||
[116.324215, 28.872381],
|
||||
[116.330891, 28.877838],
|
||||
[116.342083, 28.877673],
|
||||
[116.344439, 28.88831],
|
||||
[116.358725, 28.910298],
|
||||
[116.366972, 28.927158],
|
||||
[116.380766, 28.943684],
|
||||
[116.40428, 28.953929],
|
||||
[116.407225, 28.967973],
|
||||
[116.40806, 29.003818],
|
||||
[116.402365, 29.016314],
|
||||
[116.409778, 29.031561],
|
||||
[116.4005, 29.053023],
|
||||
[116.373157, 29.049666],
|
||||
[116.318127, 29.091424],
|
||||
[116.290784, 29.108969],
|
||||
[116.27105, 29.102149],
|
||||
[116.262018, 29.082513],
|
||||
[116.265307, 29.066448],
|
||||
[116.273898, 29.0462],
|
||||
[116.278217, 29.025231],
|
||||
[116.274732, 29.006956],
|
||||
[116.27051, 29.001121],
|
||||
[116.249893, 28.999414],
|
||||
[116.236884, 28.991982],
|
||||
[116.234479, 29.004369],
|
||||
[116.237817, 29.012241],
|
||||
[116.236049, 29.025727],
|
||||
[116.227901, 29.034368],
|
||||
[116.191869, 29.03866],
|
||||
[116.175227, 29.045484],
|
||||
[116.165606, 29.054344],
|
||||
[116.153235, 29.074041],
|
||||
[116.142288, 29.084493],
|
||||
[116.155199, 29.103359],
|
||||
[116.173509, 29.118098],
|
||||
[116.132519, 29.122387],
|
||||
[116.111951, 29.117768],
|
||||
[116.092757, 29.119473],
|
||||
[116.086179, 29.112764],
|
||||
[116.065659, 29.116503],
|
||||
[116.018631, 29.088563],
|
||||
[116.008421, 29.099289],
|
||||
[116.003315, 29.111334],
|
||||
[115.987852, 29.089279],
|
||||
[115.980685, 29.099729],
|
||||
[115.958005, 29.096594],
|
||||
[115.937486, 29.089664],
|
||||
[115.930024, 29.093789],
|
||||
[115.915101, 29.072115],
|
||||
[115.921385, 29.060451],
|
||||
[115.914463, 29.041852],
|
||||
[115.906019, 29.03057],
|
||||
[115.886924, 29.020057],
|
||||
[115.882702, 29.008388],
|
||||
[115.866944, 28.980969],
|
||||
[115.858304, 28.969626],
|
||||
[115.838865, 28.967092],
|
||||
[115.823549, 28.970341],
|
||||
[115.819671, 28.965715],
|
||||
[115.825905, 28.946163],
|
||||
[115.825021, 28.935972],
|
||||
[115.816578, 28.930078],
|
||||
[115.815989, 28.909527],
|
||||
[115.7992, 28.899387],
|
||||
[115.777503, 28.900379],
|
||||
[115.764199, 28.892444],
|
||||
[115.756149, 28.896246],
|
||||
[115.754185, 28.90622],
|
||||
[115.740538, 28.918838],
|
||||
[115.738378, 28.92848],
|
||||
[115.726793, 28.929967],
|
||||
[115.726302, 28.920877],
|
||||
[115.719626, 28.9168],
|
||||
[115.666364, 28.928921],
|
||||
[115.664645, 28.936633],
|
||||
[115.681876, 28.943133],
|
||||
[115.68109, 28.954976],
|
||||
[115.668425, 28.943849],
|
||||
[115.660915, 28.948752],
|
||||
[115.645157, 28.942032],
|
||||
[115.635437, 28.948642],
|
||||
[115.622968, 28.95123],
|
||||
[115.619287, 28.962852],
|
||||
[115.571228, 28.971112],
|
||||
[115.54251, 29.001011],
|
||||
[115.525329, 29.014993],
|
||||
[115.512811, 29.018461],
|
||||
[115.483603, 29.010314],
|
||||
[115.475552, 29.006186]
|
||||
]
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "Feature",
|
||||
"properties": {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<template>
|
||||
<div class='default-main'>
|
||||
<!-- 表头 -->
|
||||
<TableHeader date-picker>
|
||||
<!-- date-picker 时间组件 area区域组件-->
|
||||
<TableHeader date-picker area>
|
||||
<template v-slot:select>
|
||||
<el-form-item label='关键词:'>
|
||||
<el-input
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
v-model="formData.condition"
|
||||
multiple
|
||||
collapse-tags
|
||||
:multiple-limit="5"
|
||||
:multiple-limit="checked ? 1 : 3"
|
||||
filterable
|
||||
placeholder="请选择指标"
|
||||
@change="conditionChange"
|
||||
@@ -68,7 +68,13 @@
|
||||
|
||||
</el-form> -->
|
||||
<div id="canvas" class="mt10" :style="height1" style="overflow-y: auto" v-loading="loading">
|
||||
<my-echart :options="item.option" v-for="item in list" :style="height" @triggerPoint="triggerPoint" />
|
||||
<my-echart
|
||||
:options="item.option"
|
||||
v-for="item in list"
|
||||
style="min-height: 210px"
|
||||
:style="height"
|
||||
@triggerPoint="triggerPoint"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
|
||||
@@ -137,6 +143,7 @@ const typeOptions = ref([
|
||||
{ label: 'cp95值', value: 4 }
|
||||
])
|
||||
onMounted(() => {
|
||||
datePickerRef.value.setTheDate(5)
|
||||
init()
|
||||
})
|
||||
const height: any = ref(mainHeight(200, 1))
|
||||
@@ -144,6 +151,9 @@ const height1: any = ref(mainHeight(160))
|
||||
const checkChange = () => {
|
||||
if (checked.value) {
|
||||
monitoringPoint.setShowCheckBox(true)
|
||||
if (formData.condition.length > 0) {
|
||||
formData.condition = formData.condition.slice(0, 1)
|
||||
}
|
||||
} else {
|
||||
monitoringPoint.setShowCheckBox(false)
|
||||
init()
|
||||
@@ -157,6 +167,10 @@ const init = () => {
|
||||
formData.lineId = checked.value ? monitoringPoint.state.lineIds : [monitoringPoint.state.lineId]
|
||||
formData.searchBeginTime = datePickerRef.value.timeValue[0]
|
||||
formData.searchEndTime = datePickerRef.value.timeValue[1]
|
||||
|
||||
if (formData.lineId.length > 3) {
|
||||
return ElMessage.warning('最多只能选择3个监测点')
|
||||
}
|
||||
let directionValue = formData.condition.findIndex(item => {
|
||||
if (item === '39') {
|
||||
item = '50'
|
||||
@@ -165,6 +179,7 @@ const init = () => {
|
||||
return false
|
||||
}
|
||||
})
|
||||
|
||||
getHistoryResult(formData)
|
||||
.then(async (res: any) => {
|
||||
if (directionValue >= 0) {
|
||||
|
||||
@@ -13,7 +13,7 @@ import User from '@/views/pqs/runManage/assessment/components/uese/index.vue'
|
||||
import Assess from '@/views/pqs/runManage/assessment/components/assess/index.vue'
|
||||
import Dictionary from '@/views/pqs/runManage/assessment/components/dictionary/index.vue'
|
||||
defineOptions({
|
||||
// name: 'runManage/assessment'
|
||||
name: 'runManage/assessment'
|
||||
})
|
||||
const activeName = ref('1')
|
||||
</script>
|
||||
|
||||
@@ -109,7 +109,7 @@ const map = (res: any) => {
|
||||
color: ['#ccc', '#07CCCA ']
|
||||
},
|
||||
min: 0,
|
||||
max: res.reduce((max, obj) => Math.max(max, obj.value), 0),
|
||||
max: res.reduce((max, obj) => Math.max(max, obj.value), 0) || 1,
|
||||
calculable: true,
|
||||
textStyle: {
|
||||
color: '#000',
|
||||
|
||||
@@ -46,6 +46,16 @@ const options3 = ref({})
|
||||
const options4 = ref({})
|
||||
|
||||
const init = () => {
|
||||
let label = {
|
||||
normal: {
|
||||
show: true,
|
||||
textStyle: {
|
||||
//数值样式
|
||||
color: '#fff',
|
||||
fontSize: 14
|
||||
}
|
||||
}
|
||||
}
|
||||
loading.value = true
|
||||
formData.searchBeginTime = datePickerRef.value.timeValue[0]
|
||||
formData.searchEndTime = datePickerRef.value.timeValue[1]
|
||||
@@ -97,7 +107,7 @@ const init = () => {
|
||||
data: res[0].data.map(item => item.name)
|
||||
},
|
||||
yAxis: {
|
||||
name: '次数' // 给X轴加单位
|
||||
name: '个' // 给X轴加单位
|
||||
},
|
||||
color: ['#07CCCA', '#FFBF00'],
|
||||
options: {
|
||||
@@ -107,6 +117,7 @@ const init = () => {
|
||||
type: 'bar',
|
||||
barMaxWidth: 20,
|
||||
stack: 'account',
|
||||
|
||||
// color: 'green',
|
||||
data: res[0].data.map(item => item.onLine)
|
||||
},
|
||||
@@ -115,6 +126,7 @@ const init = () => {
|
||||
type: 'bar',
|
||||
barMaxWidth: 20,
|
||||
stack: 'account',
|
||||
|
||||
// color: 'orange',
|
||||
data: res[0].data.map(item => item.offLine)
|
||||
}
|
||||
@@ -136,7 +148,7 @@ const init = () => {
|
||||
data: res[1].data.map(item => item.name)
|
||||
},
|
||||
yAxis: {
|
||||
name: '次数' // 给X轴加单位
|
||||
name: '个' // 给X轴加单位
|
||||
},
|
||||
color: ['#07CCCA', '#FFBF00'],
|
||||
options: {
|
||||
@@ -146,6 +158,7 @@ const init = () => {
|
||||
type: 'bar',
|
||||
barMaxWidth: 20,
|
||||
stack: 'account',
|
||||
|
||||
// color: 'green',
|
||||
data: res[1].data.map(item => item.onLine)
|
||||
},
|
||||
@@ -154,6 +167,7 @@ const init = () => {
|
||||
type: 'bar',
|
||||
barMaxWidth: 20,
|
||||
stack: 'account',
|
||||
|
||||
// color: 'orange',
|
||||
data: res[1].data.map(item => item.offLine)
|
||||
}
|
||||
@@ -175,7 +189,7 @@ const init = () => {
|
||||
data: res[0].data.map(item => item.name)
|
||||
},
|
||||
yAxis: {
|
||||
name: '次数' // 给X轴加单位
|
||||
name: '次' // 给X轴加单位
|
||||
},
|
||||
color: ['#07CCCA', '#FFBF00', '#77DA63'],
|
||||
options: {
|
||||
@@ -184,6 +198,7 @@ const init = () => {
|
||||
name: '暂降次数',
|
||||
type: 'bar',
|
||||
stack: 'account',
|
||||
|
||||
barWidth: 20,
|
||||
|
||||
data: res[0].data.map(item => item.sagsCount)
|
||||
@@ -192,6 +207,7 @@ const init = () => {
|
||||
name: '中断次数',
|
||||
type: 'bar',
|
||||
stack: 'account',
|
||||
|
||||
barWidth: 20,
|
||||
|
||||
data: res[0].data.map(item => item.breakCount)
|
||||
@@ -200,6 +216,7 @@ const init = () => {
|
||||
name: '暂升次数',
|
||||
type: 'bar',
|
||||
stack: 'account',
|
||||
|
||||
barWidth: 20,
|
||||
|
||||
data: res[0].data.map(item => item.upCount)
|
||||
@@ -222,7 +239,7 @@ const init = () => {
|
||||
data: res[1].data.map(item => item.name)
|
||||
},
|
||||
yAxis: {
|
||||
name: '次数'
|
||||
name: '次'
|
||||
},
|
||||
options: {
|
||||
series: [
|
||||
@@ -230,6 +247,7 @@ const init = () => {
|
||||
name: '暂降次数',
|
||||
type: 'bar',
|
||||
stack: 'account',
|
||||
|
||||
barWidth: 20,
|
||||
|
||||
data: res[1].data.map(item => item.sagsCount)
|
||||
@@ -238,6 +256,7 @@ const init = () => {
|
||||
name: '中断次数',
|
||||
type: 'bar',
|
||||
stack: 'account',
|
||||
|
||||
barWidth: 20,
|
||||
|
||||
data: res[1].data.map(item => item.breakCount)
|
||||
|
||||
Reference in New Issue
Block a user