123

static/css/dist/gczljc.css

@@ -707,7 +707,9 @@
 }
 
 .popup-info .list-item .item {
+  padding: 0 .1rem;
   text-align: center;
+  word-wrap: break-word;
 }
 
 .popup-info .list-item .zzitem1 {
@@ -792,7 +794,7 @@
 }
 
 .popup-info .list-item .list-main .item {
-  padding: .23rem 0;
+  padding: .23rem .1rem;
 }
 
 .popup-info .list-item .list-main .item img {

static/css/scss/gczljc.scss

@@ -536,7 +536,9 @@
             @include V-center;
         }
         .item{
+            padding: 0 .1rem;
             text-align: center;
+            word-wrap: break-word;
         }
         .zzitem1{
             width: 22%;
@@ -602,7 +604,7 @@
         }
         .list-main{
             .item{
-                padding: .23rem 0;
+                padding: .23rem .1rem;
                 img{
                     width: .33rem;
                     width: .44rem;

static/js/gczljc.js

@@ -89,7 +89,7 @@ new Vue({
         GetSessionInfo(){
             let _this = this;
             let data = {
-                token: "4379D796-62EF-4CA7-8A46-B2509F18BAC0"
+                token: "ADA90463-7ABE-4564-83A6-B6BB278975D0"
             }
             $.ajax({
                 url: baseurl + "screen/GetSessionInfo",

static/js/gjjc.js

@@ -47,7 +47,7 @@ var taskList = {
                 str += `
                     <div class="info-item">
                         <div id="rwInfo-${i}-${j}">
-                            <div class="item-head" onclick="listClick('rwInfo-${i}-${j}')" data-mapx="${item2.mapx}" data-mapy="${item2.mapy}" data-index="${i}">
+                            <div class="item-head" onclick="listClick('rwInfo-${i}-${j}')" data-mapx="${item2.mapx}" data-mapy="${item2.mapy}" data-index="${i}" data-index2="${j}">
                                 <div class="flex-item">
                                     <div class="icon ${item2.abnormal_count > 0 ? 'showTip' : ''}"><img src="../static/images/icon_rwd.png"/></div>
                                     任务单：${item2.task_no}
@@ -240,9 +240,14 @@ var map = {
                 }
                 var index = Number($(this).attr('data-index'));
                 var item = taskList.data[index];
+                var index2 = Number($(this).attr('data-index2'));
+                var item2 = taskList.data[index].task_list[index2];
                 if (mapx && mapy) {
                     map.setZoomAndCenter(12, [Number(mapx), Number(mapy)]);
-                    infoWindow.setContent(`<p class="info-item" onclick="detail.getData('${item.project_id}')">${item.project_name}</p>`);
+                    infoWindow.setContent(`<div class="info-item">
+                        <p onclick="detail.getData('${item.project_id}')" style="padding: 0.2rem .5rem .2rem .3rem">${item.project_name}</p>
+                        <p class='btn' onclick="getBottomData.showPopup('${item.project_id}','${item2.SceneTask_id}','${item2.customer_id}','${item2.task_id}','${item2.order_id}')">异常录入</p>
+                    </div>`);
                     infoWindow.open(map, { Q: Number(mapy), R: Number(mapx), lat: Number(mapy), lng: Number(mapx) });
                 }
             })

static/js/htjc.js

@@ -47,7 +47,7 @@ var taskList = {
                 str += `
                     <div class="info-item">
                         <div id="rwInfo-${i}-${j}">
-                            <div class="item-head" onclick="listClick('rwInfo-${i}-${j}')" data-mapx="${item2.mapx}" data-mapy="${item2.mapy}" data-index="${i}">
+                            <div class="item-head" onclick="listClick('rwInfo-${i}-${j}')" data-mapx="${item2.mapx}" data-mapy="${item2.mapy}" data-index="${i}" data-index2="${j}">
                                 <div class="flex-item">
                                     <div class="icon ${item2.abnormal_count > 0 ? 'showTip' : ''}"><img src="../static/images/icon_rwd.png"/></div>
                                     任务单：${item2.task_no}
@@ -248,9 +248,14 @@ var map = {
                 }
                 var index = Number($(this).attr('data-index'));
                 var item = taskList.data[index];
+                var index2 = Number($(this).attr('data-index2'));
+                var item2 = taskList.data[index].task_list[index2];
                 if (mapx && mapy) {
                     map.setZoomAndCenter(12, [Number(mapx), Number(mapy)]);
-                    infoWindow.setContent(`<p class="info-item" onclick="detail.getData('${item.project_id}')">${item.project_name}</p>`);
+                    infoWindow.setContent(`<div class="info-item">
+                        <p onclick="detail.getData('${item.project_id}')" style="padding: 0.2rem .5rem .2rem .3rem">${item.project_name}</p>
+                        <p class='btn' onclick="getBottomData.showPopup('${item.project_id}','${item2.SceneTask_id}','${item2.customer_id}','${item2.task_id}','${item2.order_id}')">异常录入</p>
+                    </div>`);
                     infoWindow.open(map, { Q: Number(mapy), R: Number(mapx), lat: Number(mapy), lng: Number(mapx) });
                 }
             })

static/js/util.js

-const baseurl = 'http://192.168.0.198:5000/api/';
-const api_key = 16859729202501;
-const api_secret = "5B18352190E64BB3B1BC24CAE62DE700";
+const baseurl = 'http://jtjcapi.vnet1000.net/api/';
+const api_key = 16859729295369;
+const api_secret = "C7DEA02B195942EAA973A6FBF4151741";
 var station_id = '';
 var access_token = '';
 window._AMapSecurityConfig = {