Procházet zdrojové kódy

增加rtc模块;完善代码

zhoutao před 3 měsíci
rodič
revize
763fcc5885

+ 2 - 2
ipsomcadmin/src/components/Breadcrumb/index.vue

@@ -1,7 +1,7 @@
 <style lang="scss" scoped>
 .app-breadcrumb.el-breadcrumb {
     display: inline-block;
-    font-size: 14px;
+    font-size: 13px;
     line-height: 46px;
     padding: 0px;
 
@@ -22,7 +22,7 @@
             <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
                 <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{
                     item.meta.title
-                }}</span>
+                    }}</span>
                 <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
             </el-breadcrumb-item>
         </transition-group>

+ 4 - 4
ipsomcadmin/src/components/Hamburger/index.vue

@@ -11,10 +11,10 @@
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     box-sizing: border-box;
-    padding: 0px 0px 0px 10px;
-    font-size: 14px;
-    font-weight: bold;
+    padding: 0px 0px 0px 0px;
+    font-size: 13px;
     color: #fff;
+    padding: 0px 30px;
 }
 
 .hamburger.is-active {
@@ -27,7 +27,7 @@
 <template>
     <div style="padding: 0 15px;">
         <svg :class="{ 'is-active': isActive }" style="fill:white" class="hamburger" viewBox="0 0 1024 1024"
-            xmlns="http://www.w3.org/2000/svg" width="64" height="64" @click="toggleClick">
+            xmlns="http://www.w3.org/2000/svg" width="30" height="30" @click="toggleClick">
             <path
                 d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
         </svg>

+ 1 - 0
ipsomcadmin/src/layout/components/Navbar.vue

@@ -110,6 +110,7 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
+
         <el-dialog width="45%" :title="dialogData.editData.title" :visible.sync="dialogData.editData.show"
             :modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false">
             <el-form :model="dialogData.editData.data" :rules="dialogData.editData.rules" ref="editDataForm"

+ 4 - 3
ipsomcadmin/src/layout/components/Sidebar/Item.vue

@@ -19,14 +19,15 @@ export default {
 
         if (icon) {
             if (icon.includes('el-icon')) {
-                vnodes.push(<i class={[icon, 'sub-el-icon']} />)
+                vnodes.push(<i class={[icon, 'sub-el-icon']} style="font-size:18px" />)
             } else {
-                vnodes.push(<svg-icon icon-class={icon} />)
+                vnodes.push(<svg-icon icon-class={icon} style="width:18px;height:18px" />)
             }
         }
 
+        //菜单标题
         if (title) {
-            vnodes.push(<span slot='title'>{(title)}</span>)
+            vnodes.push(<span style='font-size:16px' slot='title'>{(title)}</span>)
         }
         return vnodes
     }

+ 1 - 0
ipsomcadmin/src/layout/components/Sidebar/SidebarItem.vue

@@ -13,6 +13,7 @@
         <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
             <template slot="title">
                 <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+                <!-- <item v-if="item.meta" :title="item.meta.title" /> -->
             </template>
             <sidebar-item v-for="child in item.children" :key="child.path" :is-nest="true" :item="child"
                 :base-path="resolvePath(child.path)" class="nest-menu" />

+ 4 - 0
ipsomcadmin/src/layout/index.vue

@@ -44,11 +44,15 @@
 <template>
     <div :class="classObj" class="app-wrapper">
         <!-- <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" /> -->
+        <!-- 左侧菜单 -->
         <sidebar class="sidebar-container" />
         <div class="main-container">
             <div :class="{ 'fixed-header': fixedHeader }">
+                <!-- 定位工作条 -->
                 <navbar />
             </div>
+
+            <!-- 右下角 -->
             <app-main />
         </div>
     </div>

+ 2 - 2
ipsomcadmin/src/router/index.js

@@ -32,9 +32,9 @@ export const constantRoutes = [
         redirect: '/dashboard',
         children: [{
             path: 'dashboard',
-            name: 'Dashboard',
+            name: 'dashboard',
             component: () => import('@/views/dashboard/index'),
-            meta: { title: '系统首页', icon: 'dashboard' }
+            meta: { title: '系统首页', icon: 'example' }
         }]
     },
     {

+ 3 - 3
ipsomcadmin/src/router/modules/bparam.js

@@ -27,19 +27,19 @@ export default {
     component: Layout,
     redirect: '/bparam/baseparam',  // 重定向配置
     name: 'bparam',
-    meta: { title: '基站参数', icon: 'el-icon-s-help' },
+    meta: { title: '基站参数', icon: 'example' },
     children: [
         {
             path: 'baseparam',  // 修改为相对路径
             name: 'baseparam',
             component: () => import('@/views/bparam/baseparam'),
-            meta: { title: '基本参数', icon: 'table' }
+            meta: { title: '基本参数', icon: 'form' }
         },
         {
             path: 'btstopology',  // 修改为相对路径
             name: 'btstopology',
             component: () => import('@/views/bparam/btstopology'),
-            meta: { title: '基站拓扑', icon: 'table' }
+            meta: { title: '基站拓扑', icon: 'form' }
         }
     ]
 }

+ 1 - 1
ipsomcadmin/src/router/modules/company.js

@@ -7,6 +7,6 @@ export default {
         path: '',
         name: 'company',
         component: () => import('@/views/company/company'),
-        meta: { title: '客户资料', icon: 'table' }
+        meta: { title: '客户资料', icon: 'example' }
     },]
 }

+ 1 - 1
ipsomcadmin/src/router/modules/permission.js

@@ -7,6 +7,6 @@ export default {
         path: '',
         name: 'permission',
         component: () => import('@/views/user/permission'),
-        meta: { title: '权限管理', icon: 'table' }
+        meta: { title: '权限管理', icon: 'example' }
     },]
 }

+ 1 - 1
ipsomcadmin/src/router/modules/project.js

@@ -7,6 +7,6 @@ export default {
         path: '',
         name: 'project',
         component: () => import('@/views/project/project.vue'),
-        meta: { title: '项目管理', icon: 'link' }
+        meta: { title: '项目管理', icon: 'example' }
     }]
 }

+ 1 - 1
ipsomcadmin/src/router/modules/role.js

@@ -7,6 +7,6 @@ export default {
         path: '',
         name: 'role',
         component: () => import('@/views/user/role'),
-        meta: { title: '角色管理', icon: 'form' }
+        meta: { title: '角色管理', icon: 'example' }
     }]
 }

+ 1 - 1
ipsomcadmin/src/router/modules/user.js

@@ -7,6 +7,6 @@ export default {
         path: '',
         name: 'operator',
         component: () => import('@/views/user/operator'),
-        meta: { title: '项目管理员', icon: 'user' }
+        meta: { title: '项目管理员', icon: 'example' }
     }]
 }

+ 1 - 3
ipsomcadmin/src/styles/variables.scss

@@ -10,7 +10,7 @@ $menuHover: #fff; //#3d6df8; //#263445;//菜单高亮色
 $subMenuBg: #3d6df8; //#1f2d3d;//子菜单背景色
 $subMenuHover: #fff; //#001528;//菜单高亮色
 
-$sideBarWidth: 210px; //左侧菜单栏的宽度
+$sideBarWidth: 200px; //左侧菜单栏的宽度//210
 
 // 基本设置
 $themeGray: #fafafa !default;
@@ -37,9 +37,7 @@ $font-size-very-little: 9px;
 $color-input-bg: #68B0FE; //输入框背景颜色
 $color-button-bg: #407FFE; //按钮背景颜色
 $color-form-item-bg: rgba(255, 255, 255, 0.7);
-// the :export directive is the magic sauce for webpack
 
-// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
     menuText: $menuText;
     menuActiveText: $menuActiveText;

+ 11 - 13
ipsomcadmin/src/views/bparam/baseparam.vue

@@ -124,7 +124,7 @@
         </app-table>
 
         <!--基本参数-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.editData.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.editData.title" center
             :visible.sync="dialogData.editData.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <base-param-dlg :isUpdate="dialogData.editData.isUpdate" :id="dialogData.editData.id" @get="hGetData"
@@ -132,7 +132,7 @@
         </el-dialog>
 
         <!--设备参数-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.deviceDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.deviceDlg.title" center
             :visible.sync="dialogData.deviceDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <device-param-dlg :isUpdate="dialogData.deviceDlg.isUpdate" :id="dialogData.deviceDlg.id" @get="hGetData"
@@ -140,7 +140,7 @@
         </el-dialog>
 
         <!--网管参数-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.netDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.netDlg.title" center
             :visible.sync="dialogData.netDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <net-param-dlg :isUpdate="dialogData.netDlg.isUpdate" :id="dialogData.netDlg.id" @get="hGetData"
@@ -148,7 +148,7 @@
         </el-dialog>
 
         <!--同步参数-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.syncDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.syncDlg.title" center
             :visible.sync="dialogData.syncDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <sync-param-dlg :isUpdate="dialogData.syncDlg.isUpdate" :id="dialogData.syncDlg.id" @get="hGetData"
@@ -156,7 +156,7 @@
         </el-dialog>
 
         <!--同步定时-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.syncTimerDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.syncTimerDlg.title" center
             :visible.sync="dialogData.syncTimerDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <rtc-dlg :isUpdate="dialogData.syncTimerDlg.isUpdate" :id="dialogData.syncTimerDlg.id" @get="hGetData"
@@ -164,7 +164,7 @@
         </el-dialog>
 
         <!--增益参数-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.gainDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.gainDlg.title" center
             :visible.sync="dialogData.gainDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <gain-param-dlg :isUpdate="dialogData.gainDlg.isUpdate" :id="dialogData.gainDlg.id" @get="hGetData"
@@ -172,7 +172,7 @@
         </el-dialog>
 
         <!--基站参数-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.btsDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.btsDlg.title" center
             :visible.sync="dialogData.btsDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <bts-param-dlg :isUpdate="dialogData.btsDlg.isUpdate" :id="dialogData.btsDlg.id" @get="hGetData"
@@ -180,7 +180,7 @@
         </el-dialog>
 
         <!--安装参数-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.installDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.installDlg.title" center
             :visible.sync="dialogData.installDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <install-param-dlg :isUpdate="dialogData.installDlg.isUpdate" :id="dialogData.installDlg.id" @get="hGetData"
@@ -188,15 +188,15 @@
         </el-dialog>
 
         <!--定位类型-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.locationDlg.title" center
+        <!-- <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.locationDlg.title" center
             :visible.sync="dialogData.locationDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <location-dlg :isUpdate="dialogData.locationDlg.isUpdate" :id="dialogData.locationDlg.id" @get="hGetData"
                 @close="hCloseLocationDlg" v-if="dialogData.locationDlg.show" />
-        </el-dialog>
+        </el-dialog> -->
 
         <!--远程升级-->
-        <el-dialog width="55%" v-drag-dialog :title="dialogData.upgradeDlg.title" center
+        <el-dialog width="55%" top="30px" v-drag-dialog :title="dialogData.upgradeDlg.title" center
             :visible.sync="dialogData.upgradeDlg.show" :modal-append-to-body="false" custom-class="editDataDialog"
             :close-on-click-modal="false" :close-on-press-escape="false">
             <upgrade-dlg :isUpdate="dialogData.upgradeDlg.isUpdate" :id="dialogData.upgradeDlg.id" @get="hGetData"
@@ -216,7 +216,6 @@ import SyncParamDlg from "./component/syncparamdlg.vue"
 import GainParamDlg from "./component/gainparamdlg.vue"
 import BtsParamDlg from "./component/btsparamdlg.vue"
 import InstallParamDlg from "./component/installparamdlg.vue"
-import LocationDlg from "./component/locationdlg.vue"
 import RtcDlg from "./component/rtcdlg.vue"
 import UpgradeDlg from "./component/upgradedlg.vue"
 
@@ -230,7 +229,6 @@ export default {
         GainParamDlg,
         BtsParamDlg,
         InstallParamDlg,
-        LocationDlg,
         RtcDlg,
         UpgradeDlg
     },

+ 1 - 1
ipsomcadmin/src/views/bparam/component/btsparamdlg.vue

@@ -80,7 +80,7 @@
                             v-model.trim="dialogData.editData.data.two_bts_num" auto-complete="off"
                             style="width:100%"></el-input-number>
                     </div>
-                    <div class="btsparamdlg__item-right">该基站与几个基站进行两站定位</div>
+                    <div class="btsparamdlg__item-right">该基站与几个基站进行两站定位</div>
                 </div>
             </el-form-item>
             <el-form-item label="两站定位基站列表" v-if="checkLctType && mainData.bts_type == 1">