车辆仿真部署、错误调剂、多人终端同步、演练交互

9 months ago · 7dbb924322
32 changed files with 3049 additions and 426 deletions
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/css/bulletframe.css
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/css/bulletframe.css
@ -0,0 +1,103 @@
+body {
+    color:#ffffff;
+}
+.layui-form-label {
+    color: #fff;
+}
+.layui-input, .layui-select, .layui-textarea {
+    border: 1px solid #42779d;
+    background-color: #2c597a;
+    border-radius: 2px;
+    color: #e5f4ff;
+}
+
+input:-ms-input-placeholder {
+    color: #e5f4ff;
+}
+
+input::-webkit-input-placeholder {
+    color: #e5f4ff;
+}
+textarea:-ms-input-placeholder {
+    color: #e5f4ff;
+}
+
+textarea::-webkit-input-placeholder {
+    color: #e5f4ff;
+}
+form input.layui-input[disabled] {
+    background: #2c597a;
+    color: #e5f4ff !important;
+}
+::-webkit-scrollbar {
+    width: 6px;
+    background-color: #2c597a;
+    border-radius: 3px;
+}
+
+/* 滚动条滑块 */
+::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: #42779d;
+}
+.layui-badge-rim, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
+    border-color: #42779d;
+}
+    .layui-elem-field legend {
+        color:#ffffff;
+    }
+.layui-icon-edit:before {
+    color: #ffffff;
+}
+.layui-text {
+    color: #ffffff;
+}
+.layui-form-select dl {
+    border: 1px solid #42779d;
+    background-color: #2c597a;
+}
+.layui-input:hover, .layui-textarea:hover {
+    border-color: #42779d !important;
+    background-color: #2c597a;
+}
+.layui-form-checkbox, .layui-form-select dl dd.layui-disabled {
+    background-color: #467aa0;
+}
+
+.layui-form-checkbox {
+    height: 38px;
+    line-height: 38px;
+}
+
+    .layui-form-checkbox span, .layui-form-checkbox:hover span {
+        background-color: #2c597a;
+    }
+
+    .layui-form-checkbox i, .layui-form-checkbox:hover i {
+        border: 1px solid #42779d;
+        height: 36px;
+        border-left: none;
+        color: #467aa0
+    }
+
+.layui-form-checked, .layui-form-checked:hover {
+    border-color: #349cc6;
+}
+
+    .layui-form-checked span, .layui-form-checked:hover span {
+        background-color: #349cc6;
+    }
+
+    .layui-form-checked i, .layui-form-checked:hover i {
+        color: #ffffff;
+        border-color: #42779d;
+    }
+.layui-form-select dl dd:hover {
+    background: #5FB878;
+}
+.layui-layer-content {
+    background-color: #073f5c;
+}
+.layui-layer-border {
+    border-color: #42779d !important;
+}
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/css/index.css
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/css/index.css
@ -142,6 +142,7 @@ body {
 .layui-form-select .layui-input{
 	background: #2e415f;
    border: 0;
+    color: #fff;
 }

 .layui-form-selected dl{
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/css/public.css
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/css/public.css
@ -0,0 +1,183 @@
+/*公共样式*/
+html,body{width:100%;height:100%}
+.childrenBody{ padding:0px;}
+.layui-table-view{ margin:0 !important;}
+.magb0{margin-bottom:0 !important;}
+.magt0{ margin-top:0 !important;}
+.magt3{ margin-top:3px !important;}
+.magt10{ margin-top:10px !important;}
+.magb15{ margin-bottom:15px !important;}
+.magt30{ margin-top:30px !important;}
+.layui-left{text-align:left;}
+.layui-block{ width:100% !important;}
+.layui-center{text-align:center;}
+.layui-right{text-align:right;}
+.layui-elem-quote.title { /*padding:10px 15px;*/
+    margin-bottom: 0;
+    font-size: 18px;
+    color: #fff;
+    background-color: #23a7c8;
+}
+.layui-bg-white{ background-color:#fff !important;}
+.border{ border:1px solid #e6e6e6 !important; padding:10px; border-top:none;}
+.main_btn .layui-btn{ margin:2px 5px 2px 0;}
+.layui-timeline-axis{ left:-4px;}
+.layui-elem-quote{ word-break: break-all;}
+.icons li,.icons li:hover,.loginBody .seraph,.loginBody .seraph:hover,.loginBody .layui-form-item.layui-input-focus label,.loginBody .layui-form-item label,.loginBody .layui-form-item.layui-input-focus input,.loginBody .layui-form-item input{transition: all 0.3s ease-in-out;-webkit-transition: all 0.3s ease-in-out;}
+.icons li:hover i,.icons li i{transition: font-size 0.3s ease-in-out;-webkit-transition: font-size 0.3s ease-in-out;}
+.loginBody .layui-input-focus .layui-input::-webkit-input-placeholder{transition: color 0.2s linear 0.2s;-webkit-transition: color 0.2s linear 0.2s;}
+.loginBody .layui-input-focus .layui-input::-moz-placeholder{transition: color 0.2s linear 0.2s;}
+.loginBody .layui-input-focus .layui-input:-ms-input-placeholder{transition: color 0.2s linear 0.2s;}
+.loginBody .layui-input-focus .layui-input::placeholder{transition: color 0.2s linear 0.2s;-webkit-transition: color 0.2s linear 0.2s;}
+.layui-bg-danger{background-color: #8e3d39!important}
+ /*滚动条*/
+::-webkit-scrollbar {width: 5px;height:10px;background-color: #fff;border-radius: 3px;}
+/* 滚动条滑块 */
+::-webkit-scrollbar-thumb {border-radius: 3px;background: #f2f2f2;}
+
+/*后台首页*/
+.panel_box{ margin-bottom:5px;}
+.panel{ text-align:center; height:90px;}
+.panel_box a{display:block; border-radius:5px; overflow:hidden; height:80px; background-color:#f2f2f2 !important; }
+.panel_icon{ width:40%; display: inline-block; line-height:80px; float:left; position:relative; height:100%;}
+.panel_icon i{ font-size:40px !important; color:#fff; display: inline-block;}
+.panel_word{ width:60%; display: inline-block; float:right; margin:13px 0 14px; }
+.panel_word span{ font-size:25px; display:block; height:34px; }
+.panel .loginTime{ font-size:15px; color:#1E9FFF; line-height:17px;}
+.panel em{ font-style:normal;}
+.history_box{ min-height:500px; height:500px; overflow-y:scroll; padding:10px !important;}
+.history_box .layui-timeline .layui-timeline-item:last-child{ padding-bottom:0;}
+@media screen and (max-width:1200px) {
+    .history_box { height: auto !important; overflow-y: inherit; }
+}
+/*修改密码*/
+.pwdTips{ min-height:auto; margin:40px 0 15px 110px;}
+/*个人资料*/
+form input.layui-input[disabled]{ background:#f2f2f2; color:#595963!important; }
+.user_right{ text-align: center; }
+.user_right p{ margin:10px 0 25px; font-size: 12px; text-align: center; color: #FF5722;}
+.user_right img#userFace{ width:200px; height:200px; margin-top:20px; cursor:pointer; box-shadow:0 0 50px #44576b; }
+.userAddress.layui-form-item .layui-input-inline{ width:23%; }
+.userAddress.layui-form-item .layui-input-inline:last-child{ margin-right:0; }
+/*下拉多选*/
+.layui-form-item select[multiple]+.layui-form-select dd{ padding:0;}
+.layui-form-item select[multiple]+.layui-form-select .layui-form-checkbox[lay-skin=primary]{ margin:0 !important; display:block; line-height:36px !important; position:relative; padding-left:26px;}
+.layui-form-item select[multiple]+.layui-form-select .layui-form-checkbox[lay-skin=primary] span{line-height:36px !important; float:none;}
+.layui-form-item select[multiple]+.layui-form-select .layui-form-checkbox[lay-skin=primary] i{ position:absolute; left:10px; top:0; margin-top:9px;}
+.multiSelect{ line-height:normal; height:auto; padding:4px 10px; overflow:hidden;min-height:38px; margin-top:-38px; left:0; z-index:99;position:relative;background:none;}
+.multiSelect a{ padding:2px 5px; background:#908e8e; border-radius:2px; color:#fff; display:block; line-height:20px; height:20px; margin:2px 5px 2px 0; float:left;}
+.multiSelect a span{ float:left;}
+.multiSelect a i{ float:left; display:block; margin:2px 0 0 2px; border-radius:2px; width:8px; height:8px; background:url(../images/close.png) no-repeat center; background-size:65%; padding:4px;}
+.multiSelect a i:hover{ background-color:#545556;}
+/*404页面*/
+.noFind{ text-align:center; padding-top:2%;}
+.noFind i{ line-height:1em; font-size:12em !important; color: #393D50; display:block;}
+.ufo{ text-align:center; height:100%; position:relative;}
+.noFind .page_icon,.noFind .ufo_icon{ opacity:1; position:absolute; left:50%; transform:translateX(-50%); -ms-transform:translateX(-50%); -moz-transform:translateX(-50%); -webkit-transform:translateX(-50%); -o-transform:translateX(-50%);}
+.noFind .page_icon{ top:300px; animation:pageGo 0.3s ease-in 0.3s forwards; -webkit-animation:pageGo 0.3s ease-in 0.3s forwards; -o-animation:pageGo 0.3s ease-in 0.3s forwards; -moz-animation:pageGo 0.3s ease-in 0.3s forwards;}
+.noFind .ufo_icon{ top:100px; animation:ufo 1s ease-in 0.6s forwards; -webkit-animation:ufo 1s ease-in 0.6s forwards; -o-animation:ufo 1s ease-in 0.6s forwards; -moz-animation:ufo 1s ease-in 0.6s forwards;}
+.page404{ margin-top:10%; opacity:0; font-size:0; animation:page404 0.5s ease-in 1.7s forwards; -webkit-animation:page404 0.5s ease-in 1.7s forwards; -o-animation:page404 0.5s ease-in 1.7s forwards; -moz-animation:page404 0.5s ease-in 1.7s forwards;}
+.page404 p{ font-size: 20px; font-weight: 300; color: #999;}
+/*页面被吸走*/
+@keyframes pageGo{from{font-size: 12em; top:300px;} to{font-size:0; opacity:0; top: 100px;}}
+@-moz-keyframes pageGo{from{font-size: 12em; top:300px;} to{font-size:0; opacity:0; top:100px}}
+@-webkit-keyframes pageGo{from{font-size: 12em; top:300px;} to{font-size:0; opacity:0; top:100px}}
+@-o-keyframes pageGo{from{font-size: 12em; top:300px;} to{font-size:0; opacity:0; top:100px}}
+/*ufo飞走*/
+@keyframes ufo{0%{font-size: 14em; top:100px;} 20%{font-size: 12em; top:50px;} 100%{font-size:0; opacity:0; top:-100px; left:80%;}}
+@-moz-keyframes ufo{0%{font-size: 14em; top:100px;} 20%{font-size: 12em;  top:50px;} 100%{font-size:0; opacity:0; top:-100px; left:80%;}}
+@-webkit-keyframes ufo{0%{font-size: 14em; top:100px;} 20%{font-size: 12em;  top:50px;} 100%{font-size:0; opacity:0; top:-100px; left:80%;}}
+@-o-keyframes ufo{0%{font-size: 14em; top:100px;} 20%{font-size: 12em; top:50px;} 100%{font-size:0; opacity:0; top:-100px; left:80%;}}
+/*404显示*/
+@keyframes page404{from{opacity:0; font-size:2em;} to{opacity:1;font-size:2em;}}
+@-moz-keyframes page404{from{opacity:0; font-size:2em;} to{opacity:1;font-size:2em;}}
+@-webkit-keyframes page404{from{opacity:0; font-size:2em;} to{opacity:1;font-size:2em;}}
+@-o-keyframes page404{from{opacity:0; font-size:2em;} to{opacity:1;font-size:2em;}}
+/*图标管理*/
+.iconsLength{ margin:0 5px;}
+.icons li{  margin:5px 0; text-align:center; height:120px; cursor:pointer;}
+.icons li i{ display:block; font-size:35px; margin:10px 0; line-height:60px; height:60px;}
+.icons li:hover{ background:rgba(13,10,49,.9); border-radius:5px; color:#fff;}
+.icons li:hover i{ font-size:50px;}
+#copyText{ width:0;height:0; opacity:0; position:absolute; left:-9999px; top:-9999px;}
+/*开发文档*/
+h2.method{ font-size:18px; line-height:45px; padding-left:5px;}
+/*登录*/
+.loginHtml,.loginBody{ height:100%;}
+.loginBody{ background:url("../images/login_bg.jpg") no-repeat center center;}
+.loginBody form.layui-form{ padding:0 20px; width:300px; height:335px; position:absolute; left:50%; top:50%; margin:-150px 0 0 -150px; -webkit-box-sizing:border-box;-moz-box-sizing:border-box; -o-box-sizing:border-box; box-sizing:border-box; background:#fff;-webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px; box-shadow:0 0 50px #009688;}
+.login_face{ margin:-55px auto 20px; width:100px; height:100px; -webkit-border-radius:50%; -moz-border-radius:50%; border-radius:50%; border:5px solid #fff; overflow:hidden;box-shadow:0 0 30px #009688;}
+.login_face img{ width:100%;}
+.loginBody .layui-form-item{ position:relative;}
+.loginBody .layui-form-item label{ position:absolute; color:#757575; left:10px; top:9px; line-height:20px; background:#fff; padding:0 5px; font-size:14px; cursor:text;}
+.loginBody .layui-form-item.layui-input-focus label{ top:-10px; font-size:12px; color:#ff6700;}
+.loginBody .layui-form-item.layui-input-active label{ top:-10px; font-size:12px;}
+.loginBody .layui-input::-webkit-input-placeholder{color:#fff;}
+.loginBody .layui-input::-moz-placeholder{color:#fff;}
+.loginBody .layui-input:-ms-input-placeholder{color:#fff;}
+.loginBody .layui-input::placeholder{color:#fff;}
+.loginBody .layui-form-item.layui-input-focus input{ border-color:#ff6700 !important;}
+.loginBody .layui-input-focus .layui-input::-webkit-input-placeholder{color:#757575;}
+.loginBody .layui-input-focus .layui-input::-moz-placeholder{color:#757575;}
+.loginBody .layui-input-focus .layui-input:-ms-input-placeholder{color:#757575;}
+.loginBody .layui-input-focus .layui-input::placeholder{color:#757575;}
+.loginBody .seraph{ font-size:30px; text-align:center;}
+.loginBody .seraph.icon-qq:hover{ color:#0288d1;}
+.loginBody .seraph.icon-wechat:hover{ color:#00d20d;}
+.loginBody .seraph.icon-sina:hover{ color:#d32f2f;}
+.imgCode{ position:relative;}
+#imgCode img{ position:absolute; top:1px; right:1px; cursor:pointer;}
+/*用户等级*/
+.layui-table-view .layui-table span.seraph{ font-size:25px !important;}
+.vip1{ color:#994a2b;}
+.vip2{ color:#899396;}
+.vip3{ color:#bd6a08;}
+.vip4{ color:#a3b8c4;}
+.vip5{ color:#63c3ea;}
+.vip6{ color:#b563ed;}
+.vip7{ color:#ff9831;}
+.vip8{ color:#A757A8;}
+.vip9{ color:#0ff;}
+.vip10{ color:#f00;}
+/*新闻添加*/
+.layui-elem-quote .layui-inline{ margin:3px 0;}
+.category .layui-form-checkbox{ margin:5px 0;}
+.border .layui-form-item{ margin-bottom:10px;}
+.border .layui-form-label{ width:50px;}
+.border .layui-form-label i{ position:absolute; top:10px; left:3px;}
+.border .layui-input-block{ margin-left:80px;}
+.thumbBox{ height:151px; overflow:hidden; border:1px solid #e6e6e6; border-radius:2px; cursor:pointer; position:relative; text-align:center; line-height:153px;}
+.thumbImg{ max-width:100%; max-height:100%; border:none;}
+.thumbBox:after{ position:absolute; width:100%; height:100%;line-height:153px; z-index:-1; text-align:center; font-size:20px; content:"缩略图"; left:0; top:0; color:#9F9F9F;}
+/*图片管理*/
+#Images li{ width:19%; margin:0.5% 0.5%; float: left; overflow:hidden;}
+#Images li img{ width:100%; cursor:pointer; }
+#Images li .operate{ display: block; height: 40px; width:100%; background:#f4f5f9; }
+#Images li .operate .check{ float:left; margin-left:11px; height:18px; padding:11px 0; width:74%; position:relative;}
+#Images li .operate .check .layui-form-checkbox[lay-skin=primary]{ width:100%;}
+#Images li .operate .check .layui-form-checkbox[lay-skin=primary] span{ padding:0 5px 0 25px; width:100%; box-sizing:border-box;}
+#Images li .operate .check .layui-form-checkbox[lay-skin=primary] i{position:absolute; left:0; top:0;}
+#Images li .operate .img_del{ float:right; margin:9px 11px 0 0; font-size: 22px !important; cursor:pointer; }
+#Images li .operate .img_del:hover{ color:#f00; }
+@media screen and (max-width:1050px){#Images li{ width:24%;}}
+@media screen and (max-width: 750px){#Images li{ width:49%;}}
+@media screen and (max-width:432px){#Images li{ width:99%;}}
+/*系统日志*/
+.layui-btn-green{ background-color:#5FB878 !important;}
+/*友情链接*/
+.linkLogo{ width:80px; height:40px; overflow:hidden; border:1px solid #e6e6e6; border-radius:2px; cursor:pointer; margin:0 auto; position:relative; text-align:center; line-height:42px;}
+.linkLogoImg{ max-width:90%; max-height:90%;}
+.linkLogo:after{ position:absolute; width:100%; height:100%;line-height:42px; z-index:-1; text-align:center; font-size:12px; content:"上传LOGO"; left:0; top:0; color:#9F9F9F;}
+.linksAdd .layui-form-label{ width:60px; padding-left:0;}
+.linksAdd .layui-input-block{ margin-left:75px;}
+.linksAdd .layui-input-block input{ padding:0 5px;}
+/*响应式*/
+@media screen and (max-width:450px) {
+    #userFaceBtn{ height: 30px;line-height: 30px; padding: 0 10px; font-size: 12px;}
+    .user_right img#userFace{ width:100px; height:100px; margin-top:0;}
+    .layui-col-xs12 .layui-form-label{ width:60px; padding-left:0;}
+    .layui-col-xs12 .layui-input-block,.layui-col-xs12 .layui-input-inline{ margin-left:75px;}
+    .layui-col-xs12 .layui-input-inline{ left:0 !important; width:auto !important;}
+    .noFind{ padding-top:0;}
+    *[pc]{ display:none;}
+}
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/icon/mark_cw.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/icon/mark_cw.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/iconfont/iconfont.css
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/iconfont/iconfont.css
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/iconfont/iconfont.ttf
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/iconfont/iconfont.ttf
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/init.js
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/init.js
@ -1,5 +1,5 @@

-var _interfaceDocUrl="",//其他接口
+var _interfaceDocUrl="http://192.168.31.125:8193",//其他接口
    _interfaceMhUrl="",//摄像头
    _interfaceImgUrl = "",//图片前缀
    _interfaceDjUrl = "/political";//党建接口
@ -55,10 +55,10 @@ layui.use(['layer','table','laydate','form'], function () {
    initWorkData();

    _layuiForm.on('select(modelSwitch)', function (data) {
-        console.log(data.value);
        if (data.value != null && data.value != "") {
            if (_orgId != data.value) {
                _orgId = data.value;
+                sessionStorage.setItem("visualization_orgId",_orgId);
                initWork(_use_page);
                initTileset2();
            }
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/mapPublic/entity.js
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/mapPublic/entity.js
@ -28,6 +28,43 @@ var addEntity_billboard = function (list,id,name,position,img,distance,disable,s
    }
 }

+/**
+ * 添加图标 + 文字
+ * @param list 图标ID集合
+ * @param id 实体主键
+ * @param name 实体名称
+ * @param position 实体坐标
+ * @param img 实体图片
+ * @param distance 可显示距离
+ * @param disable 深度测试的距离
+ * @param scale 图标比例
+ */
+var addEntity_billboardAndLabel = function (list,id,name,position,img,distance,disable,scale){
+    if(this._viewer.entities.getById(id))return;
+    var entity = this._viewer.entities.add({
+        id : id,
+        name : name,
+        position : position,
+        billboard : {
+            image : img,
+            verticalOrigin : this._cesium.VerticalOrigin.BOTTOM,
+            distanceDisplayCondition: distance,
+            disableDepthTestDistance: disable,
+            scale: scale
+        },
+        label: {
+            text: name,
+            verticalOrigin : this._cesium.VerticalOrigin.TOP,
+            distanceDisplayCondition: distance,
+            disableDepthTestDistance: disable,
+            scale: scale
+        }
+    });
+    if(list != null){
+        list.push(id);
+    }
+}
+
 /**
 * 添加模型
 * @param list 模型ID集合
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/setting.js
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/setting.js
@ -0,0 +1,3 @@
+var _interfaceDocUrl="http://192.168.31.125:8193/",//其他接口
+    _staticUrl = "/3DVisualization/",//其他接口
+    _interfaceImgUrl = "http://xzcamp.xfzn365.com/";//图片前缀
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/util/jq_extend.js
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/js/util/jq_extend.js
@ -0,0 +1,105 @@
+$.extend({
+    getUrlVars: function () {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    },
+    getUrlVar: function (name) {
+        return $.getUrlVars()[name];
+    },
+    GetDateStr: function (AddDayCount) {
+        var dd = new Date();
+        dd.setDate(dd.getDate() + AddDayCount); //获取AddDayCount天后的日期
+        var y = dd.getFullYear();
+        var m = dd.getMonth() + 1; //获取当前月份的日期
+        var d = dd.getDate();
+        return m + "-" + d;
+    },
+
+    getNowFormatDate:function () {
+        var date = new Date();
+        var seperator1 = "-";
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var strDate = date.getDate();
+        if (month >= 1 && month <= 9) {
+            month = "0" + month;
+        }
+        if (strDate >= 0 && strDate <= 9) {
+            strDate = "0" + strDate;
+        }
+        var currentdate = year + seperator1 + month + seperator1 + strDate;
+        return currentdate;
+    },
+    /*
+    *下载文件
+    * options:{
+    *      url:'',  //下载地址
+    *      isNewWinOpen:false,是否新窗口打开
+    *      data:{name:value}, //要发送的数据
+    *      method:'post'
+    * }
+    */
+    downLoadFile: function (url, data, method, isNewWinOpen) {
+        var config = {
+            url: url,
+            data: (data = data || {}),
+            method: (method = method || "GET"),
+            isNewWinOpen: (isNewWinOpen = isNewWinOpen || false)
+        };
+        var $iframe = $('<div style="display: none"><iframe id="down-file-iframe" name="down-file-iframe" /></div>');
+        var $form = $('<form target="down-file-iframe" method="' + config.method + '" action="' + config.url + '" />');
+        if (config.isNewWinOpen) {
+            $form.attr("target", "_blank");
+        }
+        /*拼接参数*/
+        for (var key in config.data) {
+            $form.append('<input type="hidden" name="' + key + '" value="' + config.data[key] + '" />');
+        }
+        $iframe.append($form);
+        $(document.body).append($iframe);
+        $form.submit();
+        //        setTimeout(function () {
+        //            $iframe.remove();
+        //        }, 4000)
+    },
+    //判断获取登录单位所需展示的数据的机构ID
+    getShowDataOrgId: function (orgId) {
+        var _orgid = orgId;
+
+        switch (orgId) {
+            case "D8DC637B8B984848A63F82A018AFAEB0":   //西藏总队
+                _orgid = "734389c7ae364584aea9918693bba3de";     //总队机关
+                break;
+            case "f4d9f25b27114172a66a9d04cc158b00":   // 拉萨支队
+                _orgid = "0055c83cf8194051888061fb27971578";   //拉萨机关
+                break;
+            case "40a1e65991764d4dac2d826bfbbfc849":   // 日喀则支队
+                _orgid = "a3a158f3ed6a463d92ef65aa58c67bfa";   //日喀则机关
+                break;
+            case "5806465fa4e845998f31a10d023f332e":   // 昌都支队
+                _orgid = "335ef5c069954872a50d012b4676393a";   //昌都机关
+                break;
+            case "b5b00dfb27a34e0a8bd86270930e02d6":   // 林芝支队
+                _orgid = "1cc32e7245694343b1e5ff41014eee74";   //机关
+                break;
+            case "82487f0ebb6848e7ac4abc3d7cbc8504":   // 山南支队
+                _orgid = "0cf00efb5e5f4f668b86e08aff0ea3c4";   //山南机关
+                break;
+            case "9a1324ec8b244a7f9d6cbca88cd614fd":   // 那曲支队
+                _orgid = "2a0e0a66602145cfb456b98d92776977";   //机关
+                break;
+            case "833b28c12b42495a99a5e41068eb6805":   // 阿里支队
+                _orgid = "ba4e41e82ddd4d819703f0a57f088d4e";   //阿里机关
+                break;
+            default:
+                _orgid = orgId;        //返回原值
+        }
+        return _orgid;
+    }
+});
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/clfzbs.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/clfzbs.html
@ -0,0 +1,164 @@
+<script
+  type="text/javascript"
+  src="SuperMap_WebGL/examples/js/polygon.js"
+></script>
+<script type="text/javascript" src="subitem/js/yjcz.js"></script>
+<script type="text/javascript" src="js/setting.js"></script>
+<link href="subitem/css/clfzbs.css" rel="stylesheet" type="text/css" />
+<style>
+  .layui-layer {
+    background: #0d1535 !important;
+  }
+</style>
+<!-- 工具栏 -->
+<div class="yjcz-gjl" style="text-align: center">
+  <ul>
+    <li>
+      <a
+        href="javascript:void(0)"
+        onclick="clbs_fun()"
+        class="gjl-icon1"
+        data-value="0"
+      >
+        <div class="yjcz-gjl-icon yjcz-gjl-icon11"></div>
+        <h4>车辆部署</h4>
+      </a>
+    </li>
+  </ul>
+</div>
+<script type="text/javascript">
+  //标记数组
+  var addCarIconList = [];
+
+  function clbs_fun() {
+    $(".gjl-icon1").toggleClass("current");
+    var dataValue = $(".gjl-icon1").attr("data-value");
+    if (dataValue == "0") {
+      openCLXZ();
+      $(".gjl-icon1").attr("data-value", "1");
+    } else {
+      _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      $(".gjl-icon1").attr("data-value", "0");
+    }
+  }
+  function openCLXZ() {
+    var index = layui.layer.open({
+      title: "车辆选择 ",
+      type: 2,
+      area: ["1280px", "820px"],
+      shade: 0.4, //遮罩透明度
+      anim: 1,
+      maxmin: true,
+      content: _staticUrl+"subitem/item/clxz.html",
+      btn: ["确定", "取消"],
+      yes: function (index, layero) {
+        var body = parent.layer.getChildFrame("body", index);
+        var carSel = body.find("#carSel").val();
+        console.log(carSel);
+        if (carSel == null || carSel == "") {
+          layer.msg("");
+          return false;
+        }
+        var carSel_S = carSel.split("_,_");
+        try {
+          setPointIcon(carSel_S[0], carSel_S[1]);
+        } catch (e) {
+          layer.close(index);
+        }
+        layer.close(index);
+      },
+      btn2: function () {
+        $(".gjl-icon1").toggleClass("current");
+        $(".gjl-icon1").attr("data-value", "0");
+        layer.close(index);
+      },
+    });
+  }
+
+  //点击获取位置
+  function setPointIcon(id, name, type) {
+    _ScreenSpaceEventHandler.setInputAction(function onRightClick(movement) {
+      var position = _viewer.scene.pickPosition(movement.position);
+      if (position != null) {
+        var cartographic = _cesium.Cartographic.fromCartesian(position);
+        if (cartographic != null) {
+          longitude = _cesium.Math.toDegrees(cartographic.longitude);
+          latitude = _cesium.Math.toDegrees(cartographic.latitude);
+          var height = cartographic.height;
+          if (height < 0) {
+            height = 0;
+          }
+          position = _cesium.Cartesian3.fromDegrees(
+            longitude,
+            latitude,
+            height
+          );
+          addIcon(id, name, position, type);
+        }
+      }
+    }, _cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+
+  function addIcon(id, name, position, type) {
+    if (type == null || type == "") {
+      type = "ditu-cl-ducy-icon1";
+    }
+
+    //地图添加标注
+    addEntity_billboardAndLabel(
+      addCarIconList,
+      id == null || id == "" ? "addCarIconList" + addCarIconList.length : id,
+      name == null || name == ""
+        ? "addCarIconList" + addCarIconList.length
+        : name,
+      position,
+      _staticUrl+"/icon/" + type + ".png",
+      new this._cesium.DistanceDisplayCondition(0, 15000.0),
+      15000.0,
+      1
+    );
+
+    $(".gjl-icon1").toggleClass("current");
+	  $(".gjl-icon1").attr("data-value", "0");
+	  _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+
+  function goView(id,name) {
+    var index = layui.layer.open({
+      title: "【"+name+"】车辆状态监控 ",
+      type: 2,
+      area: ["1280px", "680px"],
+      shade: 0.4, //遮罩透明度
+      maxmin: true,
+      content: _staticUrl+"subitem/item/clxq.html?ID="+id
+    });
+  }
+
+  // 鼠标点击获取坐标点
+  this._ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+    // 选择新模型
+    var pickedFeature = this._viewer.scene.pick(movement.position);
+    if (pickedFeature && pickedFeature.id) {
+      var index = $.inArray(pickedFeature.id._id, addCarIconList);
+      if (index >= 0) {
+        //人
+        updateEntity_billboardImg(
+          addCarIconList,
+          pickedFeature.id._id,
+          _staticUrl+"icon/ditu-cl-ducy-icon1h.png",
+          _staticUrl+"icon/ditu-cl-ducy-icon1.png"
+        );
+      } else {
+        updateEntity_billboardImg(
+          addCarIconList,
+          pickedFeature.id._id,
+          _staticUrl+"icon/ditu-cl-ducy-icon1h.png",
+          _staticUrl+"icon/ditu-cl-ducy-icon1.png"
+        );
+      }
+      goView(pickedFeature.id._id,pickedFeature.id._name);
+    } else {
+      console.log("点击的是模型");
+    }
+  }, this._cesium.ScreenSpaceEventType.LEFT_CLICK);
+</script>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/css/clfzbs.css
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/css/clfzbs.css
@ -0,0 +1,67 @@
+
+/* 工具栏 */
+
+.yjcz-gjl {
+    width: calc(100% - 190px);
+    height: 100px;
+    position: absolute;
+    margin-left: 190px;
+    bottom: 26px;
+}
+
+.yjcz-gjl li {
+	width: 104px;
+	height: 100px;
+	margin-right: 36px;
+	float: left;
+	text-align: center;
+}
+
+.yjcz-gjl li a {
+	display: block;
+	color: #cbebff;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon {
+	width: 104px;
+	height: 76px;
+}
+
+.yjcz-gjl li h4 {
+	height: 24px;
+	line-height: 24px;
+	font-size: 16px;
+	font-weight: normal;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon11 {
+	background: url(../../yjczImg/yjcz-gjl-icon11.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon11 {
+	background: url(../../yjczImg/yjcz-gjl-icon11h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon12 {
+	background: url(../../yjczImg/yjcz-gjl-icon12.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon12 {
+	background: url(../../yjczImg/yjcz-gjl-icon12h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon13 {
+	background: url(../../yjczImg/yjcz-gjl-icon13.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon13 {
+	background: url(../../yjczImg/yjcz-gjl-icon13h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon14 {
+	background: url(../../yjczImg/yjcz-gjl-icon14.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon14 {
+	background: url(../../yjczImg/yjcz-gjl-icon14h.png) bottom no-repeat;
+}
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/css/yjcz.css
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/css/yjcz.css
@ -5,7 +5,7 @@
 	width: 1260px;
 	height: 100px;
 	position: absolute;
-	margin-left: 190px;
+	/* margin-left: 190px; */
 	bottom: 26px;
 }

@ -106,6 +106,38 @@
 	background: url(../img/yjcz-gjl-icon9h.png) bottom no-repeat;
 }

+.yjcz-gjl li .yjcz-gjl-icon11 {
+	background: url(../img/yjcz-gjl-icon11.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon11 {
+	background: url(../img/yjcz-gjl-icon11h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon12 {
+	background: url(../img/yjcz-gjl-icon12.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon12 {
+	background: url(../img/yjcz-gjl-icon12h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon13 {
+	background: url(../img/yjcz-gjl-icon13.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon13 {
+	background: url(../img/yjcz-gjl-icon13h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon14 {
+	background: url(../img/yjcz-gjl-icon14.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon14 {
+	background: url(../img/yjcz-gjl-icon14h.png) bottom no-repeat;
+}
+
 /* 设置事故点 */

 .yjcz-szsgd {
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/cwtj.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/cwtj.html
@ -0,0 +1,129 @@
+<script
+  type="text/javascript"
+  src="SuperMap_WebGL/examples/js/polygon.js"
+></script>
+<script type="text/javascript" src="subitem/js/yjcz.js"></script>
+<script type="text/javascript" src="js/setting.js"></script>
+<link href="subitem/css/clfzbs.css" rel="stylesheet" type="text/css" />
+<style>
+  .layui-layer {
+    background: #0d1535 !important;
+  }
+</style>
+<!-- 工具栏 -->
+<div class="yjcz-gjl" style="text-align: center">
+  <ul>
+    <li>
+      <a
+        href="javascript:void(0)"
+        onclick="clbs_fun()"
+        class="gjl-icon1"
+        data-value="0"
+      >
+        <div class="yjcz-gjl-icon yjcz-gjl-icon12"></div>
+        <h4>错误标记</h4>
+      </a>
+    </li>
+  </ul>
+</div>
+<script type="text/javascript">
+  //标记数组
+  var addCWIconList = [];
+
+  function clbs_fun() {
+    $(".gjl-icon1").toggleClass("current");
+    var dataValue = $(".gjl-icon1").attr("data-value");
+    if (dataValue == "0") {
+      openCLXZ();
+      $(".gjl-icon1").attr("data-value", "1");
+    } else {
+      _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      $(".gjl-icon1").attr("data-value", "0");
+    }
+  }
+  function openCLXZ() {
+    var index = layui.layer.open({
+      title: "调剂添加 ",
+      type: 2,
+      area: ["640px", "420px"],
+      shade: 0.4, //遮罩透明度
+      anim: 1,
+      maxmin: true,
+      content: _staticUrl+"subitem/item/cwbj.html",
+      btn: ["确定", "取消"],
+      yes: function (index, layero) {
+        var body = parent.layer.getChildFrame("body", index);
+        var xueyuan = body.find("#xueyuan").val();
+        var remarks = body.find("#remarks").val();
+        var text = xueyuan;
+        if (remarks != null && remarks != "") {
+          if(remarks.length > 10){
+            text += "("+remarks.substring(0, 10)+"...)";
+          }else{
+            text += "("+remarks+")";
+          }
+        }
+        try {
+          setPointIcon(text);
+        } catch (e) {
+          layer.close(index);
+        }
+        layer.close(index);
+      },
+      btn2: function () {
+        $(".gjl-icon1").toggleClass("current");
+        $(".gjl-icon1").attr("data-value", "0");
+        layer.close(index);
+      },
+    });
+  }
+
+  //点击获取位置
+  function setPointIcon(name, type) {
+    _ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+      var position = _viewer.scene.pickPosition(movement.position);
+      if (position != null) {
+        var cartographic = _cesium.Cartographic.fromCartesian(position);
+        if (cartographic != null) {
+          longitude = _cesium.Math.toDegrees(cartographic.longitude);
+          latitude = _cesium.Math.toDegrees(cartographic.latitude);
+          var height = cartographic.height;
+          if (height < 0) {
+            height = 0;
+          }
+          position = _cesium.Cartesian3.fromDegrees(
+            longitude,
+            latitude,
+            height
+          );
+          addIcon(name, position, type);
+        }
+      }
+    }, _cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+
+  function addIcon(name, position, type) {
+    if (type == null || type == "") {
+      type = "mark_cw";
+    }
+
+    //地图添加标注
+    addEntity_billboardAndLabel(
+      addCWIconList,
+      "addCWIconList" + addCWIconList.length,
+      name == null || name == ""
+        ? "addCWIconList" + addCWIconList.length
+        : name,
+      position,
+      _staticUrl+"icon/" + type + ".png",
+      new this._cesium.DistanceDisplayCondition(0, 15000.0),
+      15000.0,
+      1
+    );
+
+    $(".gjl-icon1").toggleClass("current");
+	  $(".gjl-icon1").attr("data-value", "0");
+	  _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+
+</script>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/drzdtb.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/drzdtb.html
@ -0,0 +1,124 @@
+<script
+  type="text/javascript"
+  src="SuperMap_WebGL/examples/js/polygon.js"
+></script>
+<script type="text/javascript" src="subitem/js/yjcz.js"></script>
+<script type="text/javascript" src="js/setting.js"></script>
+<link href="subitem/css/clfzbs.css" rel="stylesheet" type="text/css" />
+<style>
+  .layui-layer {
+    background: #0d1535 !important;
+  }
+</style>
+<!-- 工具栏 -->
+<div class="yjcz-gjl" style="text-align: center">
+  <ul>
+    <li>
+      <a
+        href="javascript:void(0)"
+        onclick="clbs_fun()"
+        class="gjl-icon1"
+        data-value="0"
+      >
+        <div class="yjcz-gjl-icon yjcz-gjl-icon13"></div>
+        <h4>角色选择与同步</h4>
+      </a>
+    </li>
+  </ul>
+</div>
+<script type="text/javascript">
+  //标记数组
+  var addRYIconList = [];
+
+  function clbs_fun() {
+    $(".gjl-icon1").toggleClass("current");
+    var dataValue = $(".gjl-icon1").attr("data-value");
+    if (dataValue == "0") {
+      openCLXZ();
+      $(".gjl-icon1").attr("data-value", "1");
+    } else {
+      _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      $(".gjl-icon1").attr("data-value", "0");
+    }
+  }
+  function openCLXZ() {
+    var index = layui.layer.open({
+      title: "角色选择 ",
+      type: 2,
+      area: ["640px", "420px"],
+      shade: 0.4, //遮罩透明度
+      anim: 1,
+      maxmin: true,
+      content: _staticUrl+"subitem/item/jsxz.html",
+      btn: ["确定", "取消"],
+      yes: function (index, layero) {
+        var body = parent.layer.getChildFrame("body", index);
+        var xueyuan = body.find("#xueyuan").val();
+        var carSel = body.find("#carSel").val();
+        var text = carSel;
+        if (xueyuan != null && xueyuan != "") {
+          text += "("+xueyuan+")";
+        }
+        try {
+          setPointIcon(text);
+        } catch (e) {
+          layer.close(index);
+        }
+        layer.close(index);
+      },
+      btn2: function () {
+        $(".gjl-icon1").toggleClass("current");
+        $(".gjl-icon1").attr("data-value", "0");
+        layer.close(index);
+      },
+    });
+  }
+
+  //点击获取位置
+  function setPointIcon(name, type) {
+    _ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+      var position = _viewer.scene.pickPosition(movement.position);
+      if (position != null) {
+        var cartographic = _cesium.Cartographic.fromCartesian(position);
+        if (cartographic != null) {
+          longitude = _cesium.Math.toDegrees(cartographic.longitude);
+          latitude = _cesium.Math.toDegrees(cartographic.latitude);
+          var height = cartographic.height;
+          if (height < 0) {
+            height = 0;
+          }
+          position = _cesium.Cartesian3.fromDegrees(
+            longitude,
+            latitude,
+            height
+          );
+          addIcon(name, position, type);
+        }
+      }
+    }, _cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+
+  function addIcon(name, position, type) {
+    if (type == null || type == "") {
+      type = "ditu-fk-icon1";
+    }
+
+    //地图添加标注
+    addEntity_billboardAndLabel(
+      addRYIconList,
+      "addRYIconList" + addRYIconList.length,
+      name == null || name == ""
+        ? "addRYIconList" + addRYIconList.length
+        : name,
+      position,
+      _staticUrl+"icon/" + type + ".png",
+      new this._cesium.DistanceDisplayCondition(0, 15000.0),
+      15000.0,
+      1
+    );
+
+    $(".gjl-icon1").toggleClass("current");
+	  $(".gjl-icon1").attr("data-value", "0");
+	  _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+</script>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/clxq.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/clxq.html
@ -0,0 +1,358 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta charset="utf-8" />
+    <title>添加--车辆管理</title>
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1"
+    />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <link rel="stylesheet" href="../../layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="../../css/public.css" media="all" />
+    <link rel="stylesheet" href="../../iconfont/iconfont.css" media="all" />
+    <link rel="stylesheet" href="../../css/bulletframe.css" media="all" />
+  </head>
+  <body class="childrenBody" style="height: 90%">
+    <form class="layui-form" style="width: 100%; margin-top: 15px">
+      <input class="layui-input ID" type="hidden" />
+      <input class="layui-input Action" type="hidden" />
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <div class="layui-inline">
+          <label class="layui-form-label"> 车辆名称 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="car_name"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 车辆编号 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="car_no"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label"> 所属消防机关 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="org_id"
+              disabled="disabled"
+            />
+          </div>
+
+          <label class="layui-form-label"> 所属部门 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="dept_id"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <div class="layui-inline">
+          <label class="layui-form-label"> 车辆号牌 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="car_num"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 车联网厂家 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="FACTORY"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label"> 所属辖区 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="region"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 终端IMEI </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="IMEI"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <div class="layui-inline">
+          <label class="layui-form-label"> 车辆位置 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="cheliangweizhi"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 方向 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="fangxiang"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label"> 是否运行 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="isstart"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 速度 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="sudu"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <div class="layui-inline">
+          <label class="layui-form-label"> 车辆照片 </label>
+          <div class="layui-input-block" style="margin-left: 160px">
+            <img
+              class="layui-upload-img"
+              id="PHOTO"
+              style="width: 87% !important; height: 50% !important"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <div class="layui-inline">
+          <label class="layui-form-label"> 载水量 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="waternum"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 载干粉量 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="drypowder"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label"> 泡沫量 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="frothamount"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 多功能泡沫量 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="frothamountmulti"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <div class="layui-inline">
+          <label class="layui-form-label"> A类泡沫量 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="frothamounta"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> B类泡沫量 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="frothamountb"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label"> 液位 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="liquidlevel"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 登高车工作高度 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="heightboardingcar"
+              disabled="disabled"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <div class="layui-inline">
+          <label class="layui-form-label"> 压力 </label>
+          <div class="layui-input-inline">
+            <input
+              type="text"
+              class="layui-input"
+              id="pressure"
+              disabled="disabled"
+            />
+          </div>
+          <label class="layui-form-label"> 备注 </label>
+          <div class="layui-input-inline">
+            <textarea
+              id="remarks"
+              class="layui-textarea"
+              style="width: 550px"
+              disabled="disabled"
+            ></textarea>
+          </div>
+        </div>
+      </div>
+    </form>
+    <script
+      src="../../js/util/jquery-1.8.3.min.js"
+      type="text/javascript"
+    ></script>
+    <script type="text/javascript" src="../../layui/layui.js"></script>
+    <script type="text/javascript" src="../../js/util/jq_extend.js"></script>
+    <script type="text/javascript" src="../../js/setting.js"></script>
+    <script type="text/javascript">
+      layui.use(["form"], function () {
+        var form = layui.form,
+          $ = layui.jquery;
+
+        var ID = $.getUrlVar("ID");
+        $(function () {
+          $.ajax({
+            type: "POST",
+            url: _interfaceDocUrl + "/ashx/CarHandler.ashx",
+            data: { Action: "View", ID: ID, random: new Date().getTime() },
+            dataType: "json",
+            success: function (data) {
+              var result = data.data[0];
+              $("#officialAndDucyDiv").show();
+              $("#ducyDiv").show();
+              $("#officialDiv").hide();
+              $("#socityDiv").hide();
+              $("#car_name").val(result.CAR_NAME); //车辆名称
+              $("#car_no").val(result.CAR_NO); //车辆编号
+              $("#org_id").val(result.ORG_NAME); //消防机构
+              $("#dept_id").val(result.DEPT_NAME); //部门
+              $("#car_num").val(result.CAR_NUM); //车辆号牌
+              $("#car_code").val(result.CAR_CODE); //车辆登记代号
+              $("#frame_num").val(result.FRAME_NUM); //车架号
+              $("#engine_no").val(result.ENGINE_NO); //发动机号
+              $("#trademark").val(result.TRADEMARK); //商标
+              $("#gbcode").val(result.GB_CODE); //国标代码
+              $("#factory").val(result.FACTORY); //出厂厂家
+              $("#liableman").val(result.LIABLEMAN); //责任人名称
+              $("#region").val(result.AREA_NAME); //所属辖区
+              $("#isrun").val(result.ISRUN); //是否运行
+              $("#class").val(result.CLASS); //大类型
+              $("#type").val(result.TYPE); //小类型
+              $("#waternum").val(result.WATERNUM); //载水量
+              $("#drypowder").val(result.DRYPOWDER); //载干粉量
+              $("#heightboardingcar").val(result.HEIGHTBOARDINGCAR); //登高车工作高度
+              $("#frothamount").val(result.FROTHAMOUNT); //泡沫量
+              $("#frothamounta").val(result.FROTHAMOUNTA); //A类泡沫量
+              $("#frothamountb").val(result.FROTHAMOUNTB); //B类泡沫量
+              $("#frothamountmulti").val(result.FROTHAMOUNTMULTI); //多功能泡沫量
+              $("#liquidlevel").val(result.LIQUIDLEVEL); //液位
+              $("#pressure").val(result.PRESSURE); //压力
+              $("#isstart").val(result.ISSTART); //是否运行
+              $("#remarks").val(result.REMARKS);
+              $("#PHOTO").attr("src", _interfaceImgUrl + result.PHOTO);
+              $("#IMEI").val(result.IMEI); //车联网厂家
+
+              $("#cheliangweizhi").val(result.AREA_NAME); //车辆位置
+              $("#fangxiang").val("--°"); //方向
+              $("#sudu").val("--(km/h)"); //速度
+
+              if (result.ISRUN == "1") {
+                $("#isrun").val("离营");
+              } else {
+                $("#isrun").val("在营");
+              }
+
+              if (result.ISRUN == "0") {
+                $("#isstart").val("未启动");
+              } else if (result.ISRUN == "1") {
+                $("#isstart").val("已启动");
+                $("#sudu").val(Math.floor(Math.random() * 75) + 1 +"(km/h)");
+                $("#fangxiang").val(Math.floor(Math.random() * 360) + 1 +"°");
+              } else {
+                $("#isstart").val("未知");
+              }
+
+              if (result.FACTORY == "0") {
+                $("#FACTORY").val("中移物联");
+              } else if (result.FACTORY == "1") {
+                $("#FACTORY").val("乐兔兔");
+              } else {
+                $("#FACTORY").val("未知");
+              }
+            },
+          });
+        });
+      });
+    </script>
+  </body>
+</html>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/clxz.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/clxz.html
@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html style="height: 100%">
+  <head>
+    <meta charset="utf-8" />
+    <title></title>
+    <script src="../../js/util/jquery-1.8.3.min.js"></script>
+    <!--Layui-->
+    <link href="../../layui/css/layui.css" rel="stylesheet" type="text/css" />
+    <script src="../../layui/layui.js" type="text/javascript"></script>
+    <script src="../../js/setting.js"></script>
+
+    <style>
+      .tool-model-select {
+        position: absolute;
+        border: 1px solid #4190b6;
+        border-radius: 4px;
+        width: 830px;
+        left: 10px;
+        z-index: 99;
+      }
+      .tool-model-select span {
+        float: left;
+        width: 20px;
+        height: 38px;
+        line-height: 34px;
+      }
+      .tool-model-select span img {
+        display: inline-block;
+        vertical-align: middle;
+      }
+      .tool-model-select select {
+        float: right;
+        width: 175px;
+        height: 38px;
+        border: 0;
+        line-height: 38px;
+        color: #00aeff;
+        font-size: 16px;
+        background: none;
+        outline: none;
+        /*很关键：将默认的select选择框样式清除*/
+        appearance: none;
+        -moz-appearance: none;
+        -webkit-appearance: none;
+
+        /*在选择框的最右侧中间显示小箭头图片*/
+        background: url("../img/tool-model-select-sanjiao.png") no-repeat scroll
+          right center transparent;
+        padding-right: 14px;
+      }
+      .tool-model-select select option {
+        background: rgba(20, 47, 91, 0.8);
+        border: 1px solid #4190b6;
+      }
+
+      .layui-form-select .layui-input {
+        background: #2e415f;
+        border: 0;
+        color: #fff;
+      }
+
+      .layui-form-selected dl {
+        background: rgb(46, 65, 95);
+      }
+
+      .layui-form-select dl dd:hover {
+        background-color: #5fb878;
+      }
+    </style>
+  </head>
+  <body style="height: 90%">
+    <form
+      id="weatherSettingDiv"
+      class="layui-form"
+      style="width: 90%; margin-top: 15px; color: #fff"
+    >
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 车辆选择 </label>
+        <div class="layui-input-block tool-model-select">
+          <select
+            id="carSel"
+            lay-filter="carSel"
+            lay-search=""
+            lay-verify="required"
+          ></select>
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 车辆照片 </label>
+        <div class="layui-input-block" style="margin-left: 160px">
+          <img
+            class="layui-upload-img"
+            id="PHOTO"
+            style="width: 87% !important; height: 50% !important"
+          />
+        </div>
+      </div>
+    </form>
+    <script type="text/javascript">
+      /**
+       * 初始化layui
+       */
+      layui.use(["layer", "form"], function () {
+        var form = layui.form,
+          layer = layui.layer,
+          $ = layui.jquery;
+
+        var orgId = sessionStorage.getItem("visualization_orgId");
+        if(orgId == "bdlg"){
+          orgId = "f4d9f25b27114172a66a9d04cc158b00"
+        }
+
+        $.ajax({
+          type: "post",
+          url: _interfaceDocUrl + "/ashx/CarHandler.ashx",
+          data: {
+            Action: "CarList",
+            page: 1,
+            limit: 9999,
+            OrgId: orgId == null || orgId == "" ? "e2edaf11624e489085ebd39a3b448cc6" : orgId,
+            is_content: 1,
+            class: "1",
+            type: "org",
+            random: new Date().getTime(), //随机参数
+          },
+          dataType: "json",
+          success: function (result) {
+            var CarStr = "";
+            result.data.forEach(function (obj, index, arr) {
+              CarStr +=
+                "<option data-img='"+obj.PHOTO+"' value='" + obj.ID + "_,_" + obj.CAR_NUM + "'>" + obj.CAR_NUM+"("+obj.CAR_NAME+")" + "</option>";
+            });
+            $("#carSel").append(CarStr);
+            form.render("select");
+          },
+        });
+
+        form.on("select(carSel)", function (data) {
+            var url = $(data.elem).find("option:selected").attr('data-img') ;
+            if (data.value != null && data.value != "") {
+                $("#PHOTO").attr("src", _interfaceImgUrl + url);
+            }
+        });
+      });
+    </script>
+  </body>
+</html>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/cwbj.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/cwbj.html
@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html style="height: 100%">
+  <head>
+    <meta charset="utf-8" />
+    <title></title>
+    <script src="../../js/util/jquery-1.8.3.min.js"></script>
+    <!--Layui-->
+    <link href="../../layui/css/layui.css" rel="stylesheet" type="text/css" />
+    <script src="../../layui/layui.js" type="text/javascript"></script>
+  </head>
+  <body style="height: 90%">
+    <form
+      id="weatherSettingDiv"
+      class="layui-form"
+      style="width: 90%; margin-top: 15px; color: #fff"
+    >
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 学员 </label>
+        <div class="layui-input-block tool-model-select">
+          <input
+              type="text"
+              class="layui-input"
+              id="xueyuan"
+              maxlength="10"
+            />
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 错误描述 </label>
+        <div class="layui-input-block" >
+          <textarea
+              id="remarks"
+              class="layui-textarea"
+            ></textarea>
+        </div>
+      </div>
+    </form>
+  </body>
+</html>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/jsxz.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/item/jsxz.html
@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html style="height: 100%">
+  <head>
+    <meta charset="utf-8" />
+    <title></title>
+    <script src="../../js/util/jquery-1.8.3.min.js"></script>
+    <!--Layui-->
+    <link href="../../layui/css/layui.css" rel="stylesheet" type="text/css" />
+    <script src="../../layui/layui.js" type="text/javascript"></script>
+
+    <style>
+      .tool-model-select {
+        position: absolute;
+        border: 1px solid #4190b6;
+        border-radius: 4px;
+        width: 230px;
+        left: 10px;
+        z-index: 99;
+      }
+      .tool-model-select span {
+        float: left;
+        width: 20px;
+        height: 38px;
+        line-height: 34px;
+      }
+      .tool-model-select span img {
+        display: inline-block;
+        vertical-align: middle;
+      }
+      .tool-model-select select {
+        float: right;
+        width: 175px;
+        height: 38px;
+        border: 0;
+        line-height: 38px;
+        color: #00aeff;
+        font-size: 16px;
+        background: none;
+        outline: none;
+        /*很关键：将默认的select选择框样式清除*/
+        appearance: none;
+        -moz-appearance: none;
+        -webkit-appearance: none;
+
+        /*在选择框的最右侧中间显示小箭头图片*/
+        background: url("../img/tool-model-select-sanjiao.png") no-repeat scroll
+          right center transparent;
+        padding-right: 14px;
+      }
+      .tool-model-select select option {
+        background: rgba(20, 47, 91, 0.8);
+        border: 1px solid #4190b6;
+      }
+
+      .layui-form-select .layui-input {
+        background: #2e415f;
+        border: 0;
+        color: #fff;
+      }
+
+      .layui-form-selected dl {
+        background: rgb(46, 65, 95);
+      }
+
+      .layui-form-select dl dd:hover {
+        background-color: #5fb878;
+      }
+    </style>
+  </head>
+  <body style="height: 90%">
+    <form
+      id="weatherSettingDiv"
+      class="layui-form"
+      style="width: 90%; margin-top: 15px; color: #fff"
+    >
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 用户 </label>
+        <div class="layui-input-block tool-model-select">
+          <input type="text" class="layui-input" id="xueyuan" maxlength="10" />
+        </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 角色选择 </label>
+        <div class="layui-input-block tool-model-select">
+          <select
+            id="carSel"
+            lay-filter="carSel"
+            lay-search=""
+            lay-verify="required"
+          >
+            <option>消防员</option>
+            <option>指挥官</option>
+            <option>救援人员</option>
+            <option>其他角色</option>
+          </select>
+        </div>
+      </div>
+    </form>
+    <script type="text/javascript">
+      /**
+       * 初始化layui
+       */
+      layui.use(["layer", "form"], function () {
+        var form = layui.form,
+          layer = layui.layer,
+          $ = layui.jquery;
+      });
+    </script>
+  </body>
+</html>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/js/yjcz.js
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/js/yjcz.js
@ -13,8 +13,8 @@ var setTimeyjczksfx1, setTimeyjczksfx2, setTimeyjczksfx3, setTimeyjczksfx4;
 //物联设备数组
 var xfz_list = [], xfsh_list = [], xfsc_list = [], xfs_list = [], wlsb_list = [], spjk_list = [], xftd_list = [], wxy_list = [], wxxfz_list = [];

-//标记数组
-var addIconList = [];
+//实体数组
+var addIconList = [],addCarIconList = [],addCWIconList = [],addTBIconList = [],addJHIconList = [];

 var yjczstart = function () {

@ -145,8 +145,6 @@ var yjczaqqyshow = function () {
            },
            clampToS3M: true
        };
-        console.log(aqqyshow3);
-        console.log(_myDataCustomDataSource.entities);
        _myDataCustomDataSource.entities.add(aqqyshow3);
    }
    
@ -158,7 +156,7 @@ var yjczaqqyhide = function () {

 //展示火苗
 function hmshow(pos1, x, y) {
-    _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+    _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
    var viewModel = {
        emissionRate: 225.0,
        gravity: 5.0,
@ -362,324 +360,324 @@ function setPoint() {
                // wind('', '');
            }
        }
-    }, _cesium.ScreenSpaceEventType.LEFT_CLICK);
+    }, _cesium.ScreenSpaceEventType.RIGHT_CLICK);
 }





-//鼠标点击 消防资源
-_ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
-    var pickedFeature = _viewer.scene.pick(movement.position);
-    if (pickedFeature && pickedFeature.id && pickedFeature.id._description) {
-        var flag = false;
-        var value = JSON.parse(pickedFeature.id._description._value);
-
-    } else {
-        $("#xfzyBubbleItem").css('display', 'none');
-    }
-
-    var pickedFeature = _viewer.scene.pick(movement.position);
-    if (pickedFeature && pickedFeature.id && pickedFeature.id._id.indexOf("six") < 0) {
-        readyClose = [];
-        updateEntity_billboardImg(pickedFeature.id._id);
-        readyClose.push(pickedFeature.id._id);
-        var flag = false;
-        var value = JSON.parse(pickedFeature.id._description._value);
-        $(".xfzyBubbleItem").removeClass("xfzyBubbleItem-spjk");
-        $(".details").attr("sys-id", value.sysId);
-        $(".bjinfo").attr("sys-id", value.sysId);
-
-        $(".details").attr("device-id", value.deviceId);
-        $(".bjinfo").attr("device-id", value.deviceId);
-
-        $(".right-img").hide();
-        $("#dvcdiv").hide();
-        $(".wxxfz-info").hide();
-        $(".xfz-info").hide();
-        $(".xfsh-info").hide();
-        $(".xfsc-info").hide();
-        $(".spjk-info").hide();
-        $(".wxy-info").hide();
-        $(".xftd-info").hide();
-        $(".dev-alam").hide();
-        $(".see-range").hide();
-        $("#jzdiv").hide();
-        $(".right-vedio").hide();
-        $(".right-img-wxy").hide();
-        switch (value.type) {
-            case "dvc":
-                $(".dev-alam").show();
-                var aState = '废弃';
-                $("#xfs-A_STATE").addClass("anable-x");
-
-                if (value.A_STATE == 0) {
-                    aState = '正常';
-                    $("#xfs-A_STATE").removeClass("anable-x");
-                    $("#xfs-A_STATE").addClass("anable-i");
-                }
-                $(".right-img").show();
-                $("#dvcdiv").show();
-                $("#xfs-name").html(value.name);
-                $("#xfs-no").html(value.no);
-                $("#xfs-A_STATE").html(aState);
-                $("#xfs-IS_COM").html(value.IS_COM);
-                $("#xfs-loushui").html(value.loushui);
-                $("#xfs-IS_IMP").html(value.IS_IMP);
-                $("#xfs-IS_DAM").html(value.IS_DAM);
-                $("#xfs-IS_ID").html(value.IS_ID);
-                $("#xfs-IS_PAINT").html(value.IS_PAINT);
-                $("#xfs-IS_ANT").html(value.IS_ANT);
-                $("#xfs-ADDR").html(value.ADDR);
-
-                $("#R_PHOTO").attr("src", _url + value.img);
-
-                flag = true;
-                break;
-            case "jz":
-                $("#jzname").html(pickedFeature.id._name);
-                $("#jztype").html(value.typename);
-                $("#jzaddr").html(value.addr);
-
-                $("#dvcdiv").css('display', 'none');
-                $("#jzdiv").css('display', 'block');
-                flag = true;
-                break;
-
-            case "xfsh":
-                var aState = '废弃';
-                $("#xfsh-A_STATE").addClass("anable-x");
-
-                if (value.A_STATE == 0) {
-                    aState = '正常';
-                    $("#xfsh-A_STATE").removeClass("anable-x");
-                    $("#xfsh-A_STATE").addClass("anable-i");
-                }
-                $(".right-img").show();
-                $(".xfsh-info").show();
-                $("#xfsh-name").html(value.name);
-                $("#xfsh-no").html(value.no);
-                $("#xfsh-A_STATE").html(aState);
-                $("#xfsh-IS_COM").html(value.IS_COM);
-                $("#xfsh-loushui").html(value.loushui);
-                $("#xfsh-IS_IMP").html(value.IS_IMP);
-                $("#xfsh-IS_DAM").html(value.IS_DAM);
-                $("#xfsh-IS_ID").html(value.IS_ID);
-                $("#xfsh-IS_PAINT").html(value.IS_PAINT);
-                $("#xfsh-IS_ANT").html(value.IS_ANT);
-                $("#xfsh-ADDR").html(value.ADDR);
-
-                $("#R_PHOTO").attr("src", _url + value.img);
-                flag = true;
-                break;
-
-            case "xfsc":
-                $(".dev-alam").show();
-                var aState = '废弃';
-                $("#xfsc-A_STATE").addClass("anable-x");
-
-                if (value.A_STATE == 0) {
-                    aState = '正常';
-                    $("#xfsc-A_STATE").removeClass("anable-x");
-                    $("#xfsc-A_STATE").addClass("anable-i");
-                }
-                $(".right-img").show();
-                $(".xfsc-info").show();
-                $("#xfsc-name").html(value.name);
-                $("#xfsc-no").html(value.no);
-                $("#xfsc-A_STATE").html(aState);
-                $("#xfsc-N_CAPACITY").html(value.N_CAPACITY);
-                $("#xfsc-FLOW_SIZE").html(value.FLOW_SIZE);
-                $("#xfsc-I_FORM").html(value.I_FORM);
-                $("#xfsc-I_HEIGHT").html(value.I_HEIGHT);
-                $("#xfsc-SUP_UNIT").html(value.SUP_UNIT);
-
-                $("#xfsc-ALL_CAPACITY").html(value.ALL_CAPACITY);
-                $("#xfsc-ADDR").html(value.ADDR);
-                $("#R_PHOTO").attr("src", _url + value.img);
-                break;
-
-
-            case "wxxfz":
-                $(".wxxfz-info").show();
-                $(".right-img").show();
-
-                var aState = '废弃';
-                $("#wxxfz-A_STATE").addClass("anable-x");
-                if (value.A_STATE == 0) {
-                    aState = '正常';
-                    $("#wxxfz-A_STATE").removeClass("anable-x");
-                    $("#wxxfz-A_STATE").addClass("anable-i");
-                }
-
-                $("#wxxfz-name").html(value.name);
-                $("#wxxfz-no").html(value.no);
-                $("#wxxfz-A_STATE").html(aState);
-                $("#wxxfz-CONT").html(value.CONT);
-                $("#wxxfz-PHONE").html(value.PHONE);
-                $("#wxxfz-PN").html(value.PN);
-                $("#wxxfz-CN").html(value.CN);
-                $("#wxxfz-IS_THE").html(value.IS_THE);
-                $("#wxxfz-IS_DUTY").html(value.IS_DUTY);
-                $("#wxxfz-EQU_DES").html(value.EQU_DES);
-                $("#wxxfz-ADDR").html(value.ADDR);
-
-                $("#R_PHOTO").attr("src", _url + value.img);
-                break;
-
-            case "xfz":
-                $(".xfz-info").show();
-                $(".right-img").show();
-
-                var aState = '废弃';
-                $("#xfz-A_STATE").addClass("anable-x");
-                if (value.A_STATE == 0) {
-                    aState = '正常';
-                    $("#xfz-A_STATE").removeClass("anable-x");
-                    $("#xfz-A_STATE").addClass("anable-i");
-                }
-
-                $("#xfz-name").html(value.name);
-                $("#xfz-no").html(value.no);
-                $("#xfz-A_STATE").html(aState);
-                $("#xfz-CONT").html(value.CONT);
-                $("#xfz-PHONE").html(value.PHONE);
-                $("#xfz-PN").html(value.PN);
-                $("#xfz-CN").html(value.CN);
-                $("#xfz-IS_THE").html(value.IS_THE);
-                $("#xfz-IS_DUTY").html(value.IS_DUTY);
-                $("#xfz-EQU_DES").html(value.EQU_DES);
-                $("#xfz-ADDR").html(value.ADDR);
-
-                $("#R_PHOTO").attr("src", _url + value.img);
-                break;
-
-            case "spjk":
-
-                $(".xfzyBubbleItem").addClass("xfzyBubbleItem-spjk");
-                $(".spjk-info").show();
-                $(".right-vedio").show();
-
-                var aState = '●离线';
-                $("#spjk-C_STATE").addClass("anable-x");
-                if (value.C_STATE == 0) {
-                    aState = '●在线';
-                    $("#spjk-C_STATE").removeClass("anable-x");
-                    $("#spjk-C_STATE").addClass("anable-i");
-                } else {
-                    layer.msg("设备离线，暂不能播放");
-                }
-
-                var fun = '';
-                if (value.C_FUN == 0) {
-                    fun += "普通摄像机、";
-                }
-                if (value.C_FUN == 1) {
-                    fun += "火焰识别摄像机、";
-                }
-                if (value.C_FUN == 2) {
-                    fun += "离岗行为识别摄像机、";
-                }
-                if (value.C_FUN == 3) {
-                    fun += "高空摄像球机、";
-                }
-                if (value.C_FUN == 4) {
-                    fun += "电子围栏、";
-                }
-
-                $("#spjk-name").html(value.name);
-                $("#spjk-no").html(value.no);
-                $("#spjk-C_STATE").html(aState);
-                $("#spjk-C_FUN").html(fun);
-                $("#spjk-INS_ADDR").html(value.INS_ADDR);
-
-                // $("#R_PHOTO").attr("src", value.img);
-                $(".right-vedio").empty();
-                var vedio = '<video id="jksp-vedio" controls playsInline webkit-playsinline autoplay' +
-                    'style="width: 325px; margin-left: 7px;"></video>';
-                $(".right-vedio").append(vedio);
-
-                var source = "<source src=\"" + value.RTMP_URL + "\" type=\"rtmp/flv\" />";
-                $("#jksp-vedio").append(source);
-                player = new EZUIKit.EZUIPlayer('jksp-vedio');
-                break;
-
-            case "xftd":
-                //$(".xftd-info").show();
-                break;
-
-            case "wxy":
-                $(".see-range").show();
-                $("#wxy-range-id").val(value.id);
-
-                var type = '';
-                if (value.TYPE == 1) {
-                    type = "化学品";
-                }
-                if (value.TYPE == 2) {
-                    type = "易爆品";
-                }
-                if (value.TYPE == 3) {
-                    type = "易燃品";
-                }
-
-                $(".wxy-info").show();
-                $(".right-img-wxy").show();
-                $("#wxy-name").html(value.name);
-                $("#wxy-TYPE").html(type);
-                $("#wxy-REMARKS").html(value.REMARKS);
-                $("#wxy-ADDR").html(value.ADDR);
-                $("#R_PHOTO_wxy").attr("src", _url + value.img);
-                break;
-        }
-
-        if (true) {
-            var bubble = new Bubble(_viewer.scene, "xfzyBubbleItem");
-            $("#xfzyBubbleItem").css('display', 'block');
-            var bubbleposition = pickedFeature.id._position._value;
-            bubble.showAt(bubbleposition);
-        }
-    } else {
-        $("#xfzyBubbleItem").css('display', 'none');
-        for (var i in wxyList) {
-            areaHide(wxyList[i]);
-        }
-        for (var i in readyClose) {
-            updateEntity_billboardImg(readyClose[i]);
-        }
-    }
-    var position = _viewer.scene.pickPosition(movement.position);
-    //将笛卡尔坐标转化为经纬度坐标
-    if (position != null) {
-        var cartographic = _cesium.Cartographic.fromCartesian(position);
-        if (cartographic != null) {
-            var longitude = _cesium.Math.toDegrees(cartographic.longitude);
-            var latitude = _cesium.Math.toDegrees(cartographic.latitude);
-            var height = cartographic.height;
-            if (height < 0) {
-                height = 0;
-            }
-        }
-    }
-}, _cesium.ScreenSpaceEventType.LEFT_CLICK);
-
-//鼠标移动
-_ScreenSpaceEventHandler.setInputAction(function onMouseMove(movement) {
-    var pickedFeature = _viewer.scene.pick(movement.endPosition);
-    // if (pickedFeature && pickedFeature.id) {
-    //     if (pickedFeature.id._description == undefined) return false;
-    //     if (pickedFeature.id._position) {
-    //         var bubble = new Bubble(_viewer.scene, "xfzybubble");
-    //         $("#popups").html(pickedFeature.id._name);
-    //         $("#xfzybubble").css('display', 'block');
-    //         var bubbleposition = pickedFeature.id._position._value;
-    //         bubble.showAt(bubbleposition);
-    //     }
-    // } else {
-    //     $("#xfzybubble").css('display', 'none');
-    // }
-}, _cesium.ScreenSpaceEventType.MOUSE_MOVE);
+// //鼠标点击 消防资源
+// _ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+//     var pickedFeature = _viewer.scene.pick(movement.position);
+//     if (pickedFeature && pickedFeature.id && pickedFeature.id._description) {
+//         var flag = false;
+//         var value = JSON.parse(pickedFeature.id._description._value);
+
+//     } else {
+//         $("#xfzyBubbleItem").css('display', 'none');
+//     }
+
+//     var pickedFeature = _viewer.scene.pick(movement.position);
+//     if (pickedFeature && pickedFeature.id && pickedFeature.id._id.indexOf("six") < 0) {
+//         readyClose = [];
+//         updateEntity_billboardImg(pickedFeature.id._id);
+//         readyClose.push(pickedFeature.id._id);
+//         var flag = false;
+//         var value = JSON.parse(pickedFeature.id._description._value);
+//         $(".xfzyBubbleItem").removeClass("xfzyBubbleItem-spjk");
+//         $(".details").attr("sys-id", value.sysId);
+//         $(".bjinfo").attr("sys-id", value.sysId);
+
+//         $(".details").attr("device-id", value.deviceId);
+//         $(".bjinfo").attr("device-id", value.deviceId);
+
+//         $(".right-img").hide();
+//         $("#dvcdiv").hide();
+//         $(".wxxfz-info").hide();
+//         $(".xfz-info").hide();
+//         $(".xfsh-info").hide();
+//         $(".xfsc-info").hide();
+//         $(".spjk-info").hide();
+//         $(".wxy-info").hide();
+//         $(".xftd-info").hide();
+//         $(".dev-alam").hide();
+//         $(".see-range").hide();
+//         $("#jzdiv").hide();
+//         $(".right-vedio").hide();
+//         $(".right-img-wxy").hide();
+//         switch (value.type) {
+//             case "dvc":
+//                 $(".dev-alam").show();
+//                 var aState = '废弃';
+//                 $("#xfs-A_STATE").addClass("anable-x");
+
+//                 if (value.A_STATE == 0) {
+//                     aState = '正常';
+//                     $("#xfs-A_STATE").removeClass("anable-x");
+//                     $("#xfs-A_STATE").addClass("anable-i");
+//                 }
+//                 $(".right-img").show();
+//                 $("#dvcdiv").show();
+//                 $("#xfs-name").html(value.name);
+//                 $("#xfs-no").html(value.no);
+//                 $("#xfs-A_STATE").html(aState);
+//                 $("#xfs-IS_COM").html(value.IS_COM);
+//                 $("#xfs-loushui").html(value.loushui);
+//                 $("#xfs-IS_IMP").html(value.IS_IMP);
+//                 $("#xfs-IS_DAM").html(value.IS_DAM);
+//                 $("#xfs-IS_ID").html(value.IS_ID);
+//                 $("#xfs-IS_PAINT").html(value.IS_PAINT);
+//                 $("#xfs-IS_ANT").html(value.IS_ANT);
+//                 $("#xfs-ADDR").html(value.ADDR);
+
+//                 $("#R_PHOTO").attr("src", _url + value.img);
+
+//                 flag = true;
+//                 break;
+//             case "jz":
+//                 $("#jzname").html(pickedFeature.id._name);
+//                 $("#jztype").html(value.typename);
+//                 $("#jzaddr").html(value.addr);
+
+//                 $("#dvcdiv").css('display', 'none');
+//                 $("#jzdiv").css('display', 'block');
+//                 flag = true;
+//                 break;
+
+//             case "xfsh":
+//                 var aState = '废弃';
+//                 $("#xfsh-A_STATE").addClass("anable-x");
+
+//                 if (value.A_STATE == 0) {
+//                     aState = '正常';
+//                     $("#xfsh-A_STATE").removeClass("anable-x");
+//                     $("#xfsh-A_STATE").addClass("anable-i");
+//                 }
+//                 $(".right-img").show();
+//                 $(".xfsh-info").show();
+//                 $("#xfsh-name").html(value.name);
+//                 $("#xfsh-no").html(value.no);
+//                 $("#xfsh-A_STATE").html(aState);
+//                 $("#xfsh-IS_COM").html(value.IS_COM);
+//                 $("#xfsh-loushui").html(value.loushui);
+//                 $("#xfsh-IS_IMP").html(value.IS_IMP);
+//                 $("#xfsh-IS_DAM").html(value.IS_DAM);
+//                 $("#xfsh-IS_ID").html(value.IS_ID);
+//                 $("#xfsh-IS_PAINT").html(value.IS_PAINT);
+//                 $("#xfsh-IS_ANT").html(value.IS_ANT);
+//                 $("#xfsh-ADDR").html(value.ADDR);
+
+//                 $("#R_PHOTO").attr("src", _url + value.img);
+//                 flag = true;
+//                 break;
+
+//             case "xfsc":
+//                 $(".dev-alam").show();
+//                 var aState = '废弃';
+//                 $("#xfsc-A_STATE").addClass("anable-x");
+
+//                 if (value.A_STATE == 0) {
+//                     aState = '正常';
+//                     $("#xfsc-A_STATE").removeClass("anable-x");
+//                     $("#xfsc-A_STATE").addClass("anable-i");
+//                 }
+//                 $(".right-img").show();
+//                 $(".xfsc-info").show();
+//                 $("#xfsc-name").html(value.name);
+//                 $("#xfsc-no").html(value.no);
+//                 $("#xfsc-A_STATE").html(aState);
+//                 $("#xfsc-N_CAPACITY").html(value.N_CAPACITY);
+//                 $("#xfsc-FLOW_SIZE").html(value.FLOW_SIZE);
+//                 $("#xfsc-I_FORM").html(value.I_FORM);
+//                 $("#xfsc-I_HEIGHT").html(value.I_HEIGHT);
+//                 $("#xfsc-SUP_UNIT").html(value.SUP_UNIT);
+
+//                 $("#xfsc-ALL_CAPACITY").html(value.ALL_CAPACITY);
+//                 $("#xfsc-ADDR").html(value.ADDR);
+//                 $("#R_PHOTO").attr("src", _url + value.img);
+//                 break;
+
+
+//             case "wxxfz":
+//                 $(".wxxfz-info").show();
+//                 $(".right-img").show();
+
+//                 var aState = '废弃';
+//                 $("#wxxfz-A_STATE").addClass("anable-x");
+//                 if (value.A_STATE == 0) {
+//                     aState = '正常';
+//                     $("#wxxfz-A_STATE").removeClass("anable-x");
+//                     $("#wxxfz-A_STATE").addClass("anable-i");
+//                 }
+
+//                 $("#wxxfz-name").html(value.name);
+//                 $("#wxxfz-no").html(value.no);
+//                 $("#wxxfz-A_STATE").html(aState);
+//                 $("#wxxfz-CONT").html(value.CONT);
+//                 $("#wxxfz-PHONE").html(value.PHONE);
+//                 $("#wxxfz-PN").html(value.PN);
+//                 $("#wxxfz-CN").html(value.CN);
+//                 $("#wxxfz-IS_THE").html(value.IS_THE);
+//                 $("#wxxfz-IS_DUTY").html(value.IS_DUTY);
+//                 $("#wxxfz-EQU_DES").html(value.EQU_DES);
+//                 $("#wxxfz-ADDR").html(value.ADDR);
+
+//                 $("#R_PHOTO").attr("src", _url + value.img);
+//                 break;
+
+//             case "xfz":
+//                 $(".xfz-info").show();
+//                 $(".right-img").show();
+
+//                 var aState = '废弃';
+//                 $("#xfz-A_STATE").addClass("anable-x");
+//                 if (value.A_STATE == 0) {
+//                     aState = '正常';
+//                     $("#xfz-A_STATE").removeClass("anable-x");
+//                     $("#xfz-A_STATE").addClass("anable-i");
+//                 }
+
+//                 $("#xfz-name").html(value.name);
+//                 $("#xfz-no").html(value.no);
+//                 $("#xfz-A_STATE").html(aState);
+//                 $("#xfz-CONT").html(value.CONT);
+//                 $("#xfz-PHONE").html(value.PHONE);
+//                 $("#xfz-PN").html(value.PN);
+//                 $("#xfz-CN").html(value.CN);
+//                 $("#xfz-IS_THE").html(value.IS_THE);
+//                 $("#xfz-IS_DUTY").html(value.IS_DUTY);
+//                 $("#xfz-EQU_DES").html(value.EQU_DES);
+//                 $("#xfz-ADDR").html(value.ADDR);
+
+//                 $("#R_PHOTO").attr("src", _url + value.img);
+//                 break;
+
+//             case "spjk":
+
+//                 $(".xfzyBubbleItem").addClass("xfzyBubbleItem-spjk");
+//                 $(".spjk-info").show();
+//                 $(".right-vedio").show();
+
+//                 var aState = '●离线';
+//                 $("#spjk-C_STATE").addClass("anable-x");
+//                 if (value.C_STATE == 0) {
+//                     aState = '●在线';
+//                     $("#spjk-C_STATE").removeClass("anable-x");
+//                     $("#spjk-C_STATE").addClass("anable-i");
+//                 } else {
+//                     layer.msg("设备离线，暂不能播放");
+//                 }
+
+//                 var fun = '';
+//                 if (value.C_FUN == 0) {
+//                     fun += "普通摄像机、";
+//                 }
+//                 if (value.C_FUN == 1) {
+//                     fun += "火焰识别摄像机、";
+//                 }
+//                 if (value.C_FUN == 2) {
+//                     fun += "离岗行为识别摄像机、";
+//                 }
+//                 if (value.C_FUN == 3) {
+//                     fun += "高空摄像球机、";
+//                 }
+//                 if (value.C_FUN == 4) {
+//                     fun += "电子围栏、";
+//                 }
+
+//                 $("#spjk-name").html(value.name);
+//                 $("#spjk-no").html(value.no);
+//                 $("#spjk-C_STATE").html(aState);
+//                 $("#spjk-C_FUN").html(fun);
+//                 $("#spjk-INS_ADDR").html(value.INS_ADDR);
+
+//                 // $("#R_PHOTO").attr("src", value.img);
+//                 $(".right-vedio").empty();
+//                 var vedio = '<video id="jksp-vedio" controls playsInline webkit-playsinline autoplay' +
+//                     'style="width: 325px; margin-left: 7px;"></video>';
+//                 $(".right-vedio").append(vedio);
+
+//                 var source = "<source src=\"" + value.RTMP_URL + "\" type=\"rtmp/flv\" />";
+//                 $("#jksp-vedio").append(source);
+//                 player = new EZUIKit.EZUIPlayer('jksp-vedio');
+//                 break;
+
+//             case "xftd":
+//                 //$(".xftd-info").show();
+//                 break;
+
+//             case "wxy":
+//                 $(".see-range").show();
+//                 $("#wxy-range-id").val(value.id);
+
+//                 var type = '';
+//                 if (value.TYPE == 1) {
+//                     type = "化学品";
+//                 }
+//                 if (value.TYPE == 2) {
+//                     type = "易爆品";
+//                 }
+//                 if (value.TYPE == 3) {
+//                     type = "易燃品";
+//                 }
+
+//                 $(".wxy-info").show();
+//                 $(".right-img-wxy").show();
+//                 $("#wxy-name").html(value.name);
+//                 $("#wxy-TYPE").html(type);
+//                 $("#wxy-REMARKS").html(value.REMARKS);
+//                 $("#wxy-ADDR").html(value.ADDR);
+//                 $("#R_PHOTO_wxy").attr("src", _url + value.img);
+//                 break;
+//         }
+
+//         if (true) {
+//             var bubble = new Bubble(_viewer.scene, "xfzyBubbleItem");
+//             $("#xfzyBubbleItem").css('display', 'block');
+//             var bubbleposition = pickedFeature.id._position._value;
+//             bubble.showAt(bubbleposition);
+//         }
+//     } else {
+//         $("#xfzyBubbleItem").css('display', 'none');
+//         for (var i in wxyList) {
+//             areaHide(wxyList[i]);
+//         }
+//         for (var i in readyClose) {
+//             updateEntity_billboardImg(readyClose[i]);
+//         }
+//     }
+//     var position = _viewer.scene.pickPosition(movement.position);
+//     //将笛卡尔坐标转化为经纬度坐标
+//     if (position != null) {
+//         var cartographic = _cesium.Cartographic.fromCartesian(position);
+//         if (cartographic != null) {
+//             var longitude = _cesium.Math.toDegrees(cartographic.longitude);
+//             var latitude = _cesium.Math.toDegrees(cartographic.latitude);
+//             var height = cartographic.height;
+//             if (height < 0) {
+//                 height = 0;
+//             }
+//         }
+//     }
+// }, _cesium.ScreenSpaceEventType.LEFT_CLICK);
+
+// //鼠标移动
+// _ScreenSpaceEventHandler.setInputAction(function onMouseMove(movement) {
+//     var pickedFeature = _viewer.scene.pick(movement.endPosition);
+//     // if (pickedFeature && pickedFeature.id) {
+//     //     if (pickedFeature.id._description == undefined) return false;
+//     //     if (pickedFeature.id._position) {
+//     //         var bubble = new Bubble(_viewer.scene, "xfzybubble");
+//     //         $("#popups").html(pickedFeature.id._name);
+//     //         $("#xfzybubble").css('display', 'block');
+//     //         var bubbleposition = pickedFeature.id._position._value;
+//     //         bubble.showAt(bubbleposition);
+//     //     }
+//     // } else {
+//     //     $("#xfzybubble").css('display', 'none');
+//     // }
+// }, _cesium.ScreenSpaceEventType.MOUSE_MOVE);
 //消防站
 function xiaofangzhan(bbbObj) {
    $.ajax({
@ -1572,13 +1570,11 @@ function wind(rota, speed) {
    },3000)
    setTimeyjczksfx4 = setTimeout(() => {
        var speedNum = Number(winSpeedNum(speed));
-        console.log("===" + speedNum);
        var majorA = Number(getMajor(speed));
        major = majorA;
        var pointPy = getXYByRota(rota, x, y, speedNum);
        x = Number(pointPy[0]);
        y = Number(pointPy[1]);
-        console.log("---"+[x, y]);

        _myDataCustomDataSource.entities.add({
            id: "yjczksfx4",
@ -1784,45 +1780,166 @@ function mapTh(x, y) {


 //点击获取位置
-function setPointIcon(type) {
-    _ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+function setPointIcon(id, name, type) {
+    _ScreenSpaceEventHandler.setInputAction(function onRightClick(movement) {
        var position = _viewer.scene.pickPosition(movement.position);
        if (position != null) {
-            var cartographic = _cesium.Cartographic.fromCartesian(position);
-            if (cartographic != null) {
-                longitude = _cesium.Math.toDegrees(cartographic.longitude);
-                latitude = _cesium.Math.toDegrees(cartographic.latitude);
-                var height = cartographic.height;
-                if (height < 0) {
-                    height = 0;
-                }
-                position = _cesium.Cartesian3.fromDegrees(longitude, latitude, height);
-                addIcon(position, type);
+          var cartographic = _cesium.Cartographic.fromCartesian(position);
+          if (cartographic != null) {
+            longitude = _cesium.Math.toDegrees(cartographic.longitude);
+            latitude = _cesium.Math.toDegrees(cartographic.latitude);
+            var height = cartographic.height;
+            if (height < 0) {
+              height = 0;
            }
+            position = _cesium.Cartesian3.fromDegrees(longitude,latitude,height);
+            addIcon(id, name, position, type);
+          }
        }
-    }, _cesium.ScreenSpaceEventType.LEFT_CLICK);
+      }, _cesium.ScreenSpaceEventType.RIGHT_CLICK);
 }
-//删除获取位置
-function delPointIcon() {
-    _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
-    addEntity_removeList(addIconList);
-    addIconList.length = 0;
+//删除实体
+function delPointIcon(type) {
+    // _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+    switch(type){
+        case "car":
+            addEntity_removeList(addCarIconList);
+            addCarIconList.length = 0;
+            break;
+        case "cw":
+            addEntity_removeList(addCWIconList);
+            addCWIconList.length = 0;
+            break;
+        case "tb":
+            addEntity_removeList(addTBIconList);
+            addTBIconList.length = 0;
+            break;
+        case "jh":
+            addEntity_removeList(addJHIconList);
+            addJHIconList.length = 0;
+            break;
+    }
+    if(type == null || type == ""){
+        addEntity_removeList(addCarIconList);
+        addCarIconList.length = 0;
+        addEntity_removeList(addCWIconList);
+        addCWIconList.length = 0;
+        addEntity_removeList(addTBIconList);
+        addTBIconList.length = 0;
+        addEntity_removeList(addJHIconList);
+        addJHIconList.length = 0;
+    }
 }

-function addIcon(position, type) {
-    if (type == null || type == "") { type = "dw"; }
-
-    //地图添加标注
-    addEntity_billboard(
-        addIconList,
-        "addIconList_" + addIconList.length,
-        "addIconList_" + addIconList.length,
-        position,
-        "icon/mark_" + type + ".png",
-        new this._cesium.DistanceDisplayCondition(0, 1500.0),
-        1500.0,
-        1
-    );
-
-    console.log(addIconList);
+function addIcon(id, name, position, type) {
+    switch(type){
+        case "":
+            //地图添加标注
+            addEntity_billboardAndLabel(
+                addIconList,
+                (id == null || id == "") ? "addIconList" + addIconList.length : id,
+                (name == null || name == "") ? "addIconList" + addIconList.length: name,
+                position,
+                "icon/mark_dw.png",
+                new this._cesium.DistanceDisplayCondition(0, 15000.0),15000.0,1
+            );
+            $(".gjl-icon10").toggleClass("current");
+            $(".gjl-icon10").attr("data-value", "0");
+            break;
+        case "car":
+            //地图添加标注
+            addEntity_billboardAndLabel(
+                addCarIconList,
+                (id == null || id == "") ? "addCarIconList" + addCarIconList.length : id,
+                (name == null || name == "") ? "addCarIconList" + addCarIconList.length: name,
+                position,
+                "icon/ditu-cl-ducy-icon1.png",
+                new this._cesium.DistanceDisplayCondition(0, 15000.0),15000.0,1
+            );
+            $(".gjl-icon11").toggleClass("current");
+            $(".gjl-icon11").attr("data-value", "0");
+            break;
+        case "cw":
+            //地图添加标注
+            addEntity_billboardAndLabel(
+                addCWIconList,
+                (id == null || id == "") ? "addCWIconList" + addCWIconList.length : id,
+                (name == null || name == "") ? "addCWIconList" + addCWIconList.length: name,
+                position,
+                "icon/mark_cw.png",
+                new this._cesium.DistanceDisplayCondition(0, 15000.0),15000.0,1
+            );
+            $(".gjl-icon12").toggleClass("current");
+            $(".gjl-icon12").attr("data-value", "0");
+            break;
+        case "tb":
+            //地图添加标注
+            addEntity_billboardAndLabel(
+                addTBIconList,
+                (id == null || id == "") ? "addTBIconList" + addTBIconList.length : id,
+                (name == null || name == "") ? "addTBIconList" + addTBIconList.length: name,
+                position,
+                "icon/ditu-fk-icon1.png",
+                new this._cesium.DistanceDisplayCondition(0, 15000.0),15000.0,1
+            );
+            $(".gjl-icon13").toggleClass("current");
+            $(".gjl-icon13").attr("data-value", "0");
+            break;
+        case "jh":
+            //地图添加标注
+            addEntity_billboardAndLabel(
+                addJHIconList,
+                (id == null || id == "") ? "addJHIconList" + addJHIconList.length : id,
+                (name == null || name == "") ? "addJHIconList" + addJHIconList.length: name,
+                position,
+                "icon/ditu-fk-icon1.png",
+                new this._cesium.DistanceDisplayCondition(0, 15000.0),15000.0,1
+            );
+            $(".gjl-icon14").toggleClass("current");
+            $(".gjl-icon14").attr("data-value", "0");
+            break;
+    }
+
+    _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
 }
+
+
+function goView(id,name) {
+    var index = layui.layer.open({
+      title: "【"+name+"】车辆状态监控 ",
+      type: 2,
+      area: ["1280px", "680px"],
+      shade: 0.4, //遮罩透明度
+      maxmin: true,
+      content: "subitem/item/clxq.html?ID="+id
+    });
+  }
+
+// 鼠标点击获取坐标点
+_ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+    // 选择新模型
+    var pickedFeature = _viewer.scene.pick(movement.position);
+    if (pickedFeature && pickedFeature.id) {
+        var index = $.inArray(pickedFeature.id._id, addCarIconList);
+        if (index >= 0) {
+            //人
+            updateEntity_billboardImg(
+                addCarIconList,
+                pickedFeature.id._id,
+                "icon/ditu-cl-ducy-icon1h.png",
+                "icon/ditu-cl-ducy-icon1.png"
+            );
+            
+            goView(pickedFeature.id._id,pickedFeature.id._name);
+        } else {
+            updateEntity_billboardImg(
+                addCarIconList,
+                pickedFeature.id._id,
+                "icon/ditu-cl-ducy-icon1h.png",
+                "icon/ditu-cl-ducy-icon1.png"
+            );
+        }
+    } else {
+        // console.log("点击的是模型");
+    }
+}, _cesium.ScreenSpaceEventType.LEFT_CLICK);
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/yjcz.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/yjcz.html
@ -447,10 +447,10 @@
 /* 工具栏 */

 .yjcz-gjl {
-    width: calc(100% - 190px);
+    width: 100%;
    height: 100px;
    position: absolute;
-    margin-left: 190px;
+    /* margin-left: 190px; */
    bottom: 26px;
 }

@ -559,6 +559,38 @@
    background: url(yjczImg/yjcz-gjl-icon9h.png) bottom no-repeat;
 }

+.yjcz-gjl li .yjcz-gjl-icon11 {
+	background: url(yjczImg/yjcz-gjl-icon11.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon11 {
+	background: url(yjczImg/yjcz-gjl-icon11h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon12 {
+	background: url(yjczImg/yjcz-gjl-icon12.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon12 {
+	background: url(yjczImg/yjcz-gjl-icon12h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon13 {
+	background: url(yjczImg/yjcz-gjl-icon13.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon13 {
+	background: url(yjczImg/yjcz-gjl-icon13h.png) bottom no-repeat;
+}
+
+.yjcz-gjl li .yjcz-gjl-icon14 {
+	background: url(yjczImg/yjcz-gjl-icon14.png) bottom no-repeat;
+}
+
+.yjcz-gjl li a.current .yjcz-gjl-icon14 {
+	background: url(yjczImg/yjcz-gjl-icon14h.png) bottom no-repeat;
+}
+
 /* 设置事故点 */

 .yjcz-szsgd {
@ -822,11 +854,30 @@
            $(".yjcz-shld").hide();


-			//添加标注
+			// //添加标注
+            // $(".gjl-icon10").removeClass("current");
+            // delPointIcon();
+            // $(".gjl-icon10").attr("data-value", "0");
+
+			//车辆仿真部署
            $(".gjl-icon10").removeClass("current");
-            delPointIcon();
            $(".gjl-icon10").attr("data-value", "0");
 			
+			//错误调剂
+            $(".gjl-icon11").removeClass("current");
+            $(".gjl-icon11").attr("data-value", "0");
+			
+			//多人终端同步
+            $(".gjl-icon12").removeClass("current");
+            $(".gjl-icon12").attr("data-value", "0");
+			
+			//演练交互
+            $(".gjl-icon13").removeClass("current");
+            $(".gjl-icon13").attr("data-value", "0");
+
+			//删除实体
+            delPointIcon();
+
 			//设置事故点
 			hmhide();
 			$(".con-out").hide();
@ -972,20 +1023,84 @@
 		$(".gjl-icon9").toggleClass("current");
 		$(".yjcz-shld").toggle();
 	});
-    $(".gjl-icon10").click(function (e) {
+    // $(".gjl-icon10").click(function (e) {
+    //     if (pointCenter == null || pointCenter.length == 0) {
+    //         layer.msg("请先设置事故点");
+    //         return;
+	// 	}
+	// 	$(".gjl-icon10").toggleClass("current");
+
+    //     var dataValue = $(".gjl-icon10").attr("data-value");
+    //     if (dataValue == "0") {
+    //         setPointIcon();
+    //         $(".gjl-icon10").attr("data-value", "1");
+    //     } else {
+    //         delPointIcon();
+    //         $(".gjl-icon10").attr("data-value", "0");
+    //     }
+    // });
+    $(".gjl-icon11").click(function (e) {
        if (pointCenter == null || pointCenter.length == 0) {
            layer.msg("请先设置事故点");
            return;
 		}
-		$(".gjl-icon10").toggleClass("current");
+		$(".gjl-icon11").toggleClass("current");

-        var dataValue = $(".gjl-icon10").attr("data-value");
+        var dataValue = $(".gjl-icon11").attr("data-value");
        if (dataValue == "0") {
-            setPointIcon();
-            $(".gjl-icon10").attr("data-value", "1");
+            openCLXZ();
+            $(".gjl-icon11").attr("data-value", "1");
        } else {
-            delPointIcon();
-            $(".gjl-icon10").attr("data-value", "0");
+            _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+            $(".gjl-icon11").attr("data-value", "0");
+        }
+    });
+    $(".gjl-icon12").click(function (e) {
+        if (pointCenter == null || pointCenter.length == 0) {
+            layer.msg("请先设置事故点");
+            return;
+		}
+		$(".gjl-icon12").toggleClass("current");
+
+        var dataValue = $(".gjl-icon12").attr("data-value");
+        if (dataValue == "0") {
+            openTJTJ();
+            $(".gjl-icon12").attr("data-value", "1");
+        } else {
+            _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+            $(".gjl-icon12").attr("data-value", "0");
+        }
+    });
+    $(".gjl-icon13").click(function (e) {
+        if (pointCenter == null || pointCenter.length == 0) {
+            layer.msg("请先设置事故点");
+            return;
+		}
+		$(".gjl-icon13").toggleClass("current");
+
+        var dataValue = $(".gjl-icon13").attr("data-value");
+        if (dataValue == "0") {
+            openJSXZ("tb");
+            $(".gjl-icon13").attr("data-value", "1");
+        } else {
+            _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+            $(".gjl-icon13").attr("data-value", "0");
+        }
+    });
+	$(".gjl-icon14").click(function (e) {
+        if (pointCenter == null || pointCenter.length == 0) {
+            layer.msg("请先设置事故点");
+            return;
+		}
+		$(".gjl-icon14").toggleClass("current");
+
+        var dataValue = $(".gjl-icon14").attr("data-value");
+        if (dataValue == "0") {
+			openJSXZ("jh");
+            $(".gjl-icon14").attr("data-value", "1");
+        } else {
+            _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+            $(".gjl-icon14").attr("data-value", "0");
        }
    });

@ -1147,11 +1262,35 @@
 				<h4>社会联动</h4>
 			</a>
 		</li>
-		<li>
+		<!-- <li>
 			<a href="javascript:void(0)" class="gjl-icon10" data-value="0">
 				<div class="yjcz-gjl-icon yjcz-gjl-icon8"></div>
 				<h4>添加标注</h4>
 			</a>
+		</li> -->
+		<li>
+			<a href="javascript:void(0)" class="gjl-icon11" data-value="0">
+				<div class="yjcz-gjl-icon yjcz-gjl-icon11"></div>
+				<h4>车辆仿真部署</h4>
+			</a>
+		</li>
+		<li>
+			<a href="javascript:void(0)" class="gjl-icon12" data-value="0">
+				<div class="yjcz-gjl-icon yjcz-gjl-icon12"></div>
+				<h4>错误调剂</h4>
+			</a>
+		</li>
+		<li>
+			<a href="javascript:void(0)" class="gjl-icon13" data-value="0">
+				<div class="yjcz-gjl-icon yjcz-gjl-icon13"></div>
+				<h4>多人终端同步</h4>
+			</a>
+		</li>
+		<li>
+			<a href="javascript:void(0)" class="gjl-icon14" data-value="0">
+				<div class="yjcz-gjl-icon yjcz-gjl-icon14"></div>
+				<h4>演练交互</h4>
+			</a>
 		</li>
 	</ul>
 </div>
@ -1562,11 +1701,6 @@
 				maxmin: true,
                content: "subitem/yjczItem.html",
 				btn: ['确定', '取消'],
-				success: function (layero, index) {
-					var pid = $("#EMP_ID").val();
-					var body = layui.layer.getChildFrame('body', index);
-					body.find("#treeID").val(pid);
-				},
 				yes: function (index, layero) {
 					var body = parent.layer.getChildFrame('body', index);
 					var tianqi = body.find("#tianqi").val();
@ -1579,6 +1713,109 @@
 				}
 			})
 		}
+
+		openCLXZ = () => {
+			var index = layui.layer.open({
+				title: "车辆选择 ",
+				type: 2,
+				area: ["1280px", "820px"],
+				shade: 0.4, //遮罩透明度
+				anim: 1,
+				maxmin: true,
+				content: "subitem/item/clxz.html",
+				btn: ["确定", "取消"],
+				yes: function (index, layero) {
+					var body = parent.layer.getChildFrame("body", index);
+					var carSel = body.find("#carSel").val();
+					if (carSel == null || carSel == "") {
+						layer.msg("");
+						return false;
+					}
+					var carSel_S = carSel.split("_,_");
+					try {
+						setPointIcon(carSel_S[0], carSel_S[1],"car");
+					} catch (e) {
+						layer.close(index);
+					}
+					layer.close(index);
+				},
+				btn2: function () {
+					$(".gjl-icon11").toggleClass("current");
+					$(".gjl-icon11").attr("data-value", "0");
+					layer.close(index);
+				},
+			});
+		}
+
+		openTJTJ = () => {
+			var index = layui.layer.open({
+				title: "调剂添加 ",
+				type: 2,
+				area: ["640px", "420px"],
+				shade: 0.4, //遮罩透明度
+				anim: 1,
+				maxmin: true,
+				content: "subitem/item/cwbj.html",
+				btn: ["确定", "取消"],
+				yes: function (index, layero) {
+					var body = parent.layer.getChildFrame("body", index);
+					var xueyuan = body.find("#xueyuan").val();
+					var remarks = body.find("#remarks").val();
+					var text = xueyuan;
+					if (remarks != null && remarks != "") {
+						if(remarks.length > 10){
+							text += "("+remarks.substring(0, 10)+"...)";
+						}else{
+							text += "("+remarks+")";
+						}
+					}
+					try {
+						setPointIcon("", text, "cw");
+					} catch (e) {
+						layer.close(index);
+					}
+					layer.close(index);
+				},
+				btn2: function () {
+					$(".gjl-icon12").toggleClass("current");
+					$(".gjl-icon12").attr("data-value", "0");
+					layer.close(index);
+				}
+			});
+		}
+
+		openJSXZ = (flag) => {
+			var index = layui.layer.open({
+				title: "角色选择 ",
+				type: 2,
+				area: ["640px", "420px"],
+				shade: 0.4, //遮罩透明度
+				anim: 1,
+				maxmin: true,
+				content: "subitem/item/jsxz.html",
+				btn: ["确定", "取消"],
+				yes: function (index, layero) {
+					var body = parent.layer.getChildFrame("body", index);
+					var xueyuan = body.find("#xueyuan").val();
+					var carSel = body.find("#carSel").val();
+					var text = carSel;
+					if (xueyuan != null && xueyuan != "") {
+						text += "("+xueyuan+")";
+					}
+					try {
+						setPointIcon("", text, flag);
+					} catch (e) {
+						layer.close(index);
+					}
+					layer.close(index);
+				},
+				btn2: function () {
+					$(".gjl-icon13").toggleClass("current");
+					$(".gjl-icon13").attr("data-value", "0");
+					layer.close(index);
+				}
+			});
+		}
 	})
 </script>
 <script type="text/javascript">
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/yjczItem.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/yjczItem.html
@ -1,61 +1,59 @@
 <!DOCTYPE html>
-<html style="height:100%">
-<head>
+<html style="height: 100%">
+  <head>
    <meta charset="utf-8" />
    <title></title>
    <!--Layui-->
-    <link href="../layui/css/layui.css" rel="stylesheet" type="text/css">
+    <link href="../layui/css/layui.css" rel="stylesheet" type="text/css" />
    <script src="../layui/layui.js" type="text/javascript"></script>
-</head>
-<body style="height:90%">
-    <form id="weatherSettingDiv" class="layui-form" style="width: 90%; margin-top:15px; color: #fff">
-        <div class="layui-form-item layui-row layui-col-xs12">
-            <label class="layui-form-label label-required-next">
-                天气
-            </label>
-            <div class="layui-input-block">
-                <select id="tianqi" style="display: block;">
-                    <option value="">晴天</option>
-                    <option value="">阴天</option>
-                    <option value="">雨天</option>
-                </select>
-            </div>
+  </head>
+  <body style="height: 90%">
+    <form
+      id="weatherSettingDiv"
+      class="layui-form"
+      style="width: 90%; margin-top: 15px; color: #fff"
+    >
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 天气 </label>
+        <div class="layui-input-block">
+          <select id="tianqi" style="display: block">
+            <option value="">晴天</option>
+            <option value="">阴天</option>
+            <option value="">雨天</option>
+          </select>
        </div>
-        <div class="layui-form-item layui-row layui-col-xs12">
-            <label class="layui-form-label label-required-next">
-                风向
-            </label>
-            <div class="layui-input-block">
-                <select id="fengxiang" style="display: block;">
-                    <option value="0">东风</option>
-                    <option value="270.0">南风</option>
-                    <option value="180.0">西风</option>
-                    <option value="90.0">北风</option>
-                    <option value="315.0">东南风</option>
-                    <option value="225.0">西南风</option>
-                    <option value="45.0">东北风</option>
-                    <option value="135.0">西北风</option>
-                </select>
-            </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 风向 </label>
+        <div class="layui-input-block">
+          <select id="fengxiang" style="display: block">
+            <option value="0">东风</option>
+            <option value="270.0">南风</option>
+            <option value="180.0">西风</option>
+            <option value="90.0">北风</option>
+            <option value="315.0">东南风</option>
+            <option value="225.0">西南风</option>
+            <option value="45.0">东北风</option>
+            <option value="135.0">西北风</option>
+          </select>
        </div>
-        <div class="layui-form-item layui-row layui-col-xs12">
-            <label class="layui-form-label label-required-next">
-                强度
-            </label>
-            <div class="layui-input-block">
-                <select id="qiangdu" style="display: block;">
-                    <option value="四级">四级及以下</option>
-                    <option value="五级">五级</option>
-                    <option value="六级">六级</option>
-                    <option value="七级">七级</option>
-                    <option value="八级">八级</option>
-                    <option value="九级">九级</option>
-                    <option value="十级">十级</option>
-                    <option value="十一级">十一级</option>
-                    <option value="十二级">十二级</option>
-                </select>
-            </div>
+      </div>
+      <div class="layui-form-item layui-row layui-col-xs12">
+        <label class="layui-form-label label-required-next"> 强度 </label>
+        <div class="layui-input-block">
+          <select id="qiangdu" style="display: block">
+            <option value="四级">四级及以下</option>
+            <option value="五级">五级</option>
+            <option value="六级">六级</option>
+            <option value="七级">七级</option>
+            <option value="八级">八级</option>
+            <option value="九级">九级</option>
+            <option value="十级">十级</option>
+            <option value="十一级">十一级</option>
+            <option value="十二级">十二级</option>
+          </select>
        </div>
+      </div>
    </form>
-</bodystyle="height:90%">
-</htmlstyle="height:90%">
+  </body>
+</html>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/yljh.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/subitem/yljh.html
@ -0,0 +1,124 @@
+<script
+  type="text/javascript"
+  src="SuperMap_WebGL/examples/js/polygon.js"
+></script>
+<script type="text/javascript" src="subitem/js/yjcz.js"></script>
+<script type="text/javascript" src="js/setting.js"></script>
+<link href="subitem/css/clfzbs.css" rel="stylesheet" type="text/css" />
+<style>
+  .layui-layer {
+    background: #0d1535 !important;
+  }
+</style>
+<!-- 工具栏 -->
+<div class="yjcz-gjl" style="text-align: center">
+  <ul>
+    <li>
+      <a
+        href="javascript:void(0)"
+        onclick="clbs_fun()"
+        class="gjl-icon1"
+        data-value="0"
+      >
+        <div class="yjcz-gjl-icon yjcz-gjl-icon14"></div>
+        <h4>创建用户</h4>
+      </a>
+    </li>
+  </ul>
+</div>
+<script type="text/javascript">
+  //标记数组
+  var addRYIconList = [];
+
+  function clbs_fun() {
+    $(".gjl-icon1").toggleClass("current");
+    var dataValue = $(".gjl-icon1").attr("data-value");
+    if (dataValue == "0") {
+      openCLXZ();
+      $(".gjl-icon1").attr("data-value", "1");
+    } else {
+      _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      $(".gjl-icon1").attr("data-value", "0");
+    }
+  }
+  function openCLXZ() {
+    var index = layui.layer.open({
+      title: "角色选择 ",
+      type: 2,
+      area: ["640px", "420px"],
+      shade: 0.4, //遮罩透明度
+      anim: 1,
+      maxmin: true,
+      content: _staticUrl+"subitem/item/jsxz.html",
+      btn: ["确定", "取消"],
+      yes: function (index, layero) {
+        var body = parent.layer.getChildFrame("body", index);
+        var xueyuan = body.find("#xueyuan").val();
+        var carSel = body.find("#carSel").val();
+        var text = carSel;
+        if (xueyuan != null && xueyuan != "") {
+          text += "("+xueyuan+")";
+        }
+        try {
+          setPointIcon(text);
+        } catch (e) {
+          layer.close(index);
+        }
+        layer.close(index);
+      },
+      btn2: function () {
+        $(".gjl-icon1").toggleClass("current");
+        $(".gjl-icon1").attr("data-value", "0");
+        layer.close(index);
+      },
+    });
+  }
+
+  //点击获取位置
+  function setPointIcon(name, type) {
+    _ScreenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
+      var position = _viewer.scene.pickPosition(movement.position);
+      if (position != null) {
+        var cartographic = _cesium.Cartographic.fromCartesian(position);
+        if (cartographic != null) {
+          longitude = _cesium.Math.toDegrees(cartographic.longitude);
+          latitude = _cesium.Math.toDegrees(cartographic.latitude);
+          var height = cartographic.height;
+          if (height < 0) {
+            height = 0;
+          }
+          position = _cesium.Cartesian3.fromDegrees(
+            longitude,
+            latitude,
+            height
+          );
+          addIcon(name, position, type);
+        }
+      }
+    }, _cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+
+  function addIcon(name, position, type) {
+    if (type == null || type == "") {
+      type = "ditu-fk-icon1";
+    }
+
+    //地图添加标注
+    addEntity_billboardAndLabel(
+      addRYIconList,
+      "addRYIconList" + addRYIconList.length,
+      name == null || name == ""
+        ? "addRYIconList" + addRYIconList.length
+        : name,
+      position,
+      _staticUrl+"icon/" + type + ".png",
+      new this._cesium.DistanceDisplayCondition(0, 15000.0),
+      15000.0,
+      1
+    );
+
+    $(".gjl-icon1").toggleClass("current");
+	  $(".gjl-icon1").attr("data-value", "0");
+	  _ScreenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+  }
+</script>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/topHead.html
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/topHead.html
@ -80,6 +80,18 @@
            <div class="menu_btn menuR_btn_back" style="float: left" data-value="yjcz">
                应急处置
            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="clfzbs">
+                车辆仿真部署
+            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="cwtj">
+                错误调剂
+            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="drzdtb">
+                多人终端同步
+            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="yljh">
+                演练交互
+            </div>
        </div>
    </div>
    <div id="notHomeHeadDiv" style="display: none;">
@ -107,6 +119,18 @@
            <div class="menu_btn menuR_btn_back" style="float: left" data-value="yjcz">
                应急处置
            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="clfzbs">
+                车辆仿真部署
+            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="cwtj">
+                错误调剂
+            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="drzdtb">
+                多人终端同步
+            </div>
+            <div class="menu_btn menuR_btn_back" style="float: left" data-value="yljh">
+                演练交互
+            </div>
        </div>
    </div>
    <script>
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon11.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon11.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon11h.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon11h.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon12.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon12.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon12h.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon12h.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon13.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon13.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon13h.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon13h.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon14.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon14.png
--- a/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon14h.png
+++ b/Code/智慧营区/DOCManageAPP（阿克苏）/3DVisualization/yjczImg/yjcz-gjl-icon14h.png