Fix

SourceCode/SmartPlan/wwwroot/data/Plan_Run.json

@@ -1,251 +0,0 @@
-{
-  "CurSceneNo": "b",
-  "RunCount": 2,
-  "RunInfos": [
-    {
-      "sceneNo": "a",
-      "sceneName": "1000KV变电站 1#主变旁电缆沟失火，出现明火，火情2分钟内（小火）",
-      "scene_desc": "电气线路通常敷设在隐蔽处，如电缆沟内。电缆线路自身具有易燃性，加之线路老化，电线的导体电阻会变大, 电缆处于高温下运行，促使电缆本身绝缘层老化加剧，导致绝缘击穿，出现明火",
-      "scene_img": "scene_a1.png",
-      "plan_img": "a.png",
-      "scene_type": 0,
-      "temperature1": 59.30,
-      "temperature2": 62.43,
-      "InfraredAlarm": 1.0,
-      "gas": 1.12,
-      "smoke": 38.27,
-      "plans": [
-        {
-          "plan_no": "a1_p1",
-          "plan_short_name": "指挥手动灭火",
-          "plan_desc": "1.值班长通知现场巡检前往起火处; 2.现场巡检前往现场确认火灾规模并上报值班长等待下一步指令; 3.值班长确认火灾现场规模为小型火灾;4.启动自动灭火; 5.自动灭火装置失效,切换手动启动",
-          "plan_command": "指挥处置小火灭火方案",
-          "plan_category": "1",
-          "plan_params": "快速响应,灭火",
-          "plan_goal": "快速响应,灭火",
-          "plan_img": "a.png",
-          "next_scene_no": "b",
-          "children": null,
-          "IsExecute": true
-        }
-      ],
-      "run_plan": {
-        "plan_no": "a1_p1",
-        "plan_short_name": "指挥手动灭火",
-        "plan_desc": "1.值班长通知现场巡检前往起火处; 2.现场巡检前往现场确认火灾规模并上报值班长等待下一步指令; 3.值班长确认火灾现场规模为小型火灾;4.启动自动灭火; 5.自动灭火装置失效,切换手动启动",
-        "plan_command": "指挥处置小火灭火方案",
-        "plan_category": "1",
-        "plan_params": "快速响应,灭火",
-        "plan_goal": "快速响应,灭火",
-        "plan_img": "a.png",
-        "next_scene_no": "b",
-        "children": null,
-        "IsExecute": true
-      },
-      "IsExecute": false,
-      "NextSceneNo": "b"
-    },
-    {
-      "sceneNo": "b",
-      "sceneName": "1000KV变电站1#主变旁电缆沟火势加大,火情5分钟内(中火)",
-      "scene_desc": "未及时采取有效措施，导致火势顺着电缆线蔓延，温度进一步升高，致使其他地方的电缆绝缘材料熔化，引发中火",
-      "scene_img": "scene_b.png",
-      "plan_img": "b.png",
-      "scene_type": 0,
-      "temperature1": 168.30,
-      "temperature2": 115.31,
-      "InfraredAlarm": 1.0,
-      "gas": 4.06,
-      "smoke": 76.27,
-      "plans": [
-        {
-          "plan_no": "b_p1",
-          "plan_short_name": "指挥处置:设备灭火,中火灭火 ",
-          "plan_desc": "指挥处置中火灭火操作方案",
-          "plan_command": "指挥处置中火灭火操作方案",
-          "plan_category": "1",
-          "plan_params": "上报情况，灭火",
-          "plan_goal": "快速响应,灭火",
-          "plan_img": null,
-          "next_scene_no": "c",
-          "children": [
-            {
-              "plan_no": "b_p1_1",
-              "plan_short_name": "指挥处置:设备灭火,中火灭火 操作方案一",
-              "plan_desc": "方案1：指挥处置：1、值班长前往现场协助；2、现场人员听从指挥，打开机械应急阀灭火",
-              "plan_command": "指挥处置中火灭火操作方案一",
-              "plan_category": "1",
-              "plan_params": "上报情况，灭火",
-              "plan_goal": "快速响应,灭火",
-              "plan_img": "b1.png",
-              "next_scene_no": "c",
-              "children": null,
-              "IsExecute": false
-            },
-            {
-              "plan_no": "b_p1_2",
-              "plan_short_name": "指挥处置:设备灭火,中火灭火 操作方案二",
-              "plan_desc": "方案2：指挥处置 ：1、拨打119，指挥巡检人员； 2、听从安排前往现场协助 ；3、现场人员听从指挥，打开机械应急阀灭火",
-              "plan_command": "指挥处置中火灭火操作方案二",
-              "plan_category": "1",
-              "plan_params": "上报情况，灭火",
-              "plan_goal": "快速响应,灭火",
-              "plan_img": "b1.png",
-              "next_scene_no": "c",
-              "children": null,
-              "IsExecute": true
-            }
-          ],
-          "IsExecute": true
-        }
-      ],
-      "run_plan": {
-        "plan_no": "b_p1_2",
-        "plan_short_name": "指挥处置:设备灭火,中火灭火 操作方案二",
-        "plan_desc": "方案2：指挥处置 ：1、拨打119，指挥巡检人员； 2、听从安排前往现场协助 ；3、现场人员听从指挥，打开机械应急阀灭火",
-        "plan_command": "指挥处置中火灭火操作方案二",
-        "plan_category": "1",
-        "plan_params": "上报情况，灭火",
-        "plan_goal": "快速响应,灭火",
-        "plan_img": "b1.png",
-        "next_scene_no": "c",
-        "children": null,
-        "IsExecute": true
-      },
-      "IsExecute": false,
-      "NextSceneNo": "c"
-    }
-  ],
-  "Logs": [
-    {
-      "type": 2,
-      "msg": "<span class=\"text-success\">新情景：</span>1000KV变电站 1#主变旁电缆沟失火，出现明火，火情2分钟内（小火）",
-      "data": null,
-      "time": "2024-06-04T14:45:03.8941431+08:00"
-    },
-    {
-      "type": 6,
-      "msg": "目标 [ <span class=\"mr-2\"></span>快速响应<span class=\"mr-2\"></span>确保供电<span class=\"mr-2\"></span> ]",
-      "data": null,
-      "time": "2024-06-04T14:45:11.8966971+08:00"
-    },
-    {
-      "type": 7,
-      "msg": "目标 [ <span class=\"mr-2\"></span>快速灭火<span class=\"mr-2\"></span>伤亡最低<span class=\"mr-2\"></span> ]",
-      "data": null,
-      "time": "2024-06-04T14:45:19.2659124+08:00"
-    },
-    {
-      "type": 1,
-      "msg": "<span class=\"text-success mr-2\">生成方案</span>目标:[ 快： 快速灭火   低： 伤亡最低]",
-      "data": null,
-      "time": "2024-06-04T14:45:24.8179687+08:00"
-    },
-    {
-      "type": 3,
-      "msg": "<span class=\"text-iwb\">1.指挥手动灭火 </span></br>",
-      "data": null,
-      "time": "2024-06-04T14:45:29.8349291+08:00"
-    },
-    {
-      "type": 4,
-      "msg": "<span class=\"text-success\">方案简称：</span>指挥手动灭火<br/><span class=\"text-success\">处置指令：</span>指挥处置小火灭火方案",
-      "data": null,
-      "time": "2024-06-04T14:45:38.0164574+08:00"
-    },
-    {
-      "type": 2,
-      "msg": "<span class=\"text-success\">新情景：</span>1000KV变电站1#主变旁电缆沟火势加大,火情5分钟内(中火)",
-      "data": null,
-      "time": "2024-06-04T14:45:47.9193161+08:00"
-    },
-    {
-      "type": 6,
-      "msg": "目标 [ <span class=\"mr-2\"></span>快速灭火<span class=\"mr-2\"></span>伤亡最低<span class=\"mr-2\"></span> ]",
-      "data": null,
-      "time": "2024-06-04T14:45:59.8053929+08:00"
-    },
-    {
-      "type": 7,
-      "msg": "目标 [ <span class=\"mr-2\"></span>快速灭火<span class=\"mr-2\"></span>伤亡最低<span class=\"mr-2\"></span> ]",
-      "data": null,
-      "time": "2024-06-04T14:46:02.7584636+08:00"
-    },
-    {
-      "type": 1,
-      "msg": "<span class=\"text-success mr-2\">生成方案</span>目标:[ 快： 快速灭火   低： 伤亡最低]",
-      "data": null,
-      "time": "2024-06-04T14:46:11.0729438+08:00"
-    },
-    {
-      "type": 3,
-      "msg": "<span class=\"text-iwb\">1.指挥处置:设备灭火,中火灭火  </span></br>",
-      "data": null,
-      "time": "2024-06-04T14:46:16.08856+08:00"
-    },
-    {
-      "type": 4,
-      "msg": "<span class=\"text-success\">方案简称：</span>指挥处置:设备灭火,中火灭火 操作方案二<br/><span class=\"text-success\">处置指令：</span>指挥处置中火灭火操作方案二",
-      "data": null,
-      "time": "2024-06-04T14:46:23.343458+08:00"
-    }
-  ],
-  "Targets": [
-    {
-      "id": "202406041445119150",
-      "sceneNo": "a",
-      "sceneName": "1000KV变电站 1#主变旁电缆沟失火，出现明火，火情2分钟内（小火）",
-      "content": "<span class=\"mr-2\"></span>快速灭火<span class=\"mr-2\"></span>伤亡最低<span class=\"mr-2\"></span>",
-      "oldContent": "快速灭火 伤亡最低",
-      "isConfirm": true,
-      "k1": "50",
-      "k2": "50",
-      "k3": null,
-      "k4": null,
-      "k5": null,
-      "k6": null,
-      "k7": null,
-      "k8": null,
-      "k9": null,
-      "k10": null,
-      "d1": "50",
-      "d2": "50",
-      "d3": null,
-      "d4": null,
-      "d5": null,
-      "d6": null,
-      "d7": null,
-      "d8": null,
-      "d9": null,
-      "d10": null
-    },
-    {
-      "id": "202406041445591711",
-      "sceneNo": "b",
-      "sceneName": "1000KV变电站1#主变旁电缆沟火势加大,火情5分钟内(中火)",
-      "content": "<span class=\"mr-2\"></span>快速灭火<span class=\"mr-2\"></span>伤亡最低<span class=\"mr-2\"></span>",
-      "oldContent": "快速灭火 伤亡最低",
-      "isConfirm": true,
-      "k1": "50",
-      "k2": "50",
-      "k3": null,
-      "k4": null,
-      "k5": null,
-      "k6": null,
-      "k7": null,
-      "k8": null,
-      "k9": null,
-      "k10": null,
-      "d1": "50",
-      "d2": "50",
-      "d3": null,
-      "d4": null,
-      "d5": null,
-      "d6": null,
-      "d7": null,
-      "d8": null,
-      "d9": null,
-      "d10": null
-    }
-  ]
-}

SourceCode/SmartPlan/wwwroot/data/Vr_Query_Log.json

@@ -1,30 +0,0 @@
-[
-  {
-    "NodeIdx": 1,
-    "NodeType": "2",
-    "NodeNo": "a",
-    "NodeName": "1000KV变电站 1#主变旁电缆沟失火，出现明火，火情2分钟内（小火）",
-    "NodeTime": "2024-06-04T14:45:03.8937374+08:00"
-  },
-  {
-    "NodeIdx": 2,
-    "NodeType": "4",
-    "NodeNo": "a1_p1",
-    "NodeName": "1.值班长通知现场巡检前往起火处; 2.现场巡检前往现场确认火灾规模并上报值班长等待下一步指令; 3.值班长确认火灾现场规模为小型火灾;4.启动自动灭火; 5.自动灭火装置失效,切换手动启动",
-    "NodeTime": "2024-06-04T14:45:38.0160235+08:00"
-  },
-  {
-    "NodeIdx": 3,
-    "NodeType": "2",
-    "NodeNo": "b",
-    "NodeName": "1000KV变电站1#主变旁电缆沟火势加大,火情5分钟内(中火)",
-    "NodeTime": "2024-06-04T14:45:47.918963+08:00"
-  },
-  {
-    "NodeIdx": 4,
-    "NodeType": "4",
-    "NodeNo": "b_p1_2",
-    "NodeName": "方案2：指挥处置 ：1、拨打119，指挥巡检人员； 2、听从安排前往现场协助 ；3、现场人员听从指挥，打开机械应急阀灭火",
-    "NodeTime": "2024-06-04T14:46:23.3431008+08:00"
-  }
-]

SourceCode/SmartPlanV2/SmartPlan/Views/SmartPlanV2/_Partial/_Plan/_Plan.cshtml

@@ -31,80 +31,6 @@
     </div>
 </div>
 
-<div class="modal" tabindex="-1" id="target-modal">
-    <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header" style="background: #20C997;color: #fff;">
-                <h5 class="modal-title">确定目标 生成方案</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <form id="target-form">
-                    <div class="row mb-3" style="text-align: center;font-size: 1.3rem;">
-                        <div id="target_k" class="col-md-6 text-iwb"> <strong>快：</strong> <span>快速响应</span> </div>
-                        <div id="target_d" class="col-md-6 text-iwb"> <strong>低：</strong> <span>确保供电</span> </div>
-                    </div>
-                    <div class="row mb-2">
-                        <div class="col-md-6">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text" id="">快速响应</span>
-                                </div>
-                                <input type="text" class="form-control k k1" min="0" max="100" placeholder="数值" value="50">
-                                <div class="input-group-append">
-                                    <span class="input-group-text">%</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text" id="">确保供电</span>
-                                </div>
-                                <input type="text" class="form-control d d1" min="0" max="100" placeholder="数值" value="50">
-                                <div class="input-group-append">
-                                    <span class="input-group-text">%</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-2">
-                        <div class="col-md-6">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text" id="">快速灭火</span>
-                                </div>
-                                <input type="text" class="form-control k k2" min="0" max="100" placeholder="数值" value="50">
-                                <div class="input-group-append">
-                                    <span class="input-group-text">%</span>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text" id="">伤亡最低</span>
-                                </div>
-                                <input type="text" class="form-control d d2" min="0" max="100" placeholder="数值" value="50">
-                                <div class="input-group-append">
-                                    <span class="input-group-text">%</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                <button type="button" class="btn btn-info" data-dismiss="modal">确定目标</button>
-                <button type="button" class="btn btn-iwb" onclick="ReportTarget()">上报目标</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <script>
     $('.plan-out-box').hide();
 
@@ -115,4 +41,3 @@
 
 
 </script>
-@await Html.PartialAsync("_Partial/_Target/_TargetScript")

SourceCode/SmartPlanV2/SmartPlan/Views/SmartPlanV2/_Partial/_Target/_TargetScript.cshtml

@@ -59,8 +59,8 @@
 
         $('#target-form .k').on('change.target',
             function () {
-                var $this = $(this).hasClass("k1") ? $('#target-form .k.k1') : $('#target-form .k.k2');
-                var $that = $(this).hasClass("k1") ? $('#target-form .k.k2') : $('#target-form .k.k1');
+                var $this = $(this).hasClass("k1") ? $(this).closest('#target-form').find('.k.k1') : $(this).closest('#target-form').find('.k.k2');
+                var $that = $(this).hasClass("k1") ? $(this).closest('#target-form').find('.k.k2') : $(this).closest('#target-form').find('.k.k1');
                 var k1 = Number($this.val()), k2 = Number($that.val());
                 if (!k1 || k1 < 0 || k1 > 100) {
                     alert("请填入0-100的数字！");
@@ -79,8 +79,8 @@
             });
         $('#target-form .d').on('change.target',
             function () {
-                var $this = $(this).hasClass("d1") ? $('#target-form .d.d1') : $('#target-form .d.d2');
-                var $that = $(this).hasClass("d1") ? $('#target-form .d.d2') : $('#target-form .d.d1');
+                var $this = $(this).hasClass("d1") ? $(this).closest('#target-form').find('.d.d1') : $(this).closest('#target-form').find('.d.d2');
+                var $that = $(this).hasClass("d1") ? $(this).closest('#target-form').find('.d.d2') : $(this).closest('#target-form').find('.d.d1');
                 var d1 = Number($this.val()), d2 = Number($that.val());
                 if (!d1 || d1 < 0 || d1 > 100) {
                     alert("请填入0-100的数字！");