重启

src/pages/modules/home.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-row type="flex" class="navs_wraper" justify="space-between" align="middle">
-    <el-col :span="7" class="nav_item" v-for="(e, i) in nav" :key="i" :class="'nav_item_' + (i + 1)">
+  <el-row type="flex" class="navs_wraper" justify="center" align="middle">
+    <el-col :span="7" class="nav_item" v-for="(e, i) in visibleNav" :key="i" :class="'nav_item_' + (i + 1)">
       <div class="nav_item_i" @click="toPage(e)">
         <div class="nav_icon"></div>
         <p>{{ e[$langPre.computedProp('title')] }}</p>
@@ -10,19 +10,27 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   name: 'MinniHome',
   data () {
     return {
-      nav: [
-        {title: '操作', zh_title: '操作', en_title: 'Operation', router: '/index/device'},
-        {title: '建图', zh_title: '建图', en_title: 'Map building', router: '/index/building'},
-        // {title: '取消任务', zh_title: '取消任务', en_title: 'Cancel task', router: ''},
-        {title: '地图', zh_title: '地图', en_title: 'Map', router: '/index/map'}
-      ],
       disabled: false
     }
   },
+  computed: {
+    ...mapGetters(['userRole']),
+    nav () {
+      return [
+        { title: '操作', zh_title: '操作', en_title: 'Operation', router: '/index/device', isVisible: true },
+        { title: '建图', zh_title: '建图', en_title: 'Map building', router: '/index/building', isVisible: this.userRole === 1 },
+        { title: '地图', zh_title: '地图', en_title: 'Map', router: '/index/map', isVisible: true }
+      ]
+    },
+    visibleNav () {
+      return this.nav.filter(item => item.isVisible)
+    }
+  },
   methods: {
     toPage (e) {
       if (e.router === '/index/building') {
@@ -58,7 +66,7 @@ export default {
   padding 1.5%
   color #fff
   font-size .2rem
-  margin .1rem 0
+  margin .1rem 1%
   border 1px solid #2f9ae3
   background-image: linear-gradient(to bottom,transparent 11px,rgba(32, 74, 128, 90%) 1px),
                     linear-gradient(to right,transparent 11px,rgba(32, 74, 128, 90%) 1px);

src/pages/shells/config-modal.vue

@@ -1,36 +1,46 @@
 <template>
   <el-dialog
+    class="config_dialog"
     :title="$t('Configuration')"
     :visible.sync="dialogVisible"
     width="50%"
     :before-close="handleClose">
-    <el-form :model="dataForm" ref="dataForm" :rules="dataRule" :label-width="$i18n.locale === 'en-us' ? '1.3rem' : '1.1rem'" size="mini">
-      <p class="tip">{{$t('Languageselection')}}</p>
-      <el-form-item :label="$t('Language')" prop="selectedLanguage">
-        <el-select v-model="dataForm.selectedLanguage" :placeholder="$t('Pleaseselect')" id="selectedLanguage" style="width: 100%;">
-          <el-option
-            v-for="item in languages"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <p class="tip">{{$t('Parameterconfiguration')}}</p>
-      <el-form-item label="服务IP" prop="serverIp">
-        <el-input placeholder="请输入服务IP" v-model="dataForm.serverIp" id="ip" @focus="show" data-layout="normal"></el-input>
-      </el-form-item>
-      <el-form-item :label="$t('SchedulingIP')" prop="ip">
-        <el-input :placeholder="$t('PleaseIP')" v-model="dataForm.ip" id="ip" @focus="show" data-layout="normal"></el-input>
-      </el-form-item>
-      <el-form-item label="WIFI" prop="wifi">
-        <el-input :placeholder="$t('PleaseWIFI')" v-model="dataForm.wifi" id="wifi" @focus="show" data-layout="normal"></el-input>
-      </el-form-item>
-    </el-form>
-    <el-row type="flex" justify="space-around" style="margin-top: .3rem">
-      <el-col :span="7"><button class="button_control button_control_disabled" @click="exitUser"><p>{{$t('Cancel')}}</p></button></el-col>
-      <el-col :span="7"><button class="button_control" @click="dataFormSubmit"><p>{{$t('Save')}}</p></button></el-col>
-    </el-row>
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="基础配置" name="first">
+        <el-form :model="dataForm" ref="dataForm" :rules="dataRule" :label-width="$i18n.locale === 'en-us' ? '1.3rem' : '1.1rem'" size="mini">
+          <p class="tip">{{$t('Languageselection')}}</p>
+          <el-form-item :label="$t('Language')" prop="selectedLanguage">
+            <el-select v-model="dataForm.selectedLanguage" :placeholder="$t('Pleaseselect')" id="selectedLanguage" style="width: 100%;">
+              <el-option
+                v-for="item in languages"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <p class="tip">{{$t('Parameterconfiguration')}}</p>
+          <el-form-item label="服务IP" prop="serverIp">
+            <el-input placeholder="请输入服务IP" v-model="dataForm.serverIp" id="ip" @focus="show" data-layout="normal"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('SchedulingIP')" prop="ip">
+            <el-input :placeholder="$t('PleaseIP')" v-model="dataForm.ip" id="ip" @focus="show" data-layout="normal"></el-input>
+          </el-form-item>
+          <el-form-item label="WIFI" prop="wifi">
+            <el-input :placeholder="$t('PleaseWIFI')" v-model="dataForm.wifi" id="wifi" @focus="show" data-layout="normal"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-row type="flex" justify="space-around" style="margin-top: .3rem">
+          <el-col :span="7"><button class="button_control button_control_disabled" @click="exitUser"><p>{{$t('Cancel')}}</p></button></el-col>
+          <el-col :span="7"><button class="button_control" @click="dataFormSubmit"><p>{{$t('Save')}}</p></button></el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane label="关机重启" name="second">
+        <el-row type="flex" justify="center" align="middle" class="tab_wraper">
+          <div class="reset" @click="toReboot"></div>
+        </el-row>
+      </el-tab-pane>
+    </el-tabs>
     <!-- <vue-touch-keyboard id="keyboard" :options="options" v-if="visible" :layout="layout" :cancel="hide" :accept="accept" :input="input" :next="next" /> -->
   </el-dialog>
 </template>
@@ -40,6 +50,7 @@ import { mapGetters, mapActions } from 'vuex'
 export default {
   data () {
     return {
+      activeName: 'first',
       dialogVisible: false,
       dataForm: {
         selectedLanguage: '',
@@ -108,6 +119,27 @@ export default {
       this.visible = false
       done()
     },
+    toReboot () {
+      this.$confirm('是否确定关机重启?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.initLink()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消关机重启'
+        })
+      })
+    },
+    initLink () {
+      let link = 'stservice://systech.com:8088/router?data=reboot'
+      const a = document.createElement('a')
+      a.href = link
+      document.body.appendChild(a)
+      a.click()
+    },
     show (e) {
       // 关闭中文keyboard
       let arr = document.querySelectorAll('.hg-theme-default')
@@ -154,4 +186,12 @@ export default {
   line-height .2rem
   color #E54F29
   margin-bottom .1rem
+.tab_wraper
+  width 100%
+  height calc(2.2rem + 72px)
+.reset
+  cursor pointer
+  width .72rem
+  height .71rem
+  background center / 100% auto url(../../images/new/reset.png) no-repeat
 </style>

src/pages/shells/index.vue

@@ -341,7 +341,7 @@ export default {
   right 0
   background-image url(../../images/new/hud_right.png)
 .warn_image
-  _wh(.38rem, .39rem)
-  margin .08rem .08rem 0 0
+  _wh(.36rem, .32rem)
+  margin 0 .08rem 0 0
   background center / 100% auto url(../../images/new/warn_green.png) no-repeat
 </style>

src/style/common.styl

@@ -205,26 +205,12 @@
   font-size .16rem
 .el-message-box__content
   font-size .14rem
-.el-steps--simple
-  width 100%
-  padding 0
-  background transparent
-.el-step__head
-  display grid
-.el-step__head.is-finish, .el-step__head.is-wait
-  color #C0C4CC
-  border-color #0059a4
-.el-step__title.is-finish, .el-step__title.is-wait
-  color #C0C4CC
-.el-step__head.is-process
-  color #17ff09
-  border-color #17ff09
-.el-step__title.is-process
-  color #17ff09
 .el-progress-bar__inner,.el-progress-bar__outer
   border-radius 0
 .el-progress__text
   font-size .2rem !important
+.config_dialog .el-dialog__body
+  padding 0 0.4rem 0.3rem 0.4rem
 
 // button
 .button_control