1.20200624版本

extra/convertor3d/worker.5c05d7a8d5993e1a5426.js → extra/convertor3d/worker.b4c7202d2c49d6cbf2a3.js

@@ -49805,6 +49805,21 @@ var _extends = Object.assign || function(e) {
       return -1 !== e.indexOf("mobile") || -1 !== e.indexOf("android")
     },
     /**
+     * 解码URL中的特殊字符
+     *  将 encodeUrl 中转换后的字符，替换成原始字符
+     *
+     * @param {string} url
+     * @return {string} new url
+     * @example
+     *  encodeUrl('http:%2F%2Flocalhost:3000%2Flogin?user%3D123%26pwd%3D123');
+     *  // http://localhost:3000/login?user=123&pwd=123
+     */
+    decodeUrl: function(e) {
+      if (e)
+        for (var r = [/(%2B)/gi, /(%20)/g, /(%2F)/gi, /(%3F)/gi, /(%23)/g, /(%26)/g, /(%3D)/gi], t = ["+", " ", "/", "?", "#", "&", "="], n = 0; n < encodeLen - 1; n++) e = e.replace(r[n], t[n]);
+      return e
+    },
+    /**
      * 转码URL中的特殊字符
      *
      * 特殊字符说明
@@ -49826,8 +49841,10 @@ var _extends = Object.assign || function(e) {
     encodeUrl: function(e) {
       var r = [/[+]/g, /[ ]/g, /[\/]/g, /[\?]/g, /[#]/g, /[&]/g, /[=]/g],
         t = ["%2B", "%20", "%2F", "%3F", "%23", "%26", "%3D"];
-      // 先替换其中的 % ，
-      e = e.replace(/[%]/g, "%25");
+      // 防止多次encodeUrl
+      e = this.decodeUrl(e),
+        // 先替换其中的 % ，
+        e = e.replace(/[%]/g, "%25");
       for (var n = 0; n < encodeLen - 1; n++) e = e.replace(r[n], t[n]);
       return e
     },
@@ -49854,7 +49871,7 @@ var _extends = Object.assign || function(e) {
         t = ["%2B", "%20", "%3F", "%23", "%26", "%3D"];
       // 先替换其中的 % ，
       e = e.replace(/[%]/g, "%25");
-      for (var n = 0; n < encodeLen - 1; n++) e = e.replace(r[n], t[n]);
+      for (var n = 0; n < encodeLen - 2; n++) e = e.replace(r[n], t[n]);
       return e
     },
     /**
@@ -50130,7 +50147,7 @@ var _OBJLoader = __webpack_require__(6),
         s = _objectWithoutProperties(o, ["modelName", "basePath", "objName"]),
         l = (0, _helper.createLoadingManger)(e.managerParams),
         i = new _OBJLoader2.default(l);
-      i.setPath(t), i.load(n, function(o) {
+      i.setPath(t), i.load(_R3DTools2.default.encodeUrl(n), function(o) {
         o.name = a,
           // 设置对应的材质 key
           o.userData = {

mods/components/3dviewConvertor/threeres/marker-models/fireResource/fireFoamRoom.mtl

 # 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
 # ļ:19.06.2020 19:38:56
 
-newmtl fireFoam
+newmtl fireFoamRoom
 	Ns 10.0000
 	Ni 1.5000
 	d 1.0000
@@ -12,5 +12,5 @@ newmtl fireFoam
 	Kd 0.5882 0.5882 0.5882
 	Ks 0.0000 0.0000 0.0000
 	Ke 0.0000 0.0000 0.0000
-	map_Ka fireFoam.jpg
-	map_Kd fireFoam.jpg
+	map_Ka fireFoamRoom.jpg
+	map_Kd fireFoamRoom.jpg

src/_mock/videoTree.json

@@ -2,44 +2,12 @@
   {
     "id": 8,
     "equipName": "极Ⅰ高端YY换流变A相",
-    "children": [{
-      "monitorTime": 1565604224985,
-      "equipName": "摄像头9",
-      "code": "SP009",
-      "name": "摄像头9",
-      "id": 70,
-      "videoUrl": "/src/assets/alarmVideoMonitor/video/road1.mp4"
-    },
-    {
-      "monitorTime": 1565604224985,
-      "equipName": "摄像头10",
-      "code": "SP010",
-      "name": "摄像头10",
-      "id": 71,
-      "videoUrl": "/src/assets/alarmVideoMonitor/video/road2.mp4"
-    }
-    ]
+    "children": []
   },
   {
     "equipName": "极Ⅰ高端换流阀A项",
     "name": "B摄像头",
     "id": 2,
-    "children": [{
-      "monitorTime": 1565604224985,
-      "equipName": "摄像头",
-      "code": "SP001",
-      "name": "摄像头",
-      "id": 60,
-      "videoUrl": "/src/assets/alarmVideoMonitor/video/road3.mp4"
-    },
-    {
-      "monitorTime": 1565604224985,
-      "equipName": "摄像头02",
-      "code": "SP002",
-      "videoUrl": "/src/assets/alarmVideoMonitor/video/road4.mp4",
-      "name": "视频02",
-      "id": 61
-    }
-    ]
+    "children": []
   }
 ]

src/consts/urlConsts.js

@@ -87,7 +87,7 @@ export const FscSerUrl = {
   statisticsCheckUrl: completePrefix(patrolURI, 'api/view3d/statistics/check'),//今日巡检统计接口
   statisticsDutyUrl: completePrefix(patrolURI, 'api/view3d/statistics/duty'), //今日值班统计
   onlineDayUrl: completePrefix(patrolURI, 'api/view3d/online/date'), //消防安全执行天数
-  cityWeatherUrl: completePrefix(patrolURI, '/api/weather/{cityCode}'), //天气查询
+  cityWeatherUrl: completePrefix(patrolURI, 'api/weather/{cityCode}'), //天气查询
 
 
   //*******************************************************************************

src/view/bizview/alarmVideoMonitor/index.js

@@ -86,7 +86,7 @@ class AlarmVideoMonitor extends Component {
     return (<div className="video-wrapper">
       {monitors[videoFlag].map(item => {
         return (<div className={classnames(`video-item-wrapper-${videoFlag}`,{ active: item.id === activeVideo })} onClick={() =>this.clickVideo(item)}>
-          <video src={item.videoUrl} width="100%" height="100%" controls="controls" autoPlay>
+          <video src={item.videoUrl} width="100%" height="100%" controls="controls" >
         Your browser does not support the video tag.
           </video>
         </div>);

webpack.config.js

@@ -59,7 +59,7 @@ const defaultConfig = simpleConfig(config);
 defaultConfig.plugins.push(
   new HtmlInlineCodePlugin([
     { inject: 'body', begin: true, tag: 'script',  attr: { src: '/extra/convertor3d/graphmod.js' } },
-    { inject: 'body', begin: false, tag: 'script',  attr: { src: '/extra/convertor3d/worker.5c05d7a8d5993e1a5426.js' } }
+    { inject: 'body', begin: false, tag: 'script',  attr: { src: '/extra/convertor3d/worker.b4c7202d2c49d6cbf2a3.js' } }
  ])
 );