>
@ -337,17 +294,17 @@ export default {
337 294
          this.geTerminalRel(this.currenScene)
338 295
        })
339 296
    },
340
    datadragEnd(evt) {
297
    datadragEnd (evt) {
341 298
      if (evt.oldIndex !== evt.newIndex) {
342 299
        let params = {
343
          params:{
300
          params: {
344 301
            monitorSceneTerminalRelId: this.areaMonitorList[evt.oldIndex].monitorSceneTerminalRelId, // 场景与终端关联ID
345 302
            monitorSceneId: this.currenScene.monitorSceneId, // 场景ID
346 303
            resourceToolId: this.areaMonitorList[evt.oldIndex].resourceToolId, // 终端ID
347 304
            resourceToolIndex: this.areaMonitorList[evt.newIndex].resourceToolIndex // 移动位置序号
348 305
          }
349 306
        }
350
        sysapi.moveTerminalRelIndex(params).then((resp) => {})
307
        sysapi.moveTerminalRelIndex(params).then((resp) => { })
351 308
          .catch((error) => {
352 309
            console.log(error)
353 310
            this.$Message.danger('修改位置失败')
@ -356,12 +313,12 @@ export default {
356 313
          })
357 314
      }
358 315
    },
359
    handleCameraSubmit(data) {
316
    handleCameraSubmit (data) {
360 317
      if (data.monitorSceneTerminalRelId != null) {
361 318
        const target = this.areaMonitorList.find(
362 319
          (item) =>
363 320
            item.monitorSceneTerminalRelId ===
364
          data.monitorSceneTerminalRelId
321
            data.monitorSceneTerminalRelId
365 322
        )
366 323
        Object.assign(target, data)
367 324
        sysapi

+ 1 - 1
security-protection-platform/src/modules/videoSurveillance/distinguishRecord/index.vue

@ -44,7 +44,7 @@
44 44
        </div>
45 45
      </div>
46 46
      <div class="img-viewer">
47
        <t-carousel dots="none" arrow="always" style="width: 100%">
47
        <t-carousel dots="none" :speed="10000000000" arrow="always" style="width: 100%">
48 48
          <t-carousel-item v-for="(item1,index1) in dataImgList" :key="index1" style="width: 100%;padding-left: 10%">
49 49
            <div v-for="(item, index) in item1" :key="index" :src="item.idenPictureUrl" class="image-carousel">
50 50
              <img :src="'http://10.19.90.34:19000/ai-image/'+item.idenPictureUrl" class="img-viewer-size" @click="getParticularsData(item.aiIdenLogId,index)">

+ 9 - 2
security-protection-platform/src/modules/videoSurveillance/index.vue

@ -116,7 +116,7 @@ export default {
116 116
          btn.style.cursor = 'pointer'
117 117
          btn.style.marginLeft = 'auto'
118 118
          btn.className = 'aidicon aidicon-image-outline'
119
          btn.setAttribute('resourceToolId', item.value)
119
          btn.setAttribute('resourceToolId', this.videoList[index].resourceToolId)
120 120
          btn.setAttribute('title', '识别记录')
121 121
          btn.addEventListener('click', this.goDistinguishRecord)
122 122
          let btn1 = document.createElement('button')
@ -248,7 +248,8 @@ export default {
248 248
            }],
249 249
            flash: { hls: { withCredentials: false } },
250 250
            html5: { hls: { withCredentials: false } },
251
            notSupportedMessage: '此视频暂无法播放,请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
251
            notSupportedMessage: '此视频暂无法播放,请检查监控设备是否连通', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
252
            // poster:'https://avatar.csdnimg.cn/F/F/B/0_weixin_44618916.jpg',
252 253
            controlBar: {
253 254
              timeDivider: false,
254 255
              durationDisplay: false,
@ -367,5 +368,11 @@ export default {
367 368
.vjs-tech {
368 369
  pointer-events: none;
369 370
}
371
  .vjs-error-display{
372
    display:none
373
  }
374
  .vjs-big-play-button{
375
    display:none
376
  }
370 377
}
371 378
</style>

+ 2 - 1
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/MonitorSceneTerminalController.java

@ -32,7 +32,8 @@ public class MonitorSceneTerminalController {
32 32
    @ResponseBody
33 33
    @RequestMapping("/createMonitorSceneTerminalRel")
34 34
    public CommonResponse createMonitorSceneTerminalRel(@RequestBody MonitorSceneTerminalRel monitorSceneTerminalRel)  {
35
35
    	monitorSceneTerminalRel.setPlace(monitorSceneTerminalRel.getResourceToolName());
36
    	
36 37
        return monitorSceneTerminalService.createMonitorSceneTerminalRel(monitorSceneTerminalRel);
37 38
    }
38 39

上传下载网络文件 · d78e27d5fe - Nuosi Git Service
Pārlūkot izejas kodu

上传下载网络文件

leijie 5 gadi atpakaļ
vecāks
revīzija
d78e27d5fe

+ 15 - 0
display-server/src/main/webapp/biz/js/plugin/uploaddownload.js

@ -59,4 +59,19 @@ require(["domReady!","wadeMobile", "util"], function(doc,WadeMobile) {
59 59
			alert("下载错误:"+error);
60 60
		});
61 61
	});
62
	
63
	$("#downloadNetPic").tap(function(){
64
		var type = 0;
65
		var url = "http://www.tangmengyun.com/zb_users/upload/2017/12/201712141513216695663764.jpg";
66
		WadeMobile.downloadFile(type,url,function(str){
67
			$("#downloadFilePath").html(str);
68
		});
69
	});
70
	$("#downloadNetVideo").tap(function(){
71
		var type = 1;
72
		var url = "http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4";
73
		WadeMobile.downloadFile(type,url,function(str){
74
			$("#downloadFilePath").html(str);
75
		});
76
	});
62 77
});

+ 18 - 0
display-server/src/main/webapp/template/webapp/plugin/UploadDownload.html

@ -68,6 +68,24 @@
68 68
		</div>
69 69
		<div class="e_space"></div>
70 70
	</div>
71
	
72
	<div class="c_list">
73
			<ul>
74
				<li>
75
					<div class="content content-vertical" ontap>
76
						<div class="label">下载网络图片</div>
77
						<div class="fn fn-2" id="downloadNetPic">点击下载</div>
78
					</div>
79
				</li>
80
				<li>
81
					<div class="content content-vertical" ontap>
82
						<div class="label">下载网络视频</div>
83
					<div class="fn fn-2" id="downloadNetVideo">点击下载</div>
84
					</div>
85
				</li>
86
			</ul>
87
		</div>
88
		<div class="e_space"></div>
71 89
</div>
72 90
</body>
73 91
</html>