Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd
姜玉琦
commit
871964321d
|
|
@ -6,6 +6,7 @@ import dict from "./dict";
|
|||
import greenCarbon from "./greenCarbon";
|
||||
import videoMonitor from "./videoMonitor";
|
||||
import safety from "./safety";
|
||||
import tower from "./tower";
|
||||
export default {
|
||||
http: axios,
|
||||
downFile: download,
|
||||
|
|
@ -16,4 +17,5 @@ export default {
|
|||
greenCarbon,
|
||||
videoMonitor,
|
||||
safety,
|
||||
tower,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
import request from "@/utils/request";
|
||||
// 查询塔基配置列表
|
||||
const findTowerConfigGroupOnline = (data) => {
|
||||
return request({
|
||||
url: `/manage/bgscreen/tower/findTowerConfigGroupOnline`,
|
||||
method: "get",
|
||||
params: data,
|
||||
});
|
||||
};
|
||||
|
||||
// 查询塔基配置列表
|
||||
const findTowerConfigListByProjectId = (data) => {
|
||||
return request({
|
||||
url: `/manage/bgscreen/tower/findTowerConfigListByProjectId`,
|
||||
method: "get",
|
||||
params: data,
|
||||
});
|
||||
};
|
||||
|
||||
// 查询塔基运行统计
|
||||
const findTowerStatisticsView = (deviceSn) => {
|
||||
return request({
|
||||
url: `/manage/bgscreen/tower/findTowerStatisticsView?deviceSn=${deviceSn}`,
|
||||
method: "get",
|
||||
});
|
||||
};
|
||||
|
||||
// 查询塔基限位数据
|
||||
const selectDevTowerDataLimitList = (deviceSn) => {
|
||||
return request({
|
||||
url: `/manage/bgscreen/tower/selectDevTowerDataLimitList?deviceKey=${deviceSn}&pageNum=1&pageSize=10`,
|
||||
method: "get",
|
||||
});
|
||||
};
|
||||
|
||||
// 查询塔基实时数据
|
||||
const selectDevTowerDataRunList = (deviceSn) => {
|
||||
return request({
|
||||
url: `manage/bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10&warnings=Y`,
|
||||
method: "get",
|
||||
});
|
||||
};
|
||||
|
||||
export default {
|
||||
findTowerConfigGroupOnline,
|
||||
findTowerConfigListByProjectId,
|
||||
findTowerStatisticsView,
|
||||
selectDevTowerDataLimitList,
|
||||
selectDevTowerDataRunList,
|
||||
};
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<svg class="icon" style="
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
vertical-align: middle;
|
||||
fill: currentColor;
|
||||
overflow: hidden;
|
||||
" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11357">
|
||||
<path
|
||||
d="M511.362506 77.130254A435.935081 435.935081 0 0 0 75.427425 511.360799 435.935081 435.935081 0 0 0 511.362506 948.574282a435.935081 435.935081 0 0 0 434.656679-437.213483A435.935081 435.935081 0 0 0 511.362506 77.130254zM511.362506 1.278402a511.360799 511.360799 0 0 1 511.360799 511.360799 511.360799 511.360799 0 0 1-511.360799 511.360799A511.360799 511.360799 0 0 1 0.001707 512.639201 511.360799 511.360799 0 0 1 511.362506 0zM322.585144 283.379109a37.499792 37.499792 0 0 0-53.26675 0 37.925926 37.925926 0 0 0 0 53.692884l131.675406 131.675406a121.022056 121.022056 0 0 0-13.636288 56.675822A124.004994 124.004994 0 0 0 511.362506 649.428215a124.004994 124.004994 0 0 0 124.004993-124.004994A124.004994 124.004994 0 0 0 511.362506 401.418227a124.857262 124.857262 0 0 0-56.675822 13.636288zM511.362506 477.270079a48.579276 48.579276 0 0 1 48.153142 48.153142A48.153142 48.153142 0 0 1 511.362506 573.576363a48.153142 48.153142 0 0 1-48.579276-48.153142A48.579276 48.579276 0 0 1 511.362506 477.270079z m-281.24844-51.13608a302.981273 302.981273 0 0 0-14.91469 98.01082 37.925926 37.925926 0 0 0 37.925926 37.925926 37.499792 37.499792 0 0 0 37.499792-37.925926 235.652102 235.652102 0 0 1 11.079484-74.147316 37.499792 37.499792 0 0 0-23.863504-47.727008 37.073658 37.073658 0 0 0-47.727008 23.863504zM511.362506 227.98169a317.895963 317.895963 0 0 0-98.436954 14.91469 38.35206 38.35206 0 0 0-23.863504 47.727007 38.35206 38.35206 0 0 0 48.153142 24.289638A235.652102 235.652102 0 0 1 511.362506 303.833541a221.163546 221.163546 0 0 1 221.589679 221.58968 37.925926 37.925926 0 0 0 37.925926 37.925926 37.925926 37.925926 0 0 0 37.925926-37.925926A298.293799 298.293799 0 0 0 511.362506 229.260092z"
|
||||
p-id="11358"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
|
|
@ -0,0 +1,11 @@
|
|||
<svg class="icon" style="
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
vertical-align: middle;
|
||||
fill: currentColor;
|
||||
overflow: hidden;
|
||||
" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6961">
|
||||
<path
|
||||
d="M174.5 394.1h331.2c91 0 166-73.2 166.3-164.2 0.3-91-73.7-165.1-164.7-165.1-43.2 0-84 16.6-114.9 46.7-15.5 15.1-27.7 32.9-36.2 52.2-12.7 29.1 8.4 61.7 40.1 62.6 18.5 0.5 35.2-10.4 42.6-27.3 11.6-26.2 37.7-44.2 68.3-44.2 41.4 0 75.1 33.9 74.7 75.4-0.4 41.1-34.5 73.9-75.6 73.9H174.5c-24.9 0-45 20.1-45 45s20.2 45 45 45zM189.3 634.2l0.6 45-0.6-45zM682 626.9c-0.6 0-0.8 0-427.3 6.3-7.3 0.1-14.2 0.2-20.5 0.3-24.8 0.4-44.7 20.8-44.3 45.6 0.3 24.9 20.8 44.8 45.7 44.4 6.3-0.1 13.2-0.2 20.5-0.3 124.9-1.9 415.3-6.2 426.2-6.3 42.8 0.2 77.2 36.5 74.2 80-2.8 39.8-35.9 70-75.7 69.3-30.2-0.5-55.9-18.5-67.2-44.5-7.3-16.8-24.1-27.5-42.5-27-31.7 0.9-52.8 33.5-40.1 62.6 8.4 19.4 20.6 37.1 36.2 52.2 30.9 30.1 71.8 46.7 115 46.7 91.8-0.1 166.8-77 164.5-168.8-2.3-88.9-75.3-160.5-164.7-160.5zM856.6 240.3c-29-11.5-60.5 10.1-60.5 41.4v1.3c0 18 10.9 34.4 27.6 41.1 27.5 11 47 38 47 69.4 0 41.2-33.5 74.7-74.7 74.7H112.6c-24.9 0-45 20.1-45 45s20.1 45 45 45h683.5c90.8 0 164.7-73.9 164.7-164.7-0.1-69.5-43.3-129-104.2-153.2z"
|
||||
p-id="6962"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -0,0 +1,11 @@
|
|||
<svg class="icon" style="
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
vertical-align: middle;
|
||||
fill: currentColor;
|
||||
overflow: hidden;
|
||||
" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7867">
|
||||
<path
|
||||
d="M675.84 102.4c36.7616 0 66.56 29.7984 66.56 66.56v148.48h122.88c36.23424 0 65.70496 28.9536 66.53952 64.98816L931.84 384v481.28c0 36.7616-29.7984 66.56-66.56 66.56H158.72c-36.7616 0-66.56-29.7984-66.56-66.56V384c0-36.7616 29.7984-66.56 66.56-66.56h122.88V168.96c0-36.23424 28.9536-65.70496 64.98816-66.53952L348.16 102.4z m184.32 286.72H163.84v471.04h696.32V389.12z m-209.92 107.52a10.24 10.24 0 0 1 10.24 10.24v51.2a10.24 10.24 0 0 1-10.24 10.24h-102.40512l0.00512 194.56a10.24 10.24 0 0 1-10.24 10.24H486.4a10.24 10.24 0 0 1-10.24-10.24l-0.00512-194.56H373.76a10.24 10.24 0 0 1-10.24-10.24V506.88a10.24 10.24 0 0 1 10.24-10.24h276.48z m20.48-322.56H353.28v143.36h317.44V174.08z"
|
||||
p-id="7868"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
|
|
@ -0,0 +1,11 @@
|
|||
<svg class="icon" style="
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
vertical-align: middle;
|
||||
fill: currentColor;
|
||||
overflow: hidden;
|
||||
" viewBox="0 0 1042 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8742">
|
||||
<path
|
||||
d="M760.685714 376.685714l27.428572-56.685714c9.142857-18.285714 16.457143-36.571429 25.6-53.028571h1.828571c9.142857 16.457143 20.114286 34.742857 29.257143 53.028571l32.914286 56.685714h85.942857l-95.085714-149.942857 89.6-155.428571h-82.285715l-25.6 53.028571c-7.314286 18.285714-14.628571 34.742857-21.942857 51.2h-1.828571c-9.142857-16.457143-18.285714-34.742857-27.428572-51.2L768 71.314286h-85.942857l89.6 146.285714-95.085714 159.085714h84.114285zM213.942857 877.714286H162.742857V73.142857h-73.142857v841.142857c0 20.114286 16.457143 36.571429 36.571429 36.571429h841.142857v-73.142857H213.942857zM522.624 464.512l-51.712 51.730286 51.712 51.712 51.730286-51.712-51.730286-51.730286zM315.757714 671.049143l-51.730285 51.712 51.730285 51.712 51.712-51.712-51.712-51.712zM421.705143 570.916571l-51.748572 51.712 51.730286 51.730286 51.730286-51.712-51.712-51.730286zM212.315429 773.010286l-51.712 51.712 51.712 51.730285 51.730285-51.730285-51.730285-51.712zM307.2 398.628571l51.2-51.2-64-64c109.714286 9.142857 210.285714 53.028571 288.914286 120.685715l-9.142857 9.142857 51.2 51.2 9.142857-9.142857c67.657143 74.971429 113.371429 170.057143 128 276.114285l-60.342857-60.342857-51.2 51.2 128 128c7.314286 7.314286 16.457143 10.971429 25.6 10.971429 9.142857 0 18.285714-3.657143 25.6-10.971429l128-128-51.2-51.2-69.485715 69.485715C808.228571 457.142857 576 232.228571 290.742857 212.114286l67.657143-67.657143-51.2-51.2-128 128c-14.628571 14.628571-14.628571 36.571429 0 51.2l128 126.171428z"
|
||||
p-id="8743"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.0 KiB |
|
|
@ -0,0 +1,13 @@
|
|||
<svg class="icon" style="
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
vertical-align: middle;
|
||||
fill: currentColor;
|
||||
overflow: hidden;
|
||||
" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9822">
|
||||
<path d="M894.56 268.64l31.68 59.52-391.2 208.32-31.68-59.52 391.2-208.32z"
|
||||
p-id="9823"></path>
|
||||
<path
|
||||
d="M512 33.44C247.52 33.44 33.44 247.52 33.44 512s214.08 478.56 478.56 478.56 478.56-214.08 478.56-478.56S776.48 33.44 512 33.44z m0 852c-202.08 0-366.24-167.52-366.24-374.88S309.92 135.68 512 135.68s366.24 167.52 366.24 374.88-163.68 374.88-366.24 374.88z"
|
||||
p-id="9824"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 930 B |
|
|
@ -0,0 +1,11 @@
|
|||
<svg class="icon" style="
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
vertical-align: middle;
|
||||
fill: currentColor;
|
||||
overflow: hidden;
|
||||
" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10417">
|
||||
<path
|
||||
d="M819.198 910.218 204.799 910.218c-50.267 0-91.022-40.75-91.022-91.02L113.777 204.822c0-50.29 40.755-91.045 91.022-91.045l614.398 0c50.27 0 91.02 40.755 91.02 91.045l0 614.376C910.218 869.468 869.468 910.218 819.198 910.218zM841.953 227.554c0-25.122-20.385-45.51-45.51-45.51L227.554 182.044c-25.122 0-45.51 20.387-45.51 45.51l0 568.889c0 25.125 20.387 45.535 45.51 45.535l568.889 0c25.125 0 45.51-20.39 45.51-45.535L841.953 227.554zM603.268 400.952l-57.14-57.115 0 335.802 55.505-55.5c13.335-13.31 34.93-13.335 48.265 0 13.33 13.335 13.33 34.95 0 48.29l-105.77 105.765c-1.615 3.415-3.525 6.78-6.37 9.625-7.1 7.08-16.475 10.1-25.76 9.67-9.262 0.46-18.66-2.59-25.76-9.69-2.842-2.85-4.8-6.15-6.347-9.58l-105.79-105.79c-13.335-13.34-13.335-34.955 0-48.29 13.332-13.31 34.927-13.335 48.262 0l55.502 55.5L477.865 343.837l-57.117 57.115c-13.335 13.357-34.952 13.335-48.287 0s-13.335-34.93 0-48.265l115.395-115.37c13.332-13.335 34.927-13.357 48.262 0l115.395 115.37c13.335 13.335 13.335 34.952 0 48.265C638.198 414.286 616.583 414.286 603.268 400.952z"
|
||||
p-id="10418"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -0,0 +1,8 @@
|
|||
<svg class="my-svg-icon-blue"
|
||||
style="vertical-align: middle; fill: currentColor; overflow: hidden"
|
||||
viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
|
||||
p-id="3054">
|
||||
<path
|
||||
d="M929.84 550.848a29.155 29.155 0 0 0 29.153-29.154V347.16a29.282 29.282 0 0 0-17.9-27.291c-0.028-0.012-0.055-0.019-0.082-0.029L358.4 67.362a0.324 0.324 0 0 0-0.038-0.014 29.452 29.452 0 0 0-25.538 1.186L80.374 204.472A29.229 29.229 0 0 0 65 230.2v291.5a29.155 29.155 0 0 0 29.157 29.15h111.9a87.872 87.872 0 0 0 53.29 53.293V900.69h-87.453a29.155 29.155 0 0 0 0 58.309h408.125a29.155 29.155 0 0 0 0-58.309h-87.456V609.154h29.153a87.594 87.594 0 0 0 82.441-58.306h238.228v145.767a29.154 29.154 0 0 0 29.152 29.154 29.155 29.155 0 1 1-20.612 49.77 29.152 29.152 0 0 0-41.225 41.228 87.471 87.471 0 1 0 90.99-144.342V550.85h29.15zM375.957 317.62h29.152c70.392 0 129.283 50.159 142.826 116.613H405.109a29.187 29.187 0 0 1-29.152-29.154V317.62z m-174.91 174.922h-77.739V375.929h77.739v116.613z m5.013-174.922h-82.752v-70.047l194.346-104.654v116.4H288.5a87.6 87.6 0 0 0-82.44 58.301z m111.594 583.069v-75.384l75.379 75.384h-75.379zM434.26 859.46L329.728 754.922 434.26 650.383V859.46zM317.654 684.539v-75.385h75.379z m233.214-162.845a29.187 29.187 0 0 1-29.152 29.154H288.5a29.187 29.187 0 0 1-29.152-29.154v-174.92A29.187 29.187 0 0 1 288.5 317.62h29.153v87.461a87.557 87.557 0 0 0 87.455 87.461h145.76v29.152z m-3.1-204.074a203.383 203.383 0 0 0-142.659-58.306h-29.154v-120.8l413.3 179.1H547.766z m61.406 174.922v-29.155a203.612 203.612 0 0 0-7.079-53.31l82.458 82.463h-75.381zM650.4 375.927h209.063L754.931 480.465z m174.91 116.615l75.38-75.383v75.383h-75.38z"
|
||||
fill="" p-id="3341"></path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.9 KiB |
|
|
@ -206,6 +206,9 @@ export default {
|
|||
case 301:
|
||||
this.$router.push("/safetyCheck");
|
||||
break;
|
||||
case 304:
|
||||
this.$router.push("/towerCrane");
|
||||
break;
|
||||
case 4:
|
||||
this.$router.push("/prjQuality");
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1,51 +1,51 @@
|
|||
<template>
|
||||
<div :style="{'height': height}" ref="chart"></div>
|
||||
<div :style="{ 'height': height, 'width': width }" ref="chart"></div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
height:{
|
||||
type:String
|
||||
height: {
|
||||
type: [Number, String]
|
||||
},
|
||||
data:{
|
||||
type:Array
|
||||
data: {
|
||||
type: Array
|
||||
},
|
||||
width:{
|
||||
type:Number
|
||||
width: {
|
||||
type: [Number, String]
|
||||
},
|
||||
max:{
|
||||
type:Number
|
||||
max: {
|
||||
type: Number
|
||||
},
|
||||
unit: {
|
||||
type:String
|
||||
type: String
|
||||
}
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart:null,
|
||||
chart: null,
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
mounted() {
|
||||
this.init()
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
init(){
|
||||
init() {
|
||||
this.getChartData()
|
||||
},
|
||||
chartClick(p){
|
||||
this.$emit("chart-click",p);
|
||||
chartClick(p) {
|
||||
this.$emit("chart-click", p);
|
||||
},
|
||||
getChartData(){
|
||||
getChartData() {
|
||||
//品类金额占比 饼图
|
||||
var chChart = echarts.init(this.$refs.chart);
|
||||
this.chart=chChart;
|
||||
chChart.on("click",this.chartClick)
|
||||
this.echart(chChart,this.data)
|
||||
this.chart = chChart;
|
||||
chChart.on("click", this.chartClick)
|
||||
this.echart(chChart, this.data)
|
||||
},
|
||||
echart(chChart,chartData){
|
||||
let fontSize=this.$dpi()=='1K'?'12':this.$dpi()=='2K'?'14':'24';
|
||||
echart(chChart, chartData) {
|
||||
let fontSize = this.$dpi() == '1K' ? '12' : this.$dpi() == '2K' ? '14' : '24';
|
||||
let newPromise = new Promise((resolve) => {
|
||||
resolve()
|
||||
})
|
||||
|
|
@ -60,24 +60,24 @@ export default {
|
|||
value.push(chartData[i].value)
|
||||
text.push(chartData[i].text)
|
||||
bgData.push(100)
|
||||
if(this.max){
|
||||
if (this.max) {
|
||||
total = this.max
|
||||
}else{
|
||||
} else {
|
||||
total += chartData[i].value
|
||||
}
|
||||
}
|
||||
|
||||
var prop = []
|
||||
for (let j = 0; j < value.length; j++) {
|
||||
if(total == 0){
|
||||
if (total == 0) {
|
||||
prop.push(0)
|
||||
}else{
|
||||
prop.push((value[j]/total * 100).toFixed(1))
|
||||
} else {
|
||||
prop.push((value[j] / total * 100).toFixed(1))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var unit = '人'
|
||||
if(this.unit){
|
||||
if (this.unit) {
|
||||
unit = this.unit
|
||||
}
|
||||
|
||||
|
|
@ -93,14 +93,14 @@ export default {
|
|||
xAxis: [{
|
||||
show: false,
|
||||
},
|
||||
//由于下边X轴已经是百分比刻度了,所以需要在顶部加一个X轴,刻度是金额,也隐藏掉
|
||||
{
|
||||
show: false,
|
||||
}
|
||||
//由于下边X轴已经是百分比刻度了,所以需要在顶部加一个X轴,刻度是金额,也隐藏掉
|
||||
{
|
||||
show: false,
|
||||
}
|
||||
],
|
||||
yAxis: [
|
||||
yAxis: [
|
||||
{
|
||||
triggerEvent:true,
|
||||
triggerEvent: true,
|
||||
type: 'category',
|
||||
axisLabel: {
|
||||
show: false, //让Y轴数据不显示
|
||||
|
|
@ -115,8 +115,8 @@ export default {
|
|||
show: false, //隐藏Y轴线段
|
||||
},
|
||||
data: [],
|
||||
},{
|
||||
triggerEvent:true,
|
||||
}, {
|
||||
triggerEvent: true,
|
||||
show: false,
|
||||
data: [],
|
||||
axisLine: {
|
||||
|
|
@ -130,7 +130,7 @@ export default {
|
|||
type: 'bar',
|
||||
xAxisIndex: 1, //代表使用第二个X轴刻度!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
barGap: '-100%',
|
||||
barWidth: this.$dpi()=='1K'?'6':this.$dpi()=='2K'?'8':'16', //统计条宽度
|
||||
barWidth: this.$dpi() == '1K' ? '6' : this.$dpi() == '2K' ? '8' : '16', //统计条宽度
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: 'rgba(22,203,115,0.05)'
|
||||
|
|
@ -141,53 +141,53 @@ export default {
|
|||
show: true,
|
||||
//label 的position位置可以是top bottom left,right,也可以是固定值
|
||||
//在这里需要上下统一对齐,所以用固定值
|
||||
position: [0, this.$dpi()=='1K'?'-25':this.$dpi()=='2K'?'-40':'-50'],
|
||||
position: [0, this.$dpi() == '1K' ? '-25' : this.$dpi() == '2K' ? '-40' : '-50'],
|
||||
rich: { //富文本
|
||||
prop: { //自定义颜色
|
||||
color: '#c6d9fa',
|
||||
fontSize:fontSize,
|
||||
fontSize: fontSize,
|
||||
},
|
||||
unit:{
|
||||
unit: {
|
||||
color: '#6c829a',
|
||||
fontSize:fontSize,
|
||||
fontSize: fontSize,
|
||||
},
|
||||
yes:{
|
||||
yes: {
|
||||
color: '#55adf7',
|
||||
fontSize:fontSize,
|
||||
fontSize: fontSize,
|
||||
},
|
||||
not:{
|
||||
not: {
|
||||
color: '#4677fa',
|
||||
fontSize:fontSize,
|
||||
fontSize: fontSize,
|
||||
},
|
||||
index:{
|
||||
index: {
|
||||
color: '#fcbc02',
|
||||
fontStyle: 'italic',
|
||||
padding:[0,0,0,5],
|
||||
fontSize:fontSize,
|
||||
padding: [0, 0, 0, 5],
|
||||
fontSize: fontSize,
|
||||
},
|
||||
name: {
|
||||
width: this.width,
|
||||
color: '#c6d9fa',
|
||||
padding:[0,0,0,10],
|
||||
fontSize:fontSize,
|
||||
padding: [0, 0, 0, 10],
|
||||
fontSize: fontSize,
|
||||
},
|
||||
color:{
|
||||
color: {
|
||||
color: '#8ca2be',
|
||||
fontSize:fontSize,
|
||||
fontSize: fontSize,
|
||||
},
|
||||
arrow:{
|
||||
width:this.$dpi()=='1K'?12:this.$dpi()=='2K'?16:24,
|
||||
height:this.$dpi()=='1K'?8:this.$dpi()=='2K'?12:20,
|
||||
arrow: {
|
||||
width: this.$dpi() == '1K' ? 12 : this.$dpi() == '2K' ? 16 : 24,
|
||||
height: this.$dpi() == '1K' ? 8 : this.$dpi() == '2K' ? 12 : 20,
|
||||
backgroundColor: {
|
||||
image: "/cdn/images/WEB_2B7C06210CD44D55BFEE6205A35DE4A7.png",
|
||||
},
|
||||
},
|
||||
|
||||
},
|
||||
formatter: (data)=>{
|
||||
formatter: (data) => {
|
||||
//富文本固定格式{colorName|这里填你想要写的内容}
|
||||
//return '{arrow|}'
|
||||
return '{arrow|}{name|' + text[data.dataIndex] + '}{prop|' + value[data.dataIndex] + '}{color| '+unit+'} {prop|'+prop[data.dataIndex]+'}{color| %} ';
|
||||
return '{arrow|}{name|' + text[data.dataIndex] + '}{prop|' + value[data.dataIndex] + '}{color| ' + unit + '} {prop|' + prop[data.dataIndex] + '}{color| %} ';
|
||||
},
|
||||
}
|
||||
},
|
||||
|
|
@ -223,14 +223,12 @@ export default {
|
|||
})
|
||||
},
|
||||
},
|
||||
watch:{
|
||||
data: function (n,o) {
|
||||
watch: {
|
||||
data: function (n, o) {
|
||||
this.getChartData()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
<style></style>
|
||||
|
|
@ -0,0 +1,183 @@
|
|||
/**
|
||||
* 顶部header
|
||||
*/
|
||||
Vue.component("tower-crane-value-1", {
|
||||
template: `
|
||||
<div class="safe-tower-content">
|
||||
<div class="safe-tower-content-title">
|
||||
<span v-html="value.deviceName+' #前臂'+value.frontBrachium+' m'+' #后臂'+value.afterBrachium+' m'"></span>
|
||||
</div>
|
||||
<div class="safe-tower-content-data">
|
||||
<el-row>
|
||||
<el-col :span="3">
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>塔身高度</p>
|
||||
<div><span v-html="value.towerBodyHeight">0</span> m</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>当前吊重</p>
|
||||
<div><span v-html="tLoad">0</span> t</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>当前回转</p>
|
||||
<div><span v-html="tRotation">0</span> °</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>当前幅度</p>
|
||||
<div><span v-html="tRange"></span> m</div>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="18">
|
||||
<div class="safe-tower-icon">
|
||||
<!--<tower-crane-icon :width="360" :height="200" :top="55" :left="85" :ampdata="ampData"
|
||||
:forearmlength="foreArmLength" :heightdata="heightData" :downheight="downHeight"
|
||||
:angledata="angleData"></tower-crane-icon>-->
|
||||
<div class="sf-equipment-overview-bgd">
|
||||
<div class="sf-slider-track" :style="{'width':width+'px','height':height+'px','top':top+'px','left':left+'px'}">
|
||||
<div class="sf-slider-track-min" id="slider">
|
||||
<div class="sf-slider"></div>
|
||||
<div class="sf-towrope" id="towrope"></div>
|
||||
<div class="sf-hook"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="circular">
|
||||
<div class="needle rotate" id="needle" >
|
||||
<div class="dot-track">
|
||||
<div class="dot" id="dot">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>水平倾角</p>
|
||||
<div><span v-html="tLeanAngleX">0</span> °</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>垂直倾角</p>
|
||||
<div><span v-html="tLeanAngleY">0</span> °</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>重量百分比</p>
|
||||
<div><span v-html="tLoadPercent">0</span> %</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>力矩百分比</p>
|
||||
<div><span v-html="tMomentPercent"></span> %</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`,
|
||||
props: {
|
||||
value:{
|
||||
type:Object
|
||||
},
|
||||
width:{
|
||||
type:Number
|
||||
},
|
||||
height:{
|
||||
type:Number
|
||||
},
|
||||
top:{
|
||||
type:Number
|
||||
},
|
||||
left:{
|
||||
type:Number
|
||||
},
|
||||
tHeight:{
|
||||
type:String
|
||||
},
|
||||
tLoad:{
|
||||
type:String
|
||||
},
|
||||
tRotation:{
|
||||
type:String
|
||||
},
|
||||
tRange:{
|
||||
type:String
|
||||
},
|
||||
tLeanAngleX:{
|
||||
type:String
|
||||
},
|
||||
tLeanAngleY:{
|
||||
type:String
|
||||
},
|
||||
tLoadPercent:{
|
||||
type:String
|
||||
},
|
||||
tMomentPercent:{
|
||||
type:String
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
//this.animation()
|
||||
},
|
||||
methods: {
|
||||
animation(){
|
||||
var leftValue = this.tRange //幅度
|
||||
var brachium = this.value.frontBrachium //臂长 //定制
|
||||
|
||||
leftValue = leftValue < 0 ? 0 : leftValue
|
||||
var left = leftValue / brachium * 100
|
||||
|
||||
var heightValue = this.tHeight //高度
|
||||
var towerHeight = this.towerBodyHeight //塔身高度
|
||||
|
||||
var height = (towerHeight - heightValue) * this.height / towerHeight
|
||||
height = height > this.height ? this.height : height
|
||||
|
||||
var value = Number(this.tLeanAngleX) //角度
|
||||
var degValue = -value
|
||||
setTimeout(function () {
|
||||
$("#slider").animate({left:left+'%'},1000);
|
||||
$("#dot").animate({left:left+'%'},1000);
|
||||
$("#needle").css("transform","rotate("+degValue+"deg)")
|
||||
setTimeout(function () {
|
||||
$("#towrope").animate({height:height+'px'},1000);
|
||||
},1000)
|
||||
},1000)
|
||||
},
|
||||
},
|
||||
watch:{
|
||||
value:function () {
|
||||
this.animation()
|
||||
},
|
||||
tHeight:function () {
|
||||
this.animation()
|
||||
},
|
||||
tLoad:function () {
|
||||
this.animation()
|
||||
},
|
||||
tRotation:function () {
|
||||
this.animation()
|
||||
},
|
||||
tRange:function () {
|
||||
this.animation()
|
||||
},
|
||||
tLeanAngleX:function () {
|
||||
this.animation()
|
||||
},
|
||||
tLeanAngleY:function () {
|
||||
this.animation()
|
||||
},
|
||||
tLoadPercent:function () {
|
||||
this.animation()
|
||||
},
|
||||
tMomentPercent:function () {
|
||||
this.animation()
|
||||
},
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -0,0 +1,165 @@
|
|||
/**
|
||||
* 顶部header
|
||||
*/
|
||||
Vue.component("tower-crane-value-2", {
|
||||
template: `
|
||||
<div class="safe-tower-content">
|
||||
<div class="safe-tower-content-title">
|
||||
<span v-html="value.name"></span>
|
||||
</div>
|
||||
<div class="safe-tower-content-data">
|
||||
<el-row>
|
||||
<el-col :span="3">
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>后臂长</p>
|
||||
<div><span v-html="value.postArmLength">0</span> m</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>前臂长</p>
|
||||
<div><span v-html="value.foreArmLength">0</span> m</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>塔身高</p>
|
||||
<div><span v-html="value.downHeight">0</span> m</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>功率</p>
|
||||
<div><span v-html="value.power"></span> kw</div>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="18">
|
||||
<div class="safe-tower-icon">
|
||||
<!--<tower-crane-icon :width="360" :height="200" :top="55" :left="85" :ampdata="ampData"
|
||||
:forearmlength="foreArmLength" :heightdata="heightData" :downheight="downHeight"
|
||||
:angledata="angleData"></tower-crane-icon>-->
|
||||
<div class="sf-equipment-overview-bgd">
|
||||
<div class="sf-slider-track" :style="{'width':width+'px','height':height+'px','top':top+'px','left':left+'px'}">
|
||||
<div class="sf-slider-track-min" id="slider">
|
||||
<div class="sf-slider"></div>
|
||||
<div class="sf-towrope" id="towrope"></div>
|
||||
<div class="sf-hook"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="circular">
|
||||
<div class="needle rotate" id="needle" >
|
||||
<div class="dot-track">
|
||||
<div class="dot" id="dot">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>力矩比</p>
|
||||
<div><span v-html="value.torqueData">0</span> %</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>安全吊重</p>
|
||||
<div><span v-html="value.overload">0</span> t</div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>进场时间</p>
|
||||
<div class="safe-tower-content-data-list-time"><span v-html="value.enterTime">0</span></div>
|
||||
</div>
|
||||
<div class="safe-tower-content-data-list">
|
||||
<p>扶墙高度</p>
|
||||
<div><span style="font-size: 16px;" v-html="value.buttress"></span></div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`,
|
||||
props: {
|
||||
value:{
|
||||
type:Object
|
||||
},
|
||||
width:{
|
||||
type:Number
|
||||
},
|
||||
height:{
|
||||
type:Number
|
||||
},
|
||||
top:{
|
||||
type:Number
|
||||
},
|
||||
left:{
|
||||
type:Number
|
||||
},
|
||||
ampdata:{
|
||||
type:Number
|
||||
},
|
||||
forearmlength:{
|
||||
type:Number
|
||||
},
|
||||
heightdata:{
|
||||
type:Number
|
||||
},
|
||||
downheight:{
|
||||
type:Number
|
||||
},
|
||||
angledata:{
|
||||
type:Number
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
this.animation()
|
||||
},
|
||||
methods: {
|
||||
animation(){
|
||||
var leftValue = this.ampdata //幅度
|
||||
var brachium = this.forearmlength //臂长 //定制
|
||||
|
||||
leftValue = leftValue < 0 ? 0 : leftValue
|
||||
var left = leftValue / brachium * 100
|
||||
|
||||
|
||||
|
||||
var heightValue = this.heightdata //高度
|
||||
var towerHeight = this.downheight //塔身高度
|
||||
|
||||
var height = (towerHeight - heightValue) * this.height / towerHeight
|
||||
height = height > this.height ? this.height : height
|
||||
|
||||
var value = Number(this.angledata) //角度
|
||||
var degValue = -value
|
||||
setTimeout(function () {
|
||||
$("#slider").animate({left:left+'%'},1000);
|
||||
$("#dot").animate({left:left+'%'},1000);
|
||||
$("#needle").css("transform","rotate("+degValue+"deg)")
|
||||
setTimeout(function () {
|
||||
$("#towrope").animate({height:height+'px'},1000);
|
||||
},1000)
|
||||
},1000)
|
||||
|
||||
},
|
||||
},
|
||||
watch:{
|
||||
ampdata:function () {
|
||||
this.animation()
|
||||
},
|
||||
forearmlength:function () {
|
||||
this.animation()
|
||||
},
|
||||
heightdata:function () {
|
||||
this.animation()
|
||||
},
|
||||
downheight:function () {
|
||||
this.animation()
|
||||
},
|
||||
angledata:function () {
|
||||
this.animation()
|
||||
},
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -1,69 +1,77 @@
|
|||
import Vue from 'vue'
|
||||
import Api from '../api/index'
|
||||
import dayjs from 'dayjs'
|
||||
import './style/index.less'
|
||||
import dayfilter from '@/utils/dayfilter'
|
||||
import {tryToJson} from '../utils/tools'
|
||||
import Vue from "vue";
|
||||
import Api from "../api/index";
|
||||
import dayjs from "dayjs";
|
||||
import "./style/index.less";
|
||||
import dayfilter from "@/utils/dayfilter";
|
||||
import { tryToJson } from "../utils/tools";
|
||||
//import H265Player from '../components/h265-player/index'
|
||||
import { Loading } from 'element-ui';
|
||||
1
|
||||
import moduleOne11 from '../components/module/module-one-1-1.vue'
|
||||
import moduleOne12 from '../components/module/module-one-1-2.vue'
|
||||
import moduleOne21 from '../components/module/module-one-2-1.vue'
|
||||
import projectOverviewChart from '../components/project-overview-chart.vue'
|
||||
import peopleNumber from '../components/people-number.vue'
|
||||
import header from '../components/header.vue'
|
||||
import { Loading } from "element-ui";
|
||||
1;
|
||||
import moduleOne11 from "../components/module/module-one-1-1.vue";
|
||||
import moduleOne12 from "../components/module/module-one-1-2.vue";
|
||||
import moduleOne21 from "../components/module/module-one-2-1.vue";
|
||||
import staffSurveyChart from "../components/staffSurveyChart.vue";
|
||||
import projectOverviewChart from "../components/project-overview-chart.vue";
|
||||
import peopleNumber from "../components/people-number.vue";
|
||||
import header from "../components/header.vue";
|
||||
Loading.install(Vue);
|
||||
//H265Player.install(Vue);
|
||||
dayfilter(Vue);
|
||||
const vue=new Vue();
|
||||
Vue.component("screen-header",header)
|
||||
1
|
||||
Vue.component("module-one-1-1",moduleOne11)
|
||||
Vue.component("module-one-1-2",moduleOne12)
|
||||
Vue.component("module-one-2-1",moduleOne21)
|
||||
Vue.component("people-number",peopleNumber)
|
||||
Vue.component("project-overview-chart",projectOverviewChart)
|
||||
Vue.prototype.$api=Api;
|
||||
Vue.prototype.$bus=vue;
|
||||
Vue.prototype.$apiPath="/jhapi"
|
||||
Vue.prototype.$dt=dayjs;
|
||||
Vue.prototype.$tryToJson=tryToJson
|
||||
Vue.prototype.$toggleFullScreen=(el)=>{
|
||||
if(document.fullscreenElement==el){
|
||||
let screen = document.cancelFullScreen || document.webkitCancelFullScreen || document.mozCancelFullScreen || document.exitFullScreen
|
||||
if (typeof screen != "undefined" && screen) {
|
||||
screen.call(document);
|
||||
return;
|
||||
}
|
||||
|
||||
}else{
|
||||
let screen = el.requestFullScreen || el.webkitRequestFullScreen || el.mozRequestFullScreen || el.msRequestFullScreen
|
||||
if (typeof screen != "undefined" && screen) {
|
||||
screen.call(el);
|
||||
return;
|
||||
}
|
||||
const vue = new Vue();
|
||||
Vue.component("screen-header", header);
|
||||
Vue.component("module-one-1-1", moduleOne11);
|
||||
Vue.component("module-one-1-2", moduleOne12);
|
||||
Vue.component("module-one-2-1", moduleOne21);
|
||||
Vue.component("people-number", peopleNumber);
|
||||
Vue.component("staff-survey-chart", staffSurveyChart);
|
||||
Vue.component("project-overview-chart", projectOverviewChart);
|
||||
Vue.prototype.$api = Api;
|
||||
Vue.prototype.$bus = vue;
|
||||
Vue.prototype.$apiPath = "/jhapi";
|
||||
Vue.prototype.$dt = dayjs;
|
||||
Vue.prototype.$tryToJson = tryToJson;
|
||||
Vue.prototype.$toggleFullScreen = (el) => {
|
||||
if (document.fullscreenElement == el) {
|
||||
let screen =
|
||||
document.cancelFullScreen ||
|
||||
document.webkitCancelFullScreen ||
|
||||
document.mozCancelFullScreen ||
|
||||
document.exitFullScreen;
|
||||
if (typeof screen != "undefined" && screen) {
|
||||
screen.call(document);
|
||||
return;
|
||||
}
|
||||
}
|
||||
window.__isfull__=false;
|
||||
window.fullscreenInterval=setInterval(()=>{
|
||||
if(document.fullscreenElement){
|
||||
if(!window.__isfull__){
|
||||
vue.$emit("fullscreen",true);
|
||||
window.__isfull__=true;
|
||||
}
|
||||
}else{
|
||||
if(window.__isfull__){
|
||||
vue.$emit("fullscreen",false);
|
||||
window.__isfull__=false;
|
||||
}
|
||||
} else {
|
||||
let screen =
|
||||
el.requestFullScreen ||
|
||||
el.webkitRequestFullScreen ||
|
||||
el.mozRequestFullScreen ||
|
||||
el.msRequestFullScreen;
|
||||
if (typeof screen != "undefined" && screen) {
|
||||
screen.call(el);
|
||||
return;
|
||||
}
|
||||
},500);
|
||||
window.xdcaches={};
|
||||
}
|
||||
};
|
||||
window.__isfull__ = false;
|
||||
window.fullscreenInterval = setInterval(() => {
|
||||
if (document.fullscreenElement) {
|
||||
if (!window.__isfull__) {
|
||||
vue.$emit("fullscreen", true);
|
||||
window.__isfull__ = true;
|
||||
}
|
||||
} else {
|
||||
if (window.__isfull__) {
|
||||
vue.$emit("fullscreen", false);
|
||||
window.__isfull__ = false;
|
||||
}
|
||||
}
|
||||
}, 500);
|
||||
window.xdcaches = {};
|
||||
/*
|
||||
Api.project.getInfo().then(d=>{
|
||||
if(d.code==200){
|
||||
window.__info__=d;
|
||||
}
|
||||
})
|
||||
*/
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -60,7 +60,18 @@ const routes = [
|
|||
name: "safetyCheck",
|
||||
meta: { nav: 301 },
|
||||
component: () =>
|
||||
import(/* webpackChunkName: "safetyCheck" */ "../views/safetyCheck.vue"),
|
||||
import(
|
||||
/* webpackChunkName: "safetyCheck" */ "../views/safety/safetyCheck.vue"
|
||||
),
|
||||
},
|
||||
{
|
||||
path: "/towerCrane",
|
||||
name: "towerCrane",
|
||||
meta: { nav: 304 },
|
||||
component: () =>
|
||||
import(
|
||||
/* webpackChunkName: "safetyCheck" */ "../views/safety/towerCrane.vue"
|
||||
),
|
||||
},
|
||||
];
|
||||
const router = new VueRouter({
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import moduleOne21 from "../components/module/module-one-2-1.vue";
|
|||
import moduleOne22 from "../components/module/module-one-2-2.vue";
|
||||
import moduleOne23 from "../components/module/module-one-2-3.vue";
|
||||
import moduleOne31 from "../components/module/module-one-3-1.vue";
|
||||
import staffSurveyChart from "../components/staffSurveyChart.vue";
|
||||
import peopleNumber from "@/components/people-number.vue";
|
||||
import dictTag from "@/components/DictTag/index.vue";
|
||||
import MyDialog from "@/components/MyDialog.vue";
|
||||
|
|
@ -34,6 +35,7 @@ Vue.component("module-one-2-2", moduleOne22);
|
|||
Vue.component("module-one-2-3", moduleOne23);
|
||||
Vue.component("module-one-3-1", moduleOne31);
|
||||
Vue.component("people-number", peopleNumber);
|
||||
Vue.component("staff-survey-chart", staffSurveyChart);
|
||||
Vue.component("my-chart", MyChart);
|
||||
Vue.component("dict-tag", dictTag);
|
||||
Vue.component("MyDialog", MyDialog);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
<template>
|
||||
<div class="project-tower-crane main-page">
|
||||
<el-col :span="6" class="h100">
|
||||
<module-one-1-3 label="设备概况" class="h100">
|
||||
|
||||
</module-one-1-3>
|
||||
</el-col>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
dpi: '',
|
||||
selProject: null,
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
window.safetyApp = this;
|
||||
this.$store.dispatch('ChangeNav', 304);
|
||||
this.$bus.$on('projectChange', prj => {
|
||||
this.selProject = prj;
|
||||
this.init();
|
||||
});
|
||||
this.selProject = this.$store.getters.selProject;
|
||||
this.init();
|
||||
this.dpi = this.$dpi();
|
||||
window.addEventListener("resize", () => {
|
||||
if (this.dpi != this.$dpi()) {
|
||||
this.dpi = this.$dpi();
|
||||
}
|
||||
});
|
||||
this.$api.dict("ssp_proble_sub_type").then((d) => {
|
||||
this.dangerTypeDict = d || [];
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
if (!this.selProject) {
|
||||
return;
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less">
|
||||
.project-tower-crane {
|
||||
|
||||
@media (min-width: 1921px) and (max-width: 2560px) {}
|
||||
|
||||
@media (min-width: 2561px) {}
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
@ -268,7 +268,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import safetyCheckDialog from './safety/safetyCheckDialog.vue'
|
||||
import safetyCheckDialog from './dialog/safetyCheckDialog.vue'
|
||||
export default {
|
||||
components: {
|
||||
safetyCheckDialog,
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -34,7 +34,26 @@ public class DevTowerDataCollide extends BaseEntity
|
|||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 总包单位主键 */
|
||||
private Long deptId;
|
||||
@Excel(name = "总包单位")
|
||||
private String deptName;
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
public String getDeptName() {
|
||||
return deptName;
|
||||
}
|
||||
|
||||
public void setDeptName(String deptName) {
|
||||
this.deptName = deptName;
|
||||
}
|
||||
|
||||
private Long comId;
|
||||
|
||||
/** 设备序列号 */
|
||||
|
|
|
|||
|
|
@ -31,7 +31,25 @@ public class DevTowerDataLimit extends BaseEntity
|
|||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 总包单位主键 */
|
||||
private Long deptId;
|
||||
@Excel(name = "总包单位")
|
||||
private String deptName;
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
public String getDeptName() {
|
||||
return deptName;
|
||||
}
|
||||
|
||||
public void setDeptName(String deptName) {
|
||||
this.deptName = deptName;
|
||||
}
|
||||
private Long comId;
|
||||
|
||||
/** 设备序列号 */
|
||||
|
|
|
|||
|
|
@ -30,7 +30,25 @@ public class DevTowerDataLocal extends BaseEntity
|
|||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 总包单位主键 */
|
||||
private Long deptId;
|
||||
@Excel(name = "总包单位")
|
||||
private String deptName;
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
public String getDeptName() {
|
||||
return deptName;
|
||||
}
|
||||
|
||||
public void setDeptName(String deptName) {
|
||||
this.deptName = deptName;
|
||||
}
|
||||
private Long comId;
|
||||
|
||||
/** 设备序列号 */
|
||||
|
|
|
|||
|
|
@ -32,7 +32,25 @@ public class DevTowerDataRound extends BaseEntity
|
|||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 总包单位主键 */
|
||||
private Long deptId;
|
||||
@Excel(name = "总包单位")
|
||||
private String deptName;
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
public String getDeptName() {
|
||||
return deptName;
|
||||
}
|
||||
|
||||
public void setDeptName(String deptName) {
|
||||
this.deptName = deptName;
|
||||
}
|
||||
private Long comId;
|
||||
|
||||
/** 设备序列号 */
|
||||
|
|
|
|||
|
|
@ -31,7 +31,25 @@ public class DevTowerDataRun extends BaseEntity
|
|||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 总包单位主键 */
|
||||
private Long deptId;
|
||||
@Excel(name = "总包单位")
|
||||
private String deptName;
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
public String getDeptName() {
|
||||
return deptName;
|
||||
}
|
||||
|
||||
public void setDeptName(String deptName) {
|
||||
this.deptName = deptName;
|
||||
}
|
||||
private Long comId;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,25 @@ public class DevTowerDataWarning extends BaseEntity
|
|||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 总包单位主键 */
|
||||
private Long deptId;
|
||||
@Excel(name = "总包单位")
|
||||
private String deptName;
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
public String getDeptName() {
|
||||
return deptName;
|
||||
}
|
||||
|
||||
public void setDeptName(String deptName) {
|
||||
this.deptName = deptName;
|
||||
}
|
||||
private Long comId;
|
||||
|
||||
/** 设备序列号 */
|
||||
|
|
|
|||
|
|
@ -28,7 +28,25 @@ public class DevTowerProjectConfig extends BaseEntity
|
|||
@Excel(name = "项目名称")
|
||||
private String projectName;
|
||||
|
||||
/** 总包单位主键 */
|
||||
private Long deptId;
|
||||
@Excel(name = "总包单位")
|
||||
private String deptName;
|
||||
|
||||
public Long getDeptId() {
|
||||
return deptId;
|
||||
}
|
||||
|
||||
public void setDeptId(Long deptId) {
|
||||
this.deptId = deptId;
|
||||
}
|
||||
|
||||
public String getDeptName() {
|
||||
return deptName;
|
||||
}
|
||||
|
||||
public void setDeptName(String deptName) {
|
||||
this.deptName = deptName;
|
||||
}
|
||||
private Long comId;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectId" column="project_id" />
|
||||
<result property="projectName" column="projectName" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="deptName" column="dept_name" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="deviceKey" column="device_key" />
|
||||
<result property="deviceSource" column="device_source" />
|
||||
|
|
@ -57,10 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectDevTowerDataCollideVo">
|
||||
select dtdc.id, dtdc.cfg_id, dtdc.project_id, dtdc.com_id, sp.dept_name projectName, sd.dept_name com_name, dtdc.device_key, dtdc.device_source, dtdc.tower_id, dtdc.coordinate_x, dtdc.coordinate_y, dtdc.front_brachium, dtdc.after_brachium, dtdc.tower_body_height, dtdc.height, dtdc.angle, dtdc.range, dtdc.early_warning_distance, dtdc.alarm_warning_distance, dtdc.contour_value, dtdc.is_del, dtdc.create_by, dtdc.create_time, dtdc.update_by, dtdc.update_time, dtdc.remark
|
||||
select dtdc.id, dtdc.cfg_id, dtdc.project_id, dtdc.com_id, sp.dept_name projectName, sd.dept_name com_name,dtdc.dept_id,pd.sub_dept_name dept_name,
|
||||
dtdc.device_key, dtdc.device_source, dtdc.tower_id, dtdc.coordinate_x, dtdc.coordinate_y, dtdc.front_brachium, dtdc.after_brachium, dtdc.tower_body_height, dtdc.height, dtdc.angle, dtdc.range, dtdc.early_warning_distance, dtdc.alarm_warning_distance, dtdc.contour_value, dtdc.is_del, dtdc.create_by, dtdc.create_time, dtdc.update_by, dtdc.update_time, dtdc.remark
|
||||
from dev_tower_data_collide dtdc
|
||||
left join sys_dept sp on sp.dept_id = dtdc.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtdc.com_id
|
||||
left join sys_dept sp on sp.dept_id = dtdc.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtdc.com_id
|
||||
left join pro_project_info_subdepts pd on pd.id=dtdc.dept_id
|
||||
</sql>
|
||||
|
||||
<select id="selectDevTowerDataCollideList" parameterType="DevTowerDataCollide" resultMap="DevTowerDataCollideResult">
|
||||
|
|
@ -69,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">and dtdc.cfg_id = #{cfgId}</if>
|
||||
<if test="projectId != null "> and dtdc.project_id = #{projectId}</if>
|
||||
<if test="comId != null "> and dtdc.com_id = #{comId}</if>
|
||||
<if test="deptId != null "> and dtdc.dept_id = #{deptId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
|
||||
<if test="comName != null and comName != ''"> and dtdc.com_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
|
||||
<if test="deviceKey != null and deviceKey != ''"> and dtdc.device_key = #{deviceKey}</if>
|
||||
|
|
@ -93,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
<if test="deviceKey != null">device_key,</if>
|
||||
<if test="deviceSource != null">device_source,</if>
|
||||
<if test="towerId != null">tower_id,</if>
|
||||
|
|
@ -118,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">#{cfgId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
<if test="deviceKey != null">#{deviceKey},</if>
|
||||
<if test="deviceSource != null">#{deviceSource},</if>
|
||||
<if test="towerId != null">#{towerId},</if>
|
||||
|
|
@ -147,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id = #{cfgId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="deptId != null">dept_id = #{deptId},</if>
|
||||
<if test="deviceKey != null">device_key = #{deviceKey},</if>
|
||||
<if test="deviceSource != null">device_source = #{deviceSource},</if>
|
||||
<if test="towerId != null">tower_id = #{towerId},</if>
|
||||
|
|
@ -203,7 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="findCollideCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
|
||||
select count(1) as total from dev_tower_data_collide
|
||||
<where>
|
||||
<if test="deviceKey != null and deviceKey != ''">and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
|
||||
<if test="deviceKey != null and deviceKey != ''">and cfg_id in (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
|
||||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectName" column="projectName" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="deptName" column="dept_name" />
|
||||
<result property="deviceKey" column="device_key" />
|
||||
<result property="deviceSource" column="device_source" />
|
||||
<result property="towerId" column="tower_id" />
|
||||
|
|
@ -57,10 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectDevTowerDataLimitVo">
|
||||
select dtdl.id, dtdl.cfg_id, dtdl.project_id, dtdl.com_id, sp.dept_name projectName, sd.dept_name com_name, dtdl.device_key, dtdl.device_source, dtdl.tower_id, dtdl.wind_speed_warning, dtdl.wind_speed_alarm, dtdl.load_warning, dtdl.load_alarm, dtdl.moment_warning, dtdl.moment_alarm, dtdl.high_limit_warning, dtdl.high_limit_alarm, dtdl.low_limit_warning, dtdl.low_limit_alarm, dtdl.left_limit_warning, dtdl.left_limit_alarm, dtdl.right_limit_warning, dtdl.right_limit_alarm, dtdl.front_limit_warning, dtdl.front_limit_alarm, dtdl.back_limit_warning, dtdl.back_limit_alarm, dtdl.collision_angle_warning, dtdl.collision_angle_alarm, dtdl.collision_distance_warning, dtdl.collision_distance_alarm, dtdl.h_distance_warning, dtdl.h_distance_alarm, dtdl.v_distance_warning, dtdl.v_distance_alarm, dtdl.lean_warning, dtdl.lean_alarm, dtdl.range_limit_start, dtdl.range_limit_end, dtdl.height_limit_start, dtdl.height_limit_end, dtdl.rotation_limit_start, dtdl.rotation_limit_end, dtdl.is_del, dtdl.create_by, dtdl.create_time, dtdl.update_by, dtdl.update_time, dtdl.remark
|
||||
select dtdl.id, dtdl.cfg_id, dtdl.project_id, dtdl.com_id, sp.dept_name projectName, sd.dept_name com_name,dtdl.dept_id,pd.sub_dept_name dept_name,
|
||||
dtdl.device_key, dtdl.device_source, dtdl.tower_id, dtdl.wind_speed_warning, dtdl.wind_speed_alarm, dtdl.load_warning, dtdl.load_alarm, dtdl.moment_warning, dtdl.moment_alarm, dtdl.high_limit_warning, dtdl.high_limit_alarm, dtdl.low_limit_warning, dtdl.low_limit_alarm, dtdl.left_limit_warning, dtdl.left_limit_alarm, dtdl.right_limit_warning, dtdl.right_limit_alarm, dtdl.front_limit_warning, dtdl.front_limit_alarm, dtdl.back_limit_warning, dtdl.back_limit_alarm, dtdl.collision_angle_warning, dtdl.collision_angle_alarm, dtdl.collision_distance_warning, dtdl.collision_distance_alarm, dtdl.h_distance_warning, dtdl.h_distance_alarm, dtdl.v_distance_warning, dtdl.v_distance_alarm, dtdl.lean_warning, dtdl.lean_alarm, dtdl.range_limit_start, dtdl.range_limit_end, dtdl.height_limit_start, dtdl.height_limit_end, dtdl.rotation_limit_start, dtdl.rotation_limit_end, dtdl.is_del, dtdl.create_by, dtdl.create_time, dtdl.update_by, dtdl.update_time, dtdl.remark
|
||||
from dev_tower_data_limit dtdl
|
||||
left join sys_dept sp on sp.dept_id = dtdl.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtdl.com_id
|
||||
left join pro_project_info_subdepts pd on pd.id=dtdl.dept_id
|
||||
|
||||
|
||||
</sql>
|
||||
|
||||
|
|
@ -70,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
|
||||
<if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
|
||||
<if test="comId != null "> and dtdl.com_id = #{comId}</if>
|
||||
<if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
|
||||
<if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
|
||||
<if test="deviceKey != null and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
|
||||
|
|
@ -91,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
<if test="deviceKey != null">device_key,</if>
|
||||
<if test="deviceSource != null">device_source,</if>
|
||||
<if test="towerId != null">tower_id,</if>
|
||||
|
|
@ -139,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">#{cfgId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
<if test="deviceKey != null">#{deviceKey},</if>
|
||||
<if test="deviceSource != null">#{deviceSource},</if>
|
||||
<if test="towerId != null">#{towerId},</if>
|
||||
|
|
@ -191,6 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id = #{cfgId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="deptId != null">dept_id = #{deptId},</if>
|
||||
<if test="deviceKey != null">device_key = #{deviceKey},</if>
|
||||
<if test="deviceSource != null">device_source = #{deviceSource},</if>
|
||||
<if test="towerId != null">tower_id = #{towerId},</if>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectName" column="projectName" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="deptName" column="dept_name" />
|
||||
<result property="deviceKey" column="device_key" />
|
||||
<result property="deviceSource" column="device_source" />
|
||||
<result property="towerId" column="tower_id" />
|
||||
|
|
@ -46,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dtdl.project_id,
|
||||
dtdl.com_id,
|
||||
sp.dept_name projectName,
|
||||
sd.dept_name com_name,
|
||||
sd.dept_name com_name,dtdl.dept_id,pd.sub_dept_name dept_name,
|
||||
dtdl.device_key,
|
||||
dtdl.device_source,
|
||||
dtdl.tower_id,
|
||||
|
|
@ -77,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
from dev_tower_data_local dtdl
|
||||
left join sys_dept sp on sp.dept_id = dtdl.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtdl.com_id
|
||||
left join pro_project_info_subdepts pd on pd.id=dtdl.dept_id
|
||||
</sql>
|
||||
|
||||
<select id="selectDevTowerDataLocalList" parameterType="DevTowerDataLocal" resultMap="DevTowerDataLocalResult">
|
||||
|
|
@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
|
||||
<if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
|
||||
<if test="comId != null "> and dtdl.com_id = #{comId}</if>
|
||||
<if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
|
||||
<if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
|
||||
<if test="deviceKey != null and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
|
||||
|
|
@ -106,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
<if test="deviceKey != null">device_key,</if>
|
||||
<if test="deviceSource != null">device_source,</if>
|
||||
<if test="towerId != null">tower_id,</if>
|
||||
|
|
@ -138,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">#{cfgId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
<if test="deviceKey != null">#{deviceKey},</if>
|
||||
<if test="deviceSource != null">#{deviceSource},</if>
|
||||
<if test="towerId != null">#{towerId},</if>
|
||||
|
|
@ -174,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id = #{cfgId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="deptId != null">dept_id = #{deptId},</if>
|
||||
<if test="deviceKey != null">device_key = #{deviceKey},</if>
|
||||
<if test="deviceSource != null">device_source = #{deviceSource},</if>
|
||||
<if test="towerId != null">tower_id = #{towerId},</if>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectId" column="project_id" />
|
||||
<result property="projectName" column="projectName" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="deptName" column="dept_name" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="deviceKey" column="device_key" />
|
||||
<result property="deviceSource" column="device_source" />
|
||||
|
|
@ -55,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dtdr.project_id,
|
||||
dtdr.com_id,
|
||||
sp.dept_name projectName,
|
||||
sd.dept_name com_name,
|
||||
sd.dept_name com_name,dtdr.dept_id,pd.sub_dept_name dept_name,
|
||||
dtdr.device_key,
|
||||
dtdr.device_source,
|
||||
dtdr.tower_id,
|
||||
|
|
@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
from dev_tower_data_round dtdr
|
||||
left join sys_dept sp on sp.dept_id = dtdr.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtdr.com_id
|
||||
left join pro_project_info_subdepts pd on pd.id=dtdr.dept_id
|
||||
</sql>
|
||||
|
||||
<select id="selectDevTowerDataRoundList" parameterType="DevTowerDataRound" resultMap="DevTowerDataRoundResult">
|
||||
|
|
@ -102,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
|
||||
<if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
|
||||
<if test="comId != null "> and dtdr.com_id = #{comId}</if>
|
||||
<if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
|
||||
<if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
|
||||
<if test="deviceKey != null and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
|
||||
|
|
@ -123,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
<if test="deviceKey != null">device_key,</if>
|
||||
<if test="deviceSource != null">device_source,</if>
|
||||
<if test="towerId != null">tower_id,</if>
|
||||
|
|
@ -164,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">#{cfgId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
<if test="deviceKey != null">#{deviceKey},</if>
|
||||
<if test="deviceSource != null">#{deviceSource},</if>
|
||||
<if test="towerId != null">#{towerId},</if>
|
||||
|
|
@ -209,6 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id = #{cfgId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="deptId != null">dept_id = #{deptId},</if>
|
||||
<if test="deviceKey != null">device_key = #{deviceKey},</if>
|
||||
<if test="deviceSource != null">device_source = #{deviceSource},</if>
|
||||
<if test="towerId != null">tower_id = #{towerId},</if>
|
||||
|
|
@ -263,7 +270,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="findRoundCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
|
||||
select count(1) as total from dev_tower_data_round
|
||||
<where>
|
||||
<if test="deviceKey != null and deviceKey != ''">and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
|
||||
<if test="deviceKey != null and deviceKey != ''">and cfg_id in (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
|
||||
<if test='activeName == "cz"'> and is_overload = 1 </if>
|
||||
<if test='activeName == "gj"'> and is_alarm = 1 </if>
|
||||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectName" column="projectName" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="deptName" column="dept_name" />
|
||||
<result property="deviceKey" column="device_key" />
|
||||
<result property="deviceSource" column="device_source" />
|
||||
<result property="height" column="height" />
|
||||
|
|
@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dtdr.project_id,
|
||||
dtdr.com_id,
|
||||
sp.dept_name projectName,
|
||||
sd.dept_name com_name,
|
||||
sd.dept_name com_name,dtdr.dept_id,pd.sub_dept_name dept_name,
|
||||
dtdr.device_key,
|
||||
dtdr.device_source,
|
||||
dtdr.height,
|
||||
|
|
@ -83,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
from dev_tower_data_run dtdr
|
||||
left join sys_dept sp on sp.dept_id = dtdr.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtdr.com_id
|
||||
left join pro_project_info_subdepts pd on pd.id=dtdr.dept_id
|
||||
|
||||
</sql>
|
||||
|
||||
|
|
@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
|
||||
<if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
|
||||
<if test="comId != null "> and dtdr.com_id = #{comId}</if>
|
||||
<if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
|
||||
<if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
|
||||
<if test="deviceKey != null and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
|
||||
|
|
@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id,</if>
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
<if test="deviceKey != null">device_key,</if>
|
||||
<if test="deviceSource != null">device_source,</if>
|
||||
<if test="height != null">height,</if>
|
||||
|
|
@ -148,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">#{cfgId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
<if test="deviceKey != null">#{deviceKey},</if>
|
||||
<if test="deviceSource != null">#{deviceSource},</if>
|
||||
<if test="height != null">#{height},</if>
|
||||
|
|
@ -187,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id = #{cfgId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="deptId != null">dept_id = #{deptId},</if>
|
||||
<if test="deviceKey != null">device_key = #{deviceKey},</if>
|
||||
<if test="deviceSource != null">device_source = #{deviceSource},</if>
|
||||
<if test="height != null">height = #{height},</if>
|
||||
|
|
@ -235,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="findRunCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
|
||||
select count(1) as total from dev_tower_data_run
|
||||
<where>
|
||||
<if test="deviceKey != null and deviceKey != ''">and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
|
||||
<if test="deviceKey != null and deviceKey != ''">and cfg_id in (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
|
||||
<if test='activeName == "gj"'> and is_alarm = 1 </if>
|
||||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
|
||||
</where>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectName" column="projectName" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="deptName" column="dept_name" />
|
||||
<result property="deviceKey" column="device_key" />
|
||||
<result property="deviceSource" column="device_source" />
|
||||
<result property="towerId" column="tower_id" />
|
||||
|
|
@ -33,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dtdw.project_id,
|
||||
dtdw.com_id,
|
||||
sp.dept_name projectName,
|
||||
sd.dept_name com_name,
|
||||
sd.dept_name com_name,dtdw.dept_id,pd.sub_dept_name dept_name,
|
||||
dtdw.device_key,
|
||||
dtdw.device_source,
|
||||
dtdw.tower_id,
|
||||
|
|
@ -51,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
from dev_tower_data_warning dtdw
|
||||
left join sys_dept sp on sp.dept_id = dtdw.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtdw.com_id
|
||||
left join pro_project_info_subdepts pd on pd.id=dtdw.dept_id
|
||||
</sql>
|
||||
|
||||
<select id="selectDevTowerDataWarningList" parameterType="DevTowerDataWarning" resultMap="DevTowerDataWarningResult">
|
||||
|
|
@ -59,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">and dtdw.cfg_id = #{cfgId}</if>
|
||||
<if test="projectId != null "> and dtdw.project_id = #{projectId}</if>
|
||||
<if test="comId != null "> and dtdw.com_id = #{comId}</if>
|
||||
<if test="deptId != null "> and dtdw.dept_id = #{deptId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and dtdw.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
|
||||
<if test="comName != null and comName != ''"> and dtdw.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
|
||||
<if test="deviceKey != null and deviceKey != ''"> and dtdw.device_key = #{deviceKey}</if>
|
||||
|
|
@ -81,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="projectId != null">project_id,</if>
|
||||
<if test="cfgId != null">cfg_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
<if test="deviceKey != null">device_key,</if>
|
||||
<if test="deviceSource != null">device_source,</if>
|
||||
<if test="towerId != null">tower_id,</if>
|
||||
|
|
@ -100,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">#{cfgId},</if>
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
<if test="deviceKey != null">#{deviceKey},</if>
|
||||
<if test="deviceSource != null">#{deviceSource},</if>
|
||||
<if test="towerId != null">#{towerId},</if>
|
||||
|
|
@ -123,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="cfgId != null">cfg_id = #{cfgId},</if>
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="deptId != null">dept_id = #{deptId},</if>
|
||||
<if test="deviceKey != null">device_key = #{deviceKey},</if>
|
||||
<if test="deviceSource != null">device_source = #{deviceSource},</if>
|
||||
<if test="towerId != null">tower_id = #{towerId},</if>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="projectName" column="projectName" />
|
||||
<result property="comId" column="com_id" />
|
||||
<result property="comName" column="com_name" />
|
||||
<result property="deptId" column="dept_id" />
|
||||
<result property="deptName" column="dept_name" />
|
||||
<result property="deviceSn" column="device_sn" />
|
||||
<result property="deviceName" column="device_name" />
|
||||
<result property="deviceSource" column="device_source" />
|
||||
|
|
@ -40,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
dtpc.project_id,
|
||||
dtpc.com_id,
|
||||
sp.dept_name projectName,
|
||||
sd.dept_name com_name,
|
||||
sd.dept_name com_name,dtpc.dept_id,pd.sub_dept_name dept_name,
|
||||
dtpc.device_sn,
|
||||
dtpc.device_name,
|
||||
dtpc.device_source,
|
||||
|
|
@ -67,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
from dev_tower_project_config dtpc
|
||||
left join sys_dept sp on sp.dept_id = dtpc.project_id
|
||||
left join sys_dept sd on sd.dept_id = dtpc.com_id
|
||||
left join pro_project_info_subdepts pd on pd.id=dtpc.dept_id
|
||||
|
||||
</sql>
|
||||
|
||||
<select id="selectDevTowerProjectConfigList" parameterType="DevTowerProjectConfig" resultMap="DevTowerProjectConfigResult">
|
||||
|
|
@ -75,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="projectId != null "> and dtpc.project_id = #{projectId}</if>
|
||||
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
|
||||
<if test="comId != null "> and dtpc.com_id = #{comId}</if>
|
||||
<if test="deptId != null "> and dtpc.dept_id = #{deptId}</if>
|
||||
<if test="comName != null and comName != ''"> and sd.dept_name like concat('%', #{comName}, '%')</if>
|
||||
<if test="deviceSn != null and deviceSn != ''"> and dtpc.device_sn like concat('%', #{deviceSn}, '%')</if>
|
||||
<if test="deviceName != null and deviceName != ''"> and dtpc.device_name like concat('%', #{deviceName}, '%')</if>
|
||||
|
|
@ -96,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="projectId != null">project_id,</if>
|
||||
<if test="comId != null">com_id,</if>
|
||||
<if test="deptId != null">dept_id,</if>
|
||||
<if test="deviceSn != null">device_sn,</if>
|
||||
<if test="deviceName != null">device_name,</if>
|
||||
<if test="deviceSource != null">device_source,</if>
|
||||
|
|
@ -123,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="projectId != null">#{projectId},</if>
|
||||
<if test="comId != null">#{comId},</if>
|
||||
<if test="deptId != null">#{deptId},</if>
|
||||
<if test="deviceSn != null">#{deviceSn},</if>
|
||||
<if test="deviceName != null">#{deviceName},</if>
|
||||
<if test="deviceSource != null">#{deviceSource},</if>
|
||||
|
|
@ -154,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="projectId != null">project_id = #{projectId},</if>
|
||||
<if test="comId != null">com_id = #{comId},</if>
|
||||
<if test="deptId != null">dept_id = #{deptId},</if>
|
||||
<if test="deviceSn != null">device_sn = #{deviceSn},</if>
|
||||
<if test="deviceName != null">device_name = #{deviceName},</if>
|
||||
<if test="deviceSource != null">device_source = #{deviceSource},</if>
|
||||
|
|
|
|||
|
|
@ -4,13 +4,17 @@
|
|||
label-width="68px">
|
||||
<el-form-item label="项目名称" prop="projectId">
|
||||
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属项目" style="width: 200px">
|
||||
placeholder="请选择所属项目" style="width: 200px" @change="queryProjectChange">
|
||||
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单位名称" prop="deptName">
|
||||
<el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" />
|
||||
<el-form-item label="所属单位" prop="deptId">
|
||||
<el-select v-model="queryParams.deptId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属单位" style="width: 200px">
|
||||
<el-option v-for="item in subDepts" :key="item.id" :label="item.subDeptName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
|
||||
|
|
@ -40,6 +44,7 @@
|
|||
<el-table-column label="id" align="center" prop="id" width="100" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="150"
|
||||
v-if="currentPrjId ? false : true" />
|
||||
<el-table-column label="所属单位" align="center" prop="deptName" width="150" />
|
||||
<el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
|
||||
<el-table-column label="塔机坐标x" align="center" prop="coordinateX" width="120" />
|
||||
<el-table-column label="塔机坐标y" align="center" prop="coordinateY" width="120" />
|
||||
|
|
@ -233,6 +238,7 @@ import {
|
|||
listTowerDataCollide, getTowerDataCollide, delTowerDataCollide,
|
||||
addTowerDataCollide, updateTowerDataCollide
|
||||
} from "@/api/device/towerDataCollide";
|
||||
import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { findMyProjectList } from "@/api/publics";
|
||||
export default {
|
||||
|
|
@ -288,6 +294,7 @@ export default {
|
|||
isAdmin: false,
|
||||
projects: [],
|
||||
currentPrjId: null,
|
||||
subDepts: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -297,10 +304,26 @@ export default {
|
|||
this.queryParams.projectId = this.userStore.currentPrjId;
|
||||
this.queryParams.comId = this.userStore.currentComId;
|
||||
this.currentPrjId = this.userStore.currentPrjId;
|
||||
this.queryProjectChange();
|
||||
this.getList();
|
||||
this.getProjectList();
|
||||
},
|
||||
methods: {
|
||||
queryProjectChange() {
|
||||
this.subDepts = []
|
||||
this.queryParams.deptId = "";
|
||||
if (this.queryParams.projectId) {
|
||||
this.getSubDepts(this.queryParams.projectId, data => {
|
||||
this.subDepts = data;
|
||||
})
|
||||
}
|
||||
},
|
||||
getSubDepts(prjId, cb) {
|
||||
listProProjectInfoSubdepts({ projectId: prjId, pageNum: 1, pageSize: 100, activeTags: "finished" }).then(d => {
|
||||
let subdepts = d.rows || [];
|
||||
cb && cb(subdepts);
|
||||
});
|
||||
},
|
||||
/** 查询项目列表 */
|
||||
getProjectList() {
|
||||
findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
|
||||
|
|
|
|||
|
|
@ -4,13 +4,17 @@
|
|||
label-width="68px">
|
||||
<el-form-item label="项目名称" prop="projectId">
|
||||
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属项目" style="width: 200px">
|
||||
placeholder="请选择所属项目" style="width: 200px" @change="queryProjectChange">
|
||||
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单位名称" prop="deptName">
|
||||
<el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter="handleQuery" />
|
||||
<el-form-item label="所属单位" prop="deptId">
|
||||
<el-select v-model="queryParams.deptId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属单位" style="width: 200px">
|
||||
<el-option v-for="item in subDepts" :key="item.id" :label="item.subDeptName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
|
||||
|
|
@ -39,6 +43,7 @@
|
|||
<el-table-column label="id" align="center" prop="id" width="100" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="150"
|
||||
v-if="currentPrjId ? false : true" />
|
||||
<el-table-column label="所属单位" align="center" prop="deptName" width="150" />
|
||||
<el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
|
||||
<el-table-column label="风速预警" align="center" prop="windSpeedWarning" width="120" />
|
||||
<el-table-column label="风速报警" align="center" prop="windSpeedAlarm" width="120" />
|
||||
|
|
@ -238,6 +243,7 @@ import {
|
|||
listTowerDataLimit, getTowerDataLimit, delTowerDataLimit,
|
||||
addTowerDataLimit, updateTowerDataLimit
|
||||
} from "@/api/device/towerDataLimit";
|
||||
import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { findMyProjectList } from "@/api/publics";
|
||||
export default {
|
||||
|
|
@ -289,6 +295,7 @@ export default {
|
|||
isAdmin: false,
|
||||
projects: [],
|
||||
currentPrjId: null,
|
||||
subDepts: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -298,10 +305,26 @@ export default {
|
|||
this.queryParams.projectId = this.userStore.currentPrjId;
|
||||
this.queryParams.comId = this.userStore.currentComId;
|
||||
this.currentPrjId = this.userStore.currentPrjId;
|
||||
this.queryProjectChange();
|
||||
this.getList();
|
||||
this.getProjectList();
|
||||
},
|
||||
methods: {
|
||||
queryProjectChange() {
|
||||
this.subDepts = []
|
||||
this.queryParams.deptId = "";
|
||||
if (this.queryParams.projectId) {
|
||||
this.getSubDepts(this.queryParams.projectId, data => {
|
||||
this.subDepts = data;
|
||||
})
|
||||
}
|
||||
},
|
||||
getSubDepts(prjId, cb) {
|
||||
listProProjectInfoSubdepts({ projectId: prjId, pageNum: 1, pageSize: 100, activeTags: "finished" }).then(d => {
|
||||
let subdepts = d.rows || [];
|
||||
cb && cb(subdepts);
|
||||
});
|
||||
},
|
||||
/** 查询项目列表 */
|
||||
getProjectList() {
|
||||
findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,18 @@
|
|||
label-width="68px">
|
||||
<el-form-item label="项目名称" prop="projectId">
|
||||
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属项目" style="width: 240px">
|
||||
placeholder="请选择所属项目" style="width: 240px" @change="queryProjectChange">
|
||||
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属单位" prop="deptId">
|
||||
<el-select v-model="queryParams.deptId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属单位" style="width: 200px">
|
||||
<el-option v-for="item in subDepts" :key="item.id" :label="item.subDeptName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
|
||||
type="daterange" range-separator="-" start-placeholder="开始日期"
|
||||
|
|
@ -34,9 +41,10 @@
|
|||
|
||||
<el-table v-loading="loading" :data="towerDataRoundList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="id" align="center" prop="id" width="100" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="200"
|
||||
v-if="currentPrjId ? false : true" />
|
||||
<el-table-column label="id" align="center" prop="id" width="100" />
|
||||
<el-table-column label="所属单位" align="center" prop="deptName" width="150" />
|
||||
<el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
|
||||
<el-table-column label="工作循环开始" align="center" prop="workStartTime" width="180" />
|
||||
<el-table-column label="工作循环结束" align="center" prop="workEndTime" width="180" />
|
||||
|
|
@ -210,6 +218,7 @@ import {
|
|||
addTowerDataRound,
|
||||
updateTowerDataRound,
|
||||
} from "@/api/device/towerDataRound";
|
||||
import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { findMyProjectList } from "@/api/publics";
|
||||
export default {
|
||||
|
|
@ -261,6 +270,7 @@ export default {
|
|||
isAdmin: false,
|
||||
projects: [],
|
||||
currentPrjId: null,
|
||||
subDepts: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -270,10 +280,26 @@ export default {
|
|||
this.queryParams.projectId = this.userStore.currentPrjId;
|
||||
this.queryParams.comId = this.userStore.currentComId;
|
||||
this.currentPrjId = this.userStore.currentPrjId;
|
||||
this.queryProjectChange();
|
||||
this.getList();
|
||||
this.getProjectList();
|
||||
},
|
||||
methods: {
|
||||
queryProjectChange() {
|
||||
this.subDepts = []
|
||||
this.queryParams.deptId = "";
|
||||
if (this.queryParams.projectId) {
|
||||
this.getSubDepts(this.queryParams.projectId, data => {
|
||||
this.subDepts = data;
|
||||
})
|
||||
}
|
||||
},
|
||||
getSubDepts(prjId, cb) {
|
||||
listProProjectInfoSubdepts({ projectId: prjId, pageNum: 1, pageSize: 100, activeTags: "finished" }).then(d => {
|
||||
let subdepts = d.rows || [];
|
||||
cb && cb(subdepts);
|
||||
});
|
||||
},
|
||||
/** 查询项目列表 */
|
||||
getProjectList() {
|
||||
findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,18 @@
|
|||
label-width="68px">
|
||||
<el-form-item label="项目名称" prop="projectId">
|
||||
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属项目" style="width: 240px">
|
||||
placeholder="请选择所属项目" style="width: 240px" @change="queryProjectChange">
|
||||
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属单位" prop="deptId">
|
||||
<el-select v-model="queryParams.deptId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属单位" style="width: 200px">
|
||||
<el-option v-for="item in subDepts" :key="item.id" :label="item.subDeptName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
|
||||
type="daterange" range-separator="-" start-placeholder="开始日期"
|
||||
|
|
@ -41,6 +48,7 @@
|
|||
<el-table-column label="id" align="center" prop="id" width="100" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="200"
|
||||
v-if="currentPrjId ? false : true" />
|
||||
<el-table-column label="所属单位" align="center" prop="deptName" width="150" />
|
||||
<el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
|
||||
<el-table-column label="警报信息" align="center" prop="warnings" width="200">
|
||||
<template #default="scope">
|
||||
|
|
@ -219,6 +227,7 @@ import {
|
|||
addTowerDataRun,
|
||||
updateTowerDataRun,
|
||||
} from "@/api/device/towerDataRun";
|
||||
import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { findMyProjectList } from "@/api/publics";
|
||||
export default {
|
||||
|
|
@ -271,6 +280,7 @@ export default {
|
|||
isAdmin: false,
|
||||
projects: [],
|
||||
currentPrjId: null,
|
||||
subDepts: [],
|
||||
|
||||
};
|
||||
},
|
||||
|
|
@ -280,11 +290,27 @@ export default {
|
|||
this.isAdmin = this.userStore.isAdmin;
|
||||
this.queryParams.projectId = this.userStore.currentPrjId;
|
||||
this.queryParams.comId = this.userStore.currentComId;
|
||||
this.queryProjectChange();
|
||||
this.currentPrjId = this.userStore.currentPrjId;
|
||||
this.getList();
|
||||
this.getProjectList();
|
||||
},
|
||||
methods: {
|
||||
queryProjectChange() {
|
||||
this.subDepts = []
|
||||
this.queryParams.deptId = "";
|
||||
if (this.queryParams.projectId) {
|
||||
this.getSubDepts(this.queryParams.projectId, data => {
|
||||
this.subDepts = data;
|
||||
})
|
||||
}
|
||||
},
|
||||
getSubDepts(prjId, cb) {
|
||||
listProProjectInfoSubdepts({ projectId: prjId, pageNum: 1, pageSize: 100, activeTags: "finished" }).then(d => {
|
||||
let subdepts = d.rows || [];
|
||||
cb && cb(subdepts);
|
||||
});
|
||||
},
|
||||
/** 查询项目列表 */
|
||||
getProjectList() {
|
||||
findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,18 @@
|
|||
label-width="68px">
|
||||
<el-form-item label="项目名称" prop="projectId">
|
||||
<el-select v-model="queryParams.projectId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属项目" style="width: 200px">
|
||||
placeholder="请选择所属项目" style="width: 200px" @change="queryProjectChange">
|
||||
<el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属单位" prop="deptId">
|
||||
<el-select v-model="queryParams.deptId" clearable :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属单位" style="width: 200px">
|
||||
<el-option v-for="item in subDepts" :key="item.id" :label="item.subDeptName" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="deviceName">
|
||||
<el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item>
|
||||
|
|
@ -45,6 +52,7 @@
|
|||
<el-table-column label="id" align="center" prop="id" width="100" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="150"
|
||||
v-if="currentPrjId ? false : true" />
|
||||
<el-table-column label="所属单位" align="center" prop="deptName" width="150" />
|
||||
<el-table-column label="设备名称" align="center" prop="deviceName" width="150" />
|
||||
<el-table-column label="设备序号" align="center" prop="deviceSn" width="150" />
|
||||
<el-table-column label="塔机类型" align="center" prop="towerType">
|
||||
|
|
@ -107,13 +115,22 @@
|
|||
<el-col :span="12">
|
||||
<el-form-item label="所属项目" prop="projectId">
|
||||
<el-select v-model="form.projectId" :disabled="currentPrjId ? true : false" filterable
|
||||
placeholder="请选择所属项目" style="width: 100%">
|
||||
placeholder="请选择所属项目" style="width: 100%" @change="dlgProjectChange">
|
||||
<el-option v-for="item in projects" :key="item.id" :label="item.projectName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所属单位" prop="projectId">
|
||||
<el-select v-model="form.deptId" filterable placeholder="请选择所属单位" style="width: 100%">
|
||||
<el-option v-for="item in dlgDepts" :key="item.id" :label="item.subDeptName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="设备名称" prop="deviceName">
|
||||
<el-input v-model="form.deviceName" placeholder="请输入设备名称" maxlength="32" show-word-limit />
|
||||
|
|
@ -207,7 +224,7 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot-slot="footer" class="dialog-footer">
|
||||
<div slot-slot="footer" class="dialog-footer" style="text-align: center;">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
|
|
@ -223,6 +240,7 @@ import {
|
|||
addTowerProjectConfig,
|
||||
updateTowerProjectConfig,
|
||||
} from "@/api/device/towerProjectConfig";
|
||||
import { listProProjectInfoSubdepts } from "@/api/manage/proProjectInfoSubdepts";
|
||||
import useUserStore from '@/store/modules/user'
|
||||
import { findMyProjectList } from "@/api/publics";
|
||||
export default {
|
||||
|
|
@ -283,6 +301,8 @@ export default {
|
|||
isAdmin: false,
|
||||
projects: [],
|
||||
currentPrjId: null,
|
||||
subDepts: [],
|
||||
dlgDepts: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -291,11 +311,37 @@ export default {
|
|||
this.isAdmin = this.userStore.isAdmin;
|
||||
this.queryParams.projectId = this.userStore.currentPrjId;
|
||||
this.queryParams.comId = this.userStore.currentComId;
|
||||
this.queryParams.deptId = "";
|
||||
this.queryProjectChange();
|
||||
this.currentPrjId = this.userStore.currentPrjId;
|
||||
this.getList();
|
||||
this.getProjectList();
|
||||
},
|
||||
methods: {
|
||||
queryProjectChange() {
|
||||
this.subDepts = []
|
||||
this.queryParams.deptId = "";
|
||||
if (this.queryParams.projectId) {
|
||||
this.getSubDepts(this.queryParams.projectId, data => {
|
||||
this.subDepts = data;
|
||||
})
|
||||
}
|
||||
},
|
||||
dlgProjectChange() {
|
||||
this.dlgDepts = [];
|
||||
this.form.deptId = "";
|
||||
if (this.form.projectId) {
|
||||
this.getSubDepts(this.form.projectId, data => {
|
||||
this.dlgDepts = data;
|
||||
});
|
||||
}
|
||||
},
|
||||
getSubDepts(prjId, cb) {
|
||||
listProProjectInfoSubdepts({ projectId: prjId, pageNum: 1, pageSize: 100, activeTags: "finished" }).then(d => {
|
||||
let subdepts = d.rows || [];
|
||||
cb && cb(subdepts);
|
||||
});
|
||||
},
|
||||
/** 查询项目列表 */
|
||||
getProjectList() {
|
||||
findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
|
||||
|
|
@ -368,6 +414,11 @@ export default {
|
|||
this.reset();
|
||||
this.form.comId = this.userStore.currentComId;
|
||||
this.form.projectId = this.userStore.currentPrjId;
|
||||
if (this.form.projectId) {
|
||||
this.getSubDepts(this.form.projectId, data => {
|
||||
this.dlgDepts = data;
|
||||
});
|
||||
}
|
||||
this.open = true;
|
||||
this.title = "添加塔基检测配置";
|
||||
},
|
||||
|
|
@ -378,10 +429,14 @@ export default {
|
|||
getTowerProjectConfig(id).then((response) => {
|
||||
this.form = response.data;
|
||||
this.form.towerType = this.form.towerType ? 1 * this.form.towerType : '';
|
||||
this.getSubDepts(this.form.projectId, data => {
|
||||
this.dlgDepts = data;
|
||||
});
|
||||
this.open = true;
|
||||
this.title = "修改塔基检测配置";
|
||||
});
|
||||
},
|
||||
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue