From ef0e7848e2dd05555e63a07269def2ea6b455996 Mon Sep 17 00:00:00 2001
From: DIAMOND <276397553@qq.com>
Date: Fri, 19 Jan 2024 14:50:34 +0800
Subject: [PATCH] 1.modelTool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

   -增加绑定--推测 非原生面板属性（区域选择器）改变 并不能触发 OK方法
2.getLineInfo 初始化加入sceneId
3.seneIdTreeSelect 改用window.$earth.getObject(props.currentModel.xbsjGuid); 修改场景（区域id）
   -不能与prop双向绑定
4.sceneTreePopContextMenu 右键图层修改功能
5.添加防区 插入世界树
---
 src/components/earthMap/Toolbar.vue           |  28 ++--
 .../earthMap/components/seneIdTreeSelect.vue  |  18 ++-
 .../earthMap/toolbar/AddModelWin.vue          |  25 +++-
 src/utils/earthMap/getCameraInfo.ts           |   2 +-
 src/utils/earthMap/getLineInfo.ts             |   6 +-
 src/utils/earthMap/handleNodeType.ts          |   2 +-
 src/utils/earthMap/sceneTreePopContextMenu.ts | 124 ++++++++++++------
 src/views/earthMap/edit/EarthComp.vue         |   4 +-
 .../earthMap/msMapLine/MsMapLineList.vue      |   2 +-
 .../equipment/camera/MsCameraSite.data.ts     |   2 +-
 .../equipment/camera/MsCameraSiteList.vue     |   4 +-
 .../camera/components/MsCameraSiteForm.vue    |   6 +-
 .../cameraManage/CameraSet.vue                |   2 +-
 .../cameraManage/CameraSetDemo.vue            |   2 +-
 14 files changed, 148 insertions(+), 79 deletions(-)

diff --git a/src/components/earthMap/Toolbar.vue b/src/components/earthMap/Toolbar.vue
index 290c6ae..ae078c3 100644
--- a/src/components/earthMap/Toolbar.vue
+++ b/src/components/earthMap/Toolbar.vue
@@ -74,7 +74,7 @@
     <div id="addPopModal" class="popModal" style="top: 355px">
       <ul>
         <p @click="openCreateModel('addModelWin')">添加模型</p>
-        <p @click="addArea()">添加区域</p>
+        <p @click="addArea()">添加防区</p>
         <p @click="addRadar()">添加雷达</p>
         <p @click="addMonitorPoint()">添加监控点</p>
         <p @click="addWave()">添加微波探测</p>
@@ -264,12 +264,12 @@
             drawShapeShow.value = res.show;
             drawShapePackage.value = res;
           });
-           //调用创建/编辑区域 addArea方法
+           //调用创建/编辑防区 addArea方法
           $mitt.on('msMapLineHandler', function (res: any) {
             // console.log("msMapLineHandlerres",res);
             addArea(res)
           });
-           //调用创建/编辑区域 addMonitorPoint方法
+           //调用创建/编辑防区 addMonitorPoint方法
            $mitt.on('msCameraSiteHandle', function (res: any) {
             // console.log("msMapLineHandlerres",res);
             addMonitorPoint(res)
@@ -1103,11 +1103,11 @@
       function addRadar() {
         addRadarComShow.value = true;
       }
-      // 添加区域, msMapLineHandler标识 后台区域管理调用
+      // 添加防区, msMapLineHandler标识 后台防区管理调用
       function addArea(msMapLineHandler = null) {
-        // console.log("添加区域",msMapLineHandler);
+        // console.log("添加防区",msMapLineHandler);
         
-        $mitt.emit('drawShapeShow', { show: true, title: '区域创建工具', from: 'addArea' });
+        $mitt.emit('drawShapeShow', { show: true, title: '防区创建工具', from: 'addArea' });
         $mitt.on('addAreaFinished', (t: any) => {
           // console.log('addAreaFinished', t);
           //t 为drawShape传过来的临时图形
@@ -1151,7 +1151,7 @@
       }
       /**
        * @params 需要调用 addArea 方法进行绘图，获取坐标点position
-       * @params msMapLineHandler标识 后台区域管理调用
+       * @params msMapLineHandler标识 后台防区管理调用
        */
       function addPolyline(positions: any = null, msMapLineHandler:any =null) {
         // console.log('positions', positions);
@@ -1159,7 +1159,7 @@
 
         // 关闭此窗体
         // cancel();
-        // 创建区域
+        // 创建防区
         const currentModel = new window.XE.Obj.Polyline(window.$earth);
         // 设置配置参数
         const objConfig: any = {
@@ -1167,7 +1167,7 @@
         };
 
         /**
-         * 后台区域管理调用
+         * 后台防区管理调用
          * */
         //  if (typeof msMapLineHandler === 'object' && Object.keys(msMapLineHandler).length != 0) {
         //   console.log("不是空对象，则为编辑状态");
@@ -1187,12 +1187,12 @@
         // 获取地图ui对象
         const earthUI = window.$uia;
         // console.log("msMapLineHandler",msMapLineHandler);
-        //后台区域管理调用，直接return终止
+        //后台防区管理调用，直接return终止
         if(msMapLineHandler){
           $mitt.emit('toMsMapLineForm',currentModel)
           return
         }
-        // 打开一个区域编辑ui窗体
+        // 打开一个防区编辑ui窗体
         earthUI.showPropertyWindow(currentModel);
         nextTick(() => {
           // 主要ui窗口
@@ -1291,7 +1291,7 @@
                 submitData.cycleFrame = currentModel.material.XbsjODLineMaterial.totoalFrameCount;
                 break;
             }
-            // 提交区域数据
+            // 提交防区数据
             defHttp
               .post({ url: '/military/msMapLine/add', params: submitData }, { isTransformResponse: false })
               .then((response) => {
@@ -1352,11 +1352,11 @@
                   // 挂载并显示到树上
                   window.$earth.sceneTree.$refs.areas.children.push(node);
                 } else {
-                  throw '新增区域数据出错';
+                  throw '新增防区数据出错';
                 }
               })
               .catch((e) => {
-                createMessage.error('新增区域数据出错', 2);
+                createMessage.error('新增防区数据出错', 2);
               });
           };
           // 取消按钮
diff --git a/src/components/earthMap/components/seneIdTreeSelect.vue b/src/components/earthMap/components/seneIdTreeSelect.vue
index f67995c..9004261 100644
--- a/src/components/earthMap/components/seneIdTreeSelect.vue
+++ b/src/components/earthMap/components/seneIdTreeSelect.vue
@@ -2,10 +2,13 @@
   seneIdTreeSelect.vue
   场景ID树选择组件
   电子地图专用
-  功能概述：原生的折现属性面板 添加一个场景选择器功能，用于决定防区添加到哪个区域下
+  功能概述：原生的折现属性面板 添加一个场景选择器功能，用于决定防区添加到哪个区域（场景）下
  -->
 <template>
-    <ApiTreeSelect :api="sceneIdTree" v-model:value="currentModel.sceneId" placeholder="请选择所属区域" :disabled="disabled">
+    <ApiTreeSelect :api="sceneIdTree" v-model:value="sceneId" placeholder="请选择所属区域" 
+    :disabled="disabled"
+    @change="(value: any) => handleChange(value)"
+    >
     </ApiTreeSelect>
 </template>
 
@@ -34,12 +37,19 @@ const props = defineProps({
     default: {},
   }
 })
+
+let sceneId = ref<string>();
 onMounted(()=>{
-    console.log("currentModelaaaaaa",props.currentModel);
+    // console.log("currentModelaaaaaa",props.currentModel);
     // console.log("currentModelaaaaaa",props);
     // console.log("proxy",proxy);
-    
+    sceneId.value = props.currentModel.sceneId? props.currentModel.sceneId: "";
 })
+function handleChange(params:type) {
+  // console.log("params",params);
+  let model = window.$earth.getObject(props.currentModel.xbsjGuid);
+  model.sceneId = params;
+}
 
 //远程树
 const sceneIdTree = () => defHttp.get<Recordable[]>
diff --git a/src/components/earthMap/toolbar/AddModelWin.vue b/src/components/earthMap/toolbar/AddModelWin.vue
index b60486d..8cfa2ea 100644
--- a/src/components/earthMap/toolbar/AddModelWin.vue
+++ b/src/components/earthMap/toolbar/AddModelWin.vue
@@ -744,7 +744,7 @@
           t.creating = true;
           // 监控t数据，完成创建后调用后续方法
           window.XE.MVVM.watch(t, 'creating', (n: any) => {
-            console.log('creating', n);
+            // console.log('creating', n);
             if (n == false) {
               //面
               let positions: any = [];
@@ -820,13 +820,15 @@
         // let fatherNode = el.children[2].children[0].children[0]
         // let insertBeforeWhich = el.children[2].children[0].children[0].children[1];
         // fatherNode.insertBefore(divCustom,insertBeforeWhich);
-          //加入场景选择器
+          //加入区域场景选择器
           let divCustom = document.createElement("div");
           divCustom.setAttribute("data-v-74b863e5", "");
-          divCustom.setAttribute("style", "position: relative;");
+          divCustom.setAttribute("class", "flatten");
+          divCustom.setAttribute("style", "display: flex; margin-bottom: 20px;");
+          // divCustom.setAttribute("style", "position: relative;");
           divCustom.innerHTML = 
           `
-            <label data-v-74b863e5="">所属场景</label> 
+            <label data-v-74b863e5="">所属区域</label> 
           `
           let instance: ReturnType<typeof createVNode> | null = null;
           // 创建虚拟节点,传入模型的数据
@@ -859,6 +861,8 @@
             }
             // 模型名称
             submitData.name = currentModel.name;
+            // 场景区域
+            submitData.sceneId = currentModel.sceneId;
             // 线段编码
             submitData.lineCode = currentModel.guid;
             // 首尾相连属性
@@ -935,6 +939,10 @@
               .then((response) => {
                 // 成功后挂载节点到树中
                 if (response.success) {
+                  // 记录id
+                  currentModel.id = response.result;
+                  // 设置父节点
+                  const parent = window.$earth.sceneTree.$refs[currentModel.sceneId];
                   // 生成叶子节点
                   const leaf = new window.XE.SceneTree.Leaf(currentModel);
                   // 设置叶子节点标识
@@ -964,7 +972,7 @@
                   // 生成显示在树上的节点，此为虚假的节点，关联关系为ref一个为 node_ref 一个为ref
                   const node = {
                     ref: 'node_' + response.result,
-                    title: currentModel.name,
+                    title: '<防区>'+ currentModel.name,
                     expand: false,
                     children: [
                       {
@@ -988,7 +996,10 @@
                     ],
                   };
                   // 挂载并显示到树上
-                  window.$earth.sceneTree.$refs.areas.children.push(node);
+                  // window.$earth.sceneTree.$refs.areas.children.push(node);
+                  parent.children.push(node);
+                  // 提示用户
+                  createMessage.success('添加成功！', 2);
                 } else {
                   throw '新增区域数据出错';
                 }
@@ -1103,7 +1114,7 @@
             yaw: rotation.value[0], // x旋转
             pitch: rotation.value[1], // y旋转
             roll: rotation.value[2], // z旋转
-            lineId: selectArea.value.id ? selectArea.value.id : null, // 区域id
+            lineId: selectArea.value.id ? selectArea.value.id : null, // 防区id
             state: 1, // 数据状态
             modelUrl: modelName, // 模型url地址
             scale: currentModel.value.scale ? currentModel.value.scale : 1, // 整体缩放比例 默认1
diff --git a/src/utils/earthMap/getCameraInfo.ts b/src/utils/earthMap/getCameraInfo.ts
index 82d9e58..70953ff 100644
--- a/src/utils/earthMap/getCameraInfo.ts
+++ b/src/utils/earthMap/getCameraInfo.ts
@@ -1,5 +1,5 @@
 /**
- * 加载区域
+ * 加载站点
  * 用于EarthComp.vue
  */
 import { defHttp } from '/@/utils/http/axios';
diff --git a/src/utils/earthMap/getLineInfo.ts b/src/utils/earthMap/getLineInfo.ts
index 7dc1c05..cd36b73 100644
--- a/src/utils/earthMap/getLineInfo.ts
+++ b/src/utils/earthMap/getLineInfo.ts
@@ -14,7 +14,7 @@ import $ from 'jquery';
 let userStore = useUserStore();
 let store = useEarthMapStore();
 export default function  getLineInfo(models, type) {
-    console.log("加载区域");
+    // console.log("加载防区");
     
     return new Promise((resolve, reject) => {
       //请求线路信息
@@ -66,6 +66,8 @@ export default function  getLineInfo(models, type) {
               lineOptions.loop = Boolean(data.isLoop);
               lineOptions.depthTest = Boolean(data.isDepthCheck);
               lineOptions.arcType = data.interpolation;
+              lineOptions.sceneId = data.sceneId;
+              lineOptions.id = data.id;
               let material: any = {};
               switch (data.materialType) {
                 // 实线
@@ -129,6 +131,8 @@ export default function  getLineInfo(models, type) {
                     lineOptions.loop = Boolean(element.isLoop);
                     lineOptions.depthTest = Boolean(element.isDepthCheck);
                     lineOptions.arcType = element.interpolation;
+                    lineOptions.sceneId = element.sceneId;
+                    lineOptions.id = element.id;
                     let material: any = {};
                     switch (element.materialType) {
                       // 实线
diff --git a/src/utils/earthMap/handleNodeType.ts b/src/utils/earthMap/handleNodeType.ts
index 09fdd44..32b52d6 100644
--- a/src/utils/earthMap/handleNodeType.ts
+++ b/src/utils/earthMap/handleNodeType.ts
@@ -30,7 +30,7 @@ export default class HandleNodeType {
         return this;
     }
 
-    // 区域回调
+    // 防区回调
     polylineCallBack(callback) {
         this.#polylineCallBack = callback;
         return this;
diff --git a/src/utils/earthMap/sceneTreePopContextMenu.ts b/src/utils/earthMap/sceneTreePopContextMenu.ts
index 4dcde7c..f281fa9 100644
--- a/src/utils/earthMap/sceneTreePopContextMenu.ts
+++ b/src/utils/earthMap/sceneTreePopContextMenu.ts
@@ -11,7 +11,8 @@ import { earthMapUrl } from '@/api/earth/earthMap'
 import { useMessage } from '/@/hooks/web/useMessage';
 import { handleNodeType } from '@/utils/earthMap/handleNodeType';
 import setIconByRef from '@/utils/earthMap/setIconByRef';
-import { nextTick } from 'vue';
+import { createVNode, nextTick, render } from 'vue';
+import seneIdTreeSelect from '/@/components/earthMap/components/seneIdTreeSelect.vue';
 import _ from 'lodash';
 import $mitt from '@/utils/earthMap/mitt';
 import $ from 'jquery';
@@ -156,7 +157,7 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                                     createMessage.error('克隆失败');
                                 });
                         })
-                        //区域回调
+                        //防区回调
                         .polylineCallBack(() => {
                             // debugger
                             const currentModel = new window.XE.Obj.Polyline(window.$earth);
@@ -172,6 +173,8 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                             submitData.width = sn.czmObject.width;
                             submitData.interpolation = sn.czmObject.arcType;
                             submitData.positions = JSON.stringify(poistions);
+                            submitData.sceneId = sn.czmObject.sceneId;
+                            submitData.material = JSON.stringify(sn.czmObject.material);
                             switch (sn.czmObject.material.type) {
                                 // 实线
                                 case 'XbsjColorMaterial':
@@ -223,6 +226,8 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                                         currentModel.width = submitData.width;
                                         currentModel.arcType = submitData.interpolation;
                                         currentModel.positions = JSON.parse(submitData.positions);
+                                        currentModel.sceneId = submitData.sceneId
+                                        currentModel.material = JSON.stringify(submitData.material);
                                         switch (sn.czmObject.material.type) {
                                             // 实线
                                             case 'XbsjColorMaterial':
@@ -253,12 +258,12 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                                         leaf.ref = response.result;
                                         sn.parent.children.push(leaf);
                                     } else {
-                                        throw '克隆区域数据出错';
+                                        throw '克隆防区数据出错';
                                     }
                                 })
                                 .catch((e) => {
                                     currentModel.destroy();
-                                    createMessage.error('克隆区域数据出错', 3);
+                                    createMessage.error('克隆防区数据出错', 3);
                                 });
                         })
                         //监控点
@@ -390,7 +395,7 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                 // {
                 //   "regionIdList": [
                 // 2
-                //   ], // 周界防区区域ID列表（雷达设备列表的ID）
+                //   ], // 周界防区防区ID列表（雷达设备列表的ID）
                 //   "regionStatus": 0, // 布防状态 0 - 未布防 1 - 布防
                 //   "defenceRule": { // 布防规则
                 // "startTime": "yyyy-MM-dd HH:mm:ss", // 布防开始时间 每日循环情况下只包含时分秒，格式："HH:mm:ss" 非每日循环情况下包含年月日、时分秒，格式："yyyy-MM-dd HH:mm:ss"
@@ -499,7 +504,7 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                         sn.czmObject.distanceDisplayCondition = [1.0, 30000.0];
                         if (sn.czmObject.xbsjType == 'Model') {
                             const lineId = item.parent.parent._inner.sn.ref.split('_')[1];
-                          
+
                             that.czmObject = sn.czmObject;
                             that.node = item;
                             that.type = 'jkd';
@@ -541,6 +546,8 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                     let tempData = sn.czmObject.toAllJSON();
                     // 设置属性面板的确定按钮方法
                     // 显示属性面板
+                    console.log("sn", sn);
+
                     earthUI.showPropertyWindow(sn.czmObject);
                     nextTick(() => {
                         // 模型窗口
@@ -548,6 +555,8 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                         // 找到该模型设置属性窗口
                         const modelToolKey = windowsAttrList.filter((f) => f.indexOf(sn.czmObject.guid || sn.guid) > -1)[0];
                         const modelTool = mainUI.$refs[modelToolKey][0];
+                        console.log("modelTool",modelTool);
+                        
                         // 对应处理方法
                         handleNodeType(sn)
                             // 感应器
@@ -558,11 +567,41 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                             .default(() => {
                                 // 启用模型名称编辑
                                 modelTool.$el.getElementsByClassName('xbsj-flatten')[0].children[0].children[1].removeAttribute('disabled');
+                            })
+                            .polylineCallBack(() => {
+                                //  防区编辑
+                                //  加入区域场景选择器
+                                // console.log("区域编辑", modelTool.$el);
+                                let divCustom = document.createElement("div");
+                                divCustom.setAttribute("data-v-74b863e5", "");
+                                divCustom.setAttribute("class", "flatten");
+                                divCustom.setAttribute("style", "display: flex; margin-bottom: 20px;");
+                                // divCustom.setAttribute("style", "position: relative;");
+                                divCustom.innerHTML =
+                                    `
+                                        <label data-v-74b863e5="">所属区域</label> 
+                                    `
+                                let instance: ReturnType<typeof createVNode> | null = null;
+                                // 创建虚拟节点,传入模型的数据
+                                // let currentModel = window.$earth.getObject(sn.czmObject.xbsjGuid);
+                                console.log("currentModel",sn.czmObject);
+                                instance = createVNode(seneIdTreeSelect, { currentModel: sn.czmObject});
+                                // 渲染
+                                render(instance, divCustom);
+                                // 父节点
+                                let fatherNode =  modelTool.$el.children[2].children[0].children[0]
+                                // 插入位置
+                                let insertBeforeWhich =  modelTool.$el.children[2].children[0].children[0].children[1];
+                                fatherNode.insertBefore(divCustom, insertBeforeWhich);
+
+
                             })
                             .run();
 
                         // modelTool
-                        modelTool.ok = () => {
+                        // 增加绑定--推测 非原生面板属性（区域选择器）改变 并不能触发 OK方法
+                        modelTool.$el.children[3].children[1].onclick = modelTool.ok = () => {
+                            // console.log("modelTool.ok");
                             // 确定时清除这个事件
                             $mitt.off('windowCancel');
                             // 保存前端数据
@@ -576,7 +615,7 @@ export default function sceneTreePopContextMenu({ item, vueObject }, earthUI, th
                                 const sceneObject = new XE.SceneTree.Leaf(modelToolObj);
                                 earthUI.addSceneObject(sceneObject);
                             }
-
+                            
                             // 保存到数据库
                             propertiesWindowConfirm(modelTool, sn, index);
                             // 关闭属性面板
@@ -667,18 +706,18 @@ export const handleChangeTitle = _.debounce(function (options) {
                 sitename: newTitle,
             };
             defHttp.put(
-                    {
-                        url: earthMapUrl.updateSite,
-                        params: editCameraSiteModelParameter,
-                    },
-                    { isTransformResponse: false }
-                ).then((res) => {
-                    if (res.success) {
-                        createMessage.success('修改成功');
-                    } else {
-                        createMessage.error('修改失败');
-                    }
-                })
+                {
+                    url: earthMapUrl.updateSite,
+                    params: editCameraSiteModelParameter,
+                },
+                { isTransformResponse: false }
+            ).then((res) => {
+                if (res.success) {
+                    createMessage.success('修改成功');
+                } else {
+                    createMessage.error('修改失败');
+                }
+            })
                 .catch((error) => {
                     createMessage.error('修改失败');
                 });
@@ -849,6 +888,8 @@ export function propertiesWindowConfirm(propertiesWindow, sn, index) {
             submitData.width = modelData.width;
             submitData.interpolation = modelData.arcType;
             submitData.positions = JSON.stringify(poistions);
+            submitData.material = JSON.stringify(modelData.material);
+            submitData.sceneId = modelData.sceneId;
             switch (modelData.material.type) {
                 // 实线
                 case 'XbsjColorMaterial':
@@ -893,26 +934,29 @@ export function propertiesWindowConfirm(propertiesWindow, sn, index) {
                     // material.XbsjODLineMaterial.totoalFrameCount = data.cycleFrame
                     break;
             }
-            defHttp
-                .put(
-                    {
-                        url: earthMapUrl.updateMapLine,
-                        params: submitData,
-                    },
-                    { isTransformResponse: false }
-                )
-                .then((res) => {
-                    if (res.success) {
-                        createMessage.success('修改成功！', 2);
-                        sn.title = submitData.name;
-                        window.$earth.sceneTree.$refs['node_' + sn.ref].title = submitData.name;
-                    } else {
-                        createMessage.error('修改失败', 2);
-                    }
-                })
-                .catch((error) => {
-                    createMessage.error('修改失败', 2);
-                });
+            console.log("submitData",submitData);
+            console.log("modelData",modelData);
+            // defHttp
+            //     .put(
+            //         {
+            //             url: earthMapUrl.updateMapLine,
+            //             params: submitData,
+            //         },
+            //         { isTransformResponse: false }
+            //     )
+            //     .then((res) => {
+            //         if (res.success) {
+            //             createMessage.success('修改成功！', 2);
+            //             sn.title = submitData.name;
+            //             window.$earth.sceneTree.$refs['node_' + sn.ref].title = submitData.name;
+
+            //         } else {
+            //             createMessage.error('修改失败', 2);
+            //         }
+            //     })
+            //     .catch((error) => {
+            //         createMessage.error('修改失败', 2);
+            //     });
         })
         .run();
 }
\ No newline at end of file
diff --git a/src/views/earthMap/edit/EarthComp.vue b/src/views/earthMap/edit/EarthComp.vue
index eb75460..6c99f5b 100644
--- a/src/views/earthMap/edit/EarthComp.vue
+++ b/src/views/earthMap/edit/EarthComp.vue
@@ -885,8 +885,8 @@ import { nextTick } from 'vue';
 
       // console.log('models',models);
 
-      // 加载区域
-      // console.log("加载区域");
+      // 加载防区
+      // console.log("加载防区");
       if (this.PropsGetLineInfoShow) await getLineInfo(models, type);
 
       // 加载站点
diff --git a/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue b/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue
index 28ac90e..da670eb 100644
--- a/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue
+++ b/src/views/military/modules/earthMap/msMapLine/MsMapLineList.vue
@@ -2,7 +2,7 @@
   地图线路管理
 
   目录位置：三维地图管理 -> 地图线路管理（防区管理）
-  功能概述：管理所在场景下的区域，如雷达防区测试区域
+  功能概述：管理所在（区域）场景下的防区，如雷达防区测试防区
  -->
 <template>
   <div>
diff --git a/src/views/military/modules/equipment/camera/MsCameraSite.data.ts b/src/views/military/modules/equipment/camera/MsCameraSite.data.ts
index 47a7c14..86bb77d 100644
--- a/src/views/military/modules/equipment/camera/MsCameraSite.data.ts
+++ b/src/views/military/modules/equipment/camera/MsCameraSite.data.ts
@@ -6,7 +6,7 @@ import { render } from '/@/utils/common/renderUtils';
 export const columns: BasicColumn[] = [
 
   {
-    title: '区域',
+    title: '防区',
     align: "center",
     // dataIndex: 'lineId_dictText',
     dataIndex: 'lineName',
diff --git a/src/views/military/modules/equipment/camera/MsCameraSiteList.vue b/src/views/military/modules/equipment/camera/MsCameraSiteList.vue
index 440a96e..cae109d 100644
--- a/src/views/military/modules/equipment/camera/MsCameraSiteList.vue
+++ b/src/views/military/modules/equipment/camera/MsCameraSiteList.vue
@@ -11,9 +11,9 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="8">
-            <a-form-item label="区域名称" name="lineId">
+            <a-form-item label="防区名称" name="lineId">
               <!-- <JInput placeholder="请输入序号" v-model:value="queryParam.sitecode"></JInput> -->
-              <a-select v-model:value="queryParam.lineId" style="width: 300px" placeholder="请选择区域名称" @select="searchQuery" allowClear>
+              <a-select v-model:value="queryParam.lineId" style="width: 300px" placeholder="请选防区名称" @select="searchQuery" allowClear>
                 <a-select-option v-for="(item, index) in lineSelect" :value="item.id" :key="item.id">
                   {{ item.name }}
                 </a-select-option>
diff --git a/src/views/military/modules/equipment/camera/components/MsCameraSiteForm.vue b/src/views/military/modules/equipment/camera/components/MsCameraSiteForm.vue
index 34a64c6..c7241f1 100644
--- a/src/views/military/modules/equipment/camera/components/MsCameraSiteForm.vue
+++ b/src/views/military/modules/equipment/camera/components/MsCameraSiteForm.vue
@@ -3,14 +3,14 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="区域" v-bind="validateInfos.lineId">
+          <a-form-item label="防区" v-bind="validateInfos.lineId">
             <!-- <j-dict-select-tag v-model:value="formData.lineId" dictCode="" placeholder="" :disabled="disabled"/> -->
             <a-select
               v-model:value="formData.lineId"
               style="width: 300px"
               @change="changeLineValue"
               :disabled="disabled"
-              placeholder="请选择所属区域"
+              placeholder="请选择所属防区"
             >
               <a-select-option v-for="(item, index) in lineSelect" :value="item.id" :key="item.id">
                 {{ item.name }}
@@ -130,7 +130,7 @@
     sitename: [{ required: true, message: '请输入站点名称!' }],
     longitude: [{ required: true, message: '请输入经度!' }],
     latitude: [{ required: true, message: '请输入纬度!' }],
-    lineId: [{ required: true, message: '请选择所属区域!' }],
+    lineId: [{ required: true, message: '请选择所属防区!' }],
   };
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
 
diff --git a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSet.vue b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSet.vue
index b62dbed..0e341eb 100644
--- a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSet.vue
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSet.vue
@@ -2,7 +2,7 @@
   相机管理
 
   目录位置：设备管理 -> 视频监控设备信息 -> 相机管理
-  功能概述：管理所有区域下的相机，rtsp地址，安装位置等
+  功能概述：管理所有防区下的相机，rtsp地址，安装位置等
  -->
 <template>
   <div style="background: #fff">
diff --git a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSetDemo.vue b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSetDemo.vue
index 8a34345..c97512f 100644
--- a/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSetDemo.vue
+++ b/src/views/military/modules/equipmentManage/videoMonitorEquInfo/cameraManage/CameraSetDemo.vue
@@ -2,7 +2,7 @@
   相机管理
 
   目录位置：设备管理 -> 视频监控设备信息 -> 相机管理
-  功能概述：管理所有区域下的相机，rtsp地址，安装位置等
+  功能概述：管理所有防区下的相机，rtsp地址，安装位置等
  -->
 <template>
   <div style="background: #fff">