diff --git a/lms/nladmin-ui/src/assets/images/screen_btn.png b/lms/nladmin-ui/src/assets/images/screen_btn.png
new file mode 100644
index 0000000..7d909cd
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/screen_btn.png differ
diff --git a/lms/nladmin-ui/src/assets/images/screen_btn_dis.png b/lms/nladmin-ui/src/assets/images/screen_btn_dis.png
new file mode 100644
index 0000000..65c7e9d
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/screen_btn_dis.png differ
diff --git a/lms/nladmin-ui/src/assets/images/screen_exit.png b/lms/nladmin-ui/src/assets/images/screen_exit.png
new file mode 100644
index 0000000..d4ae63a
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/screen_exit.png differ
diff --git a/lms/nladmin-ui/src/assets/images/screen_header_bg.png b/lms/nladmin-ui/src/assets/images/screen_header_bg.png
new file mode 100644
index 0000000..f450f48
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/screen_header_bg.png differ
diff --git a/lms/nladmin-ui/src/assets/images/screen_setup_bg.png b/lms/nladmin-ui/src/assets/images/screen_setup_bg.png
new file mode 100644
index 0000000..a4e6e4e
Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/screen_setup_bg.png differ
diff --git a/lms/nladmin-ui/src/router/routers.js b/lms/nladmin-ui/src/router/routers.js
index 14830c3..b0deb76 100644
--- a/lms/nladmin-ui/src/router/routers.js
+++ b/lms/nladmin-ui/src/router/routers.js
@@ -5,6 +5,12 @@ import Layout from '../layout/index'
 Vue.use(Router)
 
 export const constantRouterMap = [
+  {
+    path: '/produceScreen/setup',
+    component: (resolve) => require(['@/views/wms/produceScreen/setup'], resolve),
+    hidden: true,
+    meta: { title: '加工看板登录' }
+  },
 
   {
     path: '/produceScreen/:id',
diff --git a/lms/nladmin-ui/src/store/modules/produceScreen.js b/lms/nladmin-ui/src/store/modules/produceScreen.js
new file mode 100644
index 0000000..7ed7606
--- /dev/null
+++ b/lms/nladmin-ui/src/store/modules/produceScreen.js
@@ -0,0 +1,22 @@
+const state = {
+  screenData: localStorage.getItem('screenData') || ''
+}
+
+const mutations = {
+  ADD_SCREEN_DATA: (state, res) => {
+    state.screenData = res
+  }
+}
+
+const actions = {
+  addScreenData({ commit }, res) {
+    localStorage.setItem('screenData', res)
+    commit('ADD_SCREEN_DATA', res)
+  }
+}
+
+export default {
+  state,
+  mutations,
+  actions
+}
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
index 0a82edb..88c5fd3 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue
@@ -1,124 +1,32 @@
 <template>
-  <div class="container ver-center">
-    <el-row type="flex" justify="center" class="height-30">
-      <el-col :span="5" class="height-100 ver-justify">
-        <el-row type="flex" justify="space-between" class="btns-wrap">
-          <el-col :span="9" class="height-100 ver-justify">
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT1' in pointState)}" @click="showPop(3, 'OUT1')">Container</div>
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT1' in pointState)}" @click="showPop(4, 'OUT1')">Scaner</div>
-          </el-col>
-          <el-col :span="13" class="height-100">
-            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT1' in pointState)}">
-              <p class="p1">OUT1</p>
-              <p v-show="'OUT1' in pointState" class="p2">{{ pointState.OUT1 }}</p>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="space-between" class="btns-wrap">
-          <el-col :span="9" class="height-100 ver-justify">
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT3' in pointState)}" @click="showPop(3, 'OUT3')">Container</div>
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT3' in pointState)}" @click="showPop(4, 'OUT3')">Scaner</div>
-          </el-col>
-          <el-col :span="13" class="height-100">
-            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT3' in pointState)}">
-              <p class="p1">OUT3</p>
-              <p v-show="'OUT3' in pointState" class="p2">{{ pointState.OUT3 }}</p>
-            </div>
-          </el-col>
-        </el-row>
-      </el-col>
-      <el-col :span="9" class="height-100 ver-justify mg2">
-        <div class="m-content ver-center" @click="showPop(1)">
-          <p>{{ JSON.stringify(pkObj) !== '{}' ? pkObj.label : 'MACHINE' }}</p>
-        </div>
-        <el-row type="flex" justify="space-between" class="btns-wrap-2">
-          <el-col :span="7" class="height-100">
-            <div class="s-btn-2" :class="{'s-btn-2_dis': !('N1' in pointState)}" @click="showPop(2, 'N1')">
-              <p class="p1">N1</p>
-              <p v-show="'N1' in pointState" class="p2">{{ pointState.N1 }}</p>
-            </div>
-          </el-col>
-          <el-col :span="4" class="height-100 ver-center">
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('N1' in pointState)}" @click="showPop(5, 'N1')">Back</div>
-          </el-col>
-          <el-col :span="7" class="height-100">
-            <div class="s-btn-2" :class="{'s-btn-2_dis': !('N2' in pointState)}" @click="showPop(2, 'N2')">
-              <p class="p1">N2</p>
-              <p v-show="'N2' in pointState" class="p2">{{ pointState.N2 }}</p>
-            </div>
-          </el-col>
-          <el-col :span="4" class="height-100 ver-center">
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('N2' in pointState)}" @click="showPop(5, 'N2')">Back</div>
-          </el-col>
-        </el-row>
-      </el-col>
-      <el-col :span="5" class="height-100 ver-justify">
-        <el-row type="flex" justify="space-between" class="btns-wrap">
-          <el-col :span="13" class="height-100">
-            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT2' in pointState)}">
-              <p class="p1">OUT2</p>
-              <p v-show="'OUT2' in pointState" class="p2">{{ pointState.OUT2 }}</p>
-            </div>
-          </el-col>
-          <el-col :span="9" class="height-100 ver-justify">
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT2' in pointState)}" @click="showPop(3, 'OUT2')">Container</div>
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT2' in pointState)}" @click="showPop(4, 'OUT2')">Scaner</div>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="space-between" class="btns-wrap">
-          <el-col :span="13" class="height-100">
-            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT4' in pointState)}">
-              <p class="p1">OUT4</p>
-              <p v-show="'OUT4' in pointState" class="p2">{{ pointState.OUT4 }}</p>
-            </div>
-          </el-col>
-          <el-col :span="9" class="height-100 ver-justify">
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT4' in pointState)}" @click="showPop(3, 'OUT4')">Container</div>
-            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT4' in pointState)}" @click="showPop(4, 'OUT4')">Scaner</div>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <div class="pop-wraper" :class="{'popshow': show, 'pophide': !show, 'pop-wraper-1': type === 3 || type === 4 || type === 5}">
-      <div v-show="type === 1" class="pop-h1">选择设备</div>
-      <div v-show="type === 1" class="pop-grid">
-        <el-table
-          ref="singleTable"
-          :data="machineData"
-          height="100%"
-          highlight-current-row
-          style="width: 100%"
-          @current-change="handleCurrentChange1"
-        >
-          <el-table-column
-            prop="label"
-            label="设备号"
-          />
-          <el-table-column
-            prop="value"
-            label="设备工序"
-          />
-        </el-table>
+  <div class="container">
+    <button class="btn-close" :disabled="disabled" @click="toExit" />
+    <div class="m-content">
+      <p>{{ screenData.device_name }}</p>
+    </div>
+    <div class="button-wraper">
+      <div v-for="(e, i) in screenData.region_points" :key="i" class="button-item">
+        <p v-if="e.type === '1'" class="point_name">{{ e.name }}</p>
+        <p v-if="e.type === '0'" class="point_name point_name_btn" @click="showPop('IN', e)">{{ e.name }}</p>
+        <p class="point_value">{{ e.device_code }}</p>
+        <div v-if="e.type === '1'" class="button" @click="showPop('CONTAINER', e)">CONTAINER</div>
+        <div v-if="e.type === '1'" class="button" @click="showPop('SCANER', e)">SCANER</div>
+        <div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">BACK</div>
       </div>
-      <el-row v-show="type === 1" class="pop-btns">
-        <el-col :span="3" :offset="6" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="toSure1">确定</div>
-        </el-col>
-        <el-col :span="3" :offset="6" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="show = false, vechineList = []">取消</div>
-        </el-col>
-      </el-row>
-      <div v-show="type === 2" class="pop-grid">
+    </div>
+    <div v-show="type === 'IN'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
+      <div class="pop-grid">
         <el-row type="flex" justify="space-between">
-          <el-col :span="24">
+          <el-col :span="13">
             <el-table
-              ref="singleTable"
-              :data="n1List"
-              height="100%"
-              highlight-current-row
+              :data="popList"
               style="width: 100%"
-              @current-change="handleCurrentChange2"
+              @current-change="handleCurrentChange"
             >
+              <el-table-column
+                prop="vehicle_code"
+                label="载具号"
+              />
               <el-table-column
                 prop="order_code"
                 label="订单号"
@@ -128,52 +36,58 @@
                 label="工序"
               />
               <el-table-column
-                prop="material_id"
-                label="物料号"
+                prop="material_qty"
+                label="物料数量"
               />
               <el-table-column
-                prop="material_type"
-                label="物料类型"
+                prop="due_date"
+                label="交期时间"
               />
+            </el-table>
+          </el-col>
+          <el-col :span="10">
+            <el-table
+              :data="popSecList"
+              style="width: 100%"
+            >
               <el-table-column
-                prop="material_qty"
-                label="物料数量"
+                prop="order_code"
+                label="订单号"
               />
               <el-table-column
                 prop="due_date"
                 label="交期时间"
               />
               <el-table-column
-                prop="custom"
-                label="客户编码"
+                prop="material_qty"
+                label="物料数量"
               />
               <el-table-column
-                prop="point_code"
-                label="点位编码"
+                prop="region_code"
+                label="工序"
               />
             </el-table>
           </el-col>
         </el-row>
       </div>
-      <el-row v-show="type === 2" type="flex" class="pop-btns" justify="center">
-        <el-col :span="3" class="height-100" style="margin: 0 1%;">
-          <div class="s-btn-1 s-btn-3" @click="show = false, vechineList = []">取消</div>
+      <el-row type="flex" justify="space-around">
+        <el-col :span="4">
+          <button class="login_button login_button_dis" @click="show = false">取消</button>
         </el-col>
-        <el-col :span="3" class="height-100" style="margin: 0 1%;">
-          <div class="s-btn-1 s-btn-3" @click="toCall">叫料</div>
+        <el-col :span="4">
+          <button class="login_button" :disabled="disabled" @click="toSure">叫料</button>
         </el-col>
       </el-row>
-      <div v-show="type === 3" class="pop-grid">
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">点位</el-col>
-          <el-col :span="18"><input v-model="emptyObj.device_code" type="text" class="p-value" disabled></el-col>
-        </el-row>
+    </div>
+    <div v-show="type === 'CONTAINER'" class="pop-wraper pop-wraper-1" :class="{'popshow': show, 'pophide': !show}">
+      <div class="pop-h1">{{ popData.title }}</div>
+      <div class="pop-grid">
         <el-row class="filter-wraper" type="flex" justify="space-between">
           <el-col :span="5" class="p-label">托盘类型</el-col>
           <el-col :span="18" class="select-wraper">
-            <el-select v-model="val1" placeholder="请选择">
+            <el-select v-model="value" placeholder="请选择">
               <el-option
-                v-for="item in options1"
+                v-for="item in options"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -182,75 +96,79 @@
             </el-select>
           </el-col>
         </el-row>
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">设备工序</el-col>
-          <el-col :span="18"><input v-model="emptyObj.regin_code" type="text" class="p-value" disabled></el-col>
-        </el-row>
       </div>
-      <el-row v-show="type === 3" class="pop-btns">
-        <el-col :span="5" :offset="5" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="toSure3">确定</div>
+      <el-row type="flex" justify="space-around">
+        <el-col :span="6">
+          <button class="login_button login_button_dis" @click="show = false">取消</button>
         </el-col>
-        <el-col :span="5" :offset="5" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
+        <el-col :span="6">
+          <button class="login_button" @click="toSure">确定</button>
         </el-col>
       </el-row>
-      <div v-show="type === 4" class="pop-grid">
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">地面点位</el-col>
-          <el-col :span="18"><input v-model="sendObj.device_code" type="text" class="p-value" disabled></el-col>
-        </el-row>
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">订单编号</el-col>
-          <el-col :span="18"><input v-model="sendObj.order_code" type="text" class="p-value"></el-col>
-        </el-row>
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">合格数量</el-col>
-          <el-col :span="18"><input v-model="sendObj.material_qty" type="number" class="p-value"></el-col>
-        </el-row>
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">设备工序</el-col>
-          <el-col :span="18"><input v-model="sendObj.regin_code" type="text" class="p-value" disabled></el-col>
-        </el-row>
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">载具编码</el-col>
-          <el-col :span="18"><input v-model="sendObj.vehicle_code" type="text" class="p-value"></el-col>
-        </el-row>
-        <el-row class="filter-wraper">
-          <el-col :span="1" :offset="6"><el-checkbox v-model="check1" /></el-col>
-          <el-col :span="5" class="p-label">是否报功</el-col>
-          <el-col :span="1" :offset="3"><el-checkbox v-model="check2" /></el-col>
-          <el-col :span="5" class="p-label">指定外协区</el-col>
-        </el-row>
+    </div>
+    <div v-show="type === 'SCANER'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
+      <div class="pop-grid">
+        <el-table
+          :data="popList"
+          style="width: 100%"
+        >
+          <el-table-column
+            label="订单号"
+          >
+            <template slot-scope="scope">
+              <input v-model="scope.row.order_code" type="text" class="set-input">
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="数量"
+          >
+            <template slot-scope="scope">
+              <input v-model="scope.row.material_qty" type="text" class="set-input">
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+          >
+            <template>
+              <el-button circle type="primary" icon="el-icon-plus" @click="addRow" />
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
-      <el-row v-show="type === 4" class="pop-btns">
-        <el-col :span="5" :offset="5" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="toSure4">确定</div>
+      <el-row type="flex" justify="space-around">
+        <el-col :span="4">
+          <button class="login_button login_button_dis" @click="show = false">取消</button>
         </el-col>
-        <el-col :span="5" :offset="5" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
+        <el-col :span="4">
+          <button class="login_button" :disabled="disabled" @click="toSure">确定</button>
         </el-col>
       </el-row>
-      <div v-show="type === 5" class="pop-grid">
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">地面点位</el-col>
-          <el-col :span="18"><input v-model="backObj.device_code" type="text" class="p-value" disabled></el-col>
-        </el-row>
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">物料数量</el-col>
-          <el-col :span="18"><input v-model="backObj.material_qty" type="number" class="p-value"></el-col>
-        </el-row>
-        <el-row class="filter-wraper" type="flex" justify="space-between">
-          <el-col :span="5" class="p-label">设备工序</el-col>
-          <el-col :span="18"><input v-model="backObj.regin_code" type="text" class="p-value" disabled></el-col>
-        </el-row>
+    </div>
+    <div v-show="type === 'BACK'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
+      <div class="pop-grid">
+        <el-table
+          :data="popList"
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="order_code"
+            label="订单号"
+          />
+          <el-table-column
+            label="数量"
+          >
+            <template slot-scope="scope">
+              <input v-model="scope.row.material_qty" type="text" class="set-input">
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
-      <el-row v-show="type === 5" class="pop-btns">
-        <el-col :span="5" :offset="5" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="toSure5">确定</div>
+      <el-row type="flex" justify="space-around">
+        <el-col :span="4">
+          <button class="login_button login_button_dis" @click="show = false">取消</button>
         </el-col>
-        <el-col :span="5" :offset="5" class="height-100">
-          <div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
+        <el-col :span="4">
+          <button class="login_button" :disabled="disabled" @click="toSure">确定</button>
         </el-col>
       </el-row>
     </div>
@@ -263,440 +181,119 @@ import crudProduceScreen from './produceScreen'
 export default {
   data() {
     return {
-      type: null,
       show: false,
-      machineData: [],
-      n1List: [],
-      buttonName: '',
-      vechineList: [],
-      currentRow1: null,
-      currentRow2: null,
-      pkObj: {},
-      checked: false,
-      pointState: {},
-      emptyObj: {},
-      sendObj: {},
-      backObj: {},
-      val1: '',
-      options1: [],
-      check1: false,
-      check2: false
+      type: null,
+      popData: {},
+      popList: [],
+      popSecList: [],
+      currentRow: null,
+      value: '',
+      options: [{ value: 'G01', label: '钢托盘' }, { value: 'R01', label: '990mm笼框' }, { value: 'R02', label: '450mm 笼框' }, { value: 'S04', label: '1670mm料架' }, { value: 'S06', label: '1700mm料架' }],
+      disabled: false
     }
   },
-  created() {
-    crudProduceScreen.vehicleType().then(res => {
-      this.options1 = [...res.content]
-    })
+  computed: {
+    screenData() {
+      let res = {}
+      if (this.$store.state.produceScreen.screenData !== '') {
+        res = JSON.parse(this.$store.state.produceScreen.screenData)
+      }
+      return res
+    }
   },
   methods: {
-    showPop(type, name) {
+    toExit() {
+      this.disabled = true
+      crudProduceScreen.loginOut({ username: this.screenData.username }).then(res => {
+        this.disabled = false
+        localStorage.removeItem('screenData')
+        this.$router.push('/produceScreen/setup')
+      }).catch(() => {
+        this.disabled = false
+      })
+    },
+    showPop(type, e) {
+      this.popData = {}
+      this.popList = []
+      this.popSecList = []
+      this.value = ''
       this.type = type
-      this.buttonName = name
-      if (type === 1) {
-        crudProduceScreen.regionList().then(res => {
-          this.machineData = [...res.content]
+      this.popData = e
+      if (type === 'IN') {
+        crudProduceScreen.regionOrder(this.screenData.device_code, this.popData.device_code).then(res => {
+          this.popList = [...res.content]
           this.show = true
         })
-      } else if (type === 2 && name in this.pointState) {
-        crudProduceScreen.regionOrder(this.pkObj.value, this.pointState[name]).then(res => {
-          this.n1List = [...res.content]
-          this.n1List.map(el => {
-            this.$set(el, 'device_code', this.pointState[name])
-          })
-          this.vechineList = []
-          this.show = true
-        })
-      } else if (type === 3 && name in this.pointState) {
+      } else if (type === 'CONTAINER') {
+        this.popData.title = '选择托盘类型'
         this.emptyObj = {}
         this.val1 = ''
         this.show = true
-        this.emptyObj.device_code = this.pointState[name]
-        this.emptyObj.regin_code = this.pkObj.value
-      } else if (type === 4 && name in this.pointState) {
-        this.sendObj = {}
-        this.check1 = false
-        this.check2 = false
-        this.show = true
-        this.sendObj.order_code = ''
-        this.sendObj.material_qty = null
-        this.sendObj.vehicle_code = ''
-        this.sendObj.device_code = this.pointState[name]
-        this.sendObj.regin_code = this.pkObj.value
-      } else if (type === 5 && name in this.pointState) {
-        this.backObj = {}
+        this.emptyObj.device_code = e.name
+      } else if (type === 'SCANER') {
+        this.popList.push({ order_code: '', material_qty: '' })
         this.show = true
-        this.backObj.material_qty = null
-        this.backObj.device_code = this.pointState[name]
-        this.backObj.regin_code = this.pkObj.value
-      }
-    },
-    handleCurrentChange1(val) {
-      this.currentRow1 = val
-    },
-    handleCurrentChange2(val) {
-      this.currentRow2 = val
-    },
-    toSure1() {
-      if (this.currentRow1 === null) {
-        this.$message.error('请选择设备！')
-        return
-      }
-      this.pkObj = this.currentRow1
-      this.show = false
-      crudProduceScreen.regionPoints(this.pkObj.value).then(res => {
-        this.pointState = res
-      })
-    },
-    toCall() {
-      if (this.currentRow2 === null) {
-        this.$message.error('请选择设备！')
-        return
+      } else if (type === 'BACK') {
+        crudProduceScreen.fabOrders({ device_code: this.popData.device_code }).then(res => {
+          this.popList = [...res.content]
+          this.show = true
+        })
       }
-      crudProduceScreen.callMater(this.currentRow2).then(res => {
-        this.$message(res.msg)
-      })
-      this.show = false
     },
-    toSure3() {
-      if (!this.val1) {
-        this.$message.error('请选择托盘类型！')
-        return
-      }
-      this.emptyObj.vehicle_type = this.val1
-      crudProduceScreen.callEmp(this.emptyObj).then(res => {
-        this.$message(res.msg)
+    handleCurrentChange(val) {
+      this.currentRow = val
+      crudProduceScreen.fabMaterial({ vehicle_code: this.currentRow.vehicle_code }).then(res => {
+        this.popSecList = [...res.content]
       })
-      this.show = false
     },
-    toSure4() {
-      if (this.sendObj.order_code === '') {
-        this.$message.error('请输入订单编码！')
-        return
-      }
-      if (this.sendObj.material_qty === '' || this.sendObj.material_qty === null) {
-        this.$message.error('请输入合格数量！')
-        return
-      }
-      if (this.sendObj.vehicle_code === '') {
-        this.$message.error('请输入载具编码！')
-        return
+    toSure() {
+      this.disabled = true
+      if (this.type === 'IN') {
+        if (this.popSecList.length === 0) {
+          this.disabled = false
+          return
+        }
+        crudProduceScreen.callMater(this.popSecList).then(res => {
+          this.disabled = false
+          this.$message(res.msg)
+        }).catch(() => {
+          this.disabled = false
+        })
+      } else if (this.type === 'CONTAINER') {
+        if (!this.value) {
+          this.disabled = false
+          this.$message.error('请选择托盘类型！')
+          return
+        }
+        crudProduceScreen.callEmp({ vehicle_type: this.value }).then(res => {
+          this.disabled = false
+          this.$message(res.msg)
+        }).catch(() => {
+          this.disabled = false
+        })
+      } else if (this.type === 'SCANER') {
+        crudProduceScreen.sendMater({ device_code: this.popData.device_code, mater: this.popList }).then(res => {
+          this.disabled = false
+          this.$message(res.msg)
+        }).catch(() => {
+          this.disabled = false
+        })
+      } else if (this.type === 'BACK') {
+        crudProduceScreen.sendVehicle(this.popList).then(res => {
+          this.$message(res.msg)
+        }).catch(() => {
+          this.disabled = false
+        })
       }
-      this.sendObj.has_report = this.check1
-      this.sendObj.target_region_code = this.check2
-      crudProduceScreen.sendMater(this.sendObj).then(res => {
-        this.$message(res.msg)
-      })
       this.show = false
     },
-    toSure5() {
-      if (this.backObj.material_qty === '' || this.backObj.material_qty === null) {
-        this.$message.error('请输入物料数量！')
-        return
-      }
-      crudProduceScreen.sendVehicle(this.backObj).then(res => {
-        this.$message(res.msg)
-      })
-      this.show = false
+    addRow() {
+      this.popList.push({ order_code: '', material_qty: '' })
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.container {
-  // width: 1280px;
-  // height: 960px;
-  width: 100%;
-  height: 100%;
-  padding: 1.5%;
-  box-sizing: border-box;
-  background: center / 100% 100% url('~@/assets/images/screen_bg.jpg') no-repeat;
-}
-.height-10 {
-  height: 10%;
-}
-.height-20 {
-  height: 20%;
-}
-.height-30 {
-  height: 30%;
-}
-.height-100 {
-  height: 100%;
-}
-.mg2 {
-  margin: 0 2%;
-}
-.ver-justify {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-.ver-center {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-.s-btn-1 {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 45%;
-  font-size: 18px;
-  line-height: 1;
-  text-align: center;
-  color: #fff;
-  padding: 0 15px;
-  background: center / 100% 100% url('~@/assets/images/screen_1.png') no-repeat;
-}
-.s-btn-1_dis {
-  background-image: url('~@/assets/images/screen_5.png');
-}
-.s-btn-2 {
-  position: relative;
-  height: 100%;
-  background-color: #b3d8ff;
-  border: 1px solid #53a8ff;
-  border-radius: 16px;
-  &::before {
-    position: absolute;
-    content: '';
-    left: 0;
-    top: 20%;
-    width: 100%;
-    height: 80%;
-    background-image: linear-gradient(to bottom, #66b1ff, #a0cfff);
-    border-radius: 16px;
-  }
-  .p1 {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 22px;
-    line-height: 22px;
-    font-weight: 700;
-    color: #fff;
-    margin: 0;
-  }
-  .p2 {
-    position: absolute;
-    bottom: 22%;
-    width: 100%;
-    font-size: 16px;
-    line-height: 16px;
-    color: #fff;
-    text-align: center;
-    margin: 0;
-  }
-}
-.s-btn-2_dis {
-  background-color: #a2b1c1;
-  border: 1px solid #393f44;
-  &::before {
-    background-image: linear-gradient(to bottom, #666e77, #a8b5c3);
-  }
-}
-.s-btn-3 {
-  height: 100%;
-}
-.btns-wrap {
-  height: 40%;
-}
-.btns-wrap-2 {
-  height: 35%;
-}
-.m-content {
-  height: 54%;
-  border: 1px solid #4aaee2;
-  border-radius: 10px;
-  padding: 10px;
-  box-sizing: border-box;
-  background-image: linear-gradient(to right, rgba(36, 128, 207, 0.5), rgba(15, 61, 101, 0.5));
-  box-shadow: inset 1px 1px 4px 2px rgb(74 174 226 / 40%), inset -1px -1px 4px 2px rgb(74 174 226 / 40%);
-  p {
-    font-size: 24px;
-    line-height: 1;
-    font-weight: 700;
-    text-align: center;
-    color: #3CC1FF;
-    margin: 0;
-  }
-}
-.m-content-2 {
-  width: 60%;
-  height: 65%;
-  margin: 1% auto 0;
-}
-.m-content-inner {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  // background-color: #fff;
-  border-radius: 10px;
-  padding: 2% 1%
-}
-.grid {
-  height: 90%;
-  padding-top: 2%;
-}
-.pop-wraper {
-  position: fixed;
-  top: 50%;
-  left: 5%;
-  z-index: 20;
-  width: 90%;
-  height: 80%;
-  border-radius: 15px;
-  padding: 3%;
-  background: center / 100% 100% url('~@/assets/images/screen_2.png') no-repeat;
-}
-.pop-wraper-1 {
-  width: 50%;
-  left: 25%;
-  height: 60%;
-  padding: 5% 3% 3% 3%;
-  background: center / 100% 100% url('~@/assets/images/screen_4.png') no-repeat;
-}
-.popshow {
-	transform: translateY(-50%);
-}
-.pophide {
-	transform: translateY(100%);
-}
-.modal {
-  position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-  height: 100%;
-	background-color: rgba(0,0,0,0.5);
-	z-index: 10;
-}
-.pop-h1 {
-  font-size: 22px;
-  line-height: 1;
-  font-weight: 700;
-  text-align: left;
-  color: #F6F9FE;
-  margin: 0;
-  background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
-.pop-btns {
-  height: 8%;
-}
-.pop-grid {
-  height: calc(92% - 24px);
-  padding: 2% 0;
-}
->>>.el-table {
-  background-color: transparent;
-}
->>>.el-table--border {
-  border: none;
-}
->>>.el-table .el-table__header-wrapper th {
-  height: 40px;
-}
->>>.el-table thead tr {
-  background: center / 100% 100% url('~@/assets/images/screen_3.png') no-repeat;
-}
->>>.el-table .el-table__header-wrapper th {
-  background-color: transparent;
-  color: #AFBED8;
-  font-size: 16px;
-}
->>>.el-table th.el-table__cell.is-leaf {
-  border-bottom-color: #5D92FF;
-}
->>>.el-table--border .el-table__cell {
-  border-right: none;
-}
->>>.el-table--mini .el-table__cell {
-  padding: 8px 0;
-}
->>>.el-table {
-  color: #fff;
-  font-size: 14px;
-  tr {
-    background-color: rgba(31,46,73,0.3);
-  }
-}
->>>.el-table td.el-table__cell {
-  border-bottom-color: rgba(122,159,224,0.17);
-}
->>>.el-table::before, .el-table--group::after, .el-table--border::after {
-  background-color: rgba(122,159,224,0.17);
-}
->>>.el-table__body tr.current-row>td.el-table__cell {
-  background-color: #3F6ACA;
-}
-.filter-wraper {
-  margin-bottom: 20px;
-}
-.p-label {
-  font-size: 18px;
-  line-height: 40px;
-  text-align: right;
-  color: #fff;
-  margin: 0;
-}
-.p-value {
-  width: 100%;
-  font-size: 18px;
-  line-height: 40px;
-  height: 40px;
-  text-align: left;
-  color: #fff;
-  margin: 0;
-  padding: 0 30px 0 15px;
-  background: rgba(45,88,184,0.25);
-  border: 1px solid #21D0F2;
-}
-.select-wraper {
-  font-size: 18px;
-  line-height: 40px;
-  height: 40px;
-  text-align: left;
-  color: #fff;
-  >>>.el-select {
-    width: 100%;
-  }
-  >>>.el-input__inner {
-    background-color: rgba(45,88,184,0.25);
-    border-color: #21D0F2;
-  }
-  >>>.el-input--mini .el-input__inner {
-    font-size: 18px;
-    line-height: 40px;
-    height: 40px;
-    color: #fff;
-  }
-}
-.option-wraper {
-  font-size: 18px;
-  line-height: 40px;
-  height: 40px;
-}
->>>.el-checkbox__inner {
-  width: 40px;
-  height: 40px;
-  line-height: 40px;
-  font-size: 40px;
-}
->>>.el-checkbox__inner::after {
-  width: 6px;
-  height: 20px;
-  left: 15px;
-  top: 3px;
-}
->>>.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-  background-color: rgba(122,159,224,0.5)
-}
+@import './style.scss';
 </style>
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index_back.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index_back.vue
index 7fd0072..0a82edb 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/index_back.vue
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/index_back.vue
@@ -1,235 +1,702 @@
 <template>
-  <div style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;">
-    <el-row>
-      <el-col :span="18">
-        <div class="grid-content bg-purple"><h2 style="margin-left: 30px;padding-top: 10px;">车间加工看板</h2></div>
-        <div class="grid-content bg-purple">
-          &ensp;&ensp;
-          <!--          <el-button type="primary" icon="el-icon-search" @click="queryTask(query.device_code)">搜索</el-button>-->
-          <el-button type="primary" icon="el-icon-thumb" @click="fresh">界面刷新</el-button>
-          <el-button style="margin-left: 30px;" type="warning" icon="el-icon-position" @click="callMaterial">生产叫料</el-button>
-          <el-button style="margin-left: 30px;" type="success" icon="el-icon-finished" @click="finish">生产完成</el-button>
-          <el-button style="margin-left: 30px;" type="danger" icon="el-icon-top-left" @click="materialBack">余料回库</el-button>
-          <el-button style="margin-left: 30px;" type="info" icon="el-icon-top-left" @click="emptyVehicleBack">空托回库</el-button>
-        </div>
+  <div class="container ver-center">
+    <el-row type="flex" justify="center" class="height-30">
+      <el-col :span="5" class="height-100 ver-justify">
+        <el-row type="flex" justify="space-between" class="btns-wrap">
+          <el-col :span="9" class="height-100 ver-justify">
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT1' in pointState)}" @click="showPop(3, 'OUT1')">Container</div>
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT1' in pointState)}" @click="showPop(4, 'OUT1')">Scaner</div>
+          </el-col>
+          <el-col :span="13" class="height-100">
+            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT1' in pointState)}">
+              <p class="p1">OUT1</p>
+              <p v-show="'OUT1' in pointState" class="p2">{{ pointState.OUT1 }}</p>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="space-between" class="btns-wrap">
+          <el-col :span="9" class="height-100 ver-justify">
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT3' in pointState)}" @click="showPop(3, 'OUT3')">Container</div>
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT3' in pointState)}" @click="showPop(4, 'OUT3')">Scaner</div>
+          </el-col>
+          <el-col :span="13" class="height-100">
+            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT3' in pointState)}">
+              <p class="p1">OUT3</p>
+              <p v-show="'OUT3' in pointState" class="p2">{{ pointState.OUT3 }}</p>
+            </div>
+          </el-col>
+        </el-row>
       </el-col>
-
-      <el-col :span="6">
-        <div class="grid-content bg-purple-light">
-          <h2 style="text-align:right;margin-right: 140px;">{{ getTime }}</h2>
-        </div>
-        <div class="grid-content bg-purple-light">
-          <p style="text-align:right;margin-right: 110px;"><b>{{ getDate }}</b></p>
+      <el-col :span="9" class="height-100 ver-justify mg2">
+        <div class="m-content ver-center" @click="showPop(1)">
+          <p>{{ JSON.stringify(pkObj) !== '{}' ? pkObj.label : 'MACHINE' }}</p>
         </div>
-
+        <el-row type="flex" justify="space-between" class="btns-wrap-2">
+          <el-col :span="7" class="height-100">
+            <div class="s-btn-2" :class="{'s-btn-2_dis': !('N1' in pointState)}" @click="showPop(2, 'N1')">
+              <p class="p1">N1</p>
+              <p v-show="'N1' in pointState" class="p2">{{ pointState.N1 }}</p>
+            </div>
+          </el-col>
+          <el-col :span="4" class="height-100 ver-center">
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('N1' in pointState)}" @click="showPop(5, 'N1')">Back</div>
+          </el-col>
+          <el-col :span="7" class="height-100">
+            <div class="s-btn-2" :class="{'s-btn-2_dis': !('N2' in pointState)}" @click="showPop(2, 'N2')">
+              <p class="p1">N2</p>
+              <p v-show="'N2' in pointState" class="p2">{{ pointState.N2 }}</p>
+            </div>
+          </el-col>
+          <el-col :span="4" class="height-100 ver-center">
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('N2' in pointState)}" @click="showPop(5, 'N2')">Back</div>
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="5" class="height-100 ver-justify">
+        <el-row type="flex" justify="space-between" class="btns-wrap">
+          <el-col :span="13" class="height-100">
+            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT2' in pointState)}">
+              <p class="p1">OUT2</p>
+              <p v-show="'OUT2' in pointState" class="p2">{{ pointState.OUT2 }}</p>
+            </div>
+          </el-col>
+          <el-col :span="9" class="height-100 ver-justify">
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT2' in pointState)}" @click="showPop(3, 'OUT2')">Container</div>
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT2' in pointState)}" @click="showPop(4, 'OUT2')">Scaner</div>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="space-between" class="btns-wrap">
+          <el-col :span="13" class="height-100">
+            <div class="s-btn-2" :class="{'s-btn-2_dis': !('OUT4' in pointState)}">
+              <p class="p1">OUT4</p>
+              <p v-show="'OUT4' in pointState" class="p2">{{ pointState.OUT4 }}</p>
+            </div>
+          </el-col>
+          <el-col :span="9" class="height-100 ver-justify">
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT4' in pointState)}" @click="showPop(3, 'OUT4')">Container</div>
+            <div class="s-btn-1" :class="{'s-btn-1_dis': !('OUT4' in pointState)}" @click="showPop(4, 'OUT4')">Scaner</div>
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
-    <br>
-    <br>
-    <div>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        :data="tableData"
-        size="small"
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-        />
-        <el-table-column v-if="false" prop="produce_uuid" label="生产标识" />
-        <el-table-column prop="produce_code" label="生产编码" />
-        <el-table-column prop="produce_status_name" label="生产状态" :formatter="formatStatusName" />
-        <el-table-column prop="device_code" label="生产设备" />
-        <el-table-column prop="produce_qty" label="加工数量" />
-        <el-table-column prop="finishproduce_qty" label="完工数量" />
-        <el-table-column prop="order_seq" label="顺序号" />
-        <el-table-column prop="formula" label="配方" />
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column v-if="false" prop="material_code" label="物料编码" />
-        <el-table-column prop="material_name" label="物料名字" />
-        <el-table-column prop="start_time" label="开始生产时间" />
-      </el-table>
-      <!--分页组件-->
-
+    <div class="pop-wraper" :class="{'popshow': show, 'pophide': !show, 'pop-wraper-1': type === 3 || type === 4 || type === 5}">
+      <div v-show="type === 1" class="pop-h1">选择设备</div>
+      <div v-show="type === 1" class="pop-grid">
+        <el-table
+          ref="singleTable"
+          :data="machineData"
+          height="100%"
+          highlight-current-row
+          style="width: 100%"
+          @current-change="handleCurrentChange1"
+        >
+          <el-table-column
+            prop="label"
+            label="设备号"
+          />
+          <el-table-column
+            prop="value"
+            label="设备工序"
+          />
+        </el-table>
+      </div>
+      <el-row v-show="type === 1" class="pop-btns">
+        <el-col :span="3" :offset="6" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="toSure1">确定</div>
+        </el-col>
+        <el-col :span="3" :offset="6" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="show = false, vechineList = []">取消</div>
+        </el-col>
+      </el-row>
+      <div v-show="type === 2" class="pop-grid">
+        <el-row type="flex" justify="space-between">
+          <el-col :span="24">
+            <el-table
+              ref="singleTable"
+              :data="n1List"
+              height="100%"
+              highlight-current-row
+              style="width: 100%"
+              @current-change="handleCurrentChange2"
+            >
+              <el-table-column
+                prop="order_code"
+                label="订单号"
+              />
+              <el-table-column
+                prop="region_code"
+                label="工序"
+              />
+              <el-table-column
+                prop="material_id"
+                label="物料号"
+              />
+              <el-table-column
+                prop="material_type"
+                label="物料类型"
+              />
+              <el-table-column
+                prop="material_qty"
+                label="物料数量"
+              />
+              <el-table-column
+                prop="due_date"
+                label="交期时间"
+              />
+              <el-table-column
+                prop="custom"
+                label="客户编码"
+              />
+              <el-table-column
+                prop="point_code"
+                label="点位编码"
+              />
+            </el-table>
+          </el-col>
+        </el-row>
+      </div>
+      <el-row v-show="type === 2" type="flex" class="pop-btns" justify="center">
+        <el-col :span="3" class="height-100" style="margin: 0 1%;">
+          <div class="s-btn-1 s-btn-3" @click="show = false, vechineList = []">取消</div>
+        </el-col>
+        <el-col :span="3" class="height-100" style="margin: 0 1%;">
+          <div class="s-btn-1 s-btn-3" @click="toCall">叫料</div>
+        </el-col>
+      </el-row>
+      <div v-show="type === 3" class="pop-grid">
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">点位</el-col>
+          <el-col :span="18"><input v-model="emptyObj.device_code" type="text" class="p-value" disabled></el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">托盘类型</el-col>
+          <el-col :span="18" class="select-wraper">
+            <el-select v-model="val1" placeholder="请选择">
+              <el-option
+                v-for="item in options1"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+                class="option-wraper"
+              />
+            </el-select>
+          </el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">设备工序</el-col>
+          <el-col :span="18"><input v-model="emptyObj.regin_code" type="text" class="p-value" disabled></el-col>
+        </el-row>
+      </div>
+      <el-row v-show="type === 3" class="pop-btns">
+        <el-col :span="5" :offset="5" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="toSure3">确定</div>
+        </el-col>
+        <el-col :span="5" :offset="5" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
+        </el-col>
+      </el-row>
+      <div v-show="type === 4" class="pop-grid">
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">地面点位</el-col>
+          <el-col :span="18"><input v-model="sendObj.device_code" type="text" class="p-value" disabled></el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">订单编号</el-col>
+          <el-col :span="18"><input v-model="sendObj.order_code" type="text" class="p-value"></el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">合格数量</el-col>
+          <el-col :span="18"><input v-model="sendObj.material_qty" type="number" class="p-value"></el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">设备工序</el-col>
+          <el-col :span="18"><input v-model="sendObj.regin_code" type="text" class="p-value" disabled></el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">载具编码</el-col>
+          <el-col :span="18"><input v-model="sendObj.vehicle_code" type="text" class="p-value"></el-col>
+        </el-row>
+        <el-row class="filter-wraper">
+          <el-col :span="1" :offset="6"><el-checkbox v-model="check1" /></el-col>
+          <el-col :span="5" class="p-label">是否报功</el-col>
+          <el-col :span="1" :offset="3"><el-checkbox v-model="check2" /></el-col>
+          <el-col :span="5" class="p-label">指定外协区</el-col>
+        </el-row>
+      </div>
+      <el-row v-show="type === 4" class="pop-btns">
+        <el-col :span="5" :offset="5" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="toSure4">确定</div>
+        </el-col>
+        <el-col :span="5" :offset="5" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
+        </el-col>
+      </el-row>
+      <div v-show="type === 5" class="pop-grid">
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">地面点位</el-col>
+          <el-col :span="18"><input v-model="backObj.device_code" type="text" class="p-value" disabled></el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">物料数量</el-col>
+          <el-col :span="18"><input v-model="backObj.material_qty" type="number" class="p-value"></el-col>
+        </el-row>
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">设备工序</el-col>
+          <el-col :span="18"><input v-model="backObj.regin_code" type="text" class="p-value" disabled></el-col>
+        </el-row>
+      </div>
+      <el-row v-show="type === 5" class="pop-btns">
+        <el-col :span="5" :offset="5" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="toSure5">确定</div>
+        </el-col>
+        <el-col :span="5" :offset="5" class="height-100">
+          <div class="s-btn-1 s-btn-3" @click="show = false">取消</div>
+        </el-col>
+      </el-row>
     </div>
+    <div v-show="show" class="modal" />
   </div>
-
 </template>
 
 <script>
-import crudProduceTask from '@/views/wms/produceScreen/produceScreen'
-import crud from '@/mixins/crud'
-
+import crudProduceScreen from './produceScreen'
 export default {
-  name: 'ProduceScreen',
-  mixins: [crud],
   data() {
     return {
-      currentDate: new Date(),
-      getTime: '',
-      getDate: '',
-      deviceList: [],
-      choice: '',
-      ProduceStatusList: [],
-      materialList: [],
-      tableData: [],
-      id: null
+      type: null,
+      show: false,
+      machineData: [],
+      n1List: [],
+      buttonName: '',
+      vechineList: [],
+      currentRow1: null,
+      currentRow2: null,
+      pkObj: {},
+      checked: false,
+      pointState: {},
+      emptyObj: {},
+      sendObj: {},
+      backObj: {},
+      val1: '',
+      options1: [],
+      check1: false,
+      check2: false
     }
   },
   created() {
-    this.id = this.$route.params.id
-    crudProduceTask.getDevice().then(res => {
-      this.deviceList = res
-    })
-    crudProduceTask.getProduceStatus().then(res => {
-      this.ProduceStatusList = res
-    })
-    crudProduceTask.getMaterial().then(res => {
-      this.materialList = res
-    })
-    this.queryId()
-  },
-  mounted() {
-    // 定时器
-    const timer = setInterval(() => {
-      this.settime()// 你所加载数据的方法
-    }, 1000)
-    // 销毁定时器
-    this.$once('hook:beforeDestroy', () => {
-      clearInterval(timer)
+    crudProduceScreen.vehicleType().then(res => {
+      this.options1 = [...res.content]
     })
   },
   methods: {
-    settime() {
-      const _this = this
-      const yy = new Date().getFullYear()
-      const mm = new Date().getMonth() + 1
-      const dd = new Date().getDate()
-      const hh = new Date().getHours()
-      const mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
-      const ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
-      _this.getDate = yy + '年' + mm + '月' + dd + '日 ' + '星期' + '日一二三四五六'.charAt(new Date().getDay())
-      _this.getTime = hh + ':' + mf + ':' + ss
-    },
-    queryTask(value) {
-      crudProduceTask.queryTask(value).then(res => {
-        this.tableData = res
-      })
+    showPop(type, name) {
+      this.type = type
+      this.buttonName = name
+      if (type === 1) {
+        crudProduceScreen.regionList().then(res => {
+          this.machineData = [...res.content]
+          this.show = true
+        })
+      } else if (type === 2 && name in this.pointState) {
+        crudProduceScreen.regionOrder(this.pkObj.value, this.pointState[name]).then(res => {
+          this.n1List = [...res.content]
+          this.n1List.map(el => {
+            this.$set(el, 'device_code', this.pointState[name])
+          })
+          this.vechineList = []
+          this.show = true
+        })
+      } else if (type === 3 && name in this.pointState) {
+        this.emptyObj = {}
+        this.val1 = ''
+        this.show = true
+        this.emptyObj.device_code = this.pointState[name]
+        this.emptyObj.regin_code = this.pkObj.value
+      } else if (type === 4 && name in this.pointState) {
+        this.sendObj = {}
+        this.check1 = false
+        this.check2 = false
+        this.show = true
+        this.sendObj.order_code = ''
+        this.sendObj.material_qty = null
+        this.sendObj.vehicle_code = ''
+        this.sendObj.device_code = this.pointState[name]
+        this.sendObj.regin_code = this.pkObj.value
+      } else if (type === 5 && name in this.pointState) {
+        this.backObj = {}
+        this.show = true
+        this.backObj.material_qty = null
+        this.backObj.device_code = this.pointState[name]
+        this.backObj.regin_code = this.pkObj.value
+      }
     },
-    notify(title, type) {
-      this.$notify({
-        title: title,
-        type: type,
-        duration: 2500
-      })
+    handleCurrentChange1(val) {
+      this.currentRow1 = val
     },
-    fresh() {
-      this.queryId()
-      this.notify('操作成功', 'success')
+    handleCurrentChange2(val) {
+      this.currentRow2 = val
     },
-    callMaterial() {
-      if (this.$refs.table.selection.length === 0) {
-        this.notify('请选中一条记录！', 'info')
+    toSure1() {
+      if (this.currentRow1 === null) {
+        this.$message.error('请选择设备！')
         return
       }
-      const data = this.$refs.table.selection[0]
-      crudProduceTask.callMaterial(data).then(res => {
-        this.notify('操作成功', 'success')
-        this.queryId()
-      }).cache(err => {
-        console.log(err.response.data.message)
+      this.pkObj = this.currentRow1
+      this.show = false
+      crudProduceScreen.regionPoints(this.pkObj.value).then(res => {
+        this.pointState = res
       })
     },
-    finish() {
-      debugger
-      if (this.$refs.table.selection.length === 0) {
-        this.notify('请选中一条记录！', 'info')
+    toCall() {
+      if (this.currentRow2 === null) {
+        this.$message.error('请选择设备！')
         return
       }
-      // 判断是否有完工<加工，弹出提示
-      for (const i in this.$refs.table.selection) {
-        console.log(this.$refs.table.selection[i])
-        if (this.$refs.table.selection[i].finishproduce_qty <= this.$refs.table.selection[i].produce_qty) {
-          this.$confirm('完工数量小于加工数量，是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            const data = this.$refs.table.selection[0]
-            crudProduceTask.finish(data).then(res => {
-              this.notify('操作成功', 'success')
-              this.queryId()
-            }).cache(err => {
-              console.log(err.response.data.message)
-            })
-          }).catch(() => {
-            /* this.$message({
-              type: 'info',
-              message: '已取消'
-            })*/
-          })
-        }
-      }
+      crudProduceScreen.callMater(this.currentRow2).then(res => {
+        this.$message(res.msg)
+      })
+      this.show = false
     },
-    materialBack() {
-      if (this.$refs.table.selection.length === 0) {
-        this.notify('请选中一条记录！', 'info')
+    toSure3() {
+      if (!this.val1) {
+        this.$message.error('请选择托盘类型！')
         return
       }
-      const data = this.$refs.table.selection[0]
-      crudProduceTask.materialBack(data).then(res => {
-        this.notify('操作成功', 'success')
-        this.queryId()
-      }).cache(err => {
-        console.log(err.response.data.message)
+      this.emptyObj.vehicle_type = this.val1
+      crudProduceScreen.callEmp(this.emptyObj).then(res => {
+        this.$message(res.msg)
       })
+      this.show = false
     },
-    emptyVehicleBack() {
-      const data = {
-        id: this.id
+    toSure4() {
+      if (this.sendObj.order_code === '') {
+        this.$message.error('请输入订单编码！')
+        return
       }
-      debugger
-      crudProduceTask.emptyVehicleBack(data).then(res => {
-        this.notify('操作成功', 'success')
-        this.queryId()
-      }).cache(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    formatStatusName(row, column) {
-      for (const item of this.ProduceStatusList) {
-        if (item.code === row.produce_status) {
-          return item.name
-        }
+      if (this.sendObj.material_qty === '' || this.sendObj.material_qty === null) {
+        this.$message.error('请输入合格数量！')
+        return
       }
-    },
-    changeFun(val) {
-      this.choice = val[0]
-      if (val.length > 1) {
-        return this.$message.error('请选择一条信息操作')
+      if (this.sendObj.vehicle_code === '') {
+        this.$message.error('请输入载具编码！')
+        return
       }
+      this.sendObj.has_report = this.check1
+      this.sendObj.target_region_code = this.check2
+      crudProduceScreen.sendMater(this.sendObj).then(res => {
+        this.$message(res.msg)
+      })
+      this.show = false
     },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
+    toSure5() {
+      if (this.backObj.material_qty === '' || this.backObj.material_qty === null) {
+        this.$message.error('请输入物料数量！')
+        return
       }
-    },
-
-    queryId() {
-      const id = this.$route.params.id
-      crudProduceTask.queryIdDevice(id).then(res => {
-        this.tableData = res
+      crudProduceScreen.sendVehicle(this.backObj).then(res => {
+        this.$message(res.msg)
       })
+      this.show = false
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
+.container {
+  // width: 1280px;
+  // height: 960px;
+  width: 100%;
+  height: 100%;
+  padding: 1.5%;
+  box-sizing: border-box;
+  background: center / 100% 100% url('~@/assets/images/screen_bg.jpg') no-repeat;
+}
+.height-10 {
+  height: 10%;
+}
+.height-20 {
+  height: 20%;
+}
+.height-30 {
+  height: 30%;
+}
+.height-100 {
+  height: 100%;
+}
+.mg2 {
+  margin: 0 2%;
+}
+.ver-justify {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.ver-center {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.s-btn-1 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 45%;
+  font-size: 18px;
+  line-height: 1;
+  text-align: center;
+  color: #fff;
+  padding: 0 15px;
+  background: center / 100% 100% url('~@/assets/images/screen_1.png') no-repeat;
+}
+.s-btn-1_dis {
+  background-image: url('~@/assets/images/screen_5.png');
+}
+.s-btn-2 {
+  position: relative;
+  height: 100%;
+  background-color: #b3d8ff;
+  border: 1px solid #53a8ff;
+  border-radius: 16px;
+  &::before {
+    position: absolute;
+    content: '';
+    left: 0;
+    top: 20%;
+    width: 100%;
+    height: 80%;
+    background-image: linear-gradient(to bottom, #66b1ff, #a0cfff);
+    border-radius: 16px;
+  }
+  .p1 {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 22px;
+    line-height: 22px;
+    font-weight: 700;
+    color: #fff;
+    margin: 0;
+  }
+  .p2 {
+    position: absolute;
+    bottom: 22%;
+    width: 100%;
+    font-size: 16px;
+    line-height: 16px;
+    color: #fff;
+    text-align: center;
+    margin: 0;
+  }
+}
+.s-btn-2_dis {
+  background-color: #a2b1c1;
+  border: 1px solid #393f44;
+  &::before {
+    background-image: linear-gradient(to bottom, #666e77, #a8b5c3);
+  }
+}
+.s-btn-3 {
+  height: 100%;
+}
+.btns-wrap {
+  height: 40%;
+}
+.btns-wrap-2 {
+  height: 35%;
+}
+.m-content {
+  height: 54%;
+  border: 1px solid #4aaee2;
+  border-radius: 10px;
+  padding: 10px;
+  box-sizing: border-box;
+  background-image: linear-gradient(to right, rgba(36, 128, 207, 0.5), rgba(15, 61, 101, 0.5));
+  box-shadow: inset 1px 1px 4px 2px rgb(74 174 226 / 40%), inset -1px -1px 4px 2px rgb(74 174 226 / 40%);
+  p {
+    font-size: 24px;
+    line-height: 1;
+    font-weight: 700;
+    text-align: center;
+    color: #3CC1FF;
+    margin: 0;
+  }
+}
+.m-content-2 {
+  width: 60%;
+  height: 65%;
+  margin: 1% auto 0;
+}
+.m-content-inner {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  // background-color: #fff;
+  border-radius: 10px;
+  padding: 2% 1%
+}
+.grid {
+  height: 90%;
+  padding-top: 2%;
+}
+.pop-wraper {
+  position: fixed;
+  top: 50%;
+  left: 5%;
+  z-index: 20;
+  width: 90%;
+  height: 80%;
+  border-radius: 15px;
+  padding: 3%;
+  background: center / 100% 100% url('~@/assets/images/screen_2.png') no-repeat;
+}
+.pop-wraper-1 {
+  width: 50%;
+  left: 25%;
+  height: 60%;
+  padding: 5% 3% 3% 3%;
+  background: center / 100% 100% url('~@/assets/images/screen_4.png') no-repeat;
+}
+.popshow {
+	transform: translateY(-50%);
+}
+.pophide {
+	transform: translateY(100%);
+}
+.modal {
+  position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+  height: 100%;
+	background-color: rgba(0,0,0,0.5);
+	z-index: 10;
+}
+.pop-h1 {
+  font-size: 22px;
+  line-height: 1;
+  font-weight: 700;
+  text-align: left;
+  color: #F6F9FE;
+  margin: 0;
+  background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+.pop-btns {
+  height: 8%;
+}
+.pop-grid {
+  height: calc(92% - 24px);
+  padding: 2% 0;
+}
+>>>.el-table {
+  background-color: transparent;
+}
+>>>.el-table--border {
+  border: none;
+}
+>>>.el-table .el-table__header-wrapper th {
+  height: 40px;
+}
+>>>.el-table thead tr {
+  background: center / 100% 100% url('~@/assets/images/screen_3.png') no-repeat;
+}
+>>>.el-table .el-table__header-wrapper th {
+  background-color: transparent;
+  color: #AFBED8;
+  font-size: 16px;
+}
+>>>.el-table th.el-table__cell.is-leaf {
+  border-bottom-color: #5D92FF;
+}
+>>>.el-table--border .el-table__cell {
+  border-right: none;
+}
+>>>.el-table--mini .el-table__cell {
+  padding: 8px 0;
+}
+>>>.el-table {
+  color: #fff;
+  font-size: 14px;
+  tr {
+    background-color: rgba(31,46,73,0.3);
+  }
+}
+>>>.el-table td.el-table__cell {
+  border-bottom-color: rgba(122,159,224,0.17);
+}
+>>>.el-table::before, .el-table--group::after, .el-table--border::after {
+  background-color: rgba(122,159,224,0.17);
+}
+>>>.el-table__body tr.current-row>td.el-table__cell {
+  background-color: #3F6ACA;
+}
+.filter-wraper {
+  margin-bottom: 20px;
+}
+.p-label {
+  font-size: 18px;
+  line-height: 40px;
+  text-align: right;
+  color: #fff;
+  margin: 0;
+}
+.p-value {
+  width: 100%;
+  font-size: 18px;
+  line-height: 40px;
+  height: 40px;
+  text-align: left;
+  color: #fff;
+  margin: 0;
+  padding: 0 30px 0 15px;
+  background: rgba(45,88,184,0.25);
+  border: 1px solid #21D0F2;
+}
+.select-wraper {
+  font-size: 18px;
+  line-height: 40px;
+  height: 40px;
+  text-align: left;
+  color: #fff;
+  >>>.el-select {
+    width: 100%;
+  }
+  >>>.el-input__inner {
+    background-color: rgba(45,88,184,0.25);
+    border-color: #21D0F2;
+  }
+  >>>.el-input--mini .el-input__inner {
+    font-size: 18px;
+    line-height: 40px;
+    height: 40px;
+    color: #fff;
+  }
+}
+.option-wraper {
+  font-size: 18px;
+  line-height: 40px;
+  height: 40px;
+}
+>>>.el-checkbox__inner {
+  width: 40px;
+  height: 40px;
+  line-height: 40px;
+  font-size: 40px;
+}
+>>>.el-checkbox__inner::after {
+  width: 6px;
+  height: 20px;
+  left: 15px;
+  top: 3px;
+}
+>>>.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+  background-color: rgba(122,159,224,0.5)
+}
 </style>
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
index f9e92d0..4eb3825 100644
--- a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js
@@ -1,103 +1,91 @@
 import request from '@/utils/request'
 
-// 设备工序列表
-export function regionList() {
+// 1.用户登录
+export function authLogin(data) {
   return request({
-    url: 'api/fab/regionList',
-    method: 'get'
+    url: 'mobile/auth/login',
+    method: 'post',
+    data
   })
 }
-// export function regionList() {
-//   const res = {
-//     content: [
-//       { value: '111-02', label: 'TP5000冲床加工' },
-//       { value: '111 03', label: '警平' },
-//       { value: '111-04', label: '激光切闻' },
-//       { value: '111-05', label: '复合机' },
-//       { value: '111-06', label: 'Amada 801冲床' },
-//       { value: '111-07', label: 'TruBend 7038' },
-//       { value: '111-08', label: 'TruBend 5170' },
-//       { value: '111 09', label: 'TruBend Cell 7000' },
-//       { value: '111-10', label: 'LAG Robot Bending Cell' },
-//       { value: '111-12', label: '气保焊' },
-//       { value: '111-13', label: '姆柱焊、点焊' },
-//       { value: '111-14', label: '林肯焊接机器人' },
-//       { value: '111-15', label: '铜冲机' },
-//       { value: '111-16', label: '铜弯机' },
-//       { value: '111-22', label: '钳床' },
-//       { value: '111-23', label: '压铆机' },
-//       { value: '111-24', label: '斯图加特焊接机器人' }
-//     ]
-//   }
+// export function authLogin() {
+//   const res = { username: 'aaa' }
 //   return new Promise((resolve, reject) => {
 //     resolve(res)
 //   })
 // }
 
-// 根据工序获取设备点位信息
-export function regionPoints(code) {
+// 2.选择登录设备
+export function getUserOrDevice(data) {
   return request({
-    url: 'api/fab/regionPoints?regionCode=' + code,
-    method: 'get'
+    url: 'api/handheld/getUserOrDevice',
+    method: 'post',
+    data
   })
 }
-// export function regionPoints(code) {
-//   let res = {'OUT3': '1234', 'OUT2': '2234', 'N1': '123', 'N2': '223'}
+// export function getUserOrDevice() {
+//   const res = {
+//     content: [
+//       { point_code: '111-02', point_name: 'TP5000冲床加工' },
+//       { point_code: '111 03', point_name: '警平' }
+//     ]
+//   }
 //   return new Promise((resolve, reject) => {
 //     resolve(res)
 //   })
 // }
 
-// 根据工序查询订单
-export function regionOrder(code, code1) {
+// 3.登录跳转
+export function deviceInLogin(data) {
   return request({
-    url: 'api/fab/regionOrder?regionCode=' + code + '&deviceCode=' + code1,
-    method: 'get'
+    url: 'api/handheld/deviceInLogin',
+    method: 'post',
+    data
   })
 }
-// export function regionOrder(code) {
-//   const res = {
-//     content: [{ order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }]
-//   }
+// export function deviceInLogin() {
+//   const res = { device_name: 'TP5000冲床加工', device_code: '111-02', region_points: [{ name: 'OUT1', type: '1', device_code: '1234' }, { name: 'OUT2', type: '1', device_code: '1234' }, { name: 'OUT3', type: '1', device_code: '1234' }, { name: 'OUT4', type: '1', device_code: '1234' }, { name: 'N1', type: '0', device_code: '1234' }, { name: 'N2', type: '0', device_code: '1234' }] }
 //   return new Promise((resolve, reject) => {
 //     resolve(res)
 //   })
 // }
 
-// 根据工单查询匹配库存
-export function getMaterListByOrder(code, order) {
+// 4.根据工序查询订单
+export function regionOrder(code, code1) {
   return request({
-    url: 'api/fab/getMaterListByOrder?regionCode=' + code + '&?order=' + order,
+    url: 'api/fab/regionOrder?regionCode=' + code + '&deviceCode=' + code1,
     method: 'get'
   })
 }
-// export function getMaterListByOrder(code, order) {
-//   let res = {
-//     content: [{ point_code: 'XXS23023012334', region_code: '800034202869', point_type: '120', point_status: '2' }]
+// export function regionOrder(code) {
+//   const res = {
+//     content: [{ vehicle_code: '123', order_code: '800034202869', region_code: '111-07', material_id: 'A7E0019008760_00', material_type: 'S39_SA01', custom: 'BBC支撑板后上', material_qty: '120', plan_date: '2024/8/11' }]
 //   }
 //   return new Promise((resolve, reject) => {
 //     resolve(res)
 //   })
 // }
 
-// 载具类型列表
-export function vehicleType(data) {
+// 5.查询载具物料信息
+export function fabMaterial(data) {
   return request({
-    url: 'api/fab/vehicleType',
-    method: 'post',
+    url: 'api/fab/material',
+    method: 'POST',
     data
   })
 }
-// export function vehicleType() {
-//   let res = {
-//     content: [{ label: 'aa', value: '11'}, { label: 'bb', value: '22'}]
+// export function fabMaterial() {
+//   const res = {
+//     content: [
+//       { order_code: '111-02', material_qty: '' }
+//     ]
 //   }
 //   return new Promise((resolve, reject) => {
 //     resolve(res)
 //   })
 // }
 
-// 呼叫库存物料
+// 6.呼叫库存物料
 export function callMater(data) {
   return request({
     url: 'api/fab/callMater',
@@ -106,7 +94,7 @@ export function callMater(data) {
   })
 }
 
-// 呼叫空料框
+// 7.呼叫空料框
 export function callEmp(data) {
   return request({
     url: 'api/fab/callEmp',
@@ -115,7 +103,26 @@ export function callEmp(data) {
   })
 }
 
-// 工序下料
+// 8.查询订单号
+export function fabOrders(data) {
+  return request({
+    url: 'api/fab/orders',
+    method: 'POST',
+    data
+  })
+}
+// export function fabOrders() {
+//   const res = {
+//     content: [
+//       { order_code: '111-02', material_qty: '' }
+//     ]
+//   }
+//   return new Promise((resolve, reject) => {
+//     resolve(res)
+//   })
+// }
+
+// 9.工序下料
 export function sendMater(data) {
   return request({
     url: 'api/fab/sendMater',
@@ -124,7 +131,7 @@ export function sendMater(data) {
   })
 }
 
-// 叫料点回库
+// 10.叫料点回库
 export function sendVehicle(data) {
   return request({
     url: 'api/fab/sendVehicle',
@@ -133,6 +140,20 @@ export function sendVehicle(data) {
   })
 }
 
+// 11.用户登出
+export function loginOut() {
+  return request({
+    url: 'mobile/auth/loginOut',
+    method: 'get'
+  })
+}
+// export function loginOut() {
+//   const res = {}
+//   return new Promise((resolve, reject) => {
+//     resolve(res)
+//   })
+// }
+
 export default {
-  regionList, regionPoints, regionOrder, getMaterListByOrder, vehicleType, callMater, callEmp, sendMater, sendVehicle
+  authLogin, getUserOrDevice, deviceInLogin, regionOrder, fabMaterial, callMater, callEmp, fabOrders, sendMater, sendVehicle, loginOut
 }
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
new file mode 100644
index 0000000..0ac66d4
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/setup.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="container">
+    <div class="header" />
+    <div class="set_wrap">
+      <el-row type="flex" justify="space-between" class="mgb5">
+        <el-col :span="5" class="set-label">用户名</el-col>
+        <el-col :span="17"><input v-model="username" type="text" class="set-input"></el-col>
+      </el-row>
+      <el-row type="flex" justify="space-between" class="mgb10">
+        <el-col :span="5" class="set-label">密码</el-col>
+        <el-col :span="17"><input v-model="password" type="password" class="set-input"></el-col>
+      </el-row>
+      <el-row type="flex" justify="center">
+        <el-col :span="8"><button class="login_button" :disabled="disabled" @click="toLogin">登录</button></el-col>
+      </el-row>
+    </div>
+    <div class="pop-wraper pop-wraper-1" :class="{'popshow': show, 'pophide': !show}">
+      <div class="pop-h1">选择设备</div>
+      <div class="pop-grid">
+        <el-row class="filter-wraper" type="flex" justify="space-between">
+          <el-col :span="5" class="p-label">设备</el-col>
+          <el-col :span="18" class="select-wraper">
+            <el-select v-model="value" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.point_code"
+                :label="item.point_name"
+                :value="item.point_code"
+                class="option-wraper"
+              />
+            </el-select>
+          </el-col>
+        </el-row>
+      </div>
+      <el-row type="flex" justify="space-around">
+        <el-col :span="6">
+          <button class="login_button login_button_dis" @click="show = false">取消</button>
+        </el-col>
+        <el-col :span="6">
+          <button class="login_button" :disabled="disabled" @click="toSure">确定</button>
+        </el-col>
+      </el-row>
+    </div>
+    <div v-show="show" class="modal" />
+  </div>
+</template>
+
+<script>
+import crudProduceScreen from './produceScreen'
+export default {
+  data() {
+    return {
+      username: '',
+      password: '',
+      options: [],
+      value: '',
+      disabled: false,
+      show: false
+    }
+  },
+  methods: {
+    toLogin() {
+      this.disabled = true
+      if (!this.username) {
+        this.$message('请输入用户名')
+        this.disabled = false
+        return
+      }
+      if (!this.password) {
+        this.$message('请输入密码')
+        this.disabled = false
+        return
+      }
+      crudProduceScreen.authLogin({ username: this.username, password: this.password }).then(res => {
+        this.disabled = false
+        crudProduceScreen.getUserOrDevice({ username: this.username }).then(res => {
+          this.options = [...res.content]
+          this.show = true
+        })
+      }).catch(() => {
+        this.disabled = false
+      })
+    },
+    toSure() {
+      this.disabled = true
+      if (!this.value) {
+        this.$message('请选择设备')
+        this.disabled = false
+        return
+      }
+      crudProduceScreen.deviceInLogin({ device_code: this.value }).then(res => {
+        this.$store.dispatch('addScreenData', JSON.stringify(res))
+        this.show = false
+        this.disabled = false
+        this.$router.push('/produceScreen/1')
+      }).catch(() => {
+        this.disabled = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import './style.scss';
+</style>
diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/style.scss b/lms/nladmin-ui/src/views/wms/produceScreen/style.scss
new file mode 100644
index 0000000..eb09e85
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/produceScreen/style.scss
@@ -0,0 +1,307 @@
+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    // width: 1280px;
+    // height: 960px;
+    width: 100%;
+    height: 100%;
+    background: center / 100% 100% url('~@/assets/images/screen_bg.jpg') no-repeat;
+}
+.header {
+    position: absolute;
+    left: 6%;
+    top: 0;
+    width: 88%;
+    height: 8%;
+    background: center / 100% 100% url('~@/assets/images/screen_header_bg.png') no-repeat;
+    margin: 0 auto;
+}
+.set_wrap {
+    width: 60%;
+    padding: 10% 10% 8% 10%;
+    background: center / 100% 100% url('~@/assets/images/screen_setup_bg.png') no-repeat;
+}
+.set-label {
+    position: relative;
+    font-size: 18px;
+    line-height: 40px;
+    color: #fff;
+    text-align: justify;
+    text-align-last: justify;
+}
+.set-input {
+    width: 100%;
+    font-size: 18px;
+    line-height: 40px;
+    color: #fff;
+    background: rgba(45,88,184,0.1);
+    border: 1px solid #21D0F2;
+    border-radius: 4px;
+    padding: 0 15px;
+    box-sizing: border-box;
+}
+.mgb5 {
+    margin-bottom: 5%;
+}
+.mgb10 {
+  margin-bottom: 10%;
+}
+.select-wraper {
+  font-size: 18px;
+  line-height: 40px;
+  height: 40px;
+  text-align: left;
+  color: #fff;
+  >>>.el-select {
+    width: 100%;
+  }
+  >>>.el-input__inner {
+    background-color: rgba(45,88,184,0.25);
+    border-color: #21D0F2;
+  }
+  >>>.el-input--mini .el-input__inner {
+    font-size: 18px;
+    line-height: 40px;
+    height: 40px;
+    color: #fff;
+  }
+}
+.m-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 84%;
+  height: 12%;
+  border: 1px solid #4aaee2;
+  border-radius: 10px;
+  padding: 10px;
+  margin-bottom: 3%;
+  box-sizing: border-box;
+  background-image: linear-gradient(to right, rgba(36, 128, 207, 0.5), rgba(15, 61, 101, 0.5));
+  box-shadow: inset 1px 1px 4px 2px rgb(74 174 226 / 40%), inset -1px -1px 4px 2px rgb(74 174 226 / 40%);
+  p {
+    font-size: 30px;
+    line-height: 1;
+    font-weight: 700;
+    text-align: center;
+    color: #3CC1FF;
+    margin: 0;
+  }
+}
+.option-wraper {
+  font-size: 18px;
+  line-height: 40px;
+  height: 40px;
+}
+.el-select-dropdown__item {
+  font-size: 18px;
+  line-height: 40px;
+  height: 40px;
+}
+>>>.el-checkbox__inner {
+  width: 40px;
+  height: 40px;
+  line-height: 40px;
+  font-size: 40px;
+}
+>>>.el-checkbox__inner::after {
+  width: 6px;
+  height: 20px;
+  left: 15px;
+  top: 3px;
+}
+>>>.el-table {
+  background-color: transparent;
+}
+>>>.el-table--border {
+  border: none;
+}
+>>>.el-table .el-table__header-wrapper th {
+  height: 40px;
+}
+>>>.el-table thead tr {
+  background: center / 100% 100% url('~@/assets/images/screen_3.png') no-repeat;
+}
+>>>.el-table .el-table__header-wrapper th {
+  background-color: transparent;
+  color: #AFBED8;
+  font-size: 16px;
+}
+>>>.el-table th.el-table__cell.is-leaf {
+  border-bottom-color: #5D92FF;
+}
+>>>.el-table--border .el-table__cell {
+  border-right: none;
+}
+>>>.el-table--mini .el-table__cell {
+  padding: 8px 0;
+}
+>>>.el-table {
+  color: #fff;
+  font-size: 14px;
+  tr {
+    background-color: rgba(31,46,73,0.3);
+  }
+}
+>>>.el-table td.el-table__cell {
+  border-bottom-color: rgba(122,159,224,0.17);
+}
+>>>.el-table::before, .el-table--group::after, .el-table--border::after {
+  background-color: rgba(122,159,224,0.17);
+}
+>>>.el-table__body tr.current-row>td.el-table__cell {
+  background-color: #3F6ACA;
+}
+>>>.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+  background-color: rgba(122,159,224,0.5)
+}
+.login_button {
+  width: 100%;
+  font-size: 22px;
+  line-height: 50px;
+  color: #fff;
+  border: none;
+  background: center / 100% 100% url('~@/assets/images/screen_btn.png') no-repeat;
+}
+.login_button_dis {
+  background-image: url('~@/assets/images/screen_btn_dis.png');
+}
+.btn-close {
+  position: absolute;
+  right: 2%;
+  top: 2%;
+  width: 60px;
+  height: 60px;
+  border: 0;
+  border-radius: 20px;
+  background: rgba(84, 127, 179, 0) center center / 40px 40px url('~@/assets/images/screen_exit.png') no-repeat;
+  margin-left: 20px;
+}
+.button-wraper {
+  display: flex;
+  justify-content: flex-start;
+  width: 84%;
+  height: 40%;
+}
+.button-item {
+  width: 15%;
+  height: 100%;
+  border-radius: 20px;
+  background-image: linear-gradient(to right, rgba(36, 128, 207, 0.5), rgba(15, 61, 101, 0.5));
+  margin-right: 2%;
+  padding: 2% 0;
+  &:last-child {
+    margin-right: 0;
+  }
+}
+.point_name {
+  width: 100px;
+  height: 100px;
+  font-size: 40px;
+  line-height: 100px;
+  color: #B4C1D8;
+  font-weight: 700;
+  text-align: center;
+  margin: 0 auto;
+}
+.point_name_btn {
+  border-radius: 100%;
+  background-color: #1d82b1;
+  box-shadow: 0px 4px 4px rgba(18, 15, 15, 60%);
+}
+.point_value {
+  font-size: 28px;
+  line-height: 28px;
+  height: 28px;
+  color: #3CC1FF;
+  text-align: center;
+  margin: 20% 0;
+}
+.button {
+  font-size: 18px;
+  line-height: 46px;
+  color: #fff;
+  font-weight: 700;
+  text-align: center;
+  background-image: linear-gradient(0deg, #277ddc, #213bc6);
+  width: 80%;
+  margin: 30px auto;
+  border-radius: 10px;
+  border: 1px solid #2965e2;
+  box-shadow: 0px 4px 4px rgba(18, 15, 15, 60%);
+}
+.pop-wraper {
+  position: fixed;
+  top: 50%;
+  left: 5%;
+  z-index: 20;
+  width: 90%;
+  height: 80%;
+  border-radius: 15px;
+  padding: 2% 3% 3% 3%;
+  background: center / 100% 100% url('~@/assets/images/screen_2.png') no-repeat;
+  transition: all .3s;
+}
+.pop-wraper-1 {
+  width: 50%;
+  left: 25%;
+  height: auto;
+  background: center / 100% 100% url('~@/assets/images/screen_4.png') no-repeat;
+}
+.popshow {
+	transform: translateY(-50%);
+}
+.pophide {
+	transform: translateY(180%);
+}
+.modal {
+  position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+  height: 100%;
+	background-color: rgba(0,0,0,0.5);
+	z-index: 10;
+}
+.pop-h1 {
+  font-size: 22px;
+  line-height: 1;
+  font-weight: 700;
+  text-align: left;
+  color: #F6F9FE;
+  margin-bottom: 50px;
+  background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+.pop-grid {
+  height: calc(100% - 112px);
+  margin-bottom: 60px;
+  overflow: auto;
+}
+.filter-wraper {
+  margin-bottom: 20px;
+}
+.p-label {
+  font-size: 18px;
+  line-height: 40px;
+  text-align: right;
+  color: #fff;
+  margin: 0;
+  text-align: justify;
+  text-align-last: justify;
+}
+.p-value {
+  width: 100%;
+  font-size: 18px;
+  line-height: 40px;
+  height: 40px;
+  text-align: left;
+  color: #fff;
+  margin: 0;
+  padding: 0 30px 0 15px;
+  background: rgba(45,88,184,0.25);
+  border: 1px solid #21D0F2;
+}
\ No newline at end of file