西复线平台配置

im/hzjt.properties

@@ -14,7 +14,7 @@ datasource.druid.validationQuery=SELECT 'x' FROM DUAL
 # 格式为：ip地址:端口:用户名:密码
 # 端口号一定要写，例如:192.168.2.100:21:reader:reader
 
-ftp.host=33.65.250.179:21:hzjt:1qaz2wsx
+ftp.host=33.65.219.103:21:hzjt:1qaz2wsx
 
 alarm.subscribe.data.key=gs:traff:alarmlist
 
@@ -39,6 +39,6 @@ gs.traff.cloud.department.fileagent.url=http://33.50.1.22:8888/agent/fileAgent?f
 
 alarmrecord.check.push.recordtype=1
 
-eventsend.url=http://33.65.250.179:8089/sendEvents
-devicesend.url=http://33.65.250.179:8089/traffdevicewriteresult/sendDevices
+eventsend.url=http://33.65.219.103:8089/sendEvents
+devicesend.url=http://33.65.219.103:8089/traffdevicewriteresult/sendDevices
 devicesend.timeout=1000
\ No newline at end of file

pom.xml

@@ -177,6 +177,16 @@
             <artifactId>commons-io</artifactId>
             <version>2.6</version>
         </dependency>
+
+        <!-- mqtt -->
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-stream</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
+        </dependency>
     </dependencies>
 
     <repositories>

src/main/java/im/zhaojun/common/util/FTPUtil.java → src/main/java/im/zhaojun/common/util/FtpUtil.java

 package im.zhaojun.common.util;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

src/main/java/im/zhaojun/system/controller/LoginController.java

@@ -210,7 +210,7 @@ public class LoginController {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
         HttpEntity<String> requestEntity = new HttpEntity<>(message, headers);
-        return restTemplate.postForObject("http://33.65.250.179:" + 8089 + "/alarmevent", requestEntity, ResultObj.class);
+        return restTemplate.postForObject("http://33.65.219.103:" + 8089 + "/alarmevent", requestEntity, ResultObj.class);
     }
 
 

src/main/java/im/zhaojun/system/controller/TraffdevicewriteresultController.java

@@ -69,10 +69,8 @@ public class TraffdevicewriteresultController {
         MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
         paramMap.add("recordid", recordid);
         try {
-            resultObj =(List<ResultObj> ) CompletableFuture.supplyAsync(() -> restTemplate.postForObject(eventsendurl, paramMap, List.class)).get(timeout, TimeUnit.SECONDS);
-
-        }catch (TimeoutException e) {
-            resultObj.add(ResultObj.error(ResponseEnum.E_1008.getCode(), ResponseEnum.E_1008.getMsg()));
+//            resultObj =(List<ResultObj> ) CompletableFuture.supplyAsync(() -> restTemplate.postForObject(eventsendurl, paramMap, List.class)).get(timeout, TimeUnit.MILLISECONDS);
+            resultObj= restTemplate.postForObject(eventsendurl, paramMap, List.class);
         } catch (Exception e) {
             resultObj.add(ResultObj.error(ResponseEnum.E_9999.getCode(), e.toString()));
         }

src/main/resources/application.properties

@@ -4,10 +4,10 @@ server.port=8082
 
 spring.datasource.username=hzjt
 spring.datasource.password=hzjt
-spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin
-#spring.datasource.username=test
-#spring.datasource.password=test
-#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin
+spring.datasource.url=jdbc:oracle:thin:@33.65.219.103:1521:helowin
+#spring.datasource.username=hzjt
+#spring.datasource.password=hzjt
+#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1521:helowin
 
 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
 # ��ʼ����С����С�����
@@ -30,7 +30,7 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 #
 #spring.redis.host=localhost
-spring.redis.host=33.65.250.179
+spring.redis.host=33.65.219.103
 spring.redis.port=6379
 spring.cache.type=redis
 spring.cache.redis.time-to-live=600000
@@ -62,14 +62,12 @@ spring.devtools.restart.enabled=true
 spring.devtools.restart.additional-paths=src/main/java
 spring.devtools.restart.exclude=static/**,public/**
 
-#spring.profiles.path= D:/imp/config/im/hzjt.properties
-#spring.profiles.path= D:/hzjt_service/imp/config/im/hzjt.properties
 
 managername=admin
 
-devicesend.url=http://33.65.250.179:8089/traffdevicewriteresult/sendDevices
+devicesend.url=http://33.65.219.103:8089/traffdevicewriteresult/sendDevices
 devicesend.timeout=1000
-flvurl=http://33.65.250.179:8089/getflv
+flvurl=http://33.65.219.103:8089/getflv
 
 json.resisurl=http://33.50.1.21:57081/record/ecvs
 qingzhi.devicewrite.url=http://33.50.1.213:38080/api/jtldpt/impld/deviceWrite
@@ -78,7 +76,8 @@ qingzhi.devicewrite.timeout=5000
 qingzhi.eventwrite.url=http://33.50.1.213:38080/api/jtldpt/impld/trafficEventWrite
 qingzhi.eventwrite.timeout=5000
 
-eventsend.url=http://33.65.250.179:8089/sendEvents
-pushrecordurl=33.65.250.179:8089/sendtouser
+eventsend.url=http://33.65.219.103:8089/sendEvents
+#eventsend.url=http://localhost:8089/sendEvents
+pushrecordurl=33.65.219.103:8089/sendtouser
 ipstrs=33.55.1.85,33.55.1.86,33.55.1.87,33.55.1.88,33.55.1.89,33.55.1.90,33.55.1.91,33.55.1.92,33.55.1.93,33.55.1.94,33.55.1.95,33.55.1.96,33.51.6.97,33.60.1.7,33.54.3.240,33.53.1.171,33.52.1.222,33.61.1.23,33.57.1.22
 ipurl=:8001/api/traffic-incident/restartAutoRule
\ No newline at end of file

src/main/resources/mapper/DeptMapper.xml

@@ -161,7 +161,7 @@
         select distinct to_char(t.dept_id) dept_id,
         t.dept_name ,
         to_char(t.parent_id )parent_id,
-        levels  ,t.order_num,0 vels
+        levels  ,t.order_num
         from DEPT t
         <if test="deptId != null and  deptId!=0">
             ,t_user a
@@ -172,7 +172,7 @@
             </if>
         </if>
         union all
-        select  a.* ,b.five from (SELECT
+        SELECT
         A .sbbh || '_' || tdbh dept_id,
         A .tdmc dept_name,
         TO_CHAR (A .xzbh) parent_id,
@@ -189,17 +189,12 @@
         T .dept_id = A .xzbh
         <if test="tdmc != null and  tdmc!='' ">
             and tdmc  like '%${tdmc}%'
-        </if>)a left join (
-        select video_id, max(five) five
-        from vehicletodaystatistic b
-        where ts = to_char(sysdate, 'yyyy-mm-dd')
-        group by video_id
-        ) b  on  dept_id=b.video_id
+        </if>
         union
         select distinct to_char(t.dept_id) dept_id,
         t.dept_name ,
         to_char(t.parent_id )parent_id,
-        levels  ,t.order_num,0 vels
+        levels  ,t.order_num
         from DEPT t start with parent_id = #{deptId}
         connect by parent_id =  dept_id
 

src/main/resources/mapper/TrafficStatisticsMapper.xml

@@ -685,12 +685,12 @@
                 </foreach>
             </if>
 
-            <if test="construction!=null and construction==1">
-                AND recordtype in ('roadworks_out_of_line','roadworks')
-            </if>
-            <if test="construction!=null and construction==2">
-                AND recordtype not in ('roadworks_out_of_line','roadworks')
-            </if>
+            <!--<if test="construction!=null and construction==1">-->
+                <!--AND recordtype in ('roadworks_out_of_line','roadworks')-->
+            <!--</if>-->
+            <!--<if test="construction!=null and construction==2">-->
+                <!--AND recordtype not in ('roadworks_out_of_line','roadworks')-->
+            <!--</if>-->
             <if test='rectificationtype !=null and rectificationtype=="1"'>
                 AND rectificationtype='1'
             </if>

src/main/resources/static/js/jkgl/jkgl - 副本.js

@@ -1249,7 +1249,7 @@ let arr_right_s = [];
 
 //websocket连接
 let d = new Date().getTime();
-let web_ip = "ws:/33.65.250.179:8089/websocket/" + d;
+let web_ip = "ws:/33.65.219.103:8089/websocket/" + d;
 let wss = new WebSocket(web_ip);
 wss.onopen = function () {
     console.log("连接成功");
@@ -1261,10 +1261,10 @@ wss.onmessage = function (evt) {
     // console.log(data);
     if (data.type == "alarm") {
 
-        if (data.data.incident_type == 'ROADWORKS' || data.data.incident_type == 'ROADWORKS_OUT_OF_LINE') {
-            //排除工程检测
-            return;
-        }
+        // if (data.data.incident_type == 'ROADWORKS' || data.data.incident_type == 'ROADWORKS_OUT_OF_LINE') {
+        //     //排除工程检测
+        //     return;
+        // }
         //if_cz 判断前来的事件是不是本部门下的
         let if_cz = false;
         //jk_video_id为监控id
@@ -1532,7 +1532,7 @@ $('[name="status"]').bootstrapSwitch({
 
 //推送近5分钟数据
 function websocket_s(ds) {
-    let web_ips = "ws:/33.65.250.179:8089/websocket/" + ds;
+    let web_ips = "ws:/33.65.219.103:8089/websocket/" + ds;
     ws_j5fz = new WebSocket(web_ips);
     ws_j5fz.onopen = function () {
         console.log("连接成功");
@@ -1582,7 +1582,7 @@ function websocket_s(ds) {
 
 //推送自动规则
 function websocket_gzdj(video_id, items, indexs_1) {
-    let web_ips = "ws:/33.65.250.179:8089/websocket/" + video_id;
+    let web_ips = "ws:/33.65.219.103:8089/websocket/" + video_id;
     let ws_gzdj = new WebSocket(web_ips);
     ws_gzdj.onopen = function () {
         console.log("连接成功");

src/main/resources/static/js/jkgl/jkgl.js

@@ -1249,7 +1249,7 @@ let arr_right_s = [];
 
 //websocket连接
 let d = new Date().getTime();
-let web_ip = "ws:/33.65.250.179:8089/websocket/" + d;
+let web_ip = "ws:/33.65.219.103:8089/websocket/" + d;
 let wss = new WebSocket(web_ip);
 wss.onopen = function () {
     console.log("连接成功");
@@ -1520,7 +1520,7 @@ $('[name="status"]').bootstrapSwitch({
 
 //推送近5分钟数据
 function websocket_s(ds) {
-    let web_ips = "ws:/33.65.250.179:8089/websocket/" + ds;
+    let web_ips = "ws:/33.65.219.103:8089/websocket/" + ds;
     ws_j5fz = new WebSocket(web_ips);
     ws_j5fz.onopen = function () {
         console.log("连接成功");
@@ -1570,7 +1570,7 @@ function websocket_s(ds) {
 
 //推送自动规则
 function websocket_gzdj(video_id, items, indexs_1) {
-    let web_ips = "ws:/33.65.250.179:8089/websocket/" + video_id;
+    let web_ips = "ws:/33.65.219.103:8089/websocket/" + video_id;
     let ws_gzdj = new WebSocket(web_ips);
     ws_gzdj.onopen = function () {
         console.log("连接成功");

src/main/resources/static/js/manualscreen/sjcx.js

@@ -346,9 +346,9 @@ let vue_sjcx = new Vue({
                         vue_sjcx.data_sjlxs.push({name: '全部', id: "", type: "",});
                         let arrs = [];
                         result.data.forEach((item, index)=> {
-                            if (item.id != 'ROADWORKS' && item.id != 'ROADWORKS_OUT_OF_LINE') {
+                            //if (item.id != 'ROADWORKS' && item.id != 'ROADWORKS_OUT_OF_LINE') {
                                 arrs.push(item);
-                            }
+                            //}
                         });
                         arrs.forEach((item, index)=> {
                             if (index < 4) {
@@ -617,7 +617,7 @@ $('[data-gallery=manual]').click(function (e) {
     new PhotoViewer(items, options);
 });
 let d = new Date().getTime();
-let web_ip = "ws:/33.65.250.179:8089/websocket/" + d;
+let web_ip = "ws:/33.65.219.103:8089/websocket/" + d;
 let wss = new WebSocket(web_ip);
 wss.onopen = function () {
     console.log("连接成功");
@@ -630,10 +630,10 @@ wss.onmessage = function (evt) {
     if (data.type == "recordalarm") {
         if (data.data.type == 'TRAFFIC_INCIDENT_ALARM') {
 
-            if (data.data.incident_type == 'ROADWORKS' || data.data.incident_type == 'ROADWORKS_OUT_OF_LINE') {
-                //排除工程检测
-                return;
-            }
+            // if (data.data.incident_type == 'ROADWORKS' || data.data.incident_type == 'ROADWORKS_OUT_OF_LINE') {
+            //     //排除工程检测
+            //     return;
+            // }
             //if_cz 判断前来的事件是不是本部门下的
             let if_cz = false;
             //jk_video_id为监控id

src/main/resources/static/js/sjcx/gcjl.js

@@ -673,7 +673,7 @@ $('[data-gallery=manual]').click(function (e) {
 
 
 let d = new Date().getTime();
-let web_ip = "ws:/33.65.250.179:8089/websocket/" + d;
+let web_ip = "ws:/33.65.219.103:8089/websocket/" + d;
 let wss = new WebSocket(web_ip);
 wss.onopen = function () {
     console.log("连接成功");

src/main/resources/static/js/sjcx/sjcx.js

 let state_sj = true;
+String.prototype.endWith=function(s){
+    if(s==null||s==""||this.length==0||s.length>this.length)
+        return false;
+    if(this.substring(this.length-s.length)==s)
+        return true;
+    else
+        return false;
+    return true;
+};
+//播放声音
+function palymp3()
+{
+    let myMp3 = document.getElementById("audio");
+    myMp3.load();
+    let playPromise = myMp3.play();
+    myMp3.muted = false;
+}
+
 let vue_sjcx = new Vue({
     el: '#sjcx',
     data: {
@@ -341,9 +359,9 @@ let vue_sjcx = new Vue({
                         vue_sjcx.data_sjlxs.push({name: '全部', id: "", type: "",});
                         let arrs = [];
                         result.data.forEach((item, index)=> {
-                            if (item.id != 'ROADWORKS' && item.id != 'ROADWORKS_OUT_OF_LINE') {
+                            //if (item.id != 'ROADWORKS' && item.id != 'ROADWORKS_OUT_OF_LINE') {
                                 arrs.push(item);
-                            }
+                            //}
                         });
                         arrs.forEach((item, index)=> {
                             if (index < 4) {
@@ -682,10 +700,29 @@ $('[data-gallery=manual]').click(function (e) {
             title: '图片查看'
         });
     });
+
+    new PhotoViewer(items, options);
+});
+
+$('[data-gallery=manual2]').click(function (e) {
+
+    e.preventDefault();
+
+    var items = [],
+        options = {
+            index: $(this).index()
+        };
+
+    $('[data-gallery=manual2]').each(function () {
+            items.push({
+                src: $(this).attr('src'),
+                title: '图片查看'
+            });
+    });
     new PhotoViewer(items, options);
 });
 let d = new Date().getTime();
-let web_ip = "ws:/33.65.250.179:8089/websocket/" + d;
+let web_ip = "ws:/33.65.219.103:8089/websocket/" + d;
 let wss = new WebSocket(web_ip);
 wss.onopen = function () {
     console.log("连接成功");
@@ -696,16 +733,17 @@ wss.onmessage = function (evt) {
     var data = JSON.parse(event.data);
     // console.log(data);
     if (data.type == "alarm") {
-            if (data.data.incident_type == 'ROADWORKS' || data.data.incident_type == 'ROADWORKS_OUT_OF_LINE') {
-                //排除工程检测
-                return;
-            }
+            // if (data.data.incident_type == 'ROADWORKS' || data.data.incident_type == 'ROADWORKS_OUT_OF_LINE') {
+            //     //排除工程检测
+            //     return;
+            // }
               if (data.data.type == 'TRAFFIC_INCIDENT_ALARM') {
               if(state_sj==false){
                           if(!vue_sjcx.check_s){
                                  return;
                             }
-                            vue_sjcx.query(1, true);
+                           // vue_sjcx.query(1, true);
+                            $("#querybtn").click();
                             return;
                           }
             //if_cz 判断前来的事件是不是本部门下的
@@ -714,7 +752,12 @@ wss.onmessage = function (evt) {
             // let a_id = data.data.video_id.slice(0, data.data.video_id.length - 1) + (parseInt(data.data.video_id.slice(data.data.video_id.length - 1, data.data.video_id.length)) + 1) + '';
             
             // let jk_video_id = data.data.fdid+"_"+data.data.channelid;
+
             let jk_video_id = data.data.video_id;
+            if(jk_video_id.endWith("_0")==false)
+            {
+                jk_video_id=jk_video_id+"_0";
+            }
             vue_sjcx.jk_s.forEach((item, index)=> {
                 if(item.VIDOID == jk_video_id )
                 {
@@ -722,6 +765,7 @@ wss.onmessage = function (evt) {
                 }
             });
         if (if_cz) {
+            $("#playmq").click();
             //事件id
             let sjid = data.recordid;
             //报警时间
@@ -799,7 +843,7 @@ wss.onmessage = function (evt) {
                     $('#a1s').carousel({
                         interval: 3000,
                     });
-                    vue_sjcx.query(1, true);
+
 
                 }, 500);
 
@@ -833,7 +877,7 @@ wss.onmessage = function (evt) {
                     $('#a2s').carousel({
                         interval: 3000,
                     });
-                    vue_sjcx.query(1, true);
+                    //vue_sjcx.query(1, true);
                 }, 500);
 
             } else if (sjdj == '3') {
@@ -865,10 +909,11 @@ wss.onmessage = function (evt) {
                     $('#a3s').carousel({
                         interval: 3000,
                     });
-                    vue_sjcx.query(1, true);
+                    //vue_sjcx.query(1, true);
                 }, 500);
             }
-
+                //手动点击刷新
+            $("#querybtn").click();
 
              $("#myModal_sjcx").modal("show");
             new NoticeJs({
@@ -885,7 +930,7 @@ wss.onmessage = function (evt) {
             }).show();
             //播放声音
             let myMp3 = document.getElementById("audio");
-//            audio.play();
+            myMp3.play();
         }
         }
         }

src/main/resources/static/js/sjfx/sjfx.js

@@ -705,7 +705,7 @@ laydate.render({
     }
 });
 function websocket_s(d) {
-    let web_ip = "ws:/33.65.250.179:8089/websocket/" + d;
+    let web_ip = "ws:/33.65.219.103:8089/websocket/" + d;
     wss = new WebSocket(web_ip);
     wss.onopen = function () {
         console.log("连接成功");

src/main/resources/static/js/tsgl/sjts.js

@@ -223,11 +223,13 @@ let vue_ts = new Vue({
                         result.forEach((item, index)=> {
                             vue_ts.data_table_ts.forEach((items, indexs)=> {
                                 if (item.data == parseInt(items.recordid)) {
-                                    items.pushdesc = item.msg;
+
                                     if(item.status==200){
                                         items.pushstatus = 0;
+                                        items.pushdesc ="推送成功";
                                     }else{
                                         items.pushstatus = 1;
+                                        items.pushdesc ="推送异常";
                                     }
                                 }
                             });

src/main/resources/templates/page/sjcx.html

@@ -19,7 +19,8 @@
 </head>
 <body>
 <div id="page-sy">
-    <audio id="audio"  muted="muted"  src="../img/4083.mp3"></audio>
+    <audio id="audio"  muted  src="../img/4083.mp3"></audio>
+    <button onclick="palymp3()" id="playmq"  style="display: none;"></button>
     <div class="right-nav">
         <div class="tab-content content-sjfx">
             <div role="tabpanel" class="tab-pane active" id="sjcx">
@@ -81,7 +82,7 @@
                                 </li>
                             </ul>
                             <span style="float: left;margin-left: 18px;line-height: 48px;color: #368ff3;" v-text="gd_span"></span>
-                            <button type="button" class="btn btn-sm pub-btn" style="margin-left: 30px;" @click="getChange()">查询</button>
+                            <button type="button" class="btn btn-sm pub-btn" style="margin-left: 30px;" id="querybtn" @click="getChange()">查询</button>
                         </div>
                         <div style="height:calc(100% - 164px);margin-top: 20px;" class="tables">
                             <ul class="div-ul div-pub-gt" v-if="show">
@@ -113,6 +114,10 @@
                                             <span>车辆类型：</span>
                                             <span v-text="item.objlablename"></span>
                                         </div>
+                                        <div>
+                                            <span>是否有人下车：</span>
+                                            <span v-show="item.recordname.indexOf('交通事故')>-1 || item.recordname.indexOf('行人')>-1">是</span>
+                                        </div>
                                     </div>
                                     <div class="li-bottom">
                                         <img src="../img/sjcx/lssp.png" v-show="item.videopath==null?false:true">
@@ -305,15 +310,15 @@
                                                 <span v-text="item.ss_type==1?'正检':item.ss_type==2?'误检':item.ss_type==3?'重复事件':''"></span>
                                             </div>
                                         </div>
-                                        <div class="div_modal">
-                                            <div class="div_modal_span">
-                                                <span>是否锁定:</span>
-                                            </div>
-                                            <div class="div_modal_span1">
-                                                <input type="checkbox"  :name="'a1ss_'+index" :value="item.videoid" :checked="item.checked"
-                                                       style="width: 19px;height: 19px;" @click="cli_input(item,$event,index,2)"/>
-                                            </div>
-                                        </div>
+                                        <!--<div class="div_modal">-->
+                                            <!--<div class="div_modal_span">-->
+                                                <!--<span>是否锁定:</span>-->
+                                            <!--</div>-->
+                                            <!--<div class="div_modal_span1">-->
+                                                <!--<input type="checkbox"  :name="'a1ss_'+index" :value="item.videoid" :checked="item.checked"-->
+                                                       <!--style="width: 19px;height: 19px;" @click="cli_input(item,$event,index,2)"/>-->
+                                            <!--</div>-->
+                                        <!--</div>-->
                                     </div>
                                 </div>
                             </div>
@@ -376,15 +381,15 @@
                                                 <span v-text="item.ss_type==1?'正检':item.ss_type==2?'误检':item.ss_type==3?'重复事件':''"></span>
                                             </div>
                                         </div>
-                                        <div class="div_modal">
-                                            <div class="div_modal_span">
-                                                <span>是否锁定:</span>
-                                            </div>
-                                            <div class="div_modal_span1">
-                                                <input type="checkbox" :name="'a2ss_'+index" :value="item.videoid" :checked="item.checked"
-                                                       style="width: 19px;height: 19px;" @click="cli_input(item,$event,index,3)"/>
-                                            </div>
-                                        </div>
+                                        <!--<div class="div_modal">-->
+                                            <!--<div class="div_modal_span">-->
+                                                <!--<span>是否锁定:</span>-->
+                                            <!--</div>-->
+                                            <!--<div class="div_modal_span1">-->
+                                                <!--<input type="checkbox" :name="'a2ss_'+index" :value="item.videoid" :checked="item.checked"-->
+                                                       <!--style="width: 19px;height: 19px;" @click="cli_input(item,$event,index,3)"/>-->
+                                            <!--</div>-->
+                                        <!--</div>-->
                                     </div>
                                 </div>
                             </div>
@@ -420,6 +425,7 @@
                                ref='video' v-show="show_s" style="object-fit: fill;width: 100%;height: 100%;" :src="video_src">
                         </video >
                         <img :src="img_src_s" v-show="!show_s" style="width: 100%;height: 100%;cursor: zoom-in;" data-gallery="manual">
+
                     </div>
                     <div class="pub-div" v-show="!show_s">
                         <div class="div-img" style="width: 100%;">
@@ -481,7 +487,7 @@
                                    v-show="shows">
                             </video>
                             <img :src="src_img" v-show="!shows" style="width: 100%;height: 100%;cursor: zoom-in;"
-                                 data-gallery="manual">
+                                 data-gallery="manual2">
                         </div>
                         <div class="pub-div" v-show="!shows">
                             <div class="div-img" v-for="(item,index) in data_wfsp">