Bladeren bron

添加图标到本地

zhangyu 5 jaren geleden
bovenliggende
commit
b85bc14bd2

File diff suppressed because it is too large
+ 165 - 0
src/assets/style/iconfont/iconfont.css


BIN
src/assets/style/iconfont/iconfont.eot


File diff suppressed because it is too large
+ 137 - 0
src/assets/style/iconfont/iconfont.svg


BIN
src/assets/style/iconfont/iconfont.ttf


BIN
src/assets/style/iconfont/iconfont.woff


+ 2 - 1
src/components/data_admin/buildData/style.scss

@@ -294,7 +294,8 @@ h3 {
         left: 0;
         bottom: 0;
         right: 0;
-        // padding: 0.4rem 4rem;
+        padding: 0.4rem 4rem;
+        box-sizing: border-box;
         border-top: 1px solid $borderColor;
         .pic_show {
             position: absolute;

+ 1 - 0
src/main.js

@@ -13,6 +13,7 @@ Vue.use(ElementUI, { size: "small", zIndex: 1000 })
 import './framework/style/layout.scss'
 
 import '@/assets/style/style.scss'
+import '@/assets/style/iconfont/iconfont.css'
 import './utils/scan/directive' //自定义指令
 
 import componentsPlugin from '@/framework/plugins/components'

+ 19 - 7
src/views/data_admin/buildData/index.vue

@@ -27,7 +27,7 @@
                     <div class="build_label" v-show="labelShow">
                         <!-- 左按钮 -->
                         <div class="turn_left">
-                            <i class="iconfont icon-return" @click="turn(0)"></i>
+                            <i class="iconfont" @click="turn(0)">&#xe720;</i>
                         </div>
                         <!-- 主体视窗 -->
                         <div class="label_view">
@@ -84,7 +84,7 @@
                         </div>
                         <!-- 右按钮 -->
                         <div class="turn_right">
-                            <i class="iconfont icon-enter" @click="turn(1)"></i>
+                            <i class="iconfont" @click="turn(1)">&#xe6f8;</i>
                         </div>
                     </div>
                     <!-- 控制点位标签显示 -->
@@ -139,7 +139,7 @@
                 <div class="build_pic" v-bind:style="{height:picHeight+'px'}" ref="picview">
                     <!-- <div class="pic_show" @click="picNoShow">关闭</div> -->
                     <div class="turn_left">
-                        <i class="iconfont icon-return" @click="turnPic(0)"></i>
+                        <i class="iconfont" @click="turnPic(0)">&#xe720;</i>
                     </div>
                     <div class="pic_view">
                         <div class="swiper-container" id="swiperPic" v-show="tablePicArr.Pic.length">
@@ -180,7 +180,7 @@
                         </div>
                     </div>
                     <div class="turn_right">
-                        <i class="iconfont icon-enter" @click="turnPic(1)"></i>
+                        <i class="iconfont" @click="turnPic(1)">&#xe6f8;</i>
                     </div>
                 </div>
                 <!-- 查看图片、视频、全景图页面唤起 -->
@@ -521,7 +521,6 @@
                     }
                 }).filter(b => b);
                 let param = {}
-                console.log(this.infos,'------------------------------')
                 param.BuildId = this.infos.BuildId
                 param.BuildName = this.infos.BuildName
                 param.Checked = this.infos.Checked
@@ -1692,7 +1691,9 @@
                 } else {
                     infos = this.myHotMainArr[this.tabChecked][row];
                 }
-                this.$refs.recommend.randerData(infos, prop, this.myHotHeaderArr[this.tabChecked], true, val)
+                if(this.$refs.recommend){
+                    this.$refs.recommend.randerData(infos, prop, this.myHotHeaderArr[this.tabChecked], true, val)
+                }
                 //   })
             },
             //获取被筛选掉的行号
@@ -1827,7 +1828,7 @@
     @import "../../../components/data_admin/buildData/style.scss";
 </style>
 
-<style lang="scss">
+<style lang="scss" scoped>
 #buildData{
     .el-tabs__header{
         width: 100%;
@@ -1842,6 +1843,17 @@
     .el-radio-button__inner{
         width: 90px;
     }
+    .build_label{
+        .label_view{
+            padding: 0 4rem;
+            box-sizing: border-box;
+        }
+    }
+    .build_pic {
+        .turn_right {
+            right: 0;
+        }
+    }
 }
 .el-dialog__body {
     max-height: 440px;