样式优化

2 years ago · 71c4683695
parent b8cd7c287a
commit 71c4683695
2 changed files with 13 additions and 3 deletions
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@ -41,7 +41,7 @@
          >
          </el-table-column>
          <el-table-column
-            prop="displayName"
+            prop="equipName"
            label="设备名称"
            show-overflow-tooltip
            min-width="150"
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@ -86,7 +86,12 @@

              <div class="caption">
                <p class="infoTop">
-                  {{ item.linename }} / {{ item.displayname }}
+                  {{ item.linename }} /
+                  {{
+                    item.displayname !== null && item.displayname !== ""
+                      ? item.displayname
+                      : item.cmdid
+                  }}
                </p>
                <p class="infoBottom">
                  拍照时间：{{
@ -109,7 +114,12 @@
              ></video>
              <div class="caption">
                <p class="infoTop">
-                  {{ item.linename }} / {{ item.displayname }}
+                  {{ item.linename }} /
+                  {{
+                    item.displayname !== null && item.displayname !== ""
+                      ? item.displayname
+                      : item.cmdid
+                  }}
                </p>
                <p class="infoBottom">
                  拍照时间：{{