factor 隐藏送餐相关的所有 导航 选项 图标等

src/components/ControllerTabs.vue

@@ -121,85 +121,8 @@
     <div class="flex column mr mac tabContainer p-l-10 p-r-10">
       <!-- tab控件组 内容组 -->
       <div class="tabContent" :class="{ 'active': activeIndex !== null }">
-        <!-- 订单任务 -->
-        <div v-if="activeIndex === 0" class="tabContentBox">
-          <!-- 标题 -->
-          <div class="clearB m-b-15 fb f-s-16 contentTit">
-            <i class="iconfont icon-dingdanguanli f-s-22 m-r-5"></i>
-            <span>送餐任务</span>
-          </div>
-          <!-- 内容 -->
-          <el-form label-position="left" ref="questForm" :model="questForm" label-width="80px">
-            <el-form-item label="订单选择" v-if="!executeOrder">
-              <el-select v-model="questForm.id" :filterable="isMobile" placeholder="请选择，也可输入搜索"
-                :disabled="executeOrder">
-                <el-option v-for="item in questList" :key="item.id" :label="item.id" :value="item.id"
-                  :class="isWaring(item) ? 'danger-color' : ''">
-                  <span class="l">{{ item.id }}</span>
-                  <span class="l m-l-5">{{ item.receiver }}</span>
-                  <span class="l m-l-5">{{ item.receive_site_name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <template v-else>
-              <el-form-item v-if="waringTags.length > 0" label="提示">
-                <el-tag v-for="(tag, index) in waringTags" :key="index" class="m-r-5" type="warning">{{ tag }}</el-tag>
-              </el-form-item>
-              <el-form-item label="订单ID">
-                {{ executeOrder.id }}
-              </el-form-item>
-              <el-form-item label="收货地块">
-                {{ executeOrder.receive_site_name }}
-              </el-form-item>
-              <el-form-item label="联系电话">
-                {{ executeOrder.tel }}
-              </el-form-item>
-            </template>
-            <el-form-item label="飞机操作">
-              <el-button-group>
-                <!-- <el-button size="mini" class="f-s-14" v-if="Number(plane.planeState.questState) === 1" type="primary"
-                  icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest">
-                  <font class="m-l-5">上传航点</font>
-                </el-button> -->
-                <el-button size="mini" class="f-s-14"
-                  v-if="Number(plane.planeState.questState) === 1 || Number(plane.planeState.questState) === 4"
-                  type="warning" icon="f-s-14 iconfont icon-chakanzhihangrizhi" @click="checkQuest">
-                  <font class="m-l-5">准备任务</font>
-                </el-button>
-                <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 2"
-                  key="wirteBut" type="info" :loading="true" disabled>
-                  <font class="m-l-5">航点写入中···</font>
-                </el-button>
-                <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 12" type="info"
-                  :loading="true" disabled>
-                  <font class="m-l-5">解锁中...</font>
-                </el-button>
-                <el-button size="mini" class="f-s-14" v-else-if="Number(plane.planeState.questState) === 20"
-                  type="success" icon="f-s-14 iconfont icon-yangshi_icon_tongyong_departure"
-                  @click="publishFun('{setQuestState:{bit:5,state:1}}'); speakText('执行送餐任务')">
-                  <font class="m-l-5">执行任务</font>
-                </el-button>
-                <el-button size="mini" class="f-s-14" v-else-if="isShipped" type="info" :loading="true" disabled>
-                  <font class="m-l-5">执行任务中...</font>
-                </el-button>
-              </el-button-group>
-            </el-form-item>
-            <el-form-item label="任务确认">
-              <el-button-group>
-                <el-button size="mini" class="f-s-14" type="danger" icon="iconfont icon-cuowu" key="celBUt"
-                  @click="reQuest">
-                  <font class="m-l-5">取消</font>
-                </el-button>
-                <el-button size="mini" class="f-s-14" type="success" icon="iconfont icon-qiandai" key="bingBut"
-                  @click="overQuest">
-                  <font class="m-l-5">已送达</font>
-                </el-button>
-              </el-button-group>
-            </el-form-item>
-          </el-form>
-        </div>
         <!-- 飞机操作 -->
-        <div v-else-if="activeIndex === 1" class="tabContentBox">
+        <div v-if="activeIndex === 0" class="tabContentBox">
           <!-- 标题 -->
           <div class="clearB m-b-15 fb f-s-16 contentTit">
             <i class="iconfont icon-youxishoubing f-s-22 m-r-5"></i>
@@ -243,77 +166,8 @@
             </el-button>
           </div>
         </div>
-        <!-- 附加模组操作 -->
-        <div v-else-if="activeIndex === 2" class="tabContentBox">
-          <!-- 标题 -->
-          <div class="clearB m-b-15 fb f-s-16 contentTit">
-            <i class="iconfont icon-mianxingdiaogou f-s-22 m-r-5"></i>
-            <span>挂载仓控制</span>
-          </div>
-          <div class="butIconBox m-b-15 gap10 flex">
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{hookConteroller:4}'); pesoIsZero(); speakText('重置重量传感器')">
-              <i class="iconfont icon-zhongliang f-s-24"></i>
-              <div class="m-t-5">归零</div>
-            </el-button>
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{hookConteroller:0}'); speakText('收钩')">
-              <i class="iconfont icon-xiangshang f-s-24"></i>
-              <div class="m-t-5">收钩</div>
-            </el-button>
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{hookConteroller:3}'); speakText('继续放钩')">
-              <i class="iconfont icon-qiyong f-s-24"></i>
-              <div class="m-t-5">继续</div>
-            </el-button>
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{hookConteroller:2}'); speakText('暂停放钩')">
-              <i class="iconfont icon-xuanting-zanting f-s-24"></i>
-              <div class="m-t-5">暂停</div>
-            </el-button>
-          </div>
-          <!-- 标题 -->
-          <div class="clearB m-b-15 fb f-s-16 contentTit">
-            <i class="iconfont icon-shipinjiankong f-s-22 m-r-5"></i>
-            <span>摄像头控制</span>
-          </div>
-          <div class="butIconBox m-b-15 gap10 flex">
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{cameraController:{item:0,val:0}}'); speakText('摄像头一键回中')">
-              <i class="iconfont icon-icon-rotation f-s-24"></i>
-              <div class="m-t-5">回中</div>
-            </el-button>
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="publishFun('{cameraController:{item:2,val:0,yaw:0,pitch:-50}}'); speakText('摄像头一键俯瞰')">
-              <i class="iconfont icon-down f-s-24"></i>
-              <div class="m-t-5">俯瞰</div>
-            </el-button>
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="dialogVisible = true; dialogTitle = '摄像头控制'; dialogItem = 'cameraBox'; speakText('手动调整摄像头')">
-              <i class="iconfont icon-chukong f-s-24"></i>
-              <div class="m-t-5">手动</div>
-            </el-button>
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="dialogVisible = true; dialogTitle = '摄像头控制'; dialogItem = 'cameraBox'; speakText('调整镜头焦距')">
-              <i class="iconfont icon-fangda f-s-24"></i>
-              <div class="m-t-5">焦距</div>
-            </el-button>
-          </div>
-          <!-- 标题 -->
-          <div class="clearB m-b-15 fb f-s-16 contentTit">
-            <i class="iconfont icon-tongzhi f-s-22 m-r-5"></i>
-            <span>喇叭控制</span>
-          </div>
-          <div class="butIconBox gap10 flex">
-            <el-button size="medium" type="primary" class="flex1 butIcon"
-              @click="dialogVisible = true; dialogTitle = '喊话参数'; dialogItem = 'talkBox';">
-              <i class="iconfont icon-icon-test f-s-24"></i>
-              <div class="m-t-5">喊话</div>
-            </el-button>
-          </div>
-        </div>
         <!-- 飞机调试 -->
-        <div v-else-if="activeIndex === 3" class="tabContentBox">
+        <div v-else-if="activeIndex === 1" class="tabContentBox">
           <!-- 标题 -->
           <div class="clearB m-b-15 fb f-s-16 contentTit">
             <i class="iconfont icon-banshou_Line f-s-22 m-r-5"></i>
@@ -367,9 +221,7 @@ export default {
       scaleValue: 50, // 摄像头控制滑动条 焦距值
       takeoffValue: 2, // 起飞高度
       controlItems: [// 菜单
-        { title: '任务', icon: 'icon-songcanfuwu', voice: '设置送餐任务' },
         { title: '控制', icon: 'icon-youxishoubing', voice: '控制飞机' },
-        { title: '扩展', icon: 'icon-linghuokuozhan', voice: '控制扩展组件' },
         { title: '调试', icon: 'icon-banshou_Line', voice: '调试飞机' }
       ],
       activeIndex: null, // 当前选中的菜单

src/router/index.js

@@ -212,7 +212,8 @@ const routes = [
       title: '航线管理',
       icon: 'iconfont icon-feihangluxian',
       roles: ['master', 'admin'],
-      tapName: 'plane'
+      tapName: 'plane',
+      hidden: true
     },
     children: [
       {
@@ -222,7 +223,8 @@ const routes = [
           title: '航线列表',
           icon: 'iconfont icon-a-05-1-1jihuazhihanggenzong',
           roles: ['master', 'admin'],
-          tapName: 'plane'
+          tapName: 'plane',
+          hidden: true
         }
       },
       {
@@ -232,7 +234,8 @@ const routes = [
           title: '航线设计',
           icon: 'iconfont icon-huizhi',
           roles: ['master', 'admin'],
-          tapName: 'plane'
+          tapName: 'plane',
+          hidden: true
         }
       },
       {
@@ -298,7 +301,7 @@ const routes = [
     component: Layout,
     redirect: '/planes/index',
     meta: {
-      title: '无人机',
+      title: '作业管理',
       icon: 'iconfont icon-wurenji',
       roles: ['master', 'admin'],
       tapName: 'plane'
@@ -445,7 +448,8 @@ const routes = [
       title: '分类管理',
       icon: 'iconfont icon-a-ziliaocaozuoxianshifenleishu',
       roles: ['master', 'admin', 'editor'],
-      tapName: 'admin'
+      tapName: 'admin',
+      hidden: true
     },
     children: [
       {
@@ -455,7 +459,8 @@ const routes = [
           title: '分类管理',
           icon: 'iconfont icon-a-ziliaocaozuoxianshifenleishu',
           roles: ['master', 'admin', 'editor'],
-          tapName: 'admin'
+          tapName: 'admin',
+          hidden: true
         }
       }
     ]
@@ -468,7 +473,8 @@ const routes = [
       title: '商品管理',
       icon: 'iconfont icon-chanpin',
       roles: ['master', 'admin', 'editor'],
-      tapName: 'admin'
+      tapName: 'admin',
+      hidden: true
     },
     children: [
       {
@@ -478,7 +484,8 @@ const routes = [
           title: 'SPU列表',
           icon: 'iconfont icon-chanpinliebiao-02',
           roles: ['master', 'admin', 'editor'],
-          tapName: 'admin'
+          tapName: 'admin',
+          hidden: true
         }
       },
       {
@@ -510,7 +517,8 @@ const routes = [
           title: 'SKU列表',
           icon: 'iconfont icon-sku',
           roles: ['master', 'admin', 'editor'],
-          tapName: 'admin'
+          tapName: 'admin',
+          hidden: true
         }
       },
       {
@@ -581,7 +589,8 @@ const routes = [
       title: '订单与统计',
       icon: 'iconfont icon-dingdantongji',
       roles: ['master', 'admin', 'editor'],
-      tapName: 'admin'
+      tapName: 'admin',
+      hidden: true
     },
     children: [
       {
@@ -591,7 +600,8 @@ const routes = [
           title: '订单管理',
           icon: 'iconfont icon-a-SalesOrderManagement',
           roles: ['master', 'admin', 'editor'],
-          tapName: 'admin'
+          tapName: 'admin',
+          hidden: true
         }
       },
       {
@@ -612,7 +622,8 @@ const routes = [
           title: '销售统计',
           icon: 'iconfont icon-data-view',
           roles: ['master', 'admin', 'editor'],
-          tapName: 'admin'
+          tapName: 'admin',
+          hidden: true
         }
       }
     ]

src/views/layout/components/headbar.vue

@@ -43,7 +43,7 @@
       <el-button size="small" icon="iconfont icon-shuaxin" @click="refreshPage" circle></el-button>
     </div>
     <!-- 订单信息按钮 -->
-    <el-badge :hidden="pendingCount + processingCount + shippedCount + requestedCount == 0
+    <el-badge v-if="false" :hidden="pendingCount + processingCount + shippedCount + requestedCount == 0
       ? true
       : false
       " :value="pendingCount + processingCount + shippedCount + requestedCount" class="navbarBadge l-h-50 p-r-15 r">
@@ -52,7 +52,7 @@
         : ''
         " @click="drawer = true" size="small" :icon="orderIcon" circle></el-button>
     </el-badge>
-    <el-drawer :custom-class="$store.state.app.isWideScreen ? 'el-drawer-small' : 'el-drawer-large'"
+    <el-drawer v-if="false" :custom-class="$store.state.app.isWideScreen ? 'el-drawer-small' : 'el-drawer-large'"
       :visible.sync="drawer" :size="$store.state.app.isWideScreen ? '90%' : '60%'" :append-to-body="true"
       :modal-append-to-body="false" :direction="$store.state.app.isWideScreen ? 'btt' : 'rtl'">
       <template slot="title">

src/views/layout/components/menubar.vue

@@ -3,11 +3,11 @@
     <!-- logo -->
     <div class="sidebar-logo-container" :class="{ 'collapse': isCollapse }">
       <div v-if="isCollapse" key="isCollapse" class="sidebar-logo-link" @click="isTap = !isTap">
-        <!-- <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo"> -->
+        <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo">
       </div>
       <!-- 展开状态下 -->
       <div v-else key="expand" class="sidebar-logo-link" @click="isTap = !isTap">
-        <!-- <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo"> -->
+        <img :src="isTap ? require('@/assets/logo.svg') : require('@/assets/appletLogo.svg')" class="sidebar-logo">
         <div class="sidebar-title-wrap">
           <h1 class="sidebar-title">{{ title }}</h1>
           <i class="el-icon-more arrow-icon" :class="{ rotate: !isTap }"></i>

src/views/login.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="login-container flex column mc">
     <div class="title-container fb l-h-32 flex mac">
-      <font class="f1 f-s-22">KPT-SP 无人机监管平台</font>
+      <font class="f1 f-s-22">鲲鹏堂 / KPT-SP</font>
       <font class="f2 f-s-10 m-l-5" style="vertical-align :top">v.1.0.1</font>
     </div>
     <el-form ref="loginForm" :model="loginForm" class="login-form" auto-complete="on" label-position="left">
-      <h3 class="f-s-30 m-b-15 fc">登录</h3>
+      <h3 class="f-s-30 m-b-15 fc">运载无机监管平台</h3>
       <el-form-item prop="username">
         <span class="svg-container"><i class="iconfont icon-yonghuziliao f-s-24"></i></span>
         <el-input ref="username" class="usernameBox" v-model="loginForm.username" placeholder="用户" name="username"