Browse Source

修改禅道bug

wang_xy 1 year ago
parent
commit
a53911012c

+ 1 - 1
src/components/eventLocation.vue

@@ -577,7 +577,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>网络运营商:' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":"电信")) + '</h4>' +
+                '                  <h4>网络运营商:' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":(res.data[i].operatorType == "3" ? "电信":"无"))) + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +

+ 1 - 1
src/components/vBottomMenu.vue

@@ -196,7 +196,7 @@
               </div>
               <div class="btm-r-pop-info-list">
                 <div class="btm-r-pop-info-list-name">内容</div>
-                <div class="btm-r-pop-info-list-text">
+                <div class="btm-r-pop-info-list-text" style="width:85%">
                   <h4 class="line-h-1 w-100p" v-html="item.content">{{ item.content }}</h4>
                 </div>
               </div>

+ 5 - 13
src/views/eventdetailsdialog.vue

@@ -214,7 +214,7 @@
                       size="small"
                       icon="el-icon-s-grid"
                       @click="showTVWallDiaLog()"
-                      v-show="eventType == 1"
+                      v-show="cameraCode != '' && cameraCode!= null && cameraCode != undefined"
                     >视频联动</el-button>
                     <el-button
                       size="small"
@@ -962,12 +962,8 @@
               v-for="(item, index) in depteventList"
             >
               <div class="bgt-info">
-                <div
-                  class="bgt-info-name"
-                  :class="{ on: iconCurrentIndex == item.deptId }"
-                  @click="dutysystemSelect(item.deptId, item.deptName, item.id)"
-                >
-                  {{ item.deptName }}
+                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>
@@ -1075,12 +1071,8 @@
               v-for="(item, index) in depteventList"
             >
               <div class="bgt-info">
-                <div
-                  class="bgt-info-name"
-                  :class="{ on: iconCurrentIndex == item.deptId }"
-                  @click="dutysystemSelect(item.deptId, item.deptName, item.id)"
-                >
-                  {{ item.deptName }}
+                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>

+ 5 - 5
src/views/firespread.vue

@@ -129,7 +129,7 @@
                       size="small"
                       icon="el-icon-s-grid"
                       @click="showTVWallDiaLog()"
-                      v-show="eventType == 1"
+                      v-show="cameraCode != '' && cameraCode!= null && cameraCode != undefined"
                     >视频联动</el-button>
                     <el-button size="small" icon="el-icon-upload" @click="showEventdetailsdialog()">动态标绘</el-button>
                   </div>
@@ -360,8 +360,8 @@
           <div class="bottomLeft">
             <div class="leftItem d-l-con padding-box nowrap" style="white-space: nowrap;" v-for="(item,index) in depteventList">
               <div class="bgt-info">
-                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}"
-                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName }}
+                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>
@@ -425,8 +425,8 @@
           <div class="bottomLeft">
             <div class="leftItem d-l-con padding-box nowrap" v-for="(item,index) in depteventList">
               <div class="bgt-info">
-                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}"
-                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName }}
+                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)"> {{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>

+ 2 - 14
src/views/monitor.vue

@@ -1362,13 +1362,7 @@ export default {
               "<span>" +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              "                  <h4>网络运营商:" +
-              (res.data.visuForestCloudCameraBOList[i].operatorType == "1"
-                ? "联通"
-                : res.data.visuForestCloudCameraBOList[i].operatorType == "2"
-                ? "移动"
-                : "电信") +
-              "</h4>" +
+              '                  <h4>网络运营商:' + (res.data.visuForestCloudCameraBOList[i].operatorType == "1" ? "联通" : (res.data.visuForestCloudCameraBOList[i].operatorType == "2" ? "移动":(res.data.visuForestCloudCameraBOList[i].operatorType == "3" ? "电信":"无"))) + '</h4>' +
               "                </div>" +
               "                </div>" +
               "                </span>" +
@@ -1533,13 +1527,7 @@ export default {
               "<span>" +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              "                  <h4>网络运营商:" +
-              (res.data[i].operatorType == "1"
-                ? "联通"
-                : res.data[i].operatorType == "2"
-                ? "移动"
-                : "电信") +
-              "</h4>" +
+              '                  <h4>网络运营商:' + (res.data[i].operatorType == "1" ? "联通" : (res.data[i].operatorType == "2" ? "移动":(res.data[i].operatorType == "3" ? "电信":"无"))) + '</h4>' +
               "                </div>" +
               "                </div>" +
               "                </span>" +