Skip to content

Z
zhongtong-avi-web
Commit 022889af authored by 李志鸣's avatar 李志鸣
Browse files
Options

Merge branch 'dev' of git.vtstar.net:zhongtong/zhongtong-avi-web into dev

parents 1825219c 6e732b27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 224 deletions
src/views/Layout/components/SidebarItem.vue
View file @ 022889af
......@@ -61,9 +61,12 @@
onlyOneChild: null
}
},
mounted () {},
methods: {
// 检测子路由是否有权限访问
checkCurrentRouteAuthority (children, item) {
console.log('qxCHILD', children)
console.log('qxITEM', item)
if (!item.meta) {
return false; // 匹配到框架级路由
} else {
......
src/views/Monitor/components/FinishedCar.vue
View file @ 022889af
......@@ -5,7 +5,7 @@
<!-- 第一行 -->
<div
class="finished-row-1-1"
@click="clickBtn(query['HDG1-147'].busNo)"
@click="doCarStationClick(query['HDG1-147'].busNo)"
v-if="query.hasOwnProperty('HDG1-147') && query['HDG1-147'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-147'].busType, 'HDG1-147')"
>
......@@ -13,7 +13,7 @@
</div>
<div
class="finished-row-1-2"
@click="clickBtn(query['HDG1-163'].busNo)"
@click="doCarStationClick(query['HDG1-163'].busNo)"
v-if="query.hasOwnProperty('HDG1-163') && query['HDG1-163'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-163'].busType, 'HDG1-163')"
>
......@@ -21,7 +21,7 @@
</div>
<div
class="finished-row-1-3"
@click="clickBtn(query['HDG1-205'].busNo)"
@click="doCarStationClick(query['HDG1-205'].busNo)"
v-if="query.hasOwnProperty('HDG1-205') && query['HDG1-205'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-205'].busType, 'HDG1-205')"
>
......@@ -29,7 +29,7 @@
</div>
<div
class="finished-row-1-4"
@click="clickBtn(query['HDG1-206'].busNo)"
@click="doCarStationClick(query['HDG1-206'].busNo)"
v-if="query.hasOwnProperty('HDG1-206') && query['HDG1-206'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-206'].busType, 'HDG1-206')"
>
......@@ -37,7 +37,7 @@
</div>
<div
class="finished-row-1-5"
@click="clickBtn(query['HDG1-207'].busNo)"
@click="doCarStationClick(query['HDG1-207'].busNo)"
v-if="query.hasOwnProperty('HDG1-207') && query['HDG1-207'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-207'].busType, 'HDG1-207')"
>
......@@ -46,7 +46,7 @@
<!-- 第二行 -->
<div
class="finished-row-2-1"
@click="clickBtn(query['HDG1-148'].busNo)"
@click="doCarStationClick(query['HDG1-148'].busNo)"
v-if="query.hasOwnProperty('HDG1-148') && query['HDG1-148'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-148'].busType, 'HDG1-148')"
>
......@@ -54,7 +54,7 @@
</div>
<div
class="finished-row-2-2"
@click="clickBtn(query['HDG1-164'].busNo)"
@click="doCarStationClick(query['HDG1-164'].busNo)"
v-if="query.hasOwnProperty('HDG1-164') && query['HDG1-164'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-164'].busType, 'HDG1-164')"
>
......@@ -62,7 +62,7 @@
</div>
<div
class="finished-row-2-3"
@click="clickBtn(query['HDG1-208'].busNo)"
@click="doCarStationClick(query['HDG1-208'].busNo)"
v-if="query.hasOwnProperty('HDG1-208') && query['HDG1-208'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-208'].busType, 'HDG1-208')"
>
......@@ -70,7 +70,7 @@
</div>
<div
class="finished-row-2-4"
@click="clickBtn(query['HDG1-209'].busNo)"
@click="doCarStationClick(query['HDG1-209'].busNo)"
v-if="query.hasOwnProperty('HDG1-209') && query['HDG1-209'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-209'].busType, 'HDG1-209')"
>
......@@ -78,7 +78,7 @@
</div>
<div
class="finished-row-2-5"
@click="clickBtn(query['HDG1-210'].busNo)"
@click="doCarStationClick(query['HDG1-210'].busNo)"
v-if="query.hasOwnProperty('HDG1-210') && query['HDG1-210'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-210'].busType, 'HDG1-210')"
>
......@@ -87,7 +87,7 @@
<!-- 第三行 -->
<div
class="finished-row-3-1"
@click="clickBtn(query['HDG1-149'].busNo)"
@click="doCarStationClick(query['HDG1-149'].busNo)"
v-if="query.hasOwnProperty('HDG1-149') && query['HDG1-149'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-149'].busType, 'HDG1-149')"
>
......@@ -95,7 +95,7 @@
</div>
<div
class="finished-row-3-2"
@click="clickBtn(query['HDG1-165'].busNo)"
@click="doCarStationClick(query['HDG1-165'].busNo)"
v-if="query.hasOwnProperty('HDG1-165') && query['HDG1-165'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-165'].busType, 'HDG1-165')"
>
......@@ -103,7 +103,7 @@
</div>
<div
class="finished-row-3-3"
@click="clickBtn(query['HDG1-211'].busNo)"
@click="doCarStationClick(query['HDG1-211'].busNo)"
v-if="query.hasOwnProperty('HDG1-211') && query['HDG1-211'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-211'].busType, 'HDG1-211')"
>
......@@ -111,7 +111,7 @@
</div>
<div
class="finished-row-3-4"
@click="clickBtn(query['HDG1-212'].busNo)"
@click="doCarStationClick(query['HDG1-212'].busNo)"
v-if="query.hasOwnProperty('HDG1-212') && query['HDG1-212'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-212'].busType, 'HDG1-212')"
>
......@@ -119,7 +119,7 @@
</div>
<div
class="finished-row-3-5"
@click="clickBtn(query['HDG1-213'].busNo)"
@click="doCarStationClick(query['HDG1-213'].busNo)"
v-if="query.hasOwnProperty('HDG1-213') && query['HDG1-213'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-213'].busType, 'HDG1-213')"
>
......@@ -128,7 +128,7 @@
<!-- 涂装车出 -->
<div
class="paint-car-out"
@click="clickBtn(query['HXG2-1'].busNo)"
@click="doCarStationClick(query['HXG2-1'].busNo)"
v-if="query.hasOwnProperty('HXG2-1') && query['HXG2-1'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HXG2-1'].busType, 'HXG2-1')"
>
......@@ -200,7 +200,7 @@ export default {
);
},
// 点击车位弹出车体信息
clickBtn (row) {
doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX;
......
src/views/Monitor/components/MiddleCoat.vue
View file @ 022889af
......@@ -3,7 +3,7 @@
<div class="coat-content">
<div
class="coat-row-1-1"
@click="clickBtn(query['HDG1-115'].busNo)"
@click="doCarStationClick(query['HDG1-115'].busNo)"
v-if="query.hasOwnProperty('HDG1-115') && query['HDG1-115'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-115'].busType, 'HDG1-115')"
>
......@@ -11,7 +11,7 @@
</div>
<div
class="coat-row-1-2"
@click="clickBtn(query['HDG1-116'].busNo)"
@click="doCarStationClick(query['HDG1-116'].busNo)"
v-if="query.hasOwnProperty('HDG1-116') && query['HDG1-116'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-116'].busType, 'HDG1-116')"
>
......@@ -19,7 +19,7 @@
</div>
<div
class="coat-row-1-3"
@click="clickBtn(query['HDG1-117'].busNo)"
@click="doCarStationClick(query['HDG1-117'].busNo)"
v-if="query.hasOwnProperty('HDG1-117') && query['HDG1-117'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-117'].busType, 'HDG1-117')"
>
......@@ -27,7 +27,7 @@
</div>
<div
class="coat-row-1-4"
@click="clickBtn(query['HDG1-118'].busNo)"
@click="doCarStationClick(query['HDG1-118'].busNo)"
v-if="query.hasOwnProperty('HDG1-118') && query['HDG1-118'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-118'].busType, 'HDG1-118')"
>
......@@ -35,7 +35,7 @@
</div>
<div
class="coat-row-1-5"
@click="clickBtn(query['HDG1-119'].busNo)"
@click="doCarStationClick(query['HDG1-119'].busNo)"
v-if="query.hasOwnProperty('HDG1-119') && query['HDG1-119'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-119'].busType, 'HDG1-119')"
>
......@@ -44,7 +44,7 @@
<!-- 第二行 -->
<div
class="coat-row-2-1"
@click="clickBtn(query['HDG1-120'].busNo)"
@click="doCarStationClick(query['HDG1-120'].busNo)"
v-if="query.hasOwnProperty('HDG1-120') && query['HDG1-120'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-120'].busType, 'HDG1-120')"
>
......@@ -52,7 +52,7 @@
</div>
<div
class="coat-row-2-2"
@click="clickBtn(query['HDG1-121'].busNo)"
@click="doCarStationClick(query['HDG1-121'].busNo)"
v-if="query.hasOwnProperty('HDG1-121') && query['HDG1-121'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-121'].busType, 'HDG1-121')"
>
......@@ -60,7 +60,7 @@
</div>
<div
class="coat-row-2-3"
@click="clickBtn(query['HDG1-122'].busNo)"
@click="doCarStationClick(query['HDG1-122'].busNo)"
v-if="query.hasOwnProperty('HDG1-122') && query['HDG1-122'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-122'].busType, 'HDG1-122')"
>
......@@ -68,7 +68,7 @@
</div>
<div
class="coat-row-2-4"
@click="clickBtn(query['HDG1-123'].busNo)"
@click="doCarStationClick(query['HDG1-123'].busNo)"
v-if="query.hasOwnProperty('HDG1-123') && query['HDG1-123'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-123'].busType, 'HDG1-123')"
>
......@@ -76,7 +76,7 @@
</div>
<div
class="coat-row-2-5"
@click="clickBtn(query['HDG1-124'].busNo)"
@click="doCarStationClick(query['HDG1-124'].busNo)"
v-if="query.hasOwnProperty('HDG1-124') && query['HDG1-124'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-124'].busType, 'HDG1-124')"
>
......@@ -84,7 +84,7 @@
</div>
<div
class="coat-row-2-6"
@click="clickBtn(query['HDG5-18'].busNo)"
@click="doCarStationClick(query['HDG5-18'].busNo)"
v-if="query.hasOwnProperty('HDG5-18') && query['HDG5-18'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-18'].busType, 'HDG5-18')"
>
......@@ -93,7 +93,7 @@
<!-- 第三行 -->
<div
class="coat-row-3-1"
@click="clickBtn(query['HDG1-125'].busNo)"
@click="doCarStationClick(query['HDG1-125'].busNo)"
v-if="query.hasOwnProperty('HDG1-125') && query['HDG1-125'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-125'].busType, 'HDG1-125')"
>
......@@ -101,7 +101,7 @@
</div>
<div
class="coat-row-3-2"
@click="clickBtn(query['HDG1-126'].busNo)"
@click="doCarStationClick(query['HDG1-126'].busNo)"
v-if="query.hasOwnProperty('HDG1-126') && query['HDG1-126'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-126'].busType, 'HDG1-126')"
>
......@@ -109,7 +109,7 @@
</div>
<div
class="coat-row-3-3"
@click="clickBtn(query['HDG1-127'].busNo)"
@click="doCarStationClick(query['HDG1-127'].busNo)"
v-if="query.hasOwnProperty('HDG1-127') && query['HDG1-127'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-127'].busType, 'HDG1-127')"
>
......@@ -117,7 +117,7 @@
</div>
<div
class="coat-row-3-4"
@click="clickBtn(query['HDG1-128'].busNo)"
@click="doCarStationClick(query['HDG1-128'].busNo)"
v-if="query.hasOwnProperty('HDG1-128') && query['HDG1-128'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-128'].busType, 'HDG1-128')"
>
......@@ -125,7 +125,7 @@
</div>
<div
class="coat-row-3-5"
@click="clickBtn(query['HDG1-129'].busNo)"
@click="doCarStationClick(query['HDG1-129'].busNo)"
v-if="query.hasOwnProperty('HDG1-129') && query['HDG1-129'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-129'].busType, 'HDG1-129')"
>
......@@ -133,7 +133,7 @@
</div>
<div
class="coat-row-3-6"
@click="clickBtn(query['HDG5-19'].busNo)"
@click="doCarStationClick(query['HDG5-19'].busNo)"
v-if="query.hasOwnProperty('HDG5-19') && query['HDG5-19'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-19'].busType, 'HDG5-19')"
>
......@@ -142,7 +142,7 @@
<!-- 第四行 -->
<div
class="coat-row-4-1"
@click="clickBtn(query['HDG1-130'].busNo)"
@click="doCarStationClick(query['HDG1-130'].busNo)"
v-if="query.hasOwnProperty('HDG1-130') && query['HDG1-130'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-130'].busType, 'HDG1-130')"
>
......@@ -150,7 +150,7 @@
</div>
<div
class="coat-row-4-2"
@click="clickBtn(query['HDG1-131'].busNo)"
@click="doCarStationClick(query['HDG1-131'].busNo)"
v-if="query.hasOwnProperty('HDG1-131') && query['HDG1-131'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-131'].busType, 'HDG1-131')"
>
......@@ -158,7 +158,7 @@
</div>
<div
class="coat-row-4-3"
@click="clickBtn(query['HDG1-132'].busNo)"
@click="doCarStationClick(query['HDG1-132'].busNo)"
v-if="query.hasOwnProperty('HDG1-132') && query['HDG1-132'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-132'].busType, 'HDG1-132')"
>
......@@ -166,7 +166,7 @@
</div>
<div
class="coat-row-4-4"
@click="clickBtn(query['HDG1-133'].busNo)"
@click="doCarStationClick(query['HDG1-133'].busNo)"
v-if="query.hasOwnProperty('HDG1-133') && query['HDG1-133'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG1-133'].busType, 'HDG1-133')"
>
......@@ -174,7 +174,7 @@
</div>
<div
class="coat-row-4-5"
@click="clickBtn(query['HDG5-20'].busNo)"
@click="doCarStationClick(query['HDG5-20'].busNo)"
v-if="query.hasOwnProperty('HDG5-20') && query['HDG5-20'].state !== 'FREE'"
:class="judgeCarTypeAndcarStationstyle(query['HDG5-20'].busType, 'HDG5-20')"
>
......@@ -249,7 +249,7 @@ export default {
);
},
// 点击车位弹出车体信息
clickBtn (row) {
doCarStationClick (row) {
console.log(row);
this.$refs.toolRef.$refs.tooltip.style.visibility = 'visible';
let left = window.event.clientX;
......
src/views/Monitor/components/Putty.vue
View file @ 022889af
This diff is collapsed.
src/views/Monitor/components/SealedAnticorrosion.vue
View file @ 022889af
......@@ -311,6 +311,8 @@ export default {
},
data () {
return {
// 实时车辆总数
onlineNum: null,
// 密封防腐作业区域实时数据
sealedAnticorrosion: {},
// 筛选条件订单号
......@@ -357,9 +359,7 @@ export default {
response => {
for (let item of response) {
if (item.code === '3') {
this.sealedAnticorrosionRealTime = _.cloneDeep(
item
);
this.sealedAnticorrosion = _.cloneDeep(item);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment