Merge branch 'master' of http://43.143.235.246:9080/cetc10/web-zc

src/views/intelESMProcess/index.vue

@@ -10,21 +10,9 @@
           <div style="width: 100%">
             <el-table :data="this.singleData">
               <el-table-column type="selection" width="55"> </el-table-column>
-              <el-table-column
-                prop="targetORD"
-                label="序号"
-                width="55"
-              ></el-table-column>
-              <el-table-column
-                prop="targetType"
-                label="类型"
-                width="55"
-              ></el-table-column>
-              <el-table-column
-                prop="targetEnv"
-                label="环境"
-                width="55"
-              ></el-table-column>
+              <el-table-column prop="targetORD" label="序号" width="55"></el-table-column>
+              <el-table-column prop="targetType" label="类型" width="55"></el-table-column>
+              <el-table-column prop="targetEnv" label="环境" width="55"></el-table-column>
               <el-table-column prop="targetLon" label="经度" width="55"></el-table-column>
               <el-table-column prop="targetLat" label="纬度" width="55"></el-table-column>
               <el-table-column prop="targetH" label="高度" width="55"></el-table-column>
@@ -46,21 +34,9 @@
           <div style="width: 100%">
             <el-table :data="this.singleData">
               <el-table-column type="selection" width="55"> </el-table-column>
-              <el-table-column
-                prop="targetORD"
-                label="序号"
-                width="55"
-              ></el-table-column>
-              <el-table-column
-                prop="targetType"
-                label="类型"
-                width="55"
-              ></el-table-column>
-              <el-table-column
-                prop="targetEnv"
-                label="环境"
-                width="55"
-              ></el-table-column>
+              <el-table-column prop="targetORD" label="序号" width="55"></el-table-column>
+              <el-table-column prop="targetType" label="类型" width="55"></el-table-column>
+              <el-table-column prop="targetEnv" label="环境" width="55"></el-table-column>
               <el-table-column prop="targetLon" label="经度" width="55"></el-table-column>
               <el-table-column prop="targetLat" label="纬度" width="55"></el-table-column>
               <el-table-column prop="targetH" label="高度" width="55"></el-table-column>
@@ -76,46 +52,41 @@
       </el-col>
     </el-row>
     <el-row style="height: 50%;">
-        <el-card class="box-card" style="width: 100%">
-          <div slot="header" class="clearfix">
-            <span>融合识别结果</span>
-          </div>
-          <div style="width: 100%">
-            <el-table :data="this.singleData">
-              <el-table-column type="selection"> </el-table-column>
-              <el-table-column
-                prop="targetORD"
-                label="序号"
-                
-              ></el-table-column>
-              <el-table-column
-                prop="targetType"
-                label="类型"
-                
-              ></el-table-column>
-              <el-table-column
-                prop="targetEnv"
-                label="环境"
-                
-              ></el-table-column>
-              <el-table-column prop="targetLon" label="经度" ></el-table-column>
-              <el-table-column prop="targetLat" label="纬度" ></el-table-column>
-              <el-table-column prop="targetH" label="高度"></el-table-column>
-              <el-table-column prop="targetVel" label="速度"></el-table-column>
-              <el-table-column prop="targetFreq" label="频率(MHz)"></el-table-column>
-              <el-table-column prop="targetPRI" label="PRI(MHz)"></el-table-column>
-              <el-table-column prop="targetModel" label="型号"></el-table-column>
-              <el-table-column prop="targetMode" label="模式"></el-table-column>
-            </el-table>
-            <el-button>发送选中情报</el-button>
-            <el-button>忽略选中目标</el-button>
-          </div>
-        </el-card>
+      <el-card class="box-card" style="width: 100%">
+        <div slot="header" class="clearfix">
+          <span>融合识别结果</span>
+        </div>
+        <div style="width: 100%">
+          <el-table :data="this.singleData">
+            <el-table-column type="selection"> </el-table-column>
+            <el-table-column prop="targetORD" label="序号"></el-table-column>
+            <el-table-column prop="targetType" label="类型"></el-table-column>
+            <el-table-column prop="targetEnv" label="环境"></el-table-column>
+            <el-table-column prop="targetLon" label="经度"></el-table-column>
+            <el-table-column prop="targetLat" label="纬度"></el-table-column>
+            <el-table-column prop="targetH" label="高度"></el-table-column>
+            <el-table-column prop="targetVel" label="速度"></el-table-column>
+            <el-table-column prop="targetFreq" label="频率(MHz)"></el-table-column>
+            <el-table-column prop="targetPRI" label="PRI(MHz)"></el-table-column>
+            <el-table-column prop="targetModel" label="型号"></el-table-column>
+            <el-table-column prop="targetMode" label="模式"></el-table-column>
+          </el-table>
+          <el-button>发送选中情报</el-button>
+          <el-button>忽略选中目标</el-button>
+        </div>
+      </el-card>
     </el-row>
     <!-- <el-row :gutter="20" type="flex" justify="center">
       <el-column :span="12"> </el-column>
       <el-column :span="12"> </el-column>
     </el-row> -->
+    <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+      <span>确认发送？</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </el-column>
 </template>
 
@@ -132,8 +103,8 @@ export default {
           targetLat: 25,
           targetH: 0,
           targetVel: 20,
-          targetFreq: 6e9/1e6,
-          targetPRI: 1e8/1e6,
+          targetFreq: 6e9 / 1e6,
+          targetPRI: 1e8 / 1e6,
           targetModel: "宙斯盾",
           targetMode: "粗扫描"
         },
@@ -145,8 +116,8 @@ export default {
           targetLat: 22,
           targetH: 0,
           targetVel: 0,
-          targetFreq: 1e9/1e6,
-          targetPRI: 1e7/1e6,
+          targetFreq: 1e9 / 1e6,
+          targetPRI: 1e7 / 1e6,
           targetModel: "星链地面站",
           targetMode: "通信握手"
         },
@@ -158,8 +129,8 @@ export default {
           targetLat: 22,
           targetH: 0,
           targetVel: 800,
-          targetFreq: 18e9/1e6,
-          targetPRI: 2e9/1e6,
+          targetFreq: 18e9 / 1e6,
+          targetPRI: 2e9 / 1e6,
           targetModel: "F-35",
           targetMode: "瞄准"
         },
@@ -183,6 +154,7 @@ export default {
   display: table;
   content: "";
 }
+
 .clearfix:after {
   clear: both;
 }