Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB

ansel0926

2022-05-14 82c0e01ab038fa3119208b8bf1fba2e46404c262

Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB

 assets/css/iconfont.css

New file
@@ -0,0 +1,17 @@
@font-face {
  font-family: "iconfont"; /* Project id  */
  src: url('iconfont.ttf?t=1652518912556') format('truetype');
}

.iconfont {
  font-family: "iconfont" !important;
  font-size: 16px;
  font-style: normal;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
}

.icon-lianjie:before {
  content: "\e613";
}


 assets/css/iconfont.ttf

Binary files differ

 assets/images/login/logo2.png

 view/index.html

@@ -16,6 +16,7 @@
    <link href="../libs/Cesium1.75/dist/cesium-navigation.css" rel="stylesheet">

    <link rel="stylesheet" href="//at.alicdn.com/t/font_2599272_671fgrsk7ev.css">
    <link rel="stylesheet" href="../assets/css/iconfont.css">

    <script type="text/javascript" src="../libs/jquery/jquery-3.5.1.min.js"></script>

@@ -110,7 +111,7 @@
            <!--logo-->
            <div id="logo" class="logo">
                <div class="logo-name">
                    <!-- <img src="../assets/images/login/logo.png" style="margin-top: -5px;width: 56px;" /> -->
                    <img src="../assets/images/login/logo2.png" style="margin-top: -5px;width: 35px;" />
                    <span>CUGB DDE 原型系统</span>
                </div>
            </div>
@@ -134,11 +135,11 @@
        <!--左侧栏目-->

        <div id="left" class="left-item">
            <div title="切换底图" id="baseMap" onclick="baseMap();" class="icon-hover icon-item" style="margin-top: 60px;">
            <div title="切换底图" id="baseMap" onclick="baseMap();" class="icon-hover icon-item" style="margin-top: 40px;">
                <i class="iconfont icon-dituliulan i-item"></i>
            </div>
            <div title="关联项目" id="relatedProj" onclick="relatedProj();" class="icon-hover icon-item">
                <i class="iconfont icon-lianjie i-item"></i>
                <i class="iconfont icon-lianjie i-item"></i>				
            </div>
            <div title="综合漫游" id="characterBtn" onclick="roamControl();" class="icon-hover icon-item">
                <i class="iconfont icon-manyou i-item"></i>