CzRger 1 месяц назад
Родитель
Сommit
f7989222dc
2 измененных файлов с 11 добавлено и 14 удалено
  1. 10 13
      src/views/web/warning/index.vue
  2. 1 1
      vite.config.ts

+ 10 - 13
src/views/web/warning/index.vue

@@ -38,24 +38,21 @@
         <div class="list-content">
           <template v-for="item in state.query.result.data">
             <div class="item">
-              <div class="target">
-                <SvgIcon name="warning" color="#FF0D0D"/>
-                船名号
-                <SvgIcon name="focus" color="#ffffff" class="__hover" style="margin-left: auto"/>
-              </div>
-              <div class="target">
-                <SvgIcon name="warning" color="#FF0D0D"/>
-                批次号
-                <SvgIcon name="focus" color="#ffffff" class="__hover" style="margin-left: auto"/>
-              </div>
+              <template v-for="ship in item.dynamicShipList">
+                <div class="target">
+                  <SvgIcon name="warning" color="#FF0D0D"/>
+                  {{ ship.targetName || ship.mergeTarget }}
+                  <SvgIcon name="focus" color="#ffffff" class="__hover" style="margin-left: auto"/>
+                </div>
+              </template>
               <div class="info">
                 <div class="info-img">
                   <img src="@/assets/images/web/tools-warning.png"/>
                 </div>
                 <div class="info-detail">
-                  <div class="info-item">预警名称:</div>
-                  <div class="info-item">预警时间:</div>
-                  <div class="info-item">预警区域:查看区域</div>
+                  <div class="info-item">预警名称:{{item.ruleName}}</div>
+                  <div class="info-item">预警时间:{{item.warnTime}}</div>
+                  <div class="info-item">预警区域:{{item.areaName}}<span style="color: #1CFEFF; margin-left: 10px">查看区域</span></div>
                 </div>
               </div>
             </div>

+ 1 - 1
vite.config.ts

@@ -53,7 +53,7 @@ export default defineConfig({
     strictPort: false,
     proxy: {
       '/sww-api': {
-        target: 'http://8.130.108.178:9090/',
+        target: 'http://8.130.108.178:8080/',
         changeOrigin: true,
         rewrite: (path) => {
           return path.replace(/^\/sww-api/, '')