刘洋 1 năm trước cách đây
mục cha
commit
a0c28430fb

+ 1 - 1
src/api/sop.js

@@ -4,4 +4,4 @@ export const getSopList = (data) => http.post('/api/admin/sop/list', data, { cus
 //流程详细信息接口
 export const getSopFlowView = (params) => http.post('/api/admin/flow/view', {}, { params, custom: { loading: true } })
 export const deviceCanOut = (params) => http.post('/api/admin/device/in/out/can_out_info', {}, { params })
-export const deviceCanIn = (params) => http.post('/api/admin/device/in/out/can_in_info', {}, { params })
+export const deviceCanIn = () => http.post('/api/admin/device/in/out/can_in_info')

+ 15 - 1
src/components/low-code/DEVICE_IN_TABLE.vue

@@ -46,6 +46,7 @@
         deviceList: [],
         deviceItemInfo: {
           deviceNo: '', //设备编号
+          deviceModel: '',
           supplierName: '', //供应商
           deviceStatus: '', //运行状态
           scanCount: '', //总扫描量
@@ -57,7 +58,18 @@
     },
     mounted() {
       deviceCanIn().then((res) => {
-        res = [{ deviceNo: 1, supplierName: '似懂非懂', deviceStatus: 'NORMAL', scanCount: 20, location: '武汉', address: '北京', basePhotoPath: '' }]
+        res = [
+          {
+            deviceNo: 1,
+            deviceModel: '周大福',
+            supplierName: '似懂非懂',
+            deviceStatus: 'NORMAL',
+            scanCount: 20,
+            location: '武汉',
+            address: '北京',
+            basePhotoPath: ''
+          }
+        ]
         this.deviceList = res.map((item) => {
           item.value = item.deviceNo
           item.label = item.deviceModel
@@ -94,12 +106,14 @@
   .device-in-table {
     .form-box {
       padding: 24rpx;
+      padding-top: 80rpx;
     }
     .head {
       .title {
         color: #595959;
         font-size: 28rpx;
         height: 60rpx;
+        margin-bottom: 10rpx;
       }
     }
   }

+ 3 - 5
src/router/permission.js

@@ -7,11 +7,9 @@ export default (router) => {
 
   // 全局路由前置守卫
   router.beforeEach(async (to, from, next) => {
-    if (!uni.getStorageSync('user')) {
-      let res = await pcLogin().catch(() => {})
-      if (res) {
-        uni.setStorageSync('user', res)
-      }
+    let res = await pcLogin().catch(() => {})
+    if (res) {
+      uni.setStorageSync('user', res)
     }
 
     next() //小程序登录接口还没有出来,先放开路由拦截器

+ 1 - 1
src/styles/global.scss

@@ -7,6 +7,6 @@
     line-height:44rpx;
     padding-bottom:12rpx;
 }
-.u-drawer .u-drawer{
+.u-drawer .u-drawer,.u-drawer .u-drawer-content{
     overflow:visible !important;
 }