From ab575b6592910ef2ce0cc9bff65f8e98f2877798 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Sun, 14 Sep 2025 16:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simulationScene/database/zzllsjk.vue      | 57 +++++++++++++++----
 .../system/simulationModel/index.vue          | 30 +++++-----
 .../sceneEditing/components/BzTask.vue        | 15 +++--
 .../sceneEditing/components/SceneEditing.vue  | 52 ++++++++++++-----
 4 files changed, 109 insertions(+), 45 deletions(-)

diff --git a/src/views/simulationScene/database/zzllsjk.vue b/src/views/simulationScene/database/zzllsjk.vue
index b78dcb7..a8d7d86 100644
--- a/src/views/simulationScene/database/zzllsjk.vue
+++ b/src/views/simulationScene/database/zzllsjk.vue
@@ -5,7 +5,10 @@
         <template #extra>
           <a-button type="primary" icon="plus" shape="circle" title="新增" @click="handleOpenAddZzjgModal()"></a-button>
         </template>
-        <a-tree :treeData="zzjg.treeData" :selectedKeys.sync="zzjg.selectedKeys" :expandedKeys.sync="zzjg.expandedKeys"
+        <a-tree 
+          :treeData="zzjg.treeData" 
+          :selectedKeys.sync="zzjg.selectedKeys" 
+          :expandedKeys.sync="zzjg.expandedKeys"
           @select="handleChangeZzjgSelected">
           <template #title="{ key: id, title }">
             <a-dropdown :trigger="['contextmenu']">
@@ -24,11 +27,18 @@
       <a-card title="组织人员" class="my-card my-card-has-title" :bordered="false">
         <template #extra>
           <a-button type="primary" style="margin-right: 20px" @click="handleOpenAddZzryModal">新增</a-button>
-          <a-icon v-if="layoutRight === 'zzry'" type="fullscreen-exit" style="font-size: 32px"
+          <a-icon 
+            v-if="layoutRight === 'zzry'" 
+            type="fullscreen-exit" 
+            style="font-size: 32px"
             @click="layoutRight = 'auto'" />
           <a-icon v-else type="fullscreen" style="font-size: 32px" @click="layoutRight = 'zzry'" />
         </template>
-        <AntQueryTable ref="zzry-table" height="100%" :queryConfig="zzry.queryConfig" :tableConfig="zzry.tableConfig"
+        <AntQueryTable 
+          ref="zzry-table" 
+          height="100%" 
+          :queryConfig="zzry.queryConfig" 
+          :tableConfig="zzry.tableConfig"
           :pageConfig="zzry.pageConfig" :showTool="zzry.showTool">
           <template #tablecell-action="{ record }">
             <a-button type="text-primary" icon="edit" @click="handleOpenEditZzryModal(record)"></a-button>
@@ -38,11 +48,17 @@
       <a-card title="组织装备" class="my-card my-card-has-title" :bordered="false">
         <template #extra>
           <a-button type="primary" style="margin-right: 20px" @click="handleOpenAddZzzbModal">新增</a-button>
-          <a-icon v-if="layoutRight === 'zzzb'" type="fullscreen-exit" style="font-size: 32px"
+          <a-icon 
+            v-if="layoutRight === 'zzzb'" 
+            type="fullscreen-exit" 
+            style="font-size: 32px"
             @click="layoutRight = 'auto'" />
           <a-icon v-else type="fullscreen" style="font-size: 32px" @click="layoutRight = 'zzzb'" />
         </template>
-        <AntQueryTable ref="zzzb-table" height="100%" :queryConfig="zzzb.queryConfig" :tableConfig="zzzb.tableConfig"
+        <AntQueryTable 
+          ref="zzzb-table" height="100%" 
+          :queryConfig="zzzb.queryConfig" 
+          :tableConfig="zzzb.tableConfig"
           :pageConfig="zzzb.pageConfig" :showTool="zzzb.showTool">
           <template #tablecell-action="{ record }">
             <a-button type="text-primary" icon="edit" @click="handleOpenEditZzzbModal(record)"></a-button>
@@ -53,11 +69,18 @@
       <a-card title="组织物资" class="my-card my-card-has-title" :bordered="false">
         <template #extra>
           <a-button type="primary" style="margin-right: 20px" @click="handleOpenAddZzwzModal">新增</a-button>
-          <a-icon v-if="layoutRight === 'zzwz'" type="fullscreen-exit" style="font-size: 32px"
+          <a-icon 
+            v-if="layoutRight === 'zzwz'" 
+            type="fullscreen-exit" 
+            style="font-size: 32px"
             @click="layoutRight = 'auto'" />
           <a-icon v-else type="fullscreen" style="font-size: 32px" @click="layoutRight = 'zzwz'" />
         </template>
-        <AntQueryTable ref="zzwz-table" height="100%" :queryConfig="zzwz.queryConfig" :tableConfig="zzwz.tableConfig"
+        <AntQueryTable 
+          ref="zzwz-table" 
+          height="100%" 
+          :queryConfig="zzwz.queryConfig" 
+          :tableConfig="zzwz.tableConfig"
           :pageConfig="zzwz.pageConfig" :showTool="zzwz.showTool">
           <template #tablecell-action="{ record }">
             <a-button type="text-primary" icon="edit" @click="handleOpenEditZzwzModal(record)"></a-button>
@@ -65,17 +88,29 @@
         </AntQueryTable>
       </a-card>
     </Grid>
-    <AntFormModal :visible.sync="zzjgModal.visible" :title="zzjgModal.title" :formItems="zzjgModal.formItems"
+    <AntFormModal 
+      :visible.sync="zzjgModal.visible" 
+      :title="zzjgModal.title" 
+      :formItems="zzjgModal.formItems"
       :formRules="zzjgModal.formRules" :formData="zzjgModal.formData" :onSubmit="handleSubmitZzjg"
       @success="handleSubmitZzjgSuccess"></AntFormModal>
-    <AntFormModal :visible.sync="zzryModal.visible" :title="zzryModal.title" :formItems="zzryModal.formItems"
+    <AntFormModal 
+      :visible.sync="zzryModal.visible" 
+      :title="zzryModal.title" 
+      :formItems="zzryModal.formItems"
       :formRules="zzryModal.formRules" :formData="zzryModal.formData" :onSubmit="handleSubmitZzry"
       @success="handleSubmitZzrySuccess"></AntFormModal>
-    <AntFormModal :visible.sync="zzzbModal.visible" :title="zzzbModal.title" :formItems="zzzbFormItems"
+    <AntFormModal 
+      :visible.sync="zzzbModal.visible" 
+      :title="zzzbModal.title" 
+      :formItems="zzzbFormItems"
       :formRules="zzzbModal.formRules" :formData="zzzbModal.formData" :onSubmit="handleSubmitZzzb"
       @success="handleSubmitZzzbSuccess"></AntFormModal>
     <!-- 组织物资模态框 -->
-    <AntFormModal :visible.sync="zzwzModal.visible" :title="zzwzModal.title" :formItems="zzwzFormItems"
+    <AntFormModal 
+      :visible.sync="zzwzModal.visible" 
+      :title="zzwzModal.title" 
+      :formItems="zzwzFormItems"
       :formRules="zzwzModal.formRules" :formData="zzwzModal.formData" :onSubmit="handleSubmitZzwz"
       @success="handleSubmitZzwzSuccess"></AntFormModal>
   </page-header-wrapper>
diff --git a/src/views/simulationScene/instructor/system/simulationModel/index.vue b/src/views/simulationScene/instructor/system/simulationModel/index.vue
index 74e8bb8..f0715b0 100644
--- a/src/views/simulationScene/instructor/system/simulationModel/index.vue
+++ b/src/views/simulationScene/instructor/system/simulationModel/index.vue
@@ -49,21 +49,21 @@
       </ModuleWrapper>
       <ModuleWrapper height="55%">
         <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>
-      <div class="normal" style="padding: 5px">
-        <a-table
-          class="simulation-table-plain"
-          rowKey="id"
-          :columns="qd.qdColumns"
-          :dataSource="qd.qdList"
-          :pagination="false"
-          :bordered="true"
-        ></a-table>
-      </div>
+          <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>
+        <div class="normal" style="padding: 5px">
+          <a-table
+            class="simulation-table-plain"
+            rowKey="id"
+            :columns="qd.qdColumns"
+            :dataSource="qd.qdList"
+            :pagination="false"
+            :bordered="true"
+          ></a-table>
+        </div>
       </ModuleWrapper>
     </div>
     <div
diff --git a/src/views/simulationScene/sceneEditing/components/BzTask.vue b/src/views/simulationScene/sceneEditing/components/BzTask.vue
index 19af669..181ff48 100644
--- a/src/views/simulationScene/sceneEditing/components/BzTask.vue
+++ b/src/views/simulationScene/sceneEditing/components/BzTask.vue
@@ -8,12 +8,18 @@
         <a-button type="text-primary" icon="edit" @click="handleOpenEditActionModal"></a-button>
         <a-button type="text-primary" icon="delete" @click="handleDeleteAction"></a-button>
       </div>
-      <a-modal v-model="actionModal.visible" :title="actionModal.title" :maskClosable="false" :destroyOnClose="true"
+      <a-modal 
+        v-model="actionModal.visible" 
+        :title="actionModal.title" :maskClosable="false" :destroyOnClose="true"
         @ok="handleSubmilAction">
-        <a-form-model :model="actionModal.formData" layout="horizontal" :labelCol="{ span: 6 }"
+        <a-form-model 
+          :model="actionModal.formData" 
+          layout="horizontal" :labelCol="{ span: 6 }"
           :wrapperCol="{ span: 15 }">
           <a-form-model-item v-for="item in actionModal.formItems" :key="item.prop" v-bind="item">
-            <component :is="item.component || 'a-input'" v-model="actionModal.formData[item.prop]"
+            <component 
+              :is="item.component || 'a-input'" 
+              v-model="actionModal.formData[item.prop]"
               v-bind="item.options" />
           </a-form-model-item>
         </a-form-model>
@@ -99,8 +105,7 @@ export default {
   },
   watch: {
     resourceid: {
-      handler(newValue, oldValue) {
-        console.log('用户信息发生了变化:', newValue);
+      handler(newValue, oldValue) { 
         this.handleGetTaskList()
       },
       deep: true // 重要：开启深层监听
diff --git a/src/views/simulationScene/sceneEditing/components/SceneEditing.vue b/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
index 6d8e9c1..1841290 100644
--- a/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
+++ b/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
@@ -7,20 +7,28 @@
           <a-button type="text-primary" icon="sync" style="font-size: 20px" @click="getZzbzllTreeData()"></a-button>
         </template>
         <div class="normal" style="padding: 5px; overflow-y: auto">
-          <a-tree class="simulation-tree" :treeData="zzbzll.treeData" :selectedKeys.sync="zzbzll.selectedKeys"
+          <a-tree 
+            class="simulation-tree" 
+            :treeData="zzbzll.treeData" :selectedKeys.sync="zzbzll.selectedKeys"
             :replaceFields="{ children: 'children', title: 'title', key: 'id' }" @select="handleSelectZzbzll">
             <template #title="{ id, dataRef }">
               <a-dropdown :trigger="['contextmenu']">
                 <span>{{ dataRef.resourceName || dataRef.title }}</span>
                 <template #overlay>
                   <Flex>
-                    <a-button type="text-primary" icon="edit" title="修改名称"
+                    <a-button 
+                      type="text-primary" 
+                      icon="edit" title="修改名称"
                       @click="handleOpenEditZzbzllModal(id, dataRef)"></a-button>
-                    <AntFormModal :visible.sync="zzbzllModal.visible" :title="zzbzllModal.title"
+                    <AntFormModal 
+                      :visible.sync="zzbzllModal.visible" 
+                      :title="zzbzllModal.title"
                       :formItems="zzbzllModal.formItems" :formRules="zzbzllModal.formRules"
                       :formData="zzbzllModal.formData" :onSubmit="handleSubmitZzbzll"
                       @success="handleSubmitZzbzllSuccess"></AntFormModal>
-                    <a-button type="text-danger" icon="delete" title="删除"
+                    <a-button 
+                      type="text-danger" 
+                      icon="delete" title="删除"
                       @click="handleDeleteZzbzll(id, dataRef)"></a-button>
                   </Flex>
                 </template>
@@ -40,9 +48,13 @@
           <template v-if="model.type === 'zbys'">
             <a-input-search v-model="model.queryParams.keyword" placeholder="输入关键词搜索..." @search="getZbysListData()" />
             <Flex>
-              <AntOriginSelect v-model="model.queryParams.force" :dataSource="() => ({ data: model.forceOptions })"
+              <AntOriginSelect 
+                v-model="model.queryParams.force" 
+                :dataSource="() => ({ data: model.forceOptions })"
                 width="100px" :allowClear="false" />
-              <AntOriginSelect v-model="model.queryParams.type" :dataSource="() => ({ data: model.typeOptions })"
+              <AntOriginSelect
+                v-model="model.queryParams.type" 
+                :dataSource="() => ({ data: model.typeOptions })"
                 class="flex-1" :allowClear="false" @change="getZbysListData()" />
             </Flex>
             <Flex class="flex-1 scroller-y" fw="w" ac="fs">
@@ -55,31 +67,40 @@
         </Flex>
       </ModuleWrapper>
     </div>
-    <div ref="cesium-container" class="cesium-container" id="cesium-container"
+    <div 
+      ref="cesium-container" 
+      class="cesium-container" id="cesium-container"
       style="grid-column: 2 / 3; overflow: hidden">
     </div>
     <div>
       <ModuleWrapper title="兵力编组" height="30%">
         <template #extra>
           <a-button type="text-primary" icon="plus" @click="handleOpenBlbzModal()"></a-button>
-          <a-modal v-model="blbzModal.visible"
+          <a-modal 
+            v-model="blbzModal.visible"
             :title="'兵力编组-' + (blbz.modelData && (blbz.modelData.resourceName || blbz.modelData.title))" width="900px"
             :maskClosable="false" :destroyOnClose="true" @ok="handleSubmitBlbz()">
             <Grid :columns="['300px', 1]" :rows="[1, 1]" style="height: 600px">
               <ModuleWrapper title="组织机构" style="grid-row: 1 / 3">
-                <a-tree class="simulation-tree" :treeData="blbzModal.treeData" :checkable="true"
+                <a-tree 
+                  class="simulation-tree" 
+                  :treeData="blbzModal.treeData" :checkable="true"
                   v-model="blbzModal.checkedKeys" :selectedKeys.sync="blbzModal.selectedKeys"
                   @select="() => ($refs['zzry-table'].commitAction('query'), $refs['zzzb-table'].commitAction('query'))">
                 </a-tree>
               </ModuleWrapper>
               <ModuleWrapper title="组织人员">
-                <AntQueryTable ref="zzry-table" height="100%" :queryConfig="blbzModal.zzry.queryConfig"
+                <AntQueryTable 
+                  ref="zzry-table" 
+                  height="100%" :queryConfig="blbzModal.zzry.queryConfig"
                   :tableConfig="blbzModal.zzry.tableConfig" :pageConfig="blbzModal.zzry.pageConfig"
                   :showTool="blbzModal.zzry.showTool">
                 </AntQueryTable>
               </ModuleWrapper>
               <ModuleWrapper title="组织机构">
-                <AntQueryTable ref="zzzb-table" height="100%" :queryConfig="blbzModal.zzzb.queryConfig"
+                <AntQueryTable 
+                  ref="zzzb-table" 
+                  height="100%" :queryConfig="blbzModal.zzzb.queryConfig"
                   :tableConfig="blbzModal.zzzb.tableConfig" :pageConfig="blbzModal.zzzb.pageConfig"
                   :showTool="blbzModal.zzzb.showTool">
                 </AntQueryTable>
@@ -88,7 +109,10 @@
           </a-modal>
         </template>
         <div class="normal" style="padding: 5px; overflow-y: auto">
-          <a-tree class="simulation-tree" :treeData="showBlbzCheckedTreeData" :selectable="false"
+          <a-tree 
+            class="simulation-tree" 
+            :treeData="showBlbzCheckedTreeData" 
+            :selectable="false"
             :replaceFields="{ children: 'children', title: 'title', key: 'id' }">
           </a-tree>
         </div>
@@ -391,11 +415,11 @@ export default {
       }
     },
 
-    handleSelectZzbzll(selectedKeys, { node }) { 
+    handleSelectZzbzll(selectedKeys, { node }) {
       console.log('选择信息', node.dataRef)
       this.cesium.setClientByCenter({ longitude: +node.dataRef.lng, latitude: +node.dataRef.lat })
       this.blbz.modelData = node.dataRef
-      this.resourceid = node.dataRef.id 
+      this.resourceid = node.dataRef.id
       this.type = node.dataRef.type
       this.getBlbzTreeData()
       this.getJcsxData()