From cee00a91a0bf6c44b18e70fb8863156d2c98d539 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 8 Feb 2023 13:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NavBar1.vue       |  59 +++++++
 src/components/alert.vue         |  17 +-
 src/components/toast.vue         |   6 +-
 src/config/getData2.js           |   4 +-
 src/pages/login/Login.vue        |   1 +
 src/pages/project/CallManage.vue | 233 +++++++++++++++++++++++++++
 src/pages/project/Home.vue       | 113 +++++++++++++
 src/pages/project/Login.vue      | 225 ++++++++++++++++++++++++++
 src/pages/project/Setup.vue      | 246 ++++++++++++++++++++++++++++
 src/pages/project/SiteManage.vue | 267 +++++++++++++++++++++++++++++++
 src/pages/project/TaskManage.vue | 129 +++++++++++++++
 src/pages/project/ZLManage.vue   | 144 +++++++++++++++++
 src/router/index.js              |  23 ++-
 src/style/common.styl            |  89 ++++++-----
 14 files changed, 1501 insertions(+), 55 deletions(-)
 create mode 100644 src/components/NavBar1.vue
 create mode 100644 src/pages/project/CallManage.vue
 create mode 100644 src/pages/project/Home.vue
 create mode 100644 src/pages/project/Login.vue
 create mode 100644 src/pages/project/Setup.vue
 create mode 100644 src/pages/project/SiteManage.vue
 create mode 100644 src/pages/project/TaskManage.vue
 create mode 100644 src/pages/project/ZLManage.vue

diff --git a/src/components/NavBar1.vue b/src/components/NavBar1.vue
new file mode 100644
index 0000000..d3440d1
--- /dev/null
+++ b/src/components/NavBar1.vue
@@ -0,0 +1,59 @@
+<template>
+  <header>
+    <span @click="goBack" class="icon-back"></span>
+    <span class="fxcol nav-name">{{title}}</span>
+    <div class="icon-home" @click="goHome"></div>
+  </header>
+</template>
+
+<script>
+export default {
+  name: 'NavBar',
+  props: {
+    title: String,
+    path: String,
+    inner: {
+      type: Boolean,
+      default: false
+    },
+    inner2: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    goBack () {
+      if (this.inner) {
+        this.$router.back()
+      } else if (this.inner2) {
+        this.$emit('goIn')
+      } else {
+        this.$router.push('/home')
+      }
+    },
+    goHome () {
+      this.$store.dispatch('setKeepAlive', [])
+      this.$router.push('/home')
+    }
+  }
+}
+</script>
+
+<style lang="stylus">
+@import '~@style/mixin'
+header
+    height 55px
+.icon-back
+  flex 0 0 26px
+  height 55px
+  cursor pointer
+  _bis('../images/back.png',26px)
+.icon-home
+  cursor pointer
+  flex 0 0 26px
+  height 55px
+  _bis('../images/home.png', 26px)
+.nav-name
+    font-size 18px
+    line-height 55px
+</style>
diff --git a/src/components/alert.vue b/src/components/alert.vue
index f01d103..380f4bd 100644
--- a/src/components/alert.vue
+++ b/src/components/alert.vue
@@ -72,7 +72,7 @@ export default {
   position fixed
   top 50%
   left 50%
-  width 80%
+  width 300px
   transition .3s
   transform translate3d(-50%, -50%, 0)
   overflow hidden
@@ -80,12 +80,14 @@ export default {
   border 1px solid #ebeef5
   background-color #fff
   box-shadow 0 2px 12px 0 rgba(0,0,0,.3)
-  font-size .28rem
-  line-height .42rem
+  font-size 16px
+  line-height 40px
   color #929292
   z-index 2019
 .text
-  padding .5rem
+  padding 20px
+  font-size 16px
+  line-height 30px
   max-height 60vh
   overflow-y auto
   text-align center
@@ -108,7 +110,10 @@ export default {
   border-top-width 1px
 .button--large
   width 100%
-  height 1rem
-  line-height 1rem
+  height 40px
+  line-height 40px
   color #e74f1a
+  span
+    font-size 16px
+    line-height 40px
 </style>
diff --git a/src/components/toast.vue b/src/components/toast.vue
index 1e3ae15..2bd6196 100644
--- a/src/components/toast.vue
+++ b/src/components/toast.vue
@@ -26,8 +26,8 @@ export default {
     position fixed
     z-index 10000
     width 100%
-    height .64rem
-    line-height .64rem
+    height 64px
+    line-height 64px
     text-align center
     left 50%
     top 50%
@@ -38,6 +38,6 @@ export default {
       padding 0 10px
       border-radius 10px
       background rgba(0, 0, 0, 0.6)
-      font-size .28rem
+      font-size 16px
       color #fff
 </style>
diff --git a/src/config/getData2.js b/src/config/getData2.js
index 63a2ac0..c1daecb 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -23,7 +23,7 @@ export const updatePass = (Rfold, Rfnew) => post2('api/pda/updatePass', {
 export const queryArea = () => post2('api/hand/queryArea', {})
 // export const queryArea = () => {
 //   let res = {
-//     result: [{region_code: '1', region_name: 'JLDFJLLJ'}, {region_code: '2', region_name: 'JLDFJLLJ'}, {region_code: '3', region_name: 'JLDFJLLJ'}]
+//     result: [{region_code: '1', region_name: 'A1', deviceArr: [{device_code: '1', device_name: 'A2', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A3', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A4', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A5', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}]}, {region_code: '2', region_name: 'A6'}, {region_code: '3', region_name: 'A7'}, {region_code: '11', region_name: 'A8'}, {region_code: '12', region_name: 'A9'}, {region_code: '13', region_name: 'A10'}, {region_code: '21', region_name: 'A11'}, {region_code: '22', region_name: 'JLDFJLLJ', deviceArr: [{device_code: '1', device_name: 'A2', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A3', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A4', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A5', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}]}]
 //   }
 //   return res
 // }
@@ -33,7 +33,7 @@ export const queryPointByArea = (code) => post2('api/hand/queryPointByArea', {
 })
 // export const queryPointByArea = (code) => {
 //   let res = {
-//     result: [{device_code: '1', device_name: 'JLDFJLLJ', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}]
+//     result: [{device_code: '1', device_name: 'JLDFJLLJ', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'JLDFJLLJ', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'JLDFJLLJ', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'JLDFJLLJ', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}]
 //   }
 //   return res
 // }
diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue
index 090d36c..7ae9410 100644
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -35,6 +35,7 @@ export default {
   },
   mounted () {
     document.getElementsByTagName('body')[0].className = 'login-bg'
+    alert(document.body.clientWidth + ',' + document.body.clientHeight + ',' + window.screen.width + ',' + window.screen.height)
   },
   methods: {
     changeType () {
diff --git a/src/pages/project/CallManage.vue b/src/pages/project/CallManage.vue
new file mode 100644
index 0000000..e50b0a5
--- /dev/null
+++ b/src/pages/project/CallManage.vue
@@ -0,0 +1,233 @@
+<template>
+  <section>
+    <nav-bar title="呼叫管理"></nav-bar>
+    <section class="content">
+      <div class="clear icons1">
+        <div class="fl item_icon1">
+          <div class="color_icon1 gray"></div>
+          <div class="font_icon1">空</div>
+        </div>
+        <div class="fl item_icon1">
+          <div class="color_icon1 green"></div>
+          <div class="font_icon1">有货</div>
+        </div>
+        <div class="fl item_icon1">
+          <div class="color_icon1 orange"></div>
+          <div class="font_icon1">有任务</div>
+        </div>
+      </div>
+      <div class="locate_block_wrap">
+        <div class="locate_block" v-for="e in areaArr" :key="e.region_code">
+            <div class="locate_name" @click="getPonit (e)">
+            <h2>{{e.region_name}}</h2>
+            </div>
+            <div class="site_block" ref="liCon">
+            <div class="site_item" v-for="(el, i) in e.deviceArr" :key="i" :class="['gray', 'green', 'orange'][Number(el.status)]" @click="setInfo(el)">
+                <div class="site_item_box clear">
+                <h3 class="fl">站<br>点</h3>
+                <div class="fl site_item_box_inner_r">
+                    <p class="bg_white">{{el.device_name}}</p>
+                </div>
+                </div>
+            </div>
+            </div>
+        </div>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <div class="dot_item">
+        <p class="p1">起始点</p>
+        <p class="p2">设备号：{{scodenameArr.toString()}}</p>
+      </div>
+      <div class="dot_item">
+        <p class="p1">目标点</p>
+        <p class="p2">设备号：1001</p>
+      </div>
+      <div class="btn_block">
+        <button class="btn btn1" :class="{'btn-disabled': scodeArr.length === 0}" @click="cancle">清&nbsp;&nbsp;空</button>
+        <button class="btn btn1" :class="{'btn-disabled': scodeArr.length === 0}" :disabled="disabled1" @click="toSure">确&nbsp;&nbsp;认</button>
+      </div>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar1.vue'
+import {queryArea, callTask} from '@config/getData2'
+export default {
+  name: 'siteManage',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      areaArr: [],
+      disabled1: false,
+      scodeArr: [],
+      scodenameArr: []
+    }
+  },
+  mounted () {
+    document.body.removeAttribute('class', 'login-bg')
+    this.initArea()
+    this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
+  methods: {
+    refresh () {
+      this.timer = setInterval(() => {
+        this.initArea()
+      }, this.interTime)
+    },
+    async initArea () {
+      let res = await queryArea()
+      this.areaArr = [...res.result]
+    },
+    setInfo (e) {
+      this.scodeArr.push(e.device_code)
+      this.scodenameArr.push(e.device_name)
+    },
+    /** 清空点位选择 */
+    cancle () {
+      this.scodeArr = []
+      this.scodenameArr = []
+      this.disabled1 = false
+    },
+    toSure () {
+      this.disabled1 = true
+      if (this.scodeArr.length === 0) {
+        this.disabled1 = false
+        return
+      }
+      this._callTask()
+    },
+    async _callTask () {
+      try {
+        let res = await callTask(this.scodeArr)
+        this.toast(res.desc)
+        clearInterval(this.timer)
+        this.timer = null
+        setTimeout(() => {
+          this.refresh()
+          this.cancle()
+        }, 2000)
+      } catch (err) {
+        this.disabled1 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin'
+.locate_block_wrap
+  _wh(100%, calc(100% - 40px))
+  _fj(, flex-start)
+  overflow-y auto
+.locate_block
+  width calc(100% / 8)
+  background-color #fff
+  border-radius 5px
+  padding 10px
+  margin 0 10px
+.locate_name
+  position relative
+  _wh(100%,48px)
+  h2
+    _font(16px,48px,#000,500)
+.site_block
+  _wh(100%,auto)
+  overflow hidden
+  transition height .3s
+.site_item
+  _wh(100%,60px)
+  padding 0 10px
+  margin-top 12px
+  background-color #e5e5e5
+  border-radius 5px
+  overflow hidden
+.site_item_box
+  _wh(100%, 40px)
+  margin 10px 0
+  overflow hidden
+  h3
+    display block
+    width 32px
+    _font(16px,20px,#000,500)
+.site_item_box_inner_r
+  _fj(center)
+  flex-direction column
+  _wh(calc(100% - 32px), 40px)
+  background-color #fff
+  border-radius 3px
+  overflow hidden
+  p
+    display block
+    _wh(100%, 40px)
+    overflow hidden
+    _font(16px,40px,#999,,center)
+    padding 0 5px
+.bg_white
+  background-color #fff
+.open_icon
+  position absolute
+  right 0
+  top 0
+  _wh(48px,48px)
+  _font(20px,48px,$red,,right)
+  transition all .3s
+  transform rotateZ(180deg)
+.is_reverse
+  transform rotateZ(0)
+.gray
+  background-color #e5e5e5
+.blue
+  background-color $blue
+.green
+  background-color $green
+.orange
+  background-color orange
+.submit-bar
+  height 160px
+  padding 10px
+.dot_item
+  width 35%
+  background-color #e5e5e5
+.p1
+  display block
+  height 60px
+  _font(15px,60px,,,center)
+  border-bottom 1px solid #fff
+  overflow hidden
+.p2
+  _fj(center)
+  height 80px
+  padding 0 5px
+  _font(15px,20px,,,center)
+  word-break: break-all;
+  overflow hidden
+.btn_block
+  _wh(20%, 140px)
+  _fj()
+  flex-direction column
+.btn
+    font-size 16px
+    line-height 60px
+.btn1
+  width 100%
+.content
+  height calc(100% - 220px)
+  overflow-y scroll
+.msg_item_flex_2
+  width 100%
+  _fj()
+.msg_item1
+  width calc(50% - 10px)
+.from_item
+  border-bottom 1px solid #dcdfe6
+</style>
diff --git a/src/pages/project/Home.vue b/src/pages/project/Home.vue
new file mode 100644
index 0000000..98fd799
--- /dev/null
+++ b/src/pages/project/Home.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="inner-wrap">
+    <div class="top_header">
+      <header>
+        <div class="top-left">
+          <!-- <div class="fl header-title header-name">首页</div> -->
+          <div class="fl header-title header-name">登录人员：{{$store.getters.userInfo !== '' ? JSON.parse($store.getters.userInfo).nickName : ''}}</div>
+        </div>
+        <div class="fr exitbtn" @click="Quit">退出</div>
+      </header>
+    </div>
+    <div class="menu">
+      <ul>
+        <li @click="goInner('/SiteManage')">站点管理</li>
+        <li @click="goInner('/CallManage')">呼叫管理</li>
+        <li @click="goInner('/ZlManage')">指令管理</li>
+        <li @click="goInner('/TaskManage')">任务管理</li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import {authority} from '@config/getData2.js'
+export default {
+  name: 'Home',
+  data () {
+    return {
+      menuList: [],
+      show: false,
+      secM: []
+    }
+  },
+  mounted () {
+    document.getElementsByTagName('body')[0].className = 'bgwhite'
+    this.$store.dispatch('receiveMaterObj', {})
+  },
+  beforeDestroy () {
+    document.body.removeAttribute('class', 'bgwhite')
+  },
+  created () {
+    // this._authority()
+  },
+  methods: {
+    toPage (e) {
+      let name = e.path.substr(2)
+      if (name === 'CheckManage' || name === 'ConveyorLine') {
+        this.$store.dispatch('setKeepAlive', [name])
+      }
+      this.$router.push(e.path.substr(2))
+    },
+    /** 获取菜单 */
+    async _authority () {
+      let accountId = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).account_id : ''
+      let res = await authority(accountId)
+      this.menuList = [...res.result.sonTree]
+    },
+    Quit () {
+      this.$store.dispatch('setSignOut')
+      this.$router.push('/login')
+    },
+    goInner (path) {
+      let name = path.substr(1)
+      if (name === 'CheckManage') {
+        this.$store.dispatch('setKeepAlive', [name])
+      }
+      this.$router.push(path)
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+header
+    height 55px
+    padding 0 28px
+.header-title, .date-box,ul li
+  color #ffffff
+  font-size 16px
+.exitbtn
+  color #ffffff
+  width 100px
+  text-align center
+  box-sizing border-box
+  border 1px solid #ffffff
+  border-radius 5px
+  height 40px
+  line-height 40px
+  font-size 16px
+.menu
+  display flex
+  font-size 200px
+  text-align center
+  justify-content center
+  align-items center
+  height 100%
+  // height calc(100% - 0.44rem);
+  ul
+    width 600px
+    box-sizing border-box
+    // margin 0 auto
+    li
+      color #D75930
+      width 200px
+      float left
+      font-size 18px
+      margin 40px 50px
+      line-height 50px
+      padding 10px
+      border 1px solid #D75930
+      border-radius 5px
+      cursor pointer
+</style>
diff --git a/src/pages/project/Login.vue b/src/pages/project/Login.vue
new file mode 100644
index 0000000..c80df8d
--- /dev/null
+++ b/src/pages/project/Login.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="login_bg">
+    <div class="login_wrap">
+      <div class="login-form-logo">
+        <div class="login-logo-text login-logo-text1">欢迎来到</div>
+        <div class="login-logo-text login-logo-text2">辽宁奥美手持系统！</div>
+      </div>
+      <div class="login_cnt">
+        <div class="login_card">
+          <div class="card_wrap">
+            <div class="inputOuter">
+              <input type="text" placeholder="用户名" v-model="loginname" class="inputStyle">
+            </div>
+            <div class="inputOuter">
+              <input placeholder="密码" :type="type" v-model="password" class="inputStyle">
+              <i class="icon-eye" :class="type === 'password' ? 'icon-eye-close' : 'icon-eye-open'" @click="changeType"></i>
+            </div>
+          </div>
+          <div class="fxrow check-setup-box">
+            <!-- <div class="check-box">
+              <i class="icon-name-check" :class="{'icon-name-checked': memberName === 'true'}" @click="Remember"></i>
+              <span class="meber-desc">记住用户名</span>
+            </div> -->
+            <div class="setup-box" @click="toSetup">配置</div>
+          </div>
+          <div class="submit">
+            <button class="btn submit-button" @click="_Login" :disabled="disabled">登&nbsp;&nbsp;录</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {loginApi} from '@config/getData2'
+import {encrypt} from '../../main.js'
+export default {
+  name: 'Login',
+  data () {
+    return {
+      loginname: '',
+      password: '',
+      type: 'password',
+      jobnum: '',
+      qrcode: '',
+      disabled: false
+    }
+  },
+  mounted () {
+    document.getElementsByTagName('body')[0].className = 'login-bg'
+  },
+  methods: {
+    changeType () {
+      this.type = this.type === 'password' ? 'text' : 'password'
+    },
+    async loginApi () {
+      try {
+        let res = await loginApi(this.loginname, encrypt(this.password))
+        let obj = {}
+        obj = Object.assign({}, res.user.user, {token: res.token})
+        this.$store.dispatch('userInfo', JSON.stringify(obj))
+        this.$router.push('/home')
+        this.disabled = false
+      } catch (err) {
+        this.disabled = false
+      }
+    },
+    _Login () {
+      this.disabled = true
+      if (this.loginname === '') {
+        this.toast('用户名不能为空')
+        this.disabled = false
+        return
+      }
+      if (this.password === '') {
+        this.toast('密码不能为空')
+        this.disabled = false
+        return
+      }
+      this.logintype = '01'
+      this.loginApi()
+    },
+    toSetup () {
+      this.$router.push('/setup')
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin'
+.icon-eye
+  position absolute
+  right 0
+  width 35px
+  height 40px
+.icon-eye-close
+  _bis('../../images/eyeclose.png',20px)
+.icon-eye-open
+  _bis('../../images/eyeopen.png',20px)
+.check-setup-box
+  display flex
+  align-items center
+  justify-content center
+  margin-top 24px
+.setup-box
+  line-height 40px
+  font-size 16px
+  color #4A54FF
+.check-box
+  display flex
+  align-items center
+  justify-content flex-start
+.icon-name-check
+  width 22px
+  height 22px
+  margin-right 6px
+  border 1px solid #e2e2e2
+  border-radius 50%
+.icon-name-checked
+  border none
+  background center / 100% auto url(../../images/select.png) no-repeat
+  background-size 22px 22px
+  border 1px solid #e2e2e2
+.meber-desc
+  line-height 40px
+  font-size 16px
+  color #4A54FF
+.login_bg
+  width 100%
+  height 100%
+  // background center bottom / 100% auto url(../../images/bg_01.png) no-repeat
+.login_wrap
+  position fixed
+  left 50%
+  top 50%
+  width 472px
+  min-height 460px
+  transform translate3d(-50%, -50%, 0)
+  border-radius 12px
+  overflow hidden
+  box-shadow 0 0 6px 0 rgb(0 0 0 / 20%)
+  background #fff center bottom / 100% auto url(../../images/bg.png) no-repeat
+.login-form-logo
+  width 100%
+  height 180px
+  display flex
+  flex-direction column
+  align-items center
+  justify-content center
+  background-color #e74f1a
+  background-image linear-gradient(180deg, #f77130 0, #c64602 100%), linear-gradient(126deg, #f7874e 15%, #c04103 100%)
+  border-radius 12px 12px 0 0
+  box-shadow 0 2px 7px 0 #e84f1a
+.login-logo-text
+  font-size 20px
+  line-height 30px
+  color #fff
+.login-logo-text2
+  font-sise 22px
+  font-weight bold
+.login_cnt
+  position relative
+  width 100%
+  overflow hidden
+.login_card
+  width 323px
+  margin 0 auto
+.card_wrap
+  overflow hidden
+.inputOuter
+  position relative
+  width 100%
+  margin-top 24px
+label
+  display block
+  font-size .16rem
+  line-height .3rem
+  color #333
+.inputStyle, select
+  width 100%
+  line-height 40px
+  height 40px
+  color #595959
+  padding 0 12px
+  font-size 16px
+  border 1px solid #dfdfdf
+  box-sizing border-box
+  border-radius 4px
+select
+  appearance auto
+  outline none
+.submit
+  width 100%
+  margin 24px auto
+  text-align center
+.btn
+  background-color #2778f3
+  font-size 16px
+  line-height 40px
+  color #fff
+  width 100%
+  border-radius 999px
+  margin 0
+  padding 0
+.submit-button
+  background center center #e74f1a
+  background-image linear-gradient(315deg,#D7592F 0,#E2663C 100%)
+.scan_icon
+  width .4rem
+  font-size .3rem
+  line-height .4rem
+  color #D7592F
+  text-align center
+  border 1px solid #D7592F
+  border-radius 100%
+  margin .1rem auto
+  &::before
+    content: '\e607'
+.san_text
+  font-size .16rem
+  color #D7592F
+  text-align center
+</style>
diff --git a/src/pages/project/Setup.vue b/src/pages/project/Setup.vue
new file mode 100644
index 0000000..91b7094
--- /dev/null
+++ b/src/pages/project/Setup.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="login_bg">
+    <div class="login_wrap">
+      <div class="login-form-logo">
+        <div class="login-logo-text login-logo-text1">欢迎来到</div>
+        <div class="login-logo-text login-logo-text2">辽宁奥美手持系统！</div>
+      </div>
+      <div class="login_cnt">
+        <div class="login_card">
+          <div class="card_wrap">
+            <div class="inputOuter">
+              <div class="input_label">acs地址</div>
+              <input type="text" v-model="acsip" class="inputStyle">
+            </div>
+            <div class="inputOuter">
+              <div class="input_label">刷新时间(s)</div>
+              <input type="text" v-model="setTime" class="inputStyle">
+            </div>
+          </div>
+          <div class="fxrow check-setup-box">
+            <div class="setup-box" @click="toLogin">返回登录</div>
+          </div>
+          <div class="submit">
+            <button class="btn submit-button" @click="_submit">确&nbsp;&nbsp;认</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Setup',
+  data () {
+    return {
+      //   addrip: this.$store.getters.baseUrl,
+      acsip: this.$store.getters.acsUrl,
+      //   imgip: this.$store.getters.imgip,
+      //   printip: this.$store.getters.printUrl || 'http://10.5.29.104:8000',
+      //   billPrintip: this.$store.getters.billPrintUrl || 'http://10.5.29.191:8000',
+      setTime: this.$store.getters.setTime / 1000
+    }
+  },
+  methods: {
+    toLogin () {
+      this.$router.push('/login')
+    },
+    _submit () {
+    //   if (this.addrip === '') {
+    //     this.toast('请填写wms地址')
+    //     return
+    //   }
+      if (this.acsip === '') {
+        this.toast('请填写acs地址')
+        return
+      }
+      // if (this.addrip === '') {
+      //   this.toast('请填写服务器地址')
+      //   return
+      // }
+      // if (this.imgip === '') {
+      //   this.toast('请填写图片域名地址')
+      //   return
+      // }
+      // if (this.printip === '') {
+      //   this.toast('请填写标签打印地址')
+      //   return
+      // }
+      // if (this.billPrintip === '') {
+      //   this.toast('请填写单据打印地址')
+      //   return
+      // }
+      if (this.setTime === '') {
+        this.toast('请填写刷新时间')
+        return
+      }
+      // 删除id为printid的DOM节点
+      // var printid = document.getElementById('printid')
+      // if (printid) {
+      //   printid.parentNode.removeChild(printid)
+      // }
+      // 动态添加script
+      // var script = document.createElement('script')
+      // script.setAttribute('id', 'printid')
+      // script.src = this.printip + '/CLodopfuncs.js'
+      // document.getElementsByTagName('head')[0].appendChild(script)
+
+      // 2
+      // 删除id为billPrintid的DOM节点
+      // var billPrintid = document.getElementById('billPrintid')
+      // if (billPrintid) {
+      //   billPrintid.parentNode.removeChild(billPrintid)
+      // }
+      // 动态添加script
+      // var script2 = document.createElement('script')
+      // script2.setAttribute('id', 'billPrintid')
+      // script2.src = this.billPrintip + '/CLodopfuncs.js'
+      // document.getElementsByTagName('head')[0].appendChild(script2)
+
+      // 存值
+      //   this.$store.dispatch('setBaseUrl', this.addrip)
+      this.$store.dispatch('setAcsUrl', this.acsip)
+      //   this.$store.dispatch('setImgIp', this.imgip)
+      //   this.$store.dispatch('setPrintUrl', this.printip)
+      //   this.$store.dispatch('setBillPrintUrl', this.billPrintip)
+      this.$store.dispatch('setRefreshTime', this.setTime * 1000)
+      this.$router.push('/login')
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+.check-setup-box
+  display flex
+  align-items center
+  justify-content center
+  margin-top 24px
+.setup-box
+  line-height 40px
+  font-size 16px
+  color #4A54FF
+.check-box
+  display flex
+  align-items center
+  justify-content flex-start
+.icon-name-check
+  width 22px
+  height 22px
+  margin-right 6px
+  border 1px solid #e2e2e2
+  border-radius 50%
+.icon-name-checked
+  border none
+  background center / 100% auto url(../../images/select.png) no-repeat
+  background-size 22px 22px
+  border 1px solid #e2e2e2
+.meber-desc
+  line-height 40px
+  font-size 16px
+  color #4A54FF
+.login_bg
+  width 100%
+  height 100%
+  // background center bottom / 100% auto url(../../images/bg_01.png) no-repeat
+.login_wrap
+  position fixed
+  left 50%
+  top 50%
+  width 472px
+  min-height 460px
+  transform translate3d(-50%, -50%, 0)
+  border-radius 12px
+  overflow hidden
+  box-shadow 0 0 6px 0 rgb(0 0 0 / 20%)
+  background #fff center bottom / 100% auto url(../../images/bg.png) no-repeat
+.login-form-logo
+  width 100%
+  height 180px
+  display flex
+  flex-direction column
+  align-items center
+  justify-content center
+  background-color #e74f1a
+  background-image linear-gradient(180deg, #f77130 0, #c64602 100%), linear-gradient(126deg, #f7874e 15%, #c04103 100%)
+  border-radius 12px 12px 0 0
+  box-shadow 0 2px 7px 0 #e84f1a
+.login-logo-text
+  font-size 20px
+  line-height 30px
+  color #fff
+.login-logo-text2
+  font-sise 22px
+  font-weight bold
+.login_cnt
+  position relative
+  width 100%
+  overflow hidden
+.login_card
+  width 400px
+  margin 0 auto
+.card_wrap
+  overflow hidden
+.inputOuter
+  position relative
+  display flex
+  align-items center
+  justify-content space-between
+  width 100%
+  margin-top 24px
+label
+  display block
+  font-size .16rem
+  line-height .3rem
+  color #333
+.inputStyle, select
+  width 100%
+  line-height 40px
+  height 40px
+  color #595959
+  padding 0 12px
+  font-size 16px
+  border 1px solid #dfdfdf
+  box-sizing border-box
+  border-radius 4px
+select
+  appearance auto
+  outline none
+.submit
+  width 100%
+  margin 24px auto
+  text-align center
+.btn
+  background-color #2778f3
+  font-size 16px
+  line-height 40px
+  color #fff
+  width 100%
+  border-radius 999px
+  margin 0
+  padding 0
+.submit-button
+  background center center #e74f1a
+  background-image linear-gradient(315deg,#D7592F 0,#E2663C 100%)
+.scan_icon
+  width .4rem
+  font-size .3rem
+  line-height .4rem
+  color #D7592F
+  text-align center
+  border 1px solid #D7592F
+  border-radius 100%
+  margin .1rem auto
+  &::before
+    content: '\e607'
+.san_text
+  font-size .16rem
+  color #D7592F
+  text-align center
+.input_label
+    width 150px
+    font-size 16px
+    line-height 40px
+    color #595959
+</style>
diff --git a/src/pages/project/SiteManage.vue b/src/pages/project/SiteManage.vue
new file mode 100644
index 0000000..dd70dd6
--- /dev/null
+++ b/src/pages/project/SiteManage.vue
@@ -0,0 +1,267 @@
+<template>
+  <section>
+    <nav-bar title="站点管理"></nav-bar>
+    <section class="content">
+      <div class="clear icons1">
+        <div class="fl item_icon1">
+          <div class="color_icon1 gray"></div>
+          <div class="font_icon1">空</div>
+        </div>
+        <div class="fl item_icon1">
+          <div class="color_icon1 green"></div>
+          <div class="font_icon1">有货</div>
+        </div>
+        <div class="fl item_icon1">
+          <div class="color_icon1 orange"></div>
+          <div class="font_icon1">有任务</div>
+        </div>
+      </div>
+      <div class="locate_block_wrap">
+        <div class="locate_block" v-for="e in areaArr" :key="e.region_code">
+            <div class="locate_name" @click="getPonit (e)">
+            <h2>{{e.region_name}}</h2>
+            </div>
+            <div class="site_block" ref="liCon">
+            <div class="site_item" v-for="(el, i) in e.deviceArr" :key="i" :class="['gray', 'green', 'orange'][Number(el.status)]" @click="setInfo(el)">
+                <div class="site_item_box clear">
+                <h3 class="fl">站<br>点</h3>
+                <div class="fl site_item_box_inner_r">
+                    <p class="bg_white">{{el.device_name}}</p>
+                </div>
+                </div>
+            </div>
+            </div>
+        </div>
+      </div>
+    </section>
+    <div v-if="active" class="msg_wrapper">
+      <div class="msg_box">
+        <div class="msg_item">
+          <div class="label_item">当前设备</div>
+          <div class="from_item">
+            {{obj.device_name}}
+          </div>
+        </div>
+        <div class="msg_item">
+          <div class="label_item">当前物料</div>
+          <div class="from_item" style="border-bottom: none">
+            <el-select v-model="value" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="msg_btns">
+          <button class="msg_btn" :disabled="disabled1" @click="cleanUp">清空</button>
+          <button class="msg_btn" :disabled="disabled2" @click="msgSure">确认</button>
+          <button class="msg_btn" @click="msgCancle">取消</button>
+        </div>
+      </div>
+    </div>
+    <div v-if="active" class="mask"></div>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar1.vue'
+import {queryArea, queryMaterial, bindpoint} from '@config/getData2'
+export default {
+  name: 'siteManage',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      areaArr: [],
+      active: false,
+      options: [],
+      value: '',
+      obj: {},
+      disabled1: false,
+      disabled2: false
+    }
+  },
+  mounted () {
+    document.body.removeAttribute('class', 'login-bg')
+    this.initArea()
+    this.initHandMatrial()
+    this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+  },
+  methods: {
+    refresh () {
+      this.timer = setInterval(() => {
+        this.initArea()
+      }, this.interTime)
+    },
+    async initArea () {
+      let res = await queryArea()
+      this.areaArr = [...res.result]
+    },
+    async initHandMatrial () {
+      let res = await queryMaterial()
+      this.options = [...res.result]
+    },
+    setInfo (e) {
+      if (e.input_material === '1') {
+        this.active = true
+        this.obj = e
+        this.value = e.material_type
+      }
+    },
+    msgCancle () {
+      this.active = false
+      this.obj = {}
+      this.value = ''
+    },
+    msgSure () {
+      this.disabled2 = true
+      this.handStatus(this.obj.device_code, this.value, '1', this.obj.status)
+      this.active = false
+    },
+    cleanUp () {
+      this.disabled1 = true
+      this.handStatus(this.obj.device_code, this.value, '2', this.obj.status)
+      this.active = false
+    },
+    async handStatus (code, mtype, type, no) {
+      try {
+        let res = await bindpoint(code, mtype, type, no)
+        if (res.code === '1') {
+          this.toast(res.desc)
+          clearInterval(this.timer)
+          setTimeout(() => {
+            this.initArea()
+            this.refresh()
+            this.value = ''
+            this.disabled1 = false
+            this.disabled2 = false
+          }, 2000)
+        } else {
+          this.Dialog(res.desc)
+          this.value = ''
+          this.disabled1 = false
+          this.disabled2 = false
+        }
+      } catch (err) {
+        console.log(err)
+        this.value = ''
+        this.disabled1 = false
+        this.disabled2 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin'
+.locate_block_wrap
+  _wh(100%, calc(100% - 40px))
+  _fj(, flex-start)
+  overflow-y auto
+.locate_block
+  width calc(100% / 8)
+  background-color #fff
+  border-radius 5px
+  padding 10px
+  margin 0 10px
+.locate_name
+  position relative
+  _wh(100%,48px)
+  h2
+    _font(16px,48px,#000,500)
+.site_block
+  _wh(100%,auto)
+  overflow hidden
+  transition height .3s
+.site_item
+  _wh(100%,60px)
+  padding 0 10px
+  margin-top 12px
+  background-color #e5e5e5
+  border-radius 5px
+  overflow hidden
+.site_item_box
+  _wh(100%, 40px)
+  margin 10px 0
+  overflow hidden
+  h3
+    display block
+    width 32px
+    _font(16px,20px,#000,500)
+.site_item_box_inner_r
+  _fj(center)
+  flex-direction column
+  _wh(calc(100% - 32px), 40px)
+  background-color #fff
+  border-radius 3px
+  overflow hidden
+  p
+    display block
+    _wh(100%, 40px)
+    overflow hidden
+    _font(16px,40px,#999,,center)
+    padding 0 5px
+.bg_white
+  background-color #fff
+.open_icon
+  position absolute
+  right 0
+  top 0
+  _wh(48px,48px)
+  _font(20px,48px,$red,,right)
+  transition all .3s
+  transform rotateZ(180deg)
+.is_reverse
+  transform rotateZ(0)
+.gray
+  background-color #e5e5e5
+.blue
+  background-color $blue
+.green
+  background-color $green
+.orange
+  background-color orange
+.submit-bar
+  height 1.6rem
+  padding .1rem
+.dot_item
+  width 35%
+  background-color #e5e5e5
+.p1
+  display block
+  height .6rem
+  _font(.15rem,.6rem,,,center)
+  border-bottom .01rem solid #fff
+  overflow hidden
+.p2
+  display block
+  height .8rem
+  padding 0 .05rem
+  _font(.15rem,.8rem,,,center)
+  overflow hidden
+.btn_block
+  _wh(20%, 1.4rem)
+  _fj()
+  flex-direction column
+.btn1
+  width 100%
+.content
+  height calc(100% - 55px)
+.msg_item_flex_2
+  width 100%
+  _fj()
+.msg_item1
+  width calc(50% - .1rem)
+.from_item
+  border-bottom 1px solid #dcdfe6
+</style>
diff --git a/src/pages/project/TaskManage.vue b/src/pages/project/TaskManage.vue
new file mode 100644
index 0000000..e43b8f1
--- /dev/null
+++ b/src/pages/project/TaskManage.vue
@@ -0,0 +1,129 @@
+<template>
+  <section>
+    <nav-bar title="任务管理"></nav-bar>
+    <section class="content grid-wraper">
+      <div class="left_fixed">
+        <table class="layout-t left_layout_t">
+          <tr>
+           <th>任务号</th>
+          </tr>
+          <tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_uuid === pkId}">
+            <td>{{e.task_no}}</td>
+          </tr>
+        </table>
+      </div>
+      <div class="slide">
+        <table class="layout-t">
+          <tr>
+            <th>起点</th>
+            <th>终点</th>
+            <th>状态</th>
+            <th>托盘号</th>
+            <th>物料类型</th>
+            <th>优先级</th>
+            <th>时间</th>
+          </tr>
+          <tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_uuid === pkId}">
+            <td>{{e.start_devicecode}}</td>
+            <td>{{e.next_devicecode}}</td>
+            <td>{{e.task_status_name}}</td>
+            <td>{{e.vehicle_code}}</td>
+            <td>{{e.material_type_name}}</td>
+            <td>{{e.priority}}</td>
+            <td>{{e.create_time}}</td>
+          </tr>
+        </table>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn btn-disabled submit-button" :class="{'bgred' : btnred}" :disabled="disabled" @click="toSure('1')">重新生成</button>
+      <button class="btn btn-disabled submit-button" :class="{'bgred' : btnred}" :disabled="disabled" @click="toSure('2')">强制完成</button>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar1.vue'
+import {queryTask, taskOperation} from '@config/getData1'
+export default {
+  name: 'TaskManage',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      keyword: '',
+      startPoint: '',
+      endPoint: '',
+      btnred: false,
+      disabled: false,
+      dataList: [],
+      //   dataList: [
+      //     {
+      //       task_uuid: '1',
+      //       task_no: '87511',
+      //       start_devicecode: 'A12',
+      //       next_devicecode: 'F99',
+      //       inst_status: '放货完成',
+      //       agv_no: 'A01'
+      //     }
+      //   ],
+      pkId: ''
+    }
+  },
+  mounted () {
+    this.queryTask(this.keyword, this.startPoint, this.endPoint)
+  },
+  methods: {
+    async queryTask () {
+      let res = await queryTask(this.keyword, this.startPoint, this.endPoint)
+      this.dataList = res.result
+    },
+    async taskOperation (type) {
+      try {
+        let res = await taskOperation(this.pkId, type)
+        this.toast(res.desc)
+        this.disabled = false
+        this.pkId = ''
+        this.btnred = false
+        this.dataList = []
+        this.queryTask()
+      } catch (err) {
+        this.disabled = false
+      }
+    },
+    toSure (type) {
+      if (this.pkId) {
+        this.disabled = true
+        this.taskOperation(type)
+      } else {
+        // this.toast('请选择')
+      }
+    },
+    toCheck (e) {
+      this.pkId = this.pkId === e.task_uuid ? '' : e.task_uuid
+      if (this.pkId) {
+        this.btnred = true
+      } else {
+        this.btnred = false
+      }
+    }
+  }
+}
+</script>
+<style lang="stylus" scoped>
+.content
+    margin-top 15px
+    height calc(100% - 160px)
+.slide .layout-t
+  width 100%
+.submit-bar
+    justify-content: space-evenly
+.submit-button
+    line-height 80px
+    margin: 15px
+    max-width 200px
+.btn
+    font-size 16px
+    line-height 50px
+</style>
diff --git a/src/pages/project/ZLManage.vue b/src/pages/project/ZLManage.vue
new file mode 100644
index 0000000..a1385ad
--- /dev/null
+++ b/src/pages/project/ZLManage.vue
@@ -0,0 +1,144 @@
+<template>
+  <section>
+    <nav-bar title="指令管理"></nav-bar>
+    <section class="content grid-wraper">
+      <div class="left_fixed">
+        <table class="layout-t left_layout_t">
+          <tr>
+            <th>任务号</th>
+          </tr>
+          <tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.inst_uuid === pkId}">
+            <td>{{e.task_no}}</td>
+          </tr>
+        </table>
+      </div>
+      <div class="slide">
+        <table class="layout-t">
+          <tr>
+            <th>指令号</th>
+            <th>起点</th>
+            <th>终点</th>
+            <th>状态</th>
+            <th>托盘号</th>
+            <th>agv车号</th>
+            <th>物料类型</th>
+            <th>优先级</th>
+            <th>时间</th>
+          </tr>
+          <tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.inst_uuid === pkId}">
+            <td>{{e.inst_no}}</td>
+            <td>{{e.start_devicecode}}</td>
+            <td>{{e.next_devicecode}}</td>
+            <td>{{e.inst_status_name}}</td>
+            <td>{{e.vehicle_code}}</td>
+            <td>{{e.carno}}</td>
+            <td>{{e.material_type_name}}</td>
+            <td>{{e.priority}}</td>
+            <td>{{e.create_time}}</td>
+          </tr>
+        </table>
+      </div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn btn-disabled submit-button" :class="{'bgred' : btnred}" :disabled="disabled" @click="toSure('1')">指令撤销</button>
+      <button class="btn btn-disabled submit-button" :class="{'bgred' : btnred}" :disabled="disabled" @click="toSure('2')">重新下发</button>
+      <button class="btn btn-disabled submit-button" :class="{'bgred' : btnred}" :disabled="disabled" @click="toSure('3')">强制完成</button>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar1.vue'
+import {queryInstraction, instOperation} from '@config/getData1'
+export default {
+  name: 'ZlManage',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      keyword: '',
+      startPoint: '',
+      endPoint: '',
+      btnred: false,
+      disabled: false,
+      dataList: [],
+      //   dataList: [
+      //     {
+      //       inst_uuid: '1',
+      //       task_no: '87511',
+      //       start_devicecode: 'A12',
+      //       next_devicecode: 'F99',
+      //       inst_status: '放货完成',
+      //       priority: '高',
+      //       create_time: '12:00:00'
+      //     },
+      //     {
+      //       inst_uuid: '1',
+      //       task_no: '87511',
+      //       start_devicecode: 'A12',
+      //       next_devicecode: 'F99',
+      //       inst_status: '放货完成',
+      //       priority: '高',
+      //       create_time: '12:00:00'
+      //     }
+      //   ],
+      pkId: ''
+    }
+  },
+  mounted () {
+    this.queryInstraction(this.keyword, this.startPoint, this.endPoint)
+  },
+  methods: {
+    async queryInstraction () {
+      let res = await queryInstraction(this.keyword, this.startPoint, this.endPoint)
+      this.dataList = res.result
+    },
+    async instOperation (type) {
+      try {
+        let res = await instOperation(this.pkId, type)
+        this.toast(res.desc)
+        this.disabled = false
+        this.pkId = ''
+        this.btnred = false
+        this.dataList = []
+        this.queryInstraction()
+      } catch (err) {
+        this.disabled = false
+      }
+    },
+    toSure (type) {
+      if (this.pkId) {
+        this.disabled = true
+        this.instOperation(type)
+      } else {
+        // this.toast('请选择')
+      }
+    },
+    toCheck (e) {
+      this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
+      if (this.pkId) {
+        this.btnred = true
+      } else {
+        this.btnred = false
+      }
+    }
+  }
+}
+</script>
+<style lang="stylus" scoped>
+.content
+    margin-top 15px
+    height calc(100% - 160px)
+.slide .layout-t
+  width 100%
+.submit-bar
+    justify-content: space-evenly
+.submit-button
+    line-height 80px
+    margin: 15px
+    max-width 200px
+.btn
+    font-size 16px
+    line-height 50px
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b8797c5..8bdb431 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,16 +2,25 @@ import Vue from 'vue'
 import Router from 'vue-router'
 // 首页
 const PreLoad = r => require.ensure([], () => r(require('../pages/login/PreLoad')), 'PreLoad')
-const Home = r => require.ensure([], () => r(require('../pages/login/Home')), 'Home')
+// const Home = r => require.ensure([], () => r(require('../pages/login/Home')), 'Home')
 // 个人中心
-const Login = r => require.ensure([], () => r(require('../pages/login/Login')), 'Login')
-const Setup = r => require.ensure([], () => r(require('../pages/login/Setup')), 'Setup')
+// const Login = r => require.ensure([], () => r(require('../pages/login/Login')), 'Login')
+// const Setup = r => require.ensure([], () => r(require('../pages/login/Setup')), 'Setup')
 
 const Password = r => require.ensure([], () => r(require('../pages/proj/Password')), 'Password')
-const TaskManage = r => require.ensure([], () => r(require('../pages/proj/TaskManage')), 'TaskManage')
-const ZlManage = r => require.ensure([], () => r(require('../pages/proj/ZlManage')), 'ZlManage')
-const SiteManage = r => require.ensure([], () => r(require('../pages/proj/SiteManage')), 'SiteManage')
-const CallManage = r => require.ensure([], () => r(require('../pages/proj/CallManage')), 'CallManage')
+// const TaskManage = r => require.ensure([], () => r(require('../pages/proj/TaskManage')), 'TaskManage')
+// const ZlManage = r => require.ensure([], () => r(require('../pages/proj/ZlManage')), 'ZlManage')
+// const SiteManage = r => require.ensure([], () => r(require('../pages/proj/SiteManage')), 'SiteManage')
+// const CallManage = r => require.ensure([], () => r(require('../pages/proj/CallManage')), 'CallManage')
+
+// 网页版
+const Login = r => require.ensure([], () => r(require('../pages/project/Login')), 'Login')
+const Setup = r => require.ensure([], () => r(require('../pages/project/Setup')), 'Setup')
+const Home = r => require.ensure([], () => r(require('../pages/project/Home')), 'Home')
+const SiteManage = r => require.ensure([], () => r(require('../pages/project/SiteManage')), 'SiteManage')
+const CallManage = r => require.ensure([], () => r(require('../pages/project/CallManage')), 'CallManage')
+const ZlManage = r => require.ensure([], () => r(require('../pages/project/ZlManage')), 'ZlManage')
+const TaskManage = r => require.ensure([], () => r(require('../pages/project/TaskManage')), 'TaskManage')
 
 Vue.use(Router)
 
diff --git a/src/style/common.styl b/src/style/common.styl
index 2514125..abc2500 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -30,6 +30,8 @@ html,body
   height: auto
   width: 100%
   background-color: #F5F5F5
+  // width 1920px
+  // height 1080px
 
 .clear:after
   content: ''
@@ -142,18 +144,18 @@ header
 .content
   position: relative
   padding: 0 0.24rem
-.login-bg
-  background: #ffffff center bottom / 100% auto no-repeat url(./images/bg.png)
+// .login-bg
+//   background: #ffffff center bottom / 100% auto no-repeat url(./images/bg.png)
 .loading-tips
   _font(.28rem,.53rem,#929292,,center)
   margin-bottom 1.2rem
 /** grid列表 **/
 .grid-wraper
   _fj(,flex-start)
-  max-height 12rem
+  // max-height 12rem
   overflow-y: auto
 .left_fixed
-  flex 0 0 1.5rem
+  flex 0 0 150px
 .slide
   flex 1
   overflow-x scroll
@@ -165,15 +167,15 @@ header
   tr
     th,td
       white-space nowrap
-      padding 0 .2rem
-      border-bottom .1rem solid #f5f5f5
+      padding 0 20px
+      border-bottom 1px solid #f5f5f5
     th
-      _font(.26rem,.98rem,#696969,bold)
-      height 1.08rem
+      _font(16px, 54px,#696969,bold)
+      height 54px
       background-color #d7d7d7
     td
-      _font(.28rem,.98rem,$fc1)
-      height 1.08rem
+      _font(16px, 54px,$fc1)
+      height 54px
       background-color #ffffff
       a
         text-decoration underline
@@ -188,21 +190,21 @@ header
   height 0
 .left_layout_t
   width 100%
-  min-width 1.68rem
+  min-width 168px
 .sin_input
-  width 1.6rem
-  _font(.28rem,.6rem,#8a8a8a)
-  padding 0 .1rem
+  width 160px
+  _font(16px,60px,#8a8a8a)
+  padding 0 10px
   border 1px solid #a1a1a1
   border-radius 3px
 .layout-t tr.checked td .sin_input
   color #8a8a8a
   border 1px solid #ffffff
 .slide .layout-t
-  min-width 5.34rem
+  min-width 534px
 .click_div
-  _font(.28rem,.6rem,#8a8a8a)
-  padding 0 .1rem
+  _font(16px,60px,#8a8a8a)
+  padding 0 10px
   border 1px solid #a1a1a1
   border-radius 3px
   cursor pointer
@@ -425,7 +427,7 @@ header
   display inline-block
   width 90%
   max-width 420px
-  padding .2rem
+  padding 20px
   vertical-align middle
   background-color #fff
   border-radius 4px
@@ -449,15 +451,17 @@ header
   background #000
   z-index 99
 .msg_item
+  display flex
+  align-items center
+  justify-content space-between
   height 50px
   line-height 50px
+  margin-bottom 10px
 .label_item
-  display inline-block
   width 90px
   _font(16px,inherit,#333)
 .from_item
-  display inline-block
-  width calc(100% - 100px)
+  width calc(100% - 110px)
   _font(14px,inherit,#606266)
 .from_item .el-select
   width 100%
@@ -527,21 +531,21 @@ header
 /** 选择器 */
 .el-select
   width 100%
-.el-input
-  font-size .26rem
-.el-input__inner
-  line-height .6rem
-  height .6rem
-.el-select .el-input .el-select__caret
-  line-height .6rem
-.el-radio__label
-  font-size: .28rem
-  padding-left: .1rem
-  vertical-align: top
-.el-radio__inner
-  _wh(.28rem,.28rem)
-.el-radio__inner::after
-  _wh(.08rem,.08rem)
+// .el-input
+//   font-size .26rem
+// .el-input__inner
+//   line-height .6rem
+//   height .6rem
+// .el-select .el-input .el-select__caret
+//   line-height .6rem
+// .el-radio__label
+//   font-size: .28rem
+//   padding-left: .1rem
+//   vertical-align: top
+// .el-radio__inner
+//   _wh(.28rem,.28rem)
+// .el-radio__inner::after
+//   _wh(.08rem,.08rem)
 .el-radio__input.is-checked .el-radio__inner 
   border-color: $red
   background: $red
@@ -561,4 +565,15 @@ header
   border-radius 50%
   margin-right .1rem
 .font_icon
-  _font(.28rem, .8rem, #000)
\ No newline at end of file
+  _font(.28rem, .8rem, #000)
+.icons1
+  height 40px
+.item_icon1
+  _fj()
+  margin-right 20px
+.color_icon1
+  _wh(22px, 22px)
+  border-radius 50%
+  margin-right 10px
+.font_icon1
+  _font(16px, 40px, #000)
\ No newline at end of file