浏览代码

提交底部工具条

yunxing 4 年之前
父节点
当前提交
0b64dd50ac

+ 18 - 14
public/index.html

@@ -1,17 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>博锐尚格科技股份有限公司--平面图编辑工具</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
+    <head>
+        <meta charset="utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+        <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+        <link rel="stylesheet" href="//at.alicdn.com/t/font_2231660_s5c9b1ungrn.css" />
+        <title>博锐尚格科技股份有限公司--平面图编辑工具</title>
+    </head>
+    <body>
+        <noscript>
+            <strong
+                >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to
+                continue.</strong
+            >
+        </noscript>
+        <div id="app"></div>
+        <!-- built files will be auto injected -->
+    </body>
 </html>

文件差异内容过多而无法显示
+ 30 - 6
src/assets/font/iconfont.css


二进制
src/assets/font/iconfont.eot


文件差异内容过多而无法显示
+ 1 - 0
src/assets/font/iconfont.js


+ 646 - 0
src/assets/font/iconfont.json

@@ -0,0 +1,646 @@
+{
+  "id": "2231660",
+  "name": "平面图美化工具",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "平面图编辑器",
+  "glyphs": [
+    {
+      "icon_id": "19102395",
+      "name": "区域显示",
+      "font_class": "quyuxianshi2",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "19102396",
+      "name": "底图显隐",
+      "font_class": "dituxianyin2",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "19075450",
+      "name": "加",
+      "font_class": "jia",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "19075451",
+      "name": "减",
+      "font_class": "jian",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "19075607",
+      "name": "区域显示",
+      "font_class": "quyuxianshi",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "19075608",
+      "name": "底图显隐",
+      "font_class": "dituxianyin",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "18959903",
+      "name": "撤销",
+      "font_class": "chexiao",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "18959883",
+      "name": "确认",
+      "font_class": "icondone",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "18891165",
+      "name": "扶梯",
+      "font_class": "futi",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
+    {
+      "icon_id": "18891094",
+      "name": "潜污泵",
+      "font_class": "qianwubeng",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "18890789",
+      "name": "门",
+      "font_class": "men",
+      "unicode": "e617",
+      "unicode_decimal": 58903
+    },
+    {
+      "icon_id": "18890790",
+      "name": "风机盘管",
+      "font_class": "fengjipanguan",
+      "unicode": "e618",
+      "unicode_decimal": 58904
+    },
+    {
+      "icon_id": "18890791",
+      "name": "火灾探测器",
+      "font_class": "huozaitanceqi",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "18890792",
+      "name": "楼梯",
+      "font_class": "louti",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
+    {
+      "icon_id": "18890793",
+      "name": "门禁门锁",
+      "font_class": "menjinmensuo",
+      "unicode": "e61b",
+      "unicode_decimal": 58907
+    },
+    {
+      "icon_id": "18890794",
+      "name": "防火卷帘门",
+      "font_class": "fanghuojuanlianmen",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "18890795",
+      "name": "监控主机",
+      "font_class": "jiankongzhuji",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "18890796",
+      "name": "生活给水储水箱",
+      "font_class": "shenghuogeishuichushuixiang",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "18890797",
+      "name": "热风幕",
+      "font_class": "refengmu",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "18890798",
+      "name": "集水坑",
+      "font_class": "jishuikeng",
+      "unicode": "e620",
+      "unicode_decimal": 58912
+    },
+    {
+      "icon_id": "18890799",
+      "name": "门禁控制箱",
+      "font_class": "menjinkongzhixiang",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "18890800",
+      "name": "高压开关柜",
+      "font_class": "gaoyakaiguangui",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "18890801",
+      "name": "生活给水水泵",
+      "font_class": "shenghuogeishuishuibeng",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
+      "icon_id": "18890802",
+      "name": "停车位",
+      "font_class": "tingchewei",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
+      "icon_id": "18890804",
+      "name": "喷淋供水加压泵",
+      "font_class": "penlingongshuijiayabeng",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
+      "icon_id": "18890805",
+      "name": "人流量传感器",
+      "font_class": "renliuliangchuanganqi",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "18890806",
+      "name": "门禁主机",
+      "font_class": "menjinzhuji",
+      "unicode": "e628",
+      "unicode_decimal": 58920
+    },
+    {
+      "icon_id": "18890807",
+      "name": "消防喷头",
+      "font_class": "xiaofangpentou",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "18890808",
+      "name": "直流屏",
+      "font_class": "zhiliuping",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "18890810",
+      "name": "照明控制箱",
+      "font_class": "zhaomingkongzhixiang",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "18890811",
+      "name": "污废水一体式提升机组",
+      "font_class": "wufeishuiyitishitishengjizu",
+      "unicode": "e62d",
+      "unicode_decimal": 58925
+    },
+    {
+      "icon_id": "18890812",
+      "name": "隔油池",
+      "font_class": "geyouchi",
+      "unicode": "e62e",
+      "unicode_decimal": 58926
+    },
+    {
+      "icon_id": "18890813",
+      "name": "新风机组",
+      "font_class": "xinfengjizu",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "18890814",
+      "name": "通风风机",
+      "font_class": "tongfengfengji",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "18890815",
+      "name": "空调机组",
+      "font_class": "kongtiaojizu",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "18890816",
+      "name": "浓度传感器",
+      "font_class": "nongduchuanganqi",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "18890817",
+      "name": "消火栓供水加压泵",
+      "font_class": "xiaohuoshuangongshuijiayabeng",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "18890818",
+      "name": "消防手动报警按钮",
+      "font_class": "xiaofangshoudongbaojinganniu",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "18890819",
+      "name": "湿度传感器",
+      "font_class": "shiduchuanganqi",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "18890820",
+      "name": "生活热水水泵",
+      "font_class": "shenghuoreshuishuibeng",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "18890821",
+      "name": "直梯",
+      "font_class": "zhiti",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "18890822",
+      "name": "消防水箱",
+      "font_class": "xiaofangshuixiang",
+      "unicode": "e638",
+      "unicode_decimal": 58936
+    },
+    {
+      "icon_id": "18890823",
+      "name": "消火栓箱",
+      "font_class": "xiaohuoshuanxiang",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "18890824",
+      "name": "温度传感器",
+      "font_class": "wenduchuanganqi",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "18890825",
+      "name": "硬盘录像机",
+      "font_class": "yingpanluxiangji",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "18890826",
+      "name": "位移传感器",
+      "font_class": "weiyichuanganqi",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "18890827",
+      "name": "DDC",
+      "font_class": "DDC",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "18890785",
+      "name": "变压器",
+      "font_class": "bianyaqi",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
+    {
+      "icon_id": "18890786",
+      "name": "窗",
+      "font_class": "chuang",
+      "unicode": "e614",
+      "unicode_decimal": 58900
+    },
+    {
+      "icon_id": "18890787",
+      "name": "监控前端设备",
+      "font_class": "jiankongqianduanshebei",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "18890788",
+      "name": "监控摄像头",
+      "font_class": "jiankongshexiangtou",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
+    {
+      "icon_id": "17373833",
+      "name": "通用",
+      "font_class": "tongyong",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "17373834",
+      "name": "管线",
+      "font_class": "guanxian",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "17373835",
+      "name": "楼层",
+      "font_class": "louceng",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "17373836",
+      "name": "设备",
+      "font_class": "shebei",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "17373837",
+      "name": "空间",
+      "font_class": "kongjian",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "17373838",
+      "name": "设备组",
+      "font_class": "shebeizu",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "17376472",
+      "name": "添加",
+      "font_class": "tianjia",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "17376473",
+      "name": "箭头",
+      "font_class": "jiantou",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "17376474",
+      "name": "保存",
+      "font_class": "baocun",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "17376475",
+      "name": "下载",
+      "font_class": "xiazai",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "17376476",
+      "name": "Triangle",
+      "font_class": "Triangle",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "17376477",
+      "name": "放大",
+      "font_class": "fangda",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "17376478",
+      "name": "缩小",
+      "font_class": "suoxiao",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "17376479",
+      "name": "发布",
+      "font_class": "fabu",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "17376666",
+      "name": "关系",
+      "font_class": "guanxi",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "17376667",
+      "name": "锁定",
+      "font_class": "suoding",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "17376668",
+      "name": "左对齐",
+      "font_class": "zuoduiqi",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "17376669",
+      "name": "置底",
+      "font_class": "zhidi",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "17376670",
+      "name": "删除",
+      "font_class": "shanchu",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "17376671",
+      "name": "置顶",
+      "font_class": "zhiding",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "17376672",
+      "name": "组合",
+      "font_class": "zuhe",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "17376673",
+      "name": "打散",
+      "font_class": "dasan",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "17376674",
+      "name": "粘贴",
+      "font_class": "niantie",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "17376675",
+      "name": "重做",
+      "font_class": "zhongzuo",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "17376676",
+      "name": "撤回",
+      "font_class": "chehui",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "17376677",
+      "name": "筛选",
+      "font_class": "shaixuan",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "17376678",
+      "name": "复制",
+      "font_class": "fuzhi",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "17376680",
+      "name": "搜索",
+      "font_class": "sousuo",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "17487441",
+      "name": "更多",
+      "font_class": "gengduo1",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "17559866",
+      "name": "三通_n",
+      "font_class": "santong_n",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "17559867",
+      "name": "四通_n",
+      "font_class": "sitong_n",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "17559868",
+      "name": "弯头_n",
+      "font_class": "wantou_n",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "17559869",
+      "name": "划线_n",
+      "font_class": "huaxian_n",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "17559870",
+      "name": "矩形_n",
+      "font_class": "juxing_n",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "17559871",
+      "name": "圆形_n",
+      "font_class": "yuanxing_n",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "17559872",
+      "name": "多边形_n",
+      "font_class": "duobianxing_n",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "17559873",
+      "name": "图片_n",
+      "font_class": "tupian_n",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "17559874",
+      "name": "公式_n",
+      "font_class": "gongshi_n",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "17559875",
+      "name": "文字_n",
+      "font_class": "wenzi_n",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "17559876",
+      "name": "信息点_n",
+      "font_class": "xinxidian_n",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    }
+  ]
+}

文件差异内容过多而无法显示
+ 18 - 0
src/assets/font/iconfont.svg


二进制
src/assets/font/iconfont.ttf


二进制
src/assets/font/iconfont.woff


二进制
src/assets/font/iconfont.woff2


二进制
src/assets/images/bottomToolBar/hideArea.png


二进制
src/assets/images/bottomToolBar/hideBaseMap.png


二进制
src/assets/images/bottomToolBar/showArea.png


二进制
src/assets/images/bottomToolBar/showBaseMap.png


+ 21 - 19
src/components/editview/bottomToolBar.vue

@@ -1,27 +1,23 @@
 <template>
     <div>
         <div class="action-box">
-            <div class="small-block" @click="showText">
+            <div class="small-block" @click="showArea">
                 <span>
-                    <el-tooltip v-if="isShow" effect="dark" content="区域显示" placement="top">
-                        <!-- <img src="@/assets/images/issue.png" alt /> -->
-                        <i class="iconfont icon-quyuxianshi"></i>
+                    <el-tooltip v-if="isShowArea" effect="dark" content="区域显示" placement="top">
+                        <img src="@/assets/images/bottomToolBar/showArea.png" />
                     </el-tooltip>
                     <el-tooltip v-else effect="dark" content="区域隐藏" placement="top">
-                        <!-- <img src="@/assets/images/issue.png" alt /> -->
-                        <i class="iconfont icon-quyuxianshi1"></i>
+                        <img src="@/assets/images/bottomToolBar/hideArea.png" />
                     </el-tooltip>
                 </span>
             </div>
-            <div class="small-block" @click="showText">
+            <div class="small-block" @click="showBaseMap">
                 <span>
-                    <el-tooltip v-if="isShow" effect="dark" content="底图显示" placement="top">
-                        <!-- <img src="@/assets/images/issue.png" alt /> -->
-                        <i class="iconfont icon-dituxianyin"></i>
+                    <el-tooltip v-if="isShowBaseMap" effect="dark" content="底图显示" placement="top">
+                        <img src="@/assets/images/bottomToolBar/showBaseMap.png" />
                     </el-tooltip>
                     <el-tooltip v-else effect="dark" content="底图隐藏" placement="top">
-                        <!-- <img src="@/assets/images/issue.png" alt /> -->
-                        <i class="iconfont icon-dituxianyin1"></i>
+                        <img src="@/assets/images/bottomToolBar/hideBaseMap.png" />
                     </el-tooltip>
                 </span>
             </div>
@@ -35,6 +31,7 @@
 </template>
 <script>
 import bus from "@/bus/bus";
+import "@/assets/font/iconfont.js";
 export default {
     data() {
         return {
@@ -44,7 +41,8 @@ export default {
             min: 0.1,
             max: 5,
             isSwitch: false, // 是否开启吸附
-            isShow: false,
+            isShowArea: false,
+            isShowBaseMap: false,
         };
     },
     computed: {
@@ -105,9 +103,13 @@ export default {
                 this.sliderVal = s > 0.1 ? s : 0.1;
             });
         },
-        showText() {
-            this.isShow = !this.isShow;
-            this.$emit("showText", this.isShow);
+        showArea() {
+            // this.isShowArea = !this.isShowArea;
+            // this.$emit("showArea", this.isShowArea);
+        },
+        showBaseMap() {
+            // this.isShowBaseMap = !this.isShowBaseMap;
+            // this.$emit("showBaseMap", this.isShowBaseMap);
         },
     },
     mounted() {
@@ -140,11 +142,11 @@ export default {
             width: 16px;
             height: 16px;
             display: inline-block;
-            i {
+            img {
                 width: 100%;
                 height: 100%;
-                vertical-align: top;
-                display: inline-block;
+                position: relative;
+                top: -3px;
             }
         }
     }

+ 2 - 1
src/main.ts

@@ -2,7 +2,8 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import store from './store'
-import './assets/font/iconfont.css';
+// import './assets/font/iconfont.css';
+
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import './assets/less/reset.less'