tremble 4 år sedan
förälder
incheckning
56ecd8d4d1
5 ändrade filer med 40 tillägg och 7 borttagningar
  1. 6 1
      css/hardware.css
  2. 0 1
      index.html
  3. 4 2
      js/main_2020_show.js
  4. 2 1
      js/selectHardware.js
  5. 28 2
      js/showHardware.js

+ 6 - 1
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;
 }

+ 0 - 1
index.html

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

+ 4 - 2
js/main_2020_show.js

@@ -26,7 +26,8 @@ $("#hotPannel .close").on('click',()=>{
 
 $("#hotPannel input.mui-switch").on('change',()=>{
     var ifOn = $('#hotPannel input.mui-switch').is(':checked');
-    console.log('切换')
+    window.changeDeviceStatus(window.hotNeedUpdatePannel)
+    console.log('切换',window.hotNeedUpdatePannel)
 })
 
 
@@ -15535,6 +15536,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 +19028,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);

+ 2 - 1
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({

+ 28 - 2
js/showHardware.js

@@ -1,10 +1,12 @@
 $(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({
     gridManagerName: gName,
-    height: "400px",
+    height: "300px",
     ajaxData: function (setting) {
       // 传入分页及排序的配置项
       return getList(Object.assign({}, setting.pageData, setting.sortData));
@@ -88,4 +90,28 @@ $(function () {
       });
     });
   };
+
+  window.changeDeviceStatus = function (item) {
+    console.log(item);
+    // $.ajax({
+      
+    //   method: "GET",
+    //   headers: {
+    //     "Content-Type": "application/json",
+    //   },
+    //   dataType: "json",
+    //   contentType: "application/json",
+    //   url: url + "/api/device/list",
+    //   success: function (data) {
+    //     if (data.code === 0) {
+    //       resolve({
+    //         ...data,
+    //         totals: data.data.length,
+    //       });
+    //     } else {
+    //       reject(data);
+    //     }
+    //   },
+    // });
+  }
 });