需求清单

src/views/subsystem/model/index.vue

@@ -55,19 +55,19 @@
             </a-tree>
           </div>
         </ModuleWrapper>
-        <ModuleWrapper height="55%">
+        <ModuleWrapper height="55%" title="保障需求清单">
-          <template #title>
+          <!-- <template #title>
             <a-radio-group v-model="qd.qdlx" button-style="solid">
               <a-radio-button value="xqqd">需求清单</a-radio-button>
               <a-radio-button value="bzqd">保障清单</a-radio-button>
             </a-radio-group>
-          </template>
+          </template> -->
-          <div class="normal" style="padding: 5px">
+          <div class="normal" style="padding: 5px; overflow-y: auto">
             <a-table
               class="simulation-table-plain"
               rowKey="id"
               :columns="qd.qdColumns"
-              :dataSource="qd.qdList"
+              :dataSource="supplierRequests"
               :pagination="false"
               :bordered="true"
             ></a-table>
@@ -172,15 +172,18 @@ export default {
       qd: {
         qdlx: 'xqqd',
         qdColumns: [
-          {
+          // {
-            dataIndex: 'dj',
+          //   dataIndex: 'dj',
-            title: '等级',
+          //   title: '等级',
-            width: '62px',
+          //   width: '62px',
-            align: 'center',
+          //   align: 'center',
-            customRender: (text) => ['', '紧急', '加急', '一般'][text],
+          //   customRender: (text) => ['', '紧急', '加急', '一般'][text],
-            customCell: (record) => ({ style: { color: ['', '#ff3838', '#feba29', '#ffffff'][record.dj] } }),
+          //   customCell: (record) => ({ style: { color: ['', '#ff3838', '#feba29', '#ffffff'][record.dj] } }),
-          },
+          // },
-          { dataIndex: 'bzxq', title: '保障需求' },
+          // { dataIndex: 'bzxq', title: '保障需求' },
+          { title: '等级', dataIndex: 'handleFlag' },
+          { title: '保障需求', dataIndex: 'supplierType' },
+          { title: '保障数量', dataIndex: 'supplierNum' },
         ],
         qdList: [
           { id: '1', dj: '1', bzxq: '500枚防空导弹、6辆装甲车' },
@@ -229,6 +232,20 @@ export default {
       }
       return this.roomInfo.roomData.find((item) => item.sdzy.id === this.zzbzll.selectedKeys[0])
     },
+    supplierRequests() {
+      return (this.zzbzllSelectedFd?.supplierRequests || []).map((item) => ({
+        id: item.id,
+        handleFlag: ['未处理', '已处理'][item.handleFlag],
+        supplierType:
+          {
+            fuel: '油料',
+            injured: '伤员',
+            ammunition: '弹药',
+            death: '死亡',
+          }[item.supplierType] || item.supplierType,
+        supplierNum: item.supplierNum,
+      }))
+    },
     rightRows() {
       switch (this.rightViewer) {
         case 'blbz':

src/views/subsystem/scene/index.vue

@@ -42,7 +42,7 @@
         style="grid-area: 2 / 1 / 3 / 4"
       ></div>
       <div class="pr zi1" style="grid-area: 2 / 1 / 3 / 2">
-        <ModuleWrapper title="作战/保障力量" height="60%">
+        <ModuleWrapper title="作战/保障力量" height="45%">
           <div class="normal" style="padding: 5px; overflow-y: auto">
             <a-tree
               class="simulation-tree"
@@ -54,9 +54,21 @@
             </a-tree>
           </div>
         </ModuleWrapper>
-        <ModuleWrapper title="日志" height="40%">
+        <ModuleWrapper height="55%" title="保障需求清单">
-          <div class="normal"></div>
+          <div class="normal" style="padding: 5px; overflow-y: auto">
+            <a-table
+              class="simulation-table-plain"
+              rowKey="id"
+              :columns="qd.qdColumns"
+              :dataSource="supplierRequests"
+              :pagination="false"
+              :bordered="true"
+            ></a-table>
+          </div>
         </ModuleWrapper>
+        <!-- <ModuleWrapper title="日志" height="40%">
+          <div class="normal"></div>
+        </ModuleWrapper> -->
       </div>
       <Grid class="pr zi1" :rows="rightRows" gap="0px" style="grid-area: 2 / 3 / 3 / 4">
         <ModuleWrapper title="兵力编组">
@@ -153,6 +165,13 @@ export default {
       zzbzll: {
         selectedKeys: [],
       },
+      qd: {
+        qdColumns: [
+          { title: '等级', dataIndex: 'handleFlag' },
+          { title: '保障需求', dataIndex: 'supplierType' },
+          { title: '保障数量', dataIndex: 'supplierNum' },
+        ],
+      },
       blbz: {
         treeData: [],
       },
@@ -193,6 +212,20 @@ export default {
       }
       return this.roomInfo.roomData.find((item) => item.sdzy.id === this.zzbzll.selectedKeys[0])
     },
+    supplierRequests() {
+      return (this.zzbzllSelectedFd?.supplierRequests || []).map(item => ({
+        id: item.id,
+        handleFlag: ['未处理', '已处理'][item.handleFlag],
+        supplierType:
+          {
+            fuel: '油料',
+            injured: '伤员',
+            ammunition: '弹药',
+            death: '死亡',
+          }[item.supplierType] || item.supplierType,
+        supplierNum: item.supplierNum,
+      }))
+    },
     rightRows() {
       switch (this.rightViewer) {
         case 'blbz':
@@ -315,6 +348,7 @@ export default {
           case 'editScenarioInfo':
             if (this.initial === false) {
               this.roomInfo.roomData = JSON.parse(response.data)
+              console.log(this.roomInfo.roomData)
               this.initPlots()
               this.initial = true
             }
@@ -439,4 +473,43 @@ export default {
     background-color: #bae7ff22;
   }
 }
+.simulation-table-plain::v-deep {
+  .ant-table {
+    color: #a1c2d0;
+  }
+  .ant-table-body > table {
+    border: none;
+  }
+  .ant-table-thead > tr > th {
+    background-color: #083a52;
+    color: #ffffff;
+    border-bottom-color: #05628e;
+    border-top: 1px solid #05628e;
+    &:last-child {
+      border-right-color: #05628e;
+    }
+    &:not(:last-child) {
+      border-right-color: #05628e3b;
+    }
+    &:first-child {
+      border-left: 1px solid #05628e;
+    }
+    &:not(:first-child) {
+    }
+  }
+  .ant-table-tbody > tr > td {
+    border-bottom-color: #064766;
+    &:last-child {
+      border-right-color: #064766;
+    }
+    &:not(:last-child) {
+      border-right-color: #05628e3b;
+    }
+    &:first-child {
+      border-left: 1px solid #064766;
+    }
+    &:not(:first-child) {
+    }
+  }
+}
 </style>