Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-29 636e651b6d537f6533b731947c7f7447a8ce12db

Merge remote-tracking branch 'origin/master' into master

 public/map/.project

 public/map/api/user.js

File was deleted

 public/map/api/view-api.js

File was deleted

 public/map/config.json

 public/map/controls/Queryinfowindow/InfoTemplate.js

 public/map/controls/Queryinfowindow/InfoWindow.css

 public/map/controls/Queryinfowindow/InfoWindow.js

 public/map/controls/Queryinfowindow/template.html

 public/map/controls/infowindow/InfoTemplate.js

 public/map/controls/infowindow/InfoWindow.css

 public/map/controls/infowindow/InfoWindow.js

 public/map/controls/infowindow/ico/close.png

 public/map/controls/infowindow/ico/collect.png

 public/map/controls/infowindow/ico/uncollect.png

 public/map/controls/infowindow/template.html

 public/map/controls/loader/Loader.css

 public/map/controls/loader/Loader.js

 public/map/controls/mapswitch/1_1.png

 public/map/controls/mapswitch/MapSwitchControl.css

 public/map/controls/mapswitch/MapSwitchControl.html

 public/map/controls/mapswitch/MapSwitchControl.js

 public/map/controls/overview/OverviewControl.css

 public/map/controls/overview/OverviewControl.html

 public/map/controls/overview/OverviewControl.js

 public/map/controls/overview/config.js

 public/map/controls/page/PageControl.css

 public/map/controls/page/PageControl.js

 public/map/controls/page/template.html

 public/map/controls/searchbox/SearchBox.css

 public/map/controls/searchbox/SearchBox.html

 public/map/controls/searchbox/SearchBox.js

 public/map/controls/tab/TabControl.css

 public/map/controls/tab/TabControl.html

 public/map/controls/tab/TabControl.js

 public/map/controls/timeliner/TimeLinerControl.css

 public/map/controls/timeliner/TimeLinerControl.html

 public/map/controls/timeliner/TimeLinerControl.js

 public/map/controls/timeliner/css/loading.gif

 public/map/controls/timeliner/css/next.gif

 public/map/controls/timeliner/css/next.png

 public/map/controls/timeliner/css/node.png

 public/map/controls/timeliner/css/node_active.png

 public/map/controls/timeliner/css/pause.gif

 public/map/controls/timeliner/css/pause.png

 public/map/controls/timeliner/css/play.gif

 public/map/controls/timeliner/css/play.png

 public/map/controls/timeliner/css/previous.gif

 public/map/controls/timeliner/css/previous.png

 public/map/controls/timeliner/css/slide2.jpg

 public/map/controls/timeliner/css/timeliner.css

 public/map/controls/timeliner/css/timeliner_styling.css

 public/map/controls/timeliner/js/jquery.timeliner.min.js

 public/map/controls/timeslider/TimeSliderControl.css

 public/map/controls/timeslider/TimeSliderControl.html

 public/map/controls/timeslider/TimeSliderControl.js

 public/map/controls/timeslider/images/left.png

 public/map/controls/timeslider/images/left_un.png

 public/map/controls/timeslider/images/right.png

 public/map/controls/timeslider/images/right_un.png

 public/map/controls/timeslider/images/time_txt.png

 public/map/controls/timeslider/images/zz.png

 public/map/controls/timeslider/js/jquery.ui.timeslider.js

 public/map/controls/toolbar/toolbar.css

 public/map/controls/toolbar/tools/BaseTool.js

 public/map/controls/toolbar/tools/CityLayerTool.js

 public/map/controls/toolbar/tools/ClearTool.js

 public/map/controls/toolbar/tools/DrawBaseTool.js

 public/map/controls/toolbar/tools/ErrCorrectButton.js

 public/map/controls/toolbar/tools/ErrCorrectTool.js

 public/map/controls/toolbar/tools/FullScreenTool.js

 public/map/controls/toolbar/tools/Jcrop/Jcrop.js

 public/map/controls/toolbar/tools/Jcrop/jquery.Jcrop.min.css

 public/map/controls/toolbar/tools/Jcrop/save.css

 public/map/controls/toolbar/tools/LocationTool.js

 public/map/controls/toolbar/tools/Map3DTool.js

 public/map/controls/toolbar/tools/MeasureLineTool.js

 public/map/controls/toolbar/tools/MeasurePolygonTool.js

 public/map/controls/toolbar/tools/MultidateTool.js

 public/map/controls/toolbar/tools/NavBaseTool.js

 public/map/controls/toolbar/tools/PanTool.js

 public/map/controls/toolbar/tools/PrintTool.js

 public/map/controls/toolbar/tools/ScreenWindowTool.js

 public/map/controls/toolbar/tools/SignTool.js

 public/map/controls/toolbar/tools/StreetViewTool.js

 public/map/controls/toolbar/tools/SwipeTool.js

 public/map/controls/toolbar/tools/ZoomInTool.js

 public/map/controls/toolbar/tools/ZoomOutTool.js

 public/map/controls/toolbar/tools/icons/clear_normal.png

 public/map/controls/toolbar/tools/icons/local_normal.png

 public/map/controls/toolbar/tools/icons/measureline_normal.png

 public/map/controls/toolbar/tools/icons/measureline_select.png

 public/map/controls/toolbar/tools/icons/measurepolygon_normal.png

 public/map/controls/toolbar/tools/icons/measurepolygon_select.png

 public/map/controls/toolbar/tools/icons/pan_normal.png

 public/map/controls/toolbar/tools/icons/pan_select.png

 public/map/controls/toolbar/tools/icons/zoomin_normal.png

 public/map/controls/toolbar/tools/icons/zoomin_select.png

 public/map/controls/toolbar/tools/icons/zoomout_normal.png

 public/map/controls/toolbar/tools/icons/zoomout_select.png

 public/map/controls/toolbar/tools/template.html

 public/map/core/AppEvent.js

 public/map/core/BaseControl.js

 public/map/core/BaseWidget.js

 public/map/core/ConfigData.js

 public/map/core/bustransfer/TransferParameter.js

 public/map/core/bustransfer/TransferTask.js

 public/map/core/bustransfer/WayDetailParameter.js

 public/map/core/bustransfer/WayDetailTask.js

 public/map/core/esrichina/GoogleMapLayer.js

 public/map/core/esrichina/TianDiTuLayer.js

 public/map/core/framework.js

 public/map/core/manager/configmanager.js

 public/map/core/manager/mapmanager.js

 public/map/core/manager/querymanager.js

 public/map/core/manager/routemanager.js

 public/map/core/manager/widgetsmanager.js

 public/map/core/utils/ConfigUtil.js

 public/map/core/utils/GeometryUtil.js

 public/map/core/utils/LayerUtil.js

 public/map/core/utils/RendererUtil.js

 public/map/env.js

File was renamed from public/map/views/map/env.js
@@ -74,7 +74,7 @@
    return uuid;
}

var baseUrl = getIndexUrl("/map/views/map");
var baseUrl = getIndexUrl("/map");
// var baseUrl = getIndexUrl("/views/map");
//var baseUrl = getIndexUrl("/wnga/Police");
dojoConfig = {

 public/map/framework.css

 public/map/images/aaa.mp4

Binary files differ

 public/map/images/audio.mp3

Binary files differ

 public/map/images/baojin.png

 public/map/images/baojing.png

 public/map/images/cejin.png

 public/map/images/ceshi.png

 public/map/images/close-white.png

 public/map/images/close.png

 public/map/images/diaoxian.png

 public/map/images/down-image-blue.png

 public/map/images/down-image-grey.png

 public/map/images/equipment.png

 public/map/images/guzhang.png

 public/map/images/jingbaored.png

 public/map/images/laydata-bg.png

 public/map/images/owner.png

 public/map/images/police-situation.png

 public/map/images/real-time-callPolice.png

 public/map/images/real-time-history.png

 public/map/images/real-time-look.png

 public/map/images/real-time-video-start.png

 public/map/images/real-time-views-goto.png

 public/map/images/security.png

 public/map/images/sompl.png

 public/map/images/tool/dt.jpg

 public/map/images/tool/dt.png

 public/map/images/tool/yx.jpg

 public/map/images/tool/yx.png

 public/map/images/turn-off-the-alarm.png

 public/map/images/turn-on-the-alarm.png

 public/map/images/txt.png

 public/map/images/up-image-blue.png

 public/map/images/up-image-grey.png

 public/map/index.html

File was renamed from public/map/views/map/forestry-map.html
@@ -17,29 +17,28 @@
    href="http://www.jxgis.cn:8080/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/dijit/themes/tundra/tundra.css" />
  <link rel="stylesheet" type="text/css"
    href="http://www.jxgis.cn:8080/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/esri/css/esri.css" />
  <link rel="stylesheet" href="../../lib/layui/css/layui.css" />
  <link rel="stylesheet" href="../../css/forestry-map.css" />
  <link rel="stylesheet" href="./lib/layui/css/layui.css" />
  <link rel="stylesheet" href="./css/forestry-map.css" />
  <link type="text/css" rel="stylesheet" href="framework.css" />
  <link rel="stylesheet" href="../../lib/zTree_v3//css/metroStyle/metroStyle.css">
  <link rel="stylesheet" href="./lib/zTree_v3//css/metroStyle/metroStyle.css">
  <style>
    .map_content {
      position: relative
    }
  </style>
  <script src="../../lib/jquery.js"></script>
  <script src="../../lib/js.cookie.min.js"></script>
  <script src="../../js/request.js"></script>
  <script src="../../api/view-api.js"></script>
  <script src="./lib/jquery.js"></script>
  <script src="./lib/js.cookie.min.js"></script>
  <script src="./js/request.js"></script>
  <script src="js/layer/layer.js"></script>
  <script src="js/laydate/laydate.js"></script>
  <script type="text/javascript" src="js/comm/heard.js"></script>
  <script type="text/javascript" src="js/script.js"></script>
  <script src="../../lib/layui/layui.js"></script>
  <script src="./lib/layui/layui.js"></script>
  <script src="env.js"></script>

  <script type="text/javascript"
    src="http://www.jxgis.cn:8080/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/init.js"></script>
  <script src='../../lib//zTree_v3/js/jquery.ztree.all.js'></script>
  <script src='./lib/zTree_v3/js/jquery.ztree.all.js'></script>
  <script>
    var _framework = null;
    var _AppEvent = null;
@@ -82,7 +81,7 @@
      <div class="map_tool_monitor">

        <div class="monitorClose">
          <img id="monitorClose" src="../../images/map-close.png" alt="" />
          <img id="monitorClose" src="./images/map-close.png" alt="" />
          <p>关闭</p>
        </div>

@@ -98,8 +97,8 @@
  </div>

</body>
<script src="../../js/monitor.js"></script>
<script src="../../js/forestry-map.js"></script>
<script src="./js/monitor.js"></script>
<script src="./js/forestry-map.js"></script>

<script>
  var openId = getQueryStringByKey('openid');

 public/map/js/analysis-and-judgment.js

File was deleted

 public/map/js/atmospheric-environment.js

File was deleted

 public/map/js/comm.js

 public/map/js/comm/drag.js

 public/map/js/comm/heard.js

 public/map/js/jquery.min.js

 public/map/js/jquery.ztree.all.js

File was deleted

 public/map/js/jquery.ztree.core.js

File was deleted

 public/map/js/laydate/laydate.js

 public/map/js/laydate/theme/default/font/iconfont.eot

Binary files differ

 public/map/js/laydate/theme/default/font/iconfont.svg

 public/map/js/laydate/theme/default/font/iconfont.ttf

Binary files differ

 public/map/js/laydate/theme/default/font/iconfont.woff

Binary files differ

 public/map/js/laydate/theme/default/laydate.css

 public/map/js/layer/layer.js

 public/map/js/layer/mobile/layer.js

 public/map/js/layer/mobile/need/layer.css

 public/map/js/layer/theme/default/icon-ext.png

 public/map/js/layer/theme/default/icon.png

 public/map/js/layer/theme/default/layer.css

 public/map/js/layer/theme/default/loading-0.gif

 public/map/js/layer/theme/default/loading-1.gif

 public/map/js/layer/theme/default/loading-2.gif

 public/map/js/layer/theme/myskin/equipment-details.css

 public/map/js/layer/theme/myskin/police-details.css

 public/map/js/script.js

 public/map/views/map/images/bianji.png

Binary files differ

 public/map/views/map/widgets/patrolManagement/PatrolManagement.css

File was deleted

 public/map/views/map/widgets/policeDispatching/PoliceDispatching.css

File was deleted

 public/map/widgets/FlareClusterLayer/DataManager.js

 public/map/widgets/FlareClusterLayer/data.json

 public/map/widgets/FlareClusterLayer/fcl/FlareClusterLayer_v3.js

 public/map/widgets/FlareClusterLayer/fcl/FlareClusterLayer_v4.js

 public/map/widgets/FlareClusterLayer/index.html

 public/map/widgets/FlareClusterLayer/index_v3.html

 public/map/widgets/FlareClusterLayer/index_v4.html

 public/map/widgets/FlareClusterLayer/typescript/FlareClusterLayer_v4.ts

 public/map/widgets/FlareClusterLayer/typings/custom-typings.d.ts

 public/map/widgets/FlareClusterLayer/typings/index.d.ts

 public/map/widgets/aPoliceTeam/APoliceTeam.css

copy from public/map/views/map/widgets/aPoliceTeam/APoliceTeam.css
copy to public/map/widgets/aPoliceTeam/APoliceTeam.css
File was copied from public/map/views/map/widgets/aPoliceTeam/APoliceTeam.css
@@ -266,7 +266,7 @@
    right: 8px;
    width: 24px;
    height: 24px;
    background: url('views/map/images/close.png') no-repeat;
    background: url('../../images/close.png') no-repeat;
    background-size: 100% 100%;
    cursor: pointer;
}
@@ -506,7 +506,7 @@
    transform: translate(0, -50%);
    width: 16px;
    height: 16px;
    background: url('../../../../images/select-bg.png') repeat;
    background: url('../../images/select-bg.png') repeat;
    background-size: 100% 100%;
}

@@ -755,7 +755,7 @@
    transform: translate(0, -50%);
    width: 16px;
    height: 16px;
    background: url('../../../../images/select-bg.png') repeat;
    background: url('../../images/select-bg.png') repeat;
    background-size: 100% 100%;
}


 public/map/widgets/aPoliceTeam/APoliceTeam.js

File was renamed from public/map/views/map/widgets/aPoliceTeam/APoliceTeam.js
@@ -610,7 +610,7 @@
            })
            // 巡逻区域的新增按钮
            $('.police-container .police-container-patrol .main-content>li:eq(0) .distribute-table-content .operation .add').off('click').click(function () {
                var url = '../../popup/html/region-name.html';
                var url = './popup/html/region-name.html';
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -711,7 +711,7 @@

                var snumber = $(this).attr('term-id');

                var url = '../../popup/html/personnel-information-management.html?id=' + snumber;
                var url = './popup/html/personnel-information-management.html?id=' + snumber;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -796,7 +796,7 @@
            })
            // 巡逻路线中的新增按钮的点击事件
            $('.police-dispatching .police-container .police-container-patrol .main-content>li:eq(1) .add').off('click').click(function () {
                var url = '../../popup/html/route-name-layer.html';
                var url = './popup/html/route-name-layer.html';
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -884,7 +884,7 @@
                var self = this;


                var url = '../../popup/html/routename-and-peoplename.html?routeName=' + routeName + '&routeId=' + routeId + '&peopleName=' + peopleName;
                var url = './popup/html/routename-and-peoplename.html?routeName=' + routeName + '&routeId=' + routeId + '&peopleName=' + peopleName;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -1338,7 +1338,7 @@
         */
        policeDetails: function (id) {
            var that = this;
            var url = '../../popup/html/police-details.html?obj=' + id;
            var url = './popup/html/police-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -1366,7 +1366,7 @@
         */
        ownerDetails: function (id) {
            var that = this;
            var url = '../../popup/html/owner-details.html?id=' + id;
            var url = './popup/html/owner-details.html?id=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -1394,7 +1394,7 @@
         */
        equipmentDetails: function (id) {
            var that = this;
            var url = '../../popup/html/equipment-details.html?obj=' + id;
            var url = './popup/html/equipment-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({

 public/map/widgets/aPoliceTeam/config.js

 public/map/widgets/aPoliceTeam/template.html

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.css

File was renamed from public/map/views/map/widgets/analysisAndJudgment/AnalysisAndJudgment.css
@@ -141,7 +141,7 @@
    transform: translate(0, -50%);
    width: 10px;
    height: 10px;
    background: url('../../../../images//select-bg.png') repeat;
    background: url('../../images/select-bg.png') repeat;
    background-size: 100% 100%;
}


 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js

File was renamed from public/map/views/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js
@@ -227,7 +227,7 @@
            // 警情列表中的点击事件
            $('.analysis-container-police .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function () {
                var id = $(this).attr('term-list');
                var url = '../../popup/html/police-details.html?obj=' + id;
                var url = './popup/html/police-details.html?obj=' + id;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -262,7 +262,7 @@
            // 业主列表中的点击事件
            $('.analysis-container-owner .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function () {
                var id = $(this).attr('term-list');
                var url = '../../popup/html/owner-details.html?id=' + id;
                var url = './popup/html/owner-details.html?id=' + id;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -297,7 +297,7 @@
            // 设备列表中的点击事件
            $('.analysis-container-equipment .analysis-table-content .tbody').off('click', 'tr').on('click', 'tr', function () {
                var id = $(this).attr('term-listid');
                var url = '../../popup/html/equipment-details.html?obj=' + id;
                var url = './popup/html/equipment-details.html?obj=' + id;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -520,7 +520,7 @@
         */
        policeDetails: function (id) {
            var that = this;
            var url = '../../popup/html/police-details.html?obj=' + id;
            var url = './popup/html/police-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -548,7 +548,7 @@
         */
        ownerDetails: function (id) {
            var that = this;
            var url = '../../popup/html/owner-details.html?id=' + id;
            var url = './popup/html/owner-details.html?id=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -576,7 +576,7 @@
         */
        equipmentDetails: function (id) {
            var that = this;
            var url = '../../popup/html/equipment-details.html?obj=' + id;
            var url = './popup/html/equipment-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment1.css

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment1.js

 public/map/widgets/analysisAndJudgment/config.js

 public/map/widgets/analysisAndJudgment/template.html

 public/map/widgets/analysisAndJudgment/template1.html

 public/map/widgets/clientManagement copy/ClientManagement.css

 public/map/widgets/clientManagement copy/ClientManagement.js

 public/map/widgets/clientManagement copy/config.js

 public/map/widgets/clientManagement copy/template.html

 public/map/widgets/clientManagement/ClientManagement.css

 public/map/widgets/clientManagement/ClientManagement.js

 public/map/widgets/clientManagement/FlareClusterLayer_v3.js

 public/map/widgets/clientManagement/config.js

 public/map/widgets/clientManagement/template.html

 public/map/widgets/entranceSecurity/EntranceSecurity.css

 public/map/widgets/entranceSecurity/EntranceSecurity.js

 public/map/widgets/entranceSecurity/config.js

 public/map/widgets/entranceSecurity/template.html

 public/map/widgets/map/MapWidget.css

 public/map/widgets/map/MapWidget.html

 public/map/widgets/map/MapWidget.js

 public/map/widgets/map/TianDiTuLayer.js

 public/map/widgets/mapBrowse/MapBrowseWidget.css

 public/map/widgets/mapBrowse/MapBrowseWidget.js

 public/map/widgets/mapBrowse/config.js

 public/map/widgets/mapBrowse/template.html

 public/map/widgets/mapBrowse/upDateSiteName.html

 public/map/widgets/mapBrowsecopy/MapBrowseWidgetCopy.css

 public/map/widgets/mapBrowsecopy/MapBrowseWidgetCopy.js

 public/map/widgets/mapBrowsecopy/config.js

 public/map/widgets/mapBrowsecopy/template.html

 public/map/widgets/mapBrowsecopy/upDateSiteName.html

 public/map/widgets/patrolManagement/PatrolManagement.css

File was renamed from public/map/views/map/widgets/aPoliceTeam/APoliceTeam.css
@@ -7,6 +7,7 @@
}

div[open-li='police-dispatching']>ul {

    display: none;
    height: 36px;
    line-height: 36px;
@@ -266,7 +267,7 @@
    right: 8px;
    width: 24px;
    height: 24px;
    background: url('views/map/images/close.png') no-repeat;
    background: url('../../images/close.png') no-repeat;
    background-size: 100% 100%;
    cursor: pointer;
}
@@ -506,7 +507,7 @@
    transform: translate(0, -50%);
    width: 16px;
    height: 16px;
    background: url('../../../../images/select-bg.png') repeat;
    background: url('../../images/select-bg.png') repeat;
    background-size: 100% 100%;
}

@@ -755,7 +756,7 @@
    transform: translate(0, -50%);
    width: 16px;
    height: 16px;
    background: url('../../../../images/select-bg.png') repeat;
    background: url('../../images/select-bg.png') repeat;
    background-size: 100% 100%;
}


 public/map/widgets/patrolManagement/PatrolManagement.js

File was renamed from public/map/views/map/widgets/patrolManagement/PatrolManagement.js
@@ -610,7 +610,7 @@
            })
            // 巡逻区域的新增按钮
            $('.police-container .police-container-patrol .main-content>li:eq(0) .distribute-table-content .operation .add').off('click').click(function () {
                var url = '../../popup/html/region-name.html';
                var url = './popup/html/region-name.html';
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -711,7 +711,7 @@

                var snumber = $(this).attr('term-id');

                var url = '../../popup/html/personnel-information-management.html?id=' + snumber;
                var url = './popup/html/personnel-information-management.html?id=' + snumber;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -796,7 +796,7 @@
            })
            // 巡逻路线中的新增按钮的点击事件
            $('.police-dispatching .police-container .police-container-patrol .main-content>li:eq(1) .add').off('click').click(function () {
                var url = '../../popup/html/route-name-layer.html';
                var url = './popup/html/route-name-layer.html';
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -884,7 +884,7 @@
                var self = this;


                var url = '../../popup/html/routename-and-peoplename.html?routeName=' + routeName + '&routeId=' + routeId + '&peopleName=' + peopleName;
                var url = './popup/html/routename-and-peoplename.html?routeName=' + routeName + '&routeId=' + routeId + '&peopleName=' + peopleName;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -1342,7 +1342,7 @@
         */
        policeDetails: function (id) {
            var that = this;
            var url = '../../popup/html/police-details.html?obj=' + id;
            var url = './popup/html/police-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -1370,7 +1370,7 @@
         */
        ownerDetails: function (id) {
            var that = this;
            var url = '../../popup/html/owner-details.html?id=' + id;
            var url = './popup/html/owner-details.html?id=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -1398,7 +1398,7 @@
         */
        equipmentDetails: function (id) {
            var that = this;
            var url = '../../popup/html/equipment-details.html?obj=' + id;
            var url = './popup/html/equipment-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({

 public/map/widgets/patrolManagement/config.js

 public/map/widgets/patrolManagement/template.html

 public/map/widgets/perimeterDetection/PerimeterDetection.css

 public/map/widgets/perimeterDetection/PerimeterDetection.js

 public/map/widgets/perimeterDetection/config.js

 public/map/widgets/perimeterDetection/template.html

 public/map/widgets/policeDispatching/PoliceDispatching.css

copy from public/map/views/map/widgets/aPoliceTeam/APoliceTeam.css
copy to public/map/widgets/policeDispatching/PoliceDispatching.css
File was copied from public/map/views/map/widgets/aPoliceTeam/APoliceTeam.css
@@ -7,13 +7,13 @@
}

div[open-li='police-dispatching']>ul {
    display: none;
    display: flex;
    height: 36px;
    line-height: 36px;
}

div[open-li='police-dispatching']>ul>li {
    /* flex: 1; */
    flex: 1;
    font-size: 16px;
    text-align: center;
    color: #a5a5a5;
@@ -35,7 +35,7 @@
/* 分析研判内容容器 */
.police-container {
    position: relative;
    height: calc(100%);
    height: calc(100% - 38px);
    font-size: 14px;
}

@@ -266,7 +266,7 @@
    right: 8px;
    width: 24px;
    height: 24px;
    background: url('views/map/images/close.png') no-repeat;
    background: url('../../images/close.png') no-repeat;
    background-size: 100% 100%;
    cursor: pointer;
}
@@ -506,7 +506,7 @@
    transform: translate(0, -50%);
    width: 16px;
    height: 16px;
    background: url('../../../../images/select-bg.png') repeat;
    background: url('../../images/select-bg.png') repeat;
    background-size: 100% 100%;
}

@@ -755,7 +755,7 @@
    transform: translate(0, -50%);
    width: 16px;
    height: 16px;
    background: url('../../../../images/select-bg.png') repeat;
    background: url('../../images/select-bg.png') repeat;
    background-size: 100% 100%;
}


 public/map/widgets/policeDispatching/PoliceDispatching.js

File was renamed from public/map/views/map/widgets/policeDispatching/PoliceDispatching.js
@@ -610,7 +610,7 @@
            })
            // 巡逻区域的新增按钮
            $('.police-container .police-container-patrol .main-content>li:eq(0) .distribute-table-content .operation .add').off('click').click(function () {
                var url = '../../popup/html/region-name.html';
                var url = './popup/html/region-name.html';
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -711,7 +711,7 @@

                var snumber = $(this).attr('term-id');

                var url = '../../popup/html/personnel-information-management.html?id=' + snumber;
                var url = './popup/html/personnel-information-management.html?id=' + snumber;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -796,7 +796,7 @@
            })
            // 巡逻路线中的新增按钮的点击事件
            $('.police-dispatching .police-container .police-container-patrol .main-content>li:eq(1) .add').off('click').click(function () {
                var url = '../../popup/html/route-name-layer.html';
                var url = './popup/html/route-name-layer.html';
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -884,7 +884,7 @@
                var self = this;


                var url = '../../popup/html/routename-and-peoplename.html?routeName=' + routeName + '&routeId=' + routeId + '&peopleName=' + peopleName;
                var url = './popup/html/routename-and-peoplename.html?routeName=' + routeName + '&routeId=' + routeId + '&peopleName=' + peopleName;
                layui.use('layer', function () {
                    that.layuiLayer = layui.layer;
                    that.layuiLayer.config({
@@ -1335,7 +1335,7 @@
         */
        policeDetails: function (id) {
            var that = this;
            var url = '../../popup/html/police-details.html?obj=' + id;
            var url = './popup/html/police-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -1363,7 +1363,7 @@
         */
        ownerDetails: function (id) {
            var that = this;
            var url = '../../popup/html/owner-details.html?id=' + id;
            var url = './popup/html/owner-details.html?id=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({
@@ -1391,7 +1391,7 @@
         */
        equipmentDetails: function (id) {
            var that = this;
            var url = '../../popup/html/equipment-details.html?obj=' + id;
            var url = './popup/html/equipment-details.html?obj=' + id;
            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
                that.layuiLayer.config({

 public/map/widgets/policeDispatching/config.js

 public/map/widgets/policeDispatching/template.html

 public/map/widgets/realTimePolice/1.js

 public/map/widgets/realTimePolice/1.json

 public/map/widgets/realTimePolice/LayUIDataTable.js

 public/map/widgets/realTimePolice/RealTimePolice.css

File was renamed from public/map/views/map/widgets/realTimePolice/RealTimePolice.css
@@ -96,7 +96,7 @@
    transform: translate(0, -50%);
    width: 8px;
    height: 8px;
    background: url('../../../../images/select-bg.png') repeat;
    background: url('/images/select-bg.png') repeat;
    background-size: 100% 100%;
}

@@ -484,7 +484,7 @@
    right: 8px;
    width: 24px;
    height: 24px;
    background: url('../../images/close-white.png') no-repeat;
    background: url('/images/close-white.png') no-repeat;
    background-size: 100% 100%;
}

@@ -494,17 +494,17 @@
    right: 48px;
    width: 24px;
    height: 24px;
    background: url('../../images/turn-on-the-alarm.png') no-repeat;
    background: url('/images/turn-on-the-alarm.png') no-repeat;
    background-size: 100% 100%;
}

.layer-realtime-police .layer-header .audio.open {
    background: url('../../images/turn-on-the-alarm.png') no-repeat;
    background: url('/images/turn-on-the-alarm.png') no-repeat;
    background-size: 100% 100%;
}

.layer-realtime-police .layer-header .audio.close {
    background: url('../../images/turn-off-the-alarm.png') no-repeat;
    background: url('/images/turn-off-the-alarm.png') no-repeat;
    background-size: 100% 100%;
}


 public/map/widgets/realTimePolice/RealTimePolice.js

File was renamed from public/map/views/map/widgets/realTimePolice/RealTimePolice.js
@@ -671,7 +671,7 @@
                                //     lttd: res.data[i].wd,
                                //     id: res.data[i].id,
                                //     deviceNumber: res.data[i].deviceNumber
                                // }, res.data[i].jd, res.data[i].wd, './images/real-time-callPolice.png');
                                // }, res.data[i].jd, res.data[i].wd, '/images/real-time-callPolice.png');
                            }
                            if (that.clusterLayer != null) {
                                that.clearLayer();
@@ -913,7 +913,7 @@
        // 实时警情详情
        realTimePoliceDetails: function (id, deviceNumber, channelNumber, serialNumber, jtype) {
            var that = this;
            var url = '../../popup/html/realtime-police-details.html?obj=' + id + '&deviceNumber=' + deviceNumber + "&channelNumber=" + channelNumber + "&serialNumber=" + serialNumber + "&jtype=" + jtype;
            var url = './popup/html/realtime-police-details.html?obj=' + id + '&deviceNumber=' + deviceNumber + "&channelNumber=" + channelNumber + "&serialNumber=" + serialNumber + "&jtype=" + jtype;

            layui.use('layer', function () {
                that.layuiLayer = layui.layer;
@@ -942,7 +942,7 @@

        // 设备历史查看
        realTimeHistorySee: function (deviceNumber) {
            var url = '../../popup/html/realtime-equipment-history.html?deviceNumber=' + deviceNumber;
            var url = './popup/html/realtime-equipment-history.html?deviceNumber=' + deviceNumber;

            layui.use('layer', function () {
                var layer = layui.layer;
@@ -972,7 +972,7 @@
        // 视频查看
        realTimeVideoSee: function (channelNumber, serialNumber) {

            var url = '../../popup/html/realtime-view-video.html?channelNumber=' + channelNumber + '&serialNumber=' + serialNumber;
            var url = './popup/html/realtime-view-video.html?channelNumber=' + channelNumber + '&serialNumber=' + serialNumber;

            layui.use('layer', function () {

@@ -1107,7 +1107,7 @@
                                    //     lttd: result[i].wd,
                                    //     id: result[i].id,
                                    //     deviceNumber: result[i].deviceNumber
                                    // }, result[i].jd, result[i].wd, './images/real-time-callPolice.png');
                                    // }, result[i].jd, result[i].wd, '/images/real-time-callPolice.png');

                                    t = result[i].alarmTime.substr(0, 10);
                                    e = result[i].alarmTime.substr(11);

 public/map/widgets/realTimePolice/config.js

 public/map/widgets/realTimePolice/template.html

 src/api/system/dept.js

@@ -1,4 +1,5 @@
import request from '@/router/axios';
import Message from "element-ui/packages/message/src/main";

export const getList = (current, size, params) => {
  return request({
@@ -86,8 +87,10 @@
}
// 封装api get请求
export const fetch = (path, params) => {
  let axios;
  return axios.get(path, {params: params}).then(res => {
    if (res.data.code === 403) {
      let router;
      router.push({
        path: '/'
      });
@@ -103,4 +106,3 @@
    return Promise.reject(err);
  })
}


 src/page/login/codelogin.vue

@@ -187,6 +187,7 @@
        var z = document.querySelector('.z');
        z.style.display = 'none';
        this.clearValidate('loginForm')
        this.clearValidate('loginForm')
      },
      gb() {
        this.loginForm.phone=""

 src/views/suser/suser.vue

@@ -113,56 +113,23 @@
              prop: "wd",
            },
            {
              label: "地址",
              // hide:true,
              // width:250,
              prop: "address",
              rules: [{
                required: true,
                message: "请输入地址",
                trigger: "blur"
              }]
            },
            // {
            //   label: "行政区",
            //   width:80,
            //   prop: "addvcd",
            //   searchSpan: 4,
            //   search: true,
            //   type: "select",
            //   dicUrl: "/api/blade-jfpts/district/district/selectd",
            //   props: {
            //     label: "addvnm",
            //     value: "addvcds"
            //   },
            // },
            {
              label: "等级",
              searchSpan: 4,
            /*  search: true,*/
              width:60,
              prop: "dj",
            },
            {
              label: "营业信息",
              component: 'AvueUeditor',
              width:350,
              prop: "information",
              rules: [{
                required: true,
                message: "请输入营业信息",
                trigger: "blur"
              }],
              minRows: 6,
              span: 24,
            },
            {
              label: "提交日期",
              width:110,
              type: "datetime",
              format: "yyyy-MM-dd",
              prop: "createtime",
              display: false,
              label: "类型",
              searchSpan: 4,
              search: true,
              width:70,
              prop: "type",
              type: "select",
              dicUrl: "/api/blade-jfpts/lx/lx/seleclx",
              props: {
                label: "types",
                value: "tnumber"
              },
            },
            {
              label: '省份',
@@ -188,7 +155,6 @@
                label: 'name',
                value: 'code'
              },
              dicFlag: false,
              dicUrl: '/api/blade-system/region/select?code={{key}}',
              span: 8,
            },
@@ -202,28 +168,41 @@
                label: 'name',
                value: 'code'
              },
              dicFlag: false,
              dicUrl: '/api/blade-system/region/select?code={{key}}',
              span: 8,
            },
            {
              label: "类型",
              searchSpan: 4,
              search: true,
              width:70,
              prop: "type",
              type: "select",
              dicUrl: "/api/blade-jfpts/lx/lx/seleclx",
              props: {
                label: "types",
                value: "tnumber"
              },
              label: "地址",
              hide:true,
              prop: "address",
              rules: [{
                required: true,
                message: "请输入地址",
                trigger: "blur"
              }]
            },
        /*   {
              label: "空间坐标",
               display: false,
              prop: "coordinate",
            },*/
            {
              label: "营业信息",
              hide:true,
              component: 'AvueUeditor',
              width:350,
              prop: "information",
              rules: [{
                required: true,
                message: "请输入营业信息",
                trigger: "blur"
              }],
              minRows: 6,
              span: 24,
            },
            {
              label: "提交日期",
              width:110,
              type: "datetime",
              format: "yyyy-MM-dd",
              prop: "createtime",
              display: false,
            },
          ]
        },
        data: []