Hwf 7 kuukautta sitten
vanhempi
commit
c7b3a64f46

+ 8 - 8
src/views/globalMap/RightMenu/OnlinePlotting/index.vue

@@ -868,14 +868,14 @@ const handleSendForm = () => {
   if (!form.value.pattern_name) {
     return proxy?.$modal.msgWarning('请填写预案名称');
   }
-  webSock = createWebSocket('ZEaBf-NZ4Fi29kSYGdNeJ', getWebSocketData);
-  patternId.value = 'ZEaBf-NZ4Fi29kSYGdNeJ';
-  // createCollaboration(form.value).then(() => {
-  //   patternId.value = form.value.pattern_id;
-  //   webSock = createWebSocket(form.value.pattern_id, getWebSocketData);
-  showForm.value = false;
-  collaboration.value = true;
-  // });
+  // webSock = createWebSocket('ZEaBf-NZ4Fi29kSYGdNeJ', getWebSocketData);
+  // patternId.value = 'ZEaBf-NZ4Fi29kSYGdNeJ';
+  createCollaboration(form.value).then(() => {
+    patternId.value = form.value.pattern_id;
+    webSock = createWebSocket(form.value.pattern_id, getWebSocketData);
+    showForm.value = false;
+    collaboration.value = true;
+  });
 };
 const handleShowDialog = () => {
   editData.value = {

+ 3 - 0
src/views/routineCommandMap/LeftSection/RealSituation.vue

@@ -258,4 +258,7 @@ onMounted(() => {
     }
   }
 }
+:deep(.dialog-content) {
+  overflow: unset !important;
+}
 </style>

+ 1 - 1
src/views/routineCommandMap/RightSection/EventReport/EventManage.vue

@@ -64,7 +64,7 @@
                   clearable
                 >
                   <el-option label="全部" value=""></el-option>
-                  <el-option v-for="item in region" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                  <el-option v-for="item in region" :key="item.value" :label="item.lable" :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>

+ 10 - 7
src/views/routineCommandMap/RightSection/EventReport/index.vue

@@ -7,24 +7,24 @@
     <!-- 表格组件 -->
     <div class="common-table">
       <div class="table-header">
-        <div class="td">事件标题</div>
-        <div class="td">事件类型</div>
         <div class="td">事发地点</div>
+        <div class="td">事件类型</div>
+        <div class="td">事件标题</div>
         <div class="td">事发时间</div>
         <div class="td">事发状态</div>
         <div class="td">操作</div>
       </div>
       <div v-for="(item, index) in eventList" :key="index" class="tr">
-        <div class="td" @click="handleShowDetail(item)">{{ item.event_title }}</div>
-        <div class="td">
-          <dict-tag :class="['0', '1'].includes(item.event_type) ? 'primary-tag' : 'success-tag'" :options="mm_event_type" :value="item.event_type" />
-        </div>
         <div class="td">
           <div class="address-box">
             <i class="address-icon" />
             <div class="address-text">{{ item.address }}</div>
           </div>
         </div>
+        <div class="td">
+          <dict-tag :class="['0', '1'].includes(item.event_type) ? 'primary-tag' : 'success-tag'" :options="mm_event_type" :value="item.event_type" />
+        </div>
+        <div class="td text1" @click="handleShowDetail(item)">{{ item.event_title }}</div>
         <div class="td">{{ item.event_time }}</div>
         <div class="td">
           <dict-tag :class="getEventStatusClass(item.event_status)" :options="mm_event_state" :value="item.event_status" />
@@ -158,6 +158,10 @@ const getEventStatusClass = (value) => {
       width: 250px;
     }
   }
+  .text1 {
+    color: #00e8ff;
+    cursor: pointer;
+  }
   .address-box {
     display: flex;
     align-items: center;
@@ -172,7 +176,6 @@ const getEventStatusClass = (value) => {
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
-      color: #00e8ff;
     }
   }
 }