From e0a7020e28229ff041405a5d0f552308a5cbf5fb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 16:14:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/policeTracking/policeTracking.vue | 2 +-
src/views/dataL/dataL.vue | 20 ++++++++++----------
src/views/supervisoryConsole/card.vue | 10 +++++-----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 01d2b7a..bfba118 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -165,7 +165,7 @@
</template>
</el-table-column>
<!-- <el-table-column label="跳转实时" prop="">
-
+
</el-table-column> -->
</el-table>
</div>
@@ -201,7 +201,7 @@
prop="open">
</el-table-column>
</el-table>
- </el-form>
+ </el-form>
</template>
</el-table-column>
<el-table-column
@@ -326,7 +326,7 @@
</el-row>
<el-row>
<el-col span="12">
- <el-form-item label="负责人">
+ <el-form-item label="主要负责人">
<el-input
disabled="true"
v-model="detailsData.person"
@@ -352,7 +352,7 @@
v-model="detailsData.user"
autocomplete="off"
></el-input>
- </el-form-item>
+ </el-form-item>
</el-col> -->
<el-col span="12">
<el-form-item label="序列号">
@@ -506,12 +506,12 @@
<!-- <div class="r-b-t-main">
<span class="r-b-t-left">设备标签</span>
<span class="r-b-t-right">
- <div
- class="r-b-t-r-label"
- v-for="(value,index) in labels"
+ <div
+ class="r-b-t-r-label"
+ v-for="(value,index) in labels"
:key="index"
>
- {{value}}
+ {{value}}
</div>
</span>
</div> -->
@@ -1025,7 +1025,7 @@
} else if (d == 2) {
states = "预警";
}
-
+
// if (s != "") {
// states = "故障";
// } else {
@@ -1738,4 +1738,4 @@
video::-webkit-media-controls-timeline {
display: none;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 09de97b..434c630 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -60,7 +60,7 @@
</el-row>
<el-row>
<el-col span="12">
- <el-form-item label="负责人">
+ <el-form-item label="主要负责人">
<el-input
disabled="true"
v-model="form.oneContacts"
diff --git a/src/views/supervisoryConsole/card.vue b/src/views/supervisoryConsole/card.vue
index 3339a2b..80d268f 100644
--- a/src/views/supervisoryConsole/card.vue
+++ b/src/views/supervisoryConsole/card.vue
@@ -174,12 +174,12 @@
f = [];
if (this.radio == "全部") {
res.data.data.forEach((item) => {
- if (item.dtype == 1) {
+ if (item.dtype == 2) {
f.push(item);
} else {
- if (item.dtype == 0) a.push(item);
- if (item.dtype == 2) c.push(item);
- if (item.dtype == 3) b.push(item);
+ if (item.dtype == 3) a.push(item);
+ if (item.dtype == 1) c.push(item);
+ if (item.dtype == 0) b.push(item);
}
});
} else if (this.radio == "仅显示预警设备") {
@@ -379,4 +379,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3