Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/scene_wisdom

css/hardware.css

@@ -5,6 +5,7 @@
   z-index: 999;
   color: #000;
   padding: 20px;
+  width: 30%;
 }
 
 .hard-header{
@@ -27,7 +28,7 @@
 
 .hard-body{
   background: #262729;
-  width: 650px;
+  width: 100%;
   padding: 20px;
 }
 
@@ -38,4 +39,8 @@
 .plugin-action{
   color: #1890ff!important;
   cursor: pointer;
+}
+
+.plugin-action img{
+  width: 24px;
 }

index.html

@@ -121,7 +121,6 @@
                         <span id="hotListText">热点列表</span>
                         <img id="hotListIcon" src="images/hotlist.png" alt="">
                     </div>
-
                 </div>
                 <div id="hotListContent">
                     <ul>

js/main_2020_show.js

@@ -26,7 +26,7 @@ $("#hotPannel .close").on('click',()=>{
 
 $("#hotPannel input.mui-switch").on('change',()=>{
     var ifOn = $('#hotPannel input.mui-switch').is(':checked');
-    console.log('切换')
+    window.changeDeviceStatus(window.hotNeedUpdatePannel)
 })
 
 
@@ -15535,6 +15535,7 @@ window.Modernizr = function(n, e, t) {
         
         hot.prototype.showPannel = function(o={}){
             var hardware = this.infoAttribute.hardware
+            console.log(window.hotNeedUpdatePannel)
             if(hardware && hardware.id!=void 0){
                 $("#hotPannel>div").css("display","block");
                 $("#hotPannel .title").text(hardware.name); 
@@ -19026,7 +19027,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.raycastToFindFloor = function() {
                 var e = [new r.Vector3(0,-1,0), new r.Vector3(1,-1,0), new r.Vector3(0,-1,1), new r.Vector3(-1,-1,0), new r.Vector3(0,-1,-1), new r.Vector3(1,0,0), new r.Vector3(0,0,1), new r.Vector3(-1,0,0), new r.Vector3(0,0,-1)];
                 return function() {
-                    I.warn("Performance warning: Raycasting to find floor index");
+                    // I.warn("Performance warning: Raycasting to find floor index");
                     for (var t = 0; t < e.length; t++) {
                         var i = new r.Raycaster(this.position.clone(),e[t].clone())
                           , n = i.intersectObjects(this.model.colliders);
@@ -51380,10 +51381,10 @@ window.Modernizr = function(n, e, t) {
                 Ge.texParameteri(e, Ge.TEXTURE_MAG_FILTER, ee(t.magFilter)),
                 Ge.texParameteri(e, Ge.TEXTURE_MIN_FILTER, ee(t.minFilter))) : (Ge.texParameteri(e, Ge.TEXTURE_WRAP_S, Ge.CLAMP_TO_EDGE),
                 Ge.texParameteri(e, Ge.TEXTURE_WRAP_T, Ge.CLAMP_TO_EDGE),
-                t.wrapS === n.ClampToEdgeWrapping && t.wrapT === n.ClampToEdgeWrapping || console.warn("THREE.WebGLRenderer: Texture is not power of two. Texture.wrapS and Texture.wrapT should be set to THREE.ClampToEdgeWrapping.", t),
+                t.wrapS === n.ClampToEdgeWrapping && t.wrapT === n.ClampToEdgeWrapping,
                 Ge.texParameteri(e, Ge.TEXTURE_MAG_FILTER, $(t.magFilter)),
                 Ge.texParameteri(e, Ge.TEXTURE_MIN_FILTER, $(t.minFilter)),
-                t.minFilter !== n.NearestFilter && t.minFilter !== n.LinearFilter && console.warn("THREE.WebGLRenderer: Texture is not power of two. Texture.minFilter should be set to THREE.NearestFilter or THREE.LinearFilter.", t)),
+                t.minFilter !== n.NearestFilter && t.minFilter !== n.LinearFilter),
                 r = We.get("EXT_texture_filter_anisotropic")) {
                     if (t.type === n.FloatType && null === We.get("OES_texture_float_linear"))
                         return;

js/selectHardware.js

@@ -1,5 +1,6 @@
 $(function () {
-  let url = `http://8.135.106.227:8004/`
+  let url = ``
+  // let url = `http://8.135.106.227:8004/`
   let gName = 'Gridtable'
   let grtable = document.querySelector("#gridtb")
   grtable.GM({
@@ -45,7 +46,7 @@ $(function () {
       return
     }
     window.editTool.hotpoint.addHardware(item[0])
-    
+    $('.jsGrid-body').hide()
     //alert(item)
     console.log(GridManager.getCheckedTr(gName));
   })

js/showHardware.js

@@ -1,11 +1,14 @@
 $(function () {
-  let url = `http://8.135.106.227:8004/`;
+  // let url = ``;
+  let url = `http://192.168.0.135:8004`;
+
   let gName = "Gridtable";
   let grtable = document.querySelector("#gridtb");
   grtable.GM({
     gridManagerName: gName,
-    height: "400px",
+    height: "300px",
     ajaxData: function (setting) {
+      console.log(setting.pageData,setting.sortData);
       // 传入分页及排序的配置项
       return getList(Object.assign({}, setting.pageData, setting.sortData));
     },
@@ -13,6 +16,7 @@ $(function () {
     supportCheckbox: false,
     supportAjaxPage: true,
     useNoTotalsMode: true,
+    pageSize:10,
     columnData: [
       {
         key: "code",
@@ -68,18 +72,27 @@ $(function () {
   let getList = function (params) {
     return new Promise((resolve, reject) => {
       $.ajax({
-        method: "GET",
+        method: "POST",
+        data : JSON.stringify({
+          "devTypeId": "",
+          "name": "",
+          "pageNum": params.cPage,
+          "pageSize": params.pSize,
+          "searchKey": "",
+          "userId": ""
+        }),
         headers: {
           "Content-Type": "application/json",
         },
         dataType: "json",
         contentType: "application/json",
-        url: url + "/api/device/list",
+        url: url + "/api/device/listPage",
+
         success: function (data) {
-          if (data.code === 0) {
+          if (data.code == 0) {
             resolve({
-              ...data,
-              totals: data.data.length,
+              data:data.data.records,
+              totals: data.data.total,
             });
           } else {
             reject(data);
@@ -88,4 +101,28 @@ $(function () {
       });
     });
   };
+
+  window.changeDeviceStatus = function (item) {
+    console.log(item);
+    let tmp = item.infoAttribute.hardware
+    $.ajax({
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      dataType: "json",
+      contentType: "application/json",
+      url: url + `/api/device/control/${tmp.id}/${tmp.deviceCode}/${paramValue}/03`,
+      success: function (data) {
+        if (data.code === 0) {
+          resolve({
+            ...data,
+            totals: data.data.length,
+          });
+        } else {
+          reject(data);
+        }
+      },
+    });
+  }
 });