Parcourir la source

移动图片到public,并修改引用,解决开发和生产环境显示问题

wukai il y a 3 semaines
Parent
commit
d73de28d2c

BIN
public/images/ico_ai.png


BIN
public/images/ico_alarm.png


BIN
public/images/ico_alarm_fire.png


BIN
public/images/ico_alarm_none.png


BIN
public/images/ico_alarm_person.png


BIN
public/images/ico_alarm_smoke.png


BIN
public/images/ico_alarm_temp.png


BIN
public/images/ico_camer.png


BIN
public/images/ico_device.png


BIN
public/images/ico_index.png


+ 22 - 22
src/layout/components/Navbar.vue

@@ -3,7 +3,7 @@
     <logo v-if="showLogo" :collapse="isCollapse" />
     <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
 
-<!--    <div class="right-menu" >-->
+    <div class="right-menu" >
 <!--      <template v-if="appStore.device !== 'mobile'">-->
 <!--        <header-search id="header-search" class="right-menu-item" />-->
 
@@ -28,28 +28,28 @@
 <!--          <size-select id="size-select" class="right-menu-item hover-effect" />-->
 <!--        </el-tooltip>-->
 <!--      </template>-->
-<!--      <div class="avatar-container">-->
-<!--        <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">-->
-<!--          <div class="avatar-wrapper">-->
+      <div class="avatar-container">
+        <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+          <div class="avatar-wrapper">
 <!--            <img :src="userStore.avatar" class="user-avatar" />-->
-<!--            <el-icon><caret-bottom /></el-icon>-->
-<!--          </div>-->
-<!--          <template #dropdown>-->
-<!--            <el-dropdown-menu>-->
-<!--              <router-link to="/user/profile">-->
-<!--                <el-dropdown-item>个人中心</el-dropdown-item>-->
-<!--              </router-link>-->
-<!--              <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">-->
-<!--                <span>布局设置</span>-->
-<!--              </el-dropdown-item>-->
-<!--              <el-dropdown-item divided command="logout">-->
-<!--                <span>退出登录</span>-->
-<!--              </el-dropdown-item>-->
-<!--            </el-dropdown-menu>-->
-<!--          </template>-->
-<!--        </el-dropdown>-->
-<!--      </div>-->
-<!--    </div>-->
+            <el-icon><caret-bottom /></el-icon>
+          </div>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <router-link to="/user/profile">
+                <el-dropdown-item>个人中心</el-dropdown-item>
+              </router-link>
+              <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
+                <span>布局设置</span>
+              </el-dropdown-item>
+              <el-dropdown-item divided command="logout">
+                <span>退出登录</span>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </div>
+    </div>
   </div>
 </template>
 

+ 2 - 2
src/layout/components/Sidebar/SidebarItem.vue

@@ -2,7 +2,7 @@
   <div v-if="!item.hidden">
     <template v-if="hasOneShowingChild(item.children, item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">          
+        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
           <svg-icon v-if="item.meta!=null && item.meta.icon!=null" :icon-class="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" />
           <img v-else :src="getImageSrc(onlyOneChild.meta.png||item.meta.png)" />
           <template #title><span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span></template>
@@ -53,7 +53,7 @@ const props = defineProps({
 const onlyOneChild = ref({});
 
 function getImageSrc(png) {
-  return new URL('../../../../src/assets/images/'+png,import.meta.url).href;
+  return new URL('/images/'+png,import.meta.url).href;
 }
 
 function hasOneShowingChild(children = [], parent) {

+ 14 - 14
src/views/index.vue

@@ -7,7 +7,7 @@
         <span  class="item" v-for="item in houselist" :style="{'background-color':alarm_type[item.alarmtype].bg}" >
           <el-tooltip :content="item.name" placement="top" class="custom-tooltip">
             <span class="item">{{ item.code }}</span>
-          </el-tooltip>      
+          </el-tooltip>
         </span>
       </div>
     </div>
@@ -22,31 +22,31 @@ const alarm_type=ref({
   "none":{
     name:'行为合规',
     bg:'#2488fe',
-    icon:'src/assets/images/ico_alarm_none.png'
+    icon:'/images/ico_alarm_none.png'
   },
   "smoke":{
     name:'吸烟告警',
     bg:'#ef911c',
-    icon:'src/assets/images/ico_alarm_smoke.png'  
+    icon:'/images/ico_alarm_smoke.png'
   },
   "fire":{
     name:'异常烟火',
-    icon:'src/assets/images/ico_alarm_fire.png',
+    icon:'/images/ico_alarm_fire.png',
     bg:'#de4a4a'
   },
   "temp":{
     name:'环境异常',
     bg:'#12c9b5',
-    icon:'src/assets/images/ico_alarm_temp.png'
+    icon:'/images/ico_alarm_temp.png'
   },
   "person":{
     name:'人员入侵',
-    icon:'src/assets/images/ico_alarm_person.png',
+    icon:'/images/ico_alarm_person.png',
     bg:'#833dd9'
   }
 })
 const alarm_list = ref([{
-  code:"none", 
+  code:"none",
   count:0
 },{
   code:"smoke",
@@ -67,14 +67,14 @@ const houselist=ref([{
   code:"zg",
   city:"510300",
   addr:"自贡市沿滩区金川路东段28号高新仓储物流园一期",
-  lnglat:[0,0],  
+  lnglat:[0,0],
   alarmtype:"none",
 },{
   name:"成都中心仓库",
   code:"cd",
   city:"510100",
   addr:"简阳市石桥镇羊羊小镇大华国际B1栋13楼1322号",
-  lnglat:[0,0],  
+  lnglat:[0,0],
   alarmtype:"smoke",
 }]);
 
@@ -115,7 +115,7 @@ const initMap = () => {
       version:'2.0.0'
     }
   })
-    .then((res) => {   
+    .then((res) => {
       AMap.value = res
       // 上来就显示的中心点  北京 116.397, 39.918
       var lnglat = new res.LngLat(116.397, 39.918);
@@ -134,7 +134,7 @@ const initMap = () => {
       })
       initHouseLoca();
       initWindow()
-      
+
     })
     .catch((e) => {
       console.log('error', e)
@@ -177,12 +177,12 @@ onMounted(() => {
         padding: 6px 20px;
         border-radius: 30px;
         color: #fff;
-        background-color: #455b6d;     
+        background-color: #455b6d;
         img{
           width: 24px;
           height: 24px;
           vertical-align: middle;
-        }   
+        }
         .alarm_item_brager{
           position: absolute;
           font-weight: bold;
@@ -217,4 +217,4 @@ onMounted(() => {
       }
     }
 }
-</style>
+</style>