Merge branch 'master' of http://123.207.147.179:8888/node_server/motorCity

src/biz/jgfwnl/data.ts

@@ -83,6 +83,7 @@ export async function getCSFX(req, res) {
             let frequency = separateDataAndUint(item.次数).dataNum;
             let kilometer = separateDataAndUint(item.里程).dataNum;
             let ratio = Math.ceil(frequency/kilometer*100);
+            if (ratio > 100) ratio = 100;
             item["比率"] = ratio;
         })
     
@@ -147,8 +148,8 @@ export async function mapData(req, res) {
         "摄像头":cameraData.length, 
         "激光雷达":lidarData.length, 
         // "毫米波雷达":millimeterWaveRadarData.length,
-        "RSU":RSUData.length, 
-        "SIBOX":SIBOXData.length 
+        "路侧单元":RSUData.length, 
+        "信号灯数据采集器":SIBOXData.length 
     };
 
     ret["base"] = getKeyValueNumberOutData("计算云资源", 基础数据data );

src/net/http_server.ts

@@ -29,7 +29,7 @@ export class httpServer {
 
     
     httpServer.use(express.static(path.join(__dirname, "../../images")) );
-    httpServer.use(express.static('video'));
+    httpServer.use(express.static(path.join(__dirname, "../../video")) );
     httpServer.use(bodyParser.json({limit:"10kb"}));
     httpServer.use(compression())