Почетна Преглед Помоћ
Регистрација Пријавите се
chenzhiguang
/
pano_museum
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

upload0413

tremble пре 3 година
родитељ
4c4497ac81
комит
231086e642
23 измењених фајлова са 101 додато и 70 уклоњено
Један поглед Покажи статистику Diff
  1. 2 2
      .env
  2. 1 1
      public/edit.html
  3. BIN
      public/favicon.ico
  4. BIN
      public/favicon.png
  5. 1 1
      public/material.html
  6. 1 1
      public/show.html
  7. 1 1
      public/showMobile.html
  8. 1 1
      public/vr.html
  9. 1 1
      src/assets/style/component.less
  10. 1 1
      src/components/preview/index.vue
  11. 1 1
      src/components/select.vue
  12. 1 1
      src/components/tableSelect.vue
  13. 25 2
      src/framework/Toolbar.vue
  14. 4 20
      src/framework/show/index.vue
  15. 1 8
      src/framework/show/list.vue
  16. 6 0
      src/mixins/index.js
  17. 3 4
      src/router/index.js
  18. 26 15
      src/views/base/EditPanel/index.vue
  19. 7 5
      src/views/base/Toolbar.vue
  20. 14 1
      src/views/hotspot/Setting.vue
  21. 3 3
      src/views/information/Toolbar.vue
  22. 1 0
      src/views/information/index.vue
  23. 0 1
      src/views/material/login/index.vue

+ 2 - 2
.env
Прегледај датотеку 

@@ -1,6 +1,6 @@
 
 VUE_APP_MAIN_COLOR=''
 
 VUE_APP_MAIN_COLOR=''
 
 VUE_APP_STATIC_DIR=static
 
 VUE_APP_STATIC_DIR=static
 
 VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
 
 VUE_APP_INNERNET=https://fcb.intranet.4dkankan.com
 
-VUE_APP_CDN=''
 
-VUE_APP_PROXY_URL=''
 
+VUE_APP_CDN=http://192.168.0.245:8007
 
+VUE_APP_PROXY_URL='http://192.168.0.245:8007/'
 
 VUE_APP_URL_FILL=''
 
 VUE_APP_URL_FILL=''

+ 1 - 1
public/edit.html
Прегледај датотеку 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <link rel="icon" href="./favicon.ico" />
 
+    <link rel="icon" href="./favicon.png" />
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfont/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfont/iconfont.css"/>
 
     <!-- <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ1.1.0/iconfont.css"/> -->
 
     <!-- <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ1.1.0/iconfont.css"/> -->
 
     <!-- <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontVR/iconfont.css"/> -->
 
     <!-- <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontVR/iconfont.css"/> -->

BIN
public/favicon.ico
Прегледај датотеку


BIN
public/favicon.png
Прегледај датотеку


+ 1 - 1
public/material.html
Прегледај датотеку 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <link rel="icon" href="./favicon.ico" />
 
+    <link rel="icon" href="./favicon.png" />
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfont/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfont/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ1.1.0/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ1.1.0/iconfont.css"/>
 
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2947721_fdnuf7rzr.css"/>
 
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2947721_fdnuf7rzr.css"/>

+ 1 - 1
public/show.html
Прегледај датотеку 

@@ -7,7 +7,7 @@
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
 
-    <link rel="icon" href="./favicon.ico" />
 
+    <link rel="icon" href="./favicon.png" />
 
     <title>VR作品</title>
 
     <title>VR作品</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>

+ 1 - 1
public/showMobile.html
Прегледај датотеку 

@@ -8,7 +8,7 @@
 
     <meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 
     <meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ/iconfont.css"/>
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/animate/animate.min.css" />
 
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/animate/animate.min.css" />
 
-    <link rel="icon" href="./favicon.ico" />
 
+    <link rel="icon" href="./favicon.png" />
 
     <!-- <style>
 
     <!-- <style>
 
       #consoleLog{ 
       #consoleLog{ 
         width: 120px;
 
         width: 120px;

+ 1 - 1
public/vr.html
Прегледај датотеку 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <link rel="icon" href="./favicon.ico" />
 
+    <link rel="icon" href="./favicon.png" />
 
     <title>VR作品</title>
 
     <title>VR作品</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>

+ 1 - 1
src/assets/style/component.less
Прегледај датотеку 

@@ -277,7 +277,7 @@ textarea:-ms-input-placeholder {
 
     
     
     .active {
 
     .active {
 
       color: rgba(255, 255, 255, 0.88);
 
       color: rgba(255, 255, 255, 0.88);
 
-      background: rgba(255, 255, 255, 0.16);
 
+      background: rgba(255, 255, 255, 0.4);
 
 
 
     }
 
     }
 
   }
 
   }

+ 1 - 1
src/components/preview/index.vue
Прегледај датотеку 

@@ -2,7 +2,7 @@
 
     <popup v-if="show" :zIdx="'1100'">
 
     <popup v-if="show" :zIdx="'1100'">
 
       <div class="ui-message ui-message-confirm">
 
       <div class="ui-message ui-message-confirm">
 
         <div class="ui-message-header">
 
         <div class="ui-message-header">
 
-          <span>全景作品预览</span>
 
+          <span>场景预览</span>
 
           <span @click="$emit('close')">
 
           <span @click="$emit('close')">
 
             <i class="iconfont iconedit_close"></i>
 
             <i class="iconfont iconedit_close"></i>
 
           </span>
 
           </span>

+ 1 - 1
src/components/select.vue
Прегледај датотеку 

@@ -44,7 +44,7 @@
 
                   <img :key="i" :src="`${item.icon}?rnd=${Math.random()}`" alt="" />
 
                   <img :key="i" :src="`${item.icon}?rnd=${Math.random()}`" alt="" />
 
                 </div>
 
                 </div>
 
                 <div class="ui-title">
 
                 <div class="ui-title">
 
-                  <span>{{
 
+                  <span :title="item.sceneTitle">{{
 
                    item.sceneTitle
 
                    item.sceneTitle
 
                   }}</span>
 
                   }}</span>
 
                 </div>
 
                 </div>

+ 1 - 1
src/components/tableSelect.vue
Прегледај датотеку 

@@ -41,7 +41,7 @@
 
           </td>
 
           </td>
 
           <td v-for="(sub,idx) in tabHeaders" :key="idx">
 
           <td v-for="(sub,idx) in tabHeaders" :key="idx">
 
             <div v-if="sub.type=='image'" class="list-img">
 
             <div v-if="sub.type=='image'" class="list-img">
 
-              <img :src="$cdn + '/' + item.sceneCode + item[sub.key]" alt="">
 
+              <img :src="$cdn + '/pano/' + item.sceneCode + item[sub.key]" alt="">
 
             </div>
 
             </div>
 
             <div class="audio" v-else-if="sub.type=='audio'" >
 
             <div class="audio" v-else-if="sub.type=='audio'" >
 
               <v-audio :vkey="item.id" :idleft="`_${$randomWord(true,8,8)}`" :idright="`_${$randomWord(true,8,8)}`" :myAudioUrl="item[sub.key]"></v-audio>
 
               <v-audio :vkey="item.id" :idleft="`_${$randomWord(true,8,8)}`" :idright="`_${$randomWord(true,8,8)}`" :myAudioUrl="item[sub.key]"></v-audio>

+ 25 - 2
src/framework/Toolbar.vue
Прегледај датотеку 

@@ -25,11 +25,14 @@
 
                 :class="{ iconedit_type_panorama: item.type !== 'house' }"
 
                 :class="{ iconedit_type_panorama: item.type !== 'house' }"
 
               ></i>
 
               ></i>
 
             </div>
 
             </div>
 
+
 
+            <i v-if="item.musicInfo.music.url" class="iconfont iconmaterial_music"></i>
 
+
 
             <div class="img">
 
             <div class="img">
 
-              <img v-if="item.icon" :src="item.icon+`?${Math.random()}`" alt="" />
 
+              <img v-if="item.icon" :src="$cdn+item.icon+`?${Math.random()}`" alt="" />
 
             </div>
 
             </div>
 
             <div class="ui-title">
 
             <div class="ui-title">
 
-              <span>{{ item.sceneTitle }}</span>
 
+              <span :title="item.sceneTitle">{{ item.sceneTitle }}</span>
 
             </div>
 
             </div>
 
           </li>
 
           </li>
 
         </ul>
 
         </ul>
 
@@ -206,6 +209,26 @@ export default {
 
           &:first-of-type {
 
           &:first-of-type {
 
             margin-left: 0;
 
             margin-left: 0;
 
           }
 
           }
 
+          .iconmaterial_music{
 
+            position: absolute;
 
+            bottom: 10px;
 
+            right: 10px;
 
+            z-index: 9999;
 
+            font-size: 16px;
 
+            &::after{
 
+              background: rgba(0,0,0,0.6);
 
+              content: "";
 
+              width: 18px;
 
+              height: 18px;
 
+              display: inline-block;
 
+              position: absolute;
 
+              top: 50%;
 
+              left: 50%;
 
+              transform: translate(-50%,-50%);
 
+              z-index: -1;
 
+              filter: blur(4px);
 
+            }
 
+          }
 
         }
 
         }
 
       }
 
       }
 
     }
 
     }

+ 4 - 20
src/framework/show/index.vue
Прегледај датотеку 

@@ -1,14 +1,7 @@
 
 <template>
 
 <template>
 
   <div class="panocon">
 
   <div class="panocon">
 
     <template v-if="showInfo">
 
     <template v-if="showInfo">
 
-      <iframe allowfullscreen="true" v-if="activeItem.type=='4dkk'" 
-      :src="`local/4dkk/${activeItem.sceneCode}/wwwroot/spc.html?m=${activeItem.sceneCode}`" frameborder="0"></iframe>
 
-      <div v-show="activeItem.type!='4dkk'" id="pano"></div>
 
-
 
-      <div class="pano-logo" v-if="showInfo.isLogo&&activeItem.type!='4dkk'">
 
-        <img :src="showInfo.logo||require('@/assets/images/default/img_logoshow@2x.png')" alt="" />
 
-      </div>
 
-
 
+      <div id="pano"></div>
 
 
 
       <div
 
       <div
 
         class="oper-tips"
 
         class="oper-tips"
 
@@ -43,7 +36,7 @@
 
         @close="showPreview = false"
 
         @close="showPreview = false"
 
       />
 
       />
 
 
 
-      <ul class="aside" v-if="activeItem.type!='4dkk'">
 
+      <ul class="aside" >
 
         <li v-for="(item, i) in aside" :key="i">
 
         <li v-for="(item, i) in aside" :key="i">
 
           <span @click="handleItem(item)">
 
           <span @click="handleItem(item)">
 
             <i class="iconfont" :class="item.icon"></i>
 
             <i class="iconfont" :class="item.icon"></i>
 
@@ -315,11 +308,7 @@ export default {
 
             this.localRemind = true;
 
             this.localRemind = true;
 
             localStorage.setItem(locoR, 0);
 
             localStorage.setItem(locoR, 0);
 
           }
 
           }
 
-          if (this.showInfo.firstScene) {
 
-            if (this.showInfo.firstScene.type == '4dkk') {
 
-              this.localRemind = false;
 
-            }
 
-          }
 
+         
           newVal.password ? (this.showPassword = true) : this.startLoad();
 
           newVal.password ? (this.showPassword = true) : this.startLoad();
 
         }
 
         }
 
       },
 
       },
 
@@ -349,17 +338,12 @@ export default {
 
           "events[skin_events].onloadcomplete": "js(window.vrInitFn());",
 
           "events[skin_events].onloadcomplete": "js(window.vrInitFn());",
 
         };
 
         };
 
         if (newVal) {
 
         if (newVal) {
 
-          if (newVal.type=='4dkk') {
 
-              removepano("#pano");
 
-              $("#pano").empty();
 
-              return
 
-          }
 
           removepano("#pano");
 
           removepano("#pano");
 
           $smallWaiting.show()
 
           $smallWaiting.show()
 
 
 
           embedpano({
 
           embedpano({
 
             // xml: "%HTMLPATH%/static/template/tour.xml",
 
             // xml: "%HTMLPATH%/static/template/tour.xml",
 
-            xml: `${this.$cdn}/${newVal.sceneCode}/vtour/tour.xml`,
 
+            xml: `${this.$cdn}/pano/${newVal.sceneCode}/vtour/tour.xml`,
 
             swf: "%HTMLPATH%/static/template/tour.swf",
 
             swf: "%HTMLPATH%/static/template/tour.swf",
 
             target: "pano",
 
             target: "pano",
 
             html5: "auto",
 
             html5: "auto",

+ 1 - 8
src/framework/show/list.vue
Прегледај датотеку 

@@ -109,14 +109,7 @@ export default {
 
 
 
   methods: {
 
   methods: {
 
     handleImg(item){
 
     handleImg(item){
 
-      let url = ''
 
-      if (item.type == "4dkk") {
 
-        url = `local/4dkk/${item.sceneCode}/wwwroot/images/images${item.sceneCode}/thumbSmallImg.jpg`
 
-      }
 
-      else{
 
-        url = item.icon.replace('https://4dkk.4dage.com/720yun_fd_manage/image/',`local/pano/images/`)
 
-      }
 
-      return url || item.icon
 
+      return item.icon
 
     },
 
     },

+ 6 - 0
src/mixins/index.js
Прегледај датотеку 

@@ -121,16 +121,22 @@ let g_typeObj = {
 
   pcIcon: {
 
   pcIcon: {
 
     acceptType:"image/png,image/jpeg",
 
     acceptType:"image/png,image/jpeg",
 
     mediaType:"image",
 
     mediaType:"image",
 
+    checkSuffix:['jpeg','jpg','png'],
 
+    errMsg:`请上传1MB以内、jpg/png格式的图片`,
 
     limit:1
 
     limit:1
 
   },
 
   },
 
   appIcon:{
 
   appIcon:{
 
     acceptType:"image/png,image/jpeg",
 
     acceptType:"image/png,image/jpeg",
 
     mediaType:"image",
 
     mediaType:"image",
 
+    checkSuffix:['jpeg','jpg','png'],
 
+    errMsg:`请上传1MB以内、jpg/png格式的图片`,
 
     limit:1
 
     limit:1
 
   },
 
   },
 
   bgm:{
 
   bgm:{
 
     acceptType:"audio/mp3",
 
     acceptType:"audio/mp3",
 
     mediaType:"audio",
 
     mediaType:"audio",
 
+    checkSuffix:['audio'],
 
+    errMsg:`请上传20MB以内、mp3格式的音频`,
 
     limit:20
 
     limit:20
 
   },
 
   },
 
   image:{
 
   image:{

+ 3 - 4
src/router/index.js
Прегледај датотеку 

@@ -52,10 +52,9 @@ checkWork().then(res=>{
 
       }
 
       }
 
     });
 
     });
 
   } 
   } 
-  else{
 
-    return vue.$alert({content: '该作品已被删除'});
 
-  }
 
-  
+  // else{
 
+  //   return vue.$alert({content: '该作品已被删除'});
 
+  // }
 
 })
 
 })
 
 
 
 getPanoInfo().then(() => {
 
 getPanoInfo().then(() => {

+ 26 - 15
src/views/base/EditPanel/index.vue
Прегледај датотеку 

@@ -31,7 +31,6 @@ import Upload from "@/components/shared/uploads/Upload";
 
 
 
 import { uploadFileByWork } from "@/api";
 
 import { uploadFileByWork } from "@/api";
 
 
 
-
 
 export default {
 
 export default {
 
   props: ["show", "data", "editTitle"],
 
   props: ["show", "data", "editTitle"],
 
   components: {
 
   components: {
 
@@ -40,8 +39,8 @@ export default {
 
   data() {
 
   data() {
 
     return {
 
     return {
 
       param: "pcIcon",
 
       param: "pcIcon",
 
-      changeArr:[],
 
-      tempTaskList:{}
 
+      changeArr: [],
 
+      tempTaskList: {},
 
     };
 
     };
 
   },
 
   },
 
   computed: {
 
   computed: {
 
@@ -61,14 +60,26 @@ export default {
 
 
 
   methods: {
 
   methods: {
 
     onFileChange(file) {
 
     onFileChange(file) {
 
+      let flag = this.typeObj.checkSuffix.some((iii) => {
 
+        return file.type.indexOf(iii) > -1;
 
+      });
 
+
 
+      if (!flag) {
 
+        this.$msg({
 
+          message: `“${file.name}”格式错误，${this.typeObj.errMsg}`,
 
+          type: "warning",
 
+        });
 
+        return;
 
+      }
 
+
 
       this.info[this.param] = URL.createObjectURL(file);
 
       this.info[this.param] = URL.createObjectURL(file);
 
-      if (this.param == 'bgm') {
 
+      if (this.param == "bgm") {
 
         this.info[this.param] = {
 
         this.info[this.param] = {
 
           url: URL.createObjectURL(file),
 
           url: URL.createObjectURL(file),
 
-          name: file.name
 
+          name: file.name,
 
         };
 
         };
 
       }
 
       }
 
-      let p = new Promise(relove => {
 
+      let p = new Promise((relove) => {
 
         let fn = () => {
 
         let fn = () => {
 
           let pp = new Promise((rel) => {
 
           let pp = new Promise((rel) => {
 
             uploadFileByWork(
 
             uploadFileByWork(
 
@@ -77,13 +88,13 @@ export default {
 
                 file: file,
 
                 file: file,
 
               },
 
               },
 
               (data) => {
 
               (data) => {
 
-                if (this.param == 'bgm') {
 
+                if (this.param == "bgm") {
 
                   this.info[this.param].url = this.$cdn + data.data.filePath + `?_=${Math.random()}`;
 
                   this.info[this.param].url = this.$cdn + data.data.filePath + `?_=${Math.random()}`;
 
-                } else{
 
+                } else {
 
                   this.info[this.param] = this.$cdn + data.data.filePath + `?_=${Math.random()}`;
 
                   this.info[this.param] = this.$cdn + data.data.filePath + `?_=${Math.random()}`;
 
                 }
 
                 }
 
                 this.$store.commit("SetInfo", this.info);
 
                 this.$store.commit("SetInfo", this.info);
 
-                
+
 
                 rel();
 
                 rel();
 
               }
 
               }
 
             );
 
             );
 
@@ -102,16 +113,16 @@ export default {
 
       });
 
       });
 
     },
 
     },
 
     cancel() {
 
     cancel() {
 
-      this.tempTaskList = {}
 
+      this.tempTaskList = {};
 
       this.$store.commit("SetInfo", this.backupInfo);
 
       this.$store.commit("SetInfo", this.backupInfo);
 
       this.$emit("close");
 
       this.$emit("close");
 
     },
 
     },
 
     save() {
 
     save() {
 
-      if (this.param == 'bgm') {
 
-        this.uploadTaskList['bgm'] = this.tempTaskList['bgm']
 
-      } else{
 
-        this.uploadTaskList['pcIcon'] = this.tempTaskList['pcIcon']
 
-        this.uploadTaskList['appIcon'] = this.tempTaskList['appIcon']
 
+      if (this.param == "bgm") {
 
+        this.uploadTaskList["bgm"] = this.tempTaskList["bgm"];
 
+      } else {
 
+        this.uploadTaskList["pcIcon"] = this.tempTaskList["pcIcon"];
 
+        this.uploadTaskList["appIcon"] = this.tempTaskList["appIcon"];
 
       }
 
       }
 
       this.$store.commit("SetInfo", this.info);
 
       this.$store.commit("SetInfo", this.info);
 
       this.$emit("close");
 
       this.$emit("close");

+ 7 - 5
src/views/base/Toolbar.vue
Прегледај датотеку 

@@ -9,7 +9,7 @@
 
           </div>
 
           </div>
 
           <div :class="{ 'ui-warning': false }">
 
           <div :class="{ 'ui-warning': false }">
 
             <input
 
             <input
 
-              v-model="info.name"
 
+              v-model.trim="info.name"
 
               @blur="$store.commit('SetInfo',info)"
 
               @blur="$store.commit('SetInfo',info)"
 
               type="text"
 
               type="text"
 
               class="ui-input"
 
               class="ui-input"
 
@@ -73,10 +73,12 @@ export default {
 
   data() {
 
   data() {
 
     return {
 
     return {
 
       type:'',
 
       type:'',
 
-      settings:[{
 
-        name:"开场提示",
 
-        id:"opening"
 
-      },{
 
+      settings:[
 
+      // {
 
+      //   name:"开场提示",
 
+      //   id:"opening"
 
+      // },
 
+      {
 
         name:"自动巡游",
 
         name:"自动巡游",
 
         id:"xy"
 
         id:"xy"
 
       },{
 
       },{

+ 14 - 1
src/views/hotspot/Setting.vue
Прегледај датотеку 

@@ -38,7 +38,7 @@
 
       :limitFailStr="'过大，请重新上传'"
 
       :limitFailStr="'过大，请重新上传'"
 
       accept-type="image/png,image/jpeg"
 
       accept-type="image/png,image/jpeg"
 
       media-type="image"
 
       media-type="image"
 
-      :limit="120"
 
+      :limit="1"
 
       @file-change="onFileChange"
 
       @file-change="onFileChange"
 
     ></upload>
 
     ></upload>
 
 
 
@@ -150,6 +150,19 @@ export default {
 
   },
 
   },
 
   methods: {
 
   methods: {
 
     onFileChange(file) {
 
     onFileChange(file) {
 
+
 
+      let flag = ['jpeg','jpg','png'].some((iii) => {
 
+        return file.type.indexOf(iii) > -1;
 
+      });
 
+
 
+      if (!flag) {
 
+        this.$msg({
 
+          message: `“${file.name}”格式错误，请上传1MB以内、jpg/png格式的图片`,
 
+          type: "warning",
 
+        });
 
+        return;
 
+      }
 
+
 
       uploadFileBySceneCode(
 
       uploadFileBySceneCode(
 
         {
 
         {
 
           sceneCode: this.activeItem.sceneCode,
 
           sceneCode: this.activeItem.sceneCode,

+ 3 - 3
src/views/information/Toolbar.vue
Прегледај датотеку 

@@ -81,7 +81,7 @@
 
                 ></i>
 
                 ></i>
 
               </div>
 
               </div>
 
               <div class="img">
 
               <div class="img">
 
-                <img :src="item.icon +`?${Math.random()}`" alt="" />
 
+                <img :src="$cdn + item.icon +`?${Math.random()}`" alt="" />
 
               </div>
 
               </div>
 
               <div class="oper">
 
               <div class="oper">
 
                 <i class="iconfont iconedit_list_more"></i>
 
                 <i class="iconfont iconedit_list_more"></i>
 
@@ -91,8 +91,8 @@
 
                 </ul>
 
                 </ul>
 
               </div>
 
               </div>
 
               <div class="ui-title">
 
               <div class="ui-title">
 
-                <span>{{
 
-                  item.type == "house" ? item.roomName : item.sceneTitle
 
+                <span :title="item.sceneTitle">{{
 
+                 item.sceneTitle
 
                 }}</span>
 
                 }}</span>
 
               </div>
 
               </div>
 
             </li>
 
             </li>

+ 1 - 0
src/views/information/index.vue
Прегледај датотеку 

@@ -153,6 +153,7 @@ export default {
 
     },
 
     },
 
     showList(newVal) {
 
     showList(newVal) {
 
       if (!newVal) {
 
       if (!newVal) {
 
+        this.key = ''
 
         this.paging = {
 
         this.paging = {
 
           pageSize: 8,
 
           pageSize: 8,
 
           pageNum: 1,
 
           pageNum: 1,

+ 0 - 1
src/views/material/login/index.vue
Прегледај датотеку 

@@ -1,4 +1,3 @@
 
-<!--  -->
 
 <template>
 
 <template>
 
 <div class='layout'>
 
 <div class='layout'>
 
   <div class="layout-con">
 
   <div class="layout-con">