大屏318

config/config.js

@@ -150,7 +150,8 @@ export default {
   /** 开发模式下的路由配置 */
   proxy: {
     '/hrvfake': {
-      target: 'http://10.16.3.178:8180',
+      // target: 'http://10.16.3.178:8180',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
       pathRewrite: {
         '^/hrvfake/': '/eolinker_os/Mock/mock?projectID=12&uri=/',
@@ -159,7 +160,8 @@ export default {
 
     '/HiatmpPro/hrv': {
       // target: 'http://10.18.221.138:8083/',
-      target: 'http://10.18.221.138:8080/',
+      // target: 'http://10.18.221.138:8080/',
+      target: 'http://20.120.23.1:8083',
       // target: 'http://10.18.221.137:999/',
       // target: 'http://10.16.5.98:8086',
       // target: "http://10.18.221.137:8086",
@@ -167,49 +169,91 @@ export default {
     },
     '/HiatmpPro/ddm': {
       // target: 'http://10.18.221.138:8090',
-      target: 'http://10.18.221.138:8080',
+      // target: 'http://10.18.221.138:8080',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
     },
     '/HiatmpPro/tle': {
-      target: 'http://10.16.1.56:8083',
+      // target: 'http://10.16.1.56:8083',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
     },
     '/HiatmpPro/scs': {
-      target: 'http://10.16.1.56:8083',
+      // target: 'http://10.16.1.56:8083',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
     },
     '/HiatmpPro/HiMap': {
       // target: 'http://10.16.1.56:86',
-      target: 'http://10.18.221.138:9499',
+      // target: 'http://10.18.221.138:9499',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
       pathRewrite: {
         '^/HiatmpPro': '/',
       },
     },
     '/HiatmpPro/static': {
-      target: 'http://10.16.4.26:8000',
+      // target: 'http://10.16.4.26:8000',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
       pathRewrite: {
         '^/HiatmpPro': '/',
       },
     },
     "/HiatmpPro/psd": {
-      target: "http://10.16.5.98:8088/",
+      // target: "http://10.16.5.98:8088/",
+      target: 'http://20.120.23.1:8083',
+      changeOrigin: true,
+    },
+    "/HiatmpPro/bsp": {
+      // target: "http://10.16.5.98:8088/",
+      target: 'http://20.120.23.1:81',
       changeOrigin: true,
     },
     '/HiatmpPro': {
       // target: 'http://10.16.5.98:81',
-      target: 'http://10.18.221.138:8080',
+      // target: 'http://10.18.221.138:8080',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
     },
 
     '/fake': {
-      target: 'http://10.16.3.178:8180',
+      // target: 'http://10.16.3.178:8180',
+      target: 'http://20.120.23.1:8083',
       changeOrigin: true,
       pathRewrite: {
         '^/fake/': '/eolinker_os/Mock/mock?projectID=2&uri=/',
       },
     },
+    '/baoapi': {
+      // target: 'http://10.16.1.56:8083',
+      target: 'http://20.121.5.208:8081',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/baoapi': '',
+      },
+    },
+    '/brain': {
+      // target: 'http://10.16.1.56:8083',
+      target: 'http://20.120.12.36:8770',
+      changeOrigin: true,
+    },
+    '/xkapi': {
+      // target: 'http://10.16.1.56:8083',
+      target: 'http://10.28.98.10:18880',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/xkapi': '',
+      },
+    },
+    '/xkapi2': {
+      // target: 'http://10.16.1.56:8083',
+      target: 'http://20.120.23.39:8880',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/xkapi2': '',
+      },
+    },
   },
   history: 'hash',
 

config/router.config.js

@@ -44,7 +44,7 @@ export default [
   },
   {
     path: '/command',
-    component: '../layouts/CommandPlatformLayout',
+    component: '../layouts/BaseCommandPlatformLayout',
     routes: [
       {
         name: '平台1',

package.json

@@ -40,7 +40,6 @@
     "lodash": "^4.17.10",
     "lodash-decorators": "^6.0.0",
     "memoize-one": "^4.0.0",
-    "moment": "^2.30.1",
     "number-flip": "^1.0.28",
     "numeral": "^2.0.6",
     "nzh": "^1.0.3",

public/front_config.js

@@ -15,6 +15,19 @@ window.Timer = {
 
   equipInfo1: 60 * 60 * 12 * 1000, // 设备在线率  12小时
   ddm1: 60 * 60 * 4 * 1000, // 计划警员数,岗位类型统计, 岗位等级统计 4小时
+  minYiStatisTime: 60 * 5 * 1000, //民意110
+  motorVehicleTime: 60 * 60 * 24 * 7 * 1000,// 机动车
+  driverTime: 60 * 60 * 24 * 7 * 1000, // 驾驶人
+  trafficAccidentDayTime: 60 * 5 * 1000, //交通事故 日
+  trafficAccidentMonthTime: 60 * 60 * 24 * 1000, //交通事故 月
+  trafficViolationTime: 60 * 60 * 24 * 1000, //交通违法
+  controlsTime: 60 * 5 * 1000, //智能信控
+  carsTime1: 60 * 5 * 1000,//工程车接入、行驶、报警数量
+  carsTime2: 60 * 10 * 1000,//工程车今日辖区行驶情况
+  carsTime3: 60 * 30 * 1000,//工程车三十天平均值
+  constructionTime: 60 * 60 * 24 * 1000,//道路施工
+  sjcjTime: 60 * 5 * 1000, //智能信控
+  ydyjTime: 60 * 5 * 1000,
 }
 
 // 警力图层刷新间隔 
@@ -62,8 +75,8 @@ window.Mock = {
     path: "http://20.120.23.3:4422/vmstemp/vmsmock.jpg",
   },
   securityNum1: 0, // 特勤任务待执行
-  securityNum2: 0, // 特勤任务总数量
+  securityNum2: 4, // 特勤任务总数量
-  securityNum3: 0, // 特勤任务警力投放
+  securityNum3: 2035, // 特勤任务警力投放
 }
 
 // 特勤任务回放基础路径 %5C === \
@@ -154,9 +167,9 @@ window.videoSize = {
     height: 900
   },
   //采血车视频播放
-  local:{
+  local: {
-    width:1200,
+    width: 1200,
-    height:675
+    height: 675
   }
 }
 
@@ -183,9 +196,9 @@ window.videoTitle = '自定义'                         //自定义弹出窗口
 
 // by zhl 20211215 start
 // 百度拥堵一定时间后过滤，暂定5分钟
-window.bdTimeRange=5
+window.bdTimeRange = 5
 // 是否获取客户端时间（用于开发，现场需要获取服务器时间，需要改为false)
-window.isClientDate=true
+window.isClientDate = true
 // by zhl 百度拥堵一定时间后过滤，暂定5分钟 20211215 end
 // 是否开启地图图层动画效果
 window.isMapAnimate = true;
@@ -195,12 +208,12 @@ window.todayOnCarNum = 0;
 
 //有效警情类型
 window.optionValue = [
-  {value:'1',name:'车流量大'},
+  { value: '1', name: '车流量大' },
-  {value:'2',name:'交通事故'},
+  { value: '2', name: '交通事故' },
-  {value:'3',name:'信号灯故障'},
+  { value: '3', name: '信号灯故障' },
-  {value:'4',name:'设施障碍'},
+  { value: '4', name: '设施障碍' },
-  {value:'5',name:'商业活动'},
+  { value: '5', name: '商业活动' },
-  {value:'6',name:'学校医院'},
+  { value: '6', name: '学校医院' },
 ]
 /**
  * 2023年2月2日演示支持
@@ -281,7 +294,7 @@ window.yanshiData = [
   }
 ]
 //今日外地在途车饼状图颜色
-window.color=[
+window.color = [
   '#37ffe5',
   '#86c4f1',
   '#e8ab7c',
@@ -297,7 +310,7 @@ window.color=[
 ]
 //今日外地在途车饼图不展示地区
 window.delayArr = [
-  '京','津'
+  '京', '津'
 ]
 
 // redisServer的IP端口
@@ -305,3 +318,39 @@ window.redisServerUrl = 'http://10.18.221.138:9999';
 
 // 需要切换时隐藏警情指挥和勤务态势、特勤任务这三个栏目的主题  主题为hdview_theme表中的themeid
 window.hideThemeArr = ['cf09d2df0b344963adf683b06a41de57'];
+
+//值班信息
+window.dutyinfo = {
+  leaderLabel: '带班领导',
+  leader: '刘轶华',//带班领导
+  groupleaderLabel: '带班组长',
+  groupleader: '张雪',//带班组长
+}
+window.dutyinfoArrList = [
+  { value: '秩序处', label: '杨佚' },
+  { value: '科信处', label: '聂师华' },
+  { value: '装财处', label: '侯建睿' },
+  { value: '党建办', label: '政磊' },
+  { value: '案侦大队', label: '郑玉辉 张骁' },
+  { value: '监管大队', label: '高峰' },
+  { value: '车管二所', label: '张永利' },
+]
+// 道路施工数据
+window.construction = {
+  zgdData: { //主干道施工里程数
+    data: 30, //百分比
+    formatter: 15 //个数
+  },
+  sgData: {//施工中项目
+    data: 70,//百分比
+    formatter: 265//个数
+  },
+  cgdData: {//次干道施工里程
+    data: 46,//百分比
+    formatter: 65//个数
+  },
+  gcxjData: 432, //过程巡检
+  kgtxData: 15, //开工提醒
+  cqtxData: 36, //超期提醒
+  yctsData: 46  //验收提醒
+}

public/map/arcgis.html

@@ -1,27 +1,32 @@
 <!DOCTYPE html>
+
 <head>
-  <meta content="text/html; charset=utf-8"/>
+  <meta content="text/html; charset=utf-8" />
 
-  <script src="/HiatmpPro/HiMap/himap.js" maptype = "arcgis" onready = "mapready"></script>
+  <!-- <script src="/HiatmpPro/HiMap/himap.js" maptype = "arcgis" onready = "mapready"></script> -->
+  <script src="http://20.120.23.1:8083/himap.js" maptype="arcgis" onready="mapready"></script>
   <title>maptest</title>
   <style>
-    html, body {
+    html,
+    body {
       padding: 0;
       margin: 0;
       height: 100%;
-      overflow-x: hidden; overflow-y: hidden;
+      overflow-x: hidden;
+      overflow-y: hidden;
     }
   </style>
   <script>
     var _MapApp;
-    function mapready(){
+    function mapready() {
-      _MapApp = new HiMap(document.getElementById("map"),{mapStyle:'darkStyle'});
+      _MapApp = new HiMap(document.getElementById("map"), { mapStyle: 'darkStyle' });
       _MapApp.TrackPlay = TrackPlay;
     }
   </script>
 </head>
 
 <body>
-<div id="map" style="top: 0px; left: 0px; border-bottom: 0px; width:100%;height:100%;"></div>
+  <div id="map" style="top: 0px; left: 0px; border-bottom: 0px; width:100%;height:100%;"></div>
 </body>
+
 </html>

public/map/arcgisDark.html

@@ -3,7 +3,8 @@
 <head>
   <meta content="text/html; charset=utf-8" />
 
-  <script src="/HiatmpPro/HiMap/himap.js" maptype="minemap" onready="mapready"></script>
+  <!-- <script src="/HiatmpPro/HiMap/himap.js" maptype="minemap" onready="mapready"></script> -->
+  <script src="http://20.120.23.3:9499/HiMap/himap.js" maptype="arcgis" onready="mapready"></script>
   <title>maptest</title>
   <style>
     html,
@@ -22,7 +23,6 @@
     /* #map_layers {
       z-index: 1;
     } */
-
   </style>
   <script>
     var _MapApp;

public/map/chromeVideo.html

@@ -165,7 +165,6 @@
     .div-inline {
       display: inline;
     }
-
   </style>
   <script>
     var _haslogin = false,
@@ -383,7 +382,6 @@
      *    @return   {[type]}       [description]
      */
     function initVideoParam() {
-
       try {
         const myreadreg = new ActiveXObject('WScript.shell');
         const CurrentVersion = myreadreg.RegRead(