0520

css/lzb.css

@@ -8,6 +8,9 @@ body {
     background: rgba(38, 39, 41, 1);
 }
 
+.hideAndDisplay{
+    display: none!important;
+}
 .wrapper {
     width: 100%;
     height: 100%;

edit.html

@@ -75,10 +75,10 @@
                         <span class="hotpoint"></span>
                         <label>热点编辑</label>
                     </li>
-                    <li data-name="music">
+                    <!-- <li data-name="music">
                         <span class="music"></span>
                         <label>背景音乐</label>
-                    </li>
+                    </li> -->
                     <!-- <li data-name="snapTour">
                         <span class="snapTour"></span>
                         <label>自动导览</label>
@@ -87,10 +87,10 @@
                         <span class="VREditIcon VR"></span>
                         <label>VR</label>
                     </li>
-                    <li data-name="overlay">
+                    <!-- <li data-name="overlay">
                         <span class="overlay"></span>
                         <label>展览</label>
-                    </li>
+                    </li> -->
                     <li data-name="panoVisible">
                         <span class="panoVisible"></span>
                         <label>漫游可行</label>
@@ -113,7 +113,7 @@
                             </div>
                             <img src="./images/phone_step_01.png" alt="">
                         </div>
-                        <div class="gr-sc">
+                        <!-- <div class="gr-sc">
                             <ul class="clearfix hotStyle-item colorWrap">
                                 <select class="cad-size">
                                     <option value="0.01" hidden>请选择硬件类型</option>
@@ -129,7 +129,7 @@
                                     <option value="0.06">6px</option>
                                 </select>
                             </ul>
-                        </div>
+                        </div> -->
                         <table id="gridtb"></table>
                         <div class="buttons">
                             <button id="gcancel" class="innerBtn cancel">取消</button>
@@ -1050,7 +1050,7 @@
                                         </ul>
                                     </div>
                                 </li>
-                                <li class="photo">
+                                <li class="photo hideAndDisplay">
                                     <div class="itemTitle" data-size="<9M">
                                         <span>图片</span>
                                     </div>
@@ -1066,7 +1066,7 @@
                                         <a class="del"></a>
                                     </div>
                                 </li>
-                                <li class="video">
+                                <li class="video hideAndDisplay">
                                     <div class="itemTitle" data-size="MP4">
                                         <span>视频</span>
                                     </div>
@@ -1082,7 +1082,7 @@
                                         <a class="del"></a>
                                     </div>
                                 </li>
-                                <li class="audio mediaUpload">
+                                <li class="audio mediaUpload hideAndDisplay">
                                     <div class="itemTitle">
                                         <span>添加音频</span>
                                         <div class="buttons">
@@ -1098,7 +1098,7 @@
                                         </div>
                                     </div>
                                 </li>
-                                <li class="model mediaUpload">
+                                <li class="model mediaUpload hideAndDisplay">
                                     <div class="itemTitle">
                                         <span>添加模型</span>
                                     </div>
@@ -1110,7 +1110,7 @@
                                         </div>
                                     </div>
                                 </li>
-                                <li class="webPage mediaUpload">
+                                <li class="webPage mediaUpload hideAndDisplay">
                                     <div class="itemTitle">
                                         <span>添加网页</span>
                                     </div>
@@ -1138,7 +1138,7 @@
                                         </div>
                                     </div>
                                 </li>
-                                <li class="">
+                                <li class="hideAndDisplay">
                                     <div class="itemTitle">
                                         <span>其他</span>
                                     </div>
@@ -1388,7 +1388,7 @@
 
                 <div class="music content hide">
                     <ul>
-                        <li class="audio mediaUpload">
+                        <li class="audio mediaUpload" >
                             <div class="itemTitle">
                                 <span>背景音乐</span>
                                 <div class="buttons">

js/edit.js

@@ -8,8 +8,8 @@ var token = window.localStorage.token
 
 
  */
-
- var ceshi = 'http://8.135.106.227:8004';
+var ceshi = '';
+//  var ceshi = 'http://8.135.106.227:8004';
 
 
 var _musicMaxWeight = 8
@@ -693,7 +693,7 @@ Hotpoint.prototype.editHot = function(target) {
     initStyle(player.model.hots[li_id])
 
     $("#isSprite")[0].checked = this.editSpot.isSprite
-    $("#noAction")[0].checked = this.editSpot.noAction
+    // $("#noAction")[0].checked = this.editSpot.noAction
     $(".webPage .MenuOptions li").removeClass("chosen")
     $(".webPage .MenuOptions li[index = " + this.editSpot.linkType+"]").addClass("chosen")
       

js/main_2020_show.js

@@ -95,7 +95,7 @@ getAjax(g_Prefix+`/api/device/getType`, null, (data)=>{
 
 
 window.getDeviceInfo = function(deviceId, callback){
-    var userId = '77547f7af360c5d8e14932866b844d53' 
+    var userId = getQueryVal('userId')
     var url = `/api/device/list/${userId}` + (deviceId ? `?deviceId=${deviceId}` : '')
     
     getAjax(url, null, (data)=>{

js/manage.js

@@ -412,6 +412,16 @@ function hotMatcher(data){
 }
 
 
+function getQueryVal(variable) {
+    var query = window.location.search.substring(1);
+    var vars = query.split("&");
+    for (var i=0;i<vars.length;i++) {
+            var pair = vars[i].split("=");
+            if(pair[0] == variable){return pair[1];}
+    }
+    return(false);
+};
+
 
 
 //兼容一代的場景

js/myShow.js

@@ -4,9 +4,9 @@ var g_ProjectName=window.location.pathname.substring(window.location.pathname.in
   
   // var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-//var g_Prefix=window.location.origin+'/';
+var g_Prefix=window.location.origin+'/';
 
-var g_Prefix= "http://8.135.106.227:8004/"
+// var g_Prefix= "http://8.135.106.227:8004/"
 
 var s = window.location.href.split('/');
 s.pop();

js/selectHardware.js

@@ -1,7 +1,9 @@
 $(function () {
    var curPageData;
   let url = ``
-  // let url = `http://8.135.106.227:8004/`
+  let userId = getQueryVal('userId')
+
+  // let url = `http://8.135.106.227:8004`
   let gName = 'Gridtable'
   let grtable = document.querySelector("#gridtb")
   grtable.GM({
@@ -9,7 +11,7 @@ $(function () {
     height: '400px',
     ajaxData: function (setting) {
       // 传入分页及排序的配置项
-      return getList(Object.assign({}, setting.pageData, setting.sortData));
+      return getList(Object.assign({}, setting.pageData, setting.sortData,setting.query));
     },
     ajaxType: "POST",
     checkboxConfig: {
@@ -59,12 +61,10 @@ $(function () {
   })
 
   //搜索事件
-  $('.gr-header > .search').click(function () {
+  $('.gr-header > .search >img').click(function () {
+    console.log($("#hinput").val());
     var _query = {
-      title: document.querySelector('[name="title"]').value,
-      type: document.querySelector('[name="type"]').value,
-      content: document.querySelector('[name="content"]').value,
-      cPage: 1
+      searchKey: $("#hinput").val()
     };
     grtable.GM('setQuery', _query, function(){
       console.log('setQuery执行成功');
@@ -87,16 +87,17 @@ $(function () {
   })
 
   let getList = function (params) {
+    console.log(params);
     return new Promise((resolve, reject) => {
       $.ajax({
         method: "POST",
         data : JSON.stringify({
           "devTypeId": "",
-          "name": "",
+          "name": params.searchKey||'',
           "pageNum": params.cPage,
           "pageSize": params.pSize,
-          "searchKey": "",
-          "userId": "77547f7af360c5d8e14932866b844d53"
+          "searchKey": '',
+          "userId": userId
         }),
         headers: {
           "Content-Type": "application/json",

js/showHardware.js

@@ -2,6 +2,7 @@ $(function () {
   let url = ``;
   // let url = `http://192.168.0.135:8004`;
 
+  let userId = getQueryVal('userId')
   let gName = "Gridtable";
   let grtable = document.querySelector("#gridtb");
   grtable.GM({
@@ -96,7 +97,7 @@ $(function () {
           "pageNum": params.cPage,
           "pageSize": params.pSize,
           "searchKey": "",
-          "userId": "77547f7af360c5d8e14932866b844d53"
+          "userId": userId
         }),
         headers: {
           "Content-Type": "application/json",