From fb5de4370b3919a91d94eed1b1b9d1a8624060f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Thu, 31 Aug 2023 16:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=8A=82=E6=B5=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js             |  4 ++--
 pages/device/APF/detail.vue      | 11 ++++++-----
 pages/home/selectEngineering.vue | 14 +++++++++++---
 pages/project/new.vue            |  2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index c378a4a..6c98ed7 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -40,7 +40,7 @@ export default (options = {}) => {
                 if (arr.indexOf(options.url) > -1) {
                     setTimeout(() => {
                         arr.splice(arr.indexOf(options.url), 1)
-                    }, 300)
+                    }, 1500)
                 }
                 if (res.data.resultCode !== 10000 && res.data.code !== 'A0000') {
                     errHandler(res.data)
@@ -53,7 +53,7 @@ export default (options = {}) => {
                 if (arr.indexOf(options.url) > -1) {
                     setTimeout(() => {
                         arr.splice(arr.indexOf(options.url), 1)
-                    }, 300)
+                    }, 1500)
                 }
                 reject(err)
                 uni.showToast({
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index e02e121..4d05817 100644
--- a/pages/device/APF/detail.vue
+++ b/pages/device/APF/detail.vue
@@ -32,7 +32,6 @@
                                         <template v-for="(item,index) in IOData">
                                             <view class="item">{{ item.clDid }}</view>
                                             <view class="item">
-<!--                                                <view class="status-point-success mr10"></view>-->
                                                 <view style="width: 30rpx"> {{ item.value || '-'}}</view>
                                                 <view v-if="item.value"> °C</view>
                                             </view>
@@ -119,7 +118,7 @@ export default {
             navMenuActive: 0,
             navHeight: 0,
             img: '',
-            topoImg:'',
+            topoImg: '',
             navMenuList: [
                 {
                     text: '基本',
@@ -369,10 +368,10 @@ export default {
                         //     }
                         // })
                         this.IOData = JSON.parse(message.toString())
-                        this.IOData.forEach(item=>{
-                            if(item.value === 0){
+                        this.IOData.forEach(item => {
+                            if (item.value === 0) {
                                 item.value = '0'
-                            }else if(!item.value){
+                            } else if (!item.value) {
                                 item.value = ''
                             }
                         })
@@ -467,6 +466,7 @@ export default {
             width: 110rpx;
             font-size: 16rpx;
             opacity: 0.8;
+
             .grid-card-content-2,
             .grid-card-content-1 {
                 font-size: 16rpx;
@@ -484,6 +484,7 @@ export default {
             right: 10rpx;
             width: 200rpx;
             opacity: 0.8;
+
             .grid-card-content-2,
             .grid-card-content-1 {
                 font-size: 16rpx;
diff --git a/pages/home/selectEngineering.vue b/pages/home/selectEngineering.vue
index 972f773..bf04f4d 100644
--- a/pages/home/selectEngineering.vue
+++ b/pages/home/selectEngineering.vue
@@ -46,6 +46,7 @@ export default {
     onLoad(options) {
         this.options = options
         this.engineeringList = uni.getStorageSync('engineeringList')
+        this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
     },
     onShow() {
         queryEngineering().then(res => {
@@ -53,9 +54,16 @@ export default {
         })
     },
     onNavigationBarButtonTap(e) {
-        uni.navigateTo({
-            url: '/pages/engineering/new',
-        })
+        if (this.userInfo.authorities === 'app_vip_user' || this.userInfo.authorities === 'engineering_user') {
+            uni.navigateTo({
+                url: `/pages/engineering/new`,
+            })
+        } else {
+            uni.showToast({
+                title: '暂无权限',
+                icon: 'none',
+            })
+        }
     },
     methods: {
         confirm(e) {
diff --git a/pages/project/new.vue b/pages/project/new.vue
index adbe641..c5cc9d5 100644
--- a/pages/project/new.vue
+++ b/pages/project/new.vue
@@ -176,7 +176,7 @@ export default {
                         this.formData.tempFiles.push(item)
                     } else {
                         this.formData.files.push({
-                            url: this.$config.static +  item.filePath,
+                            url:  item.filePath,
                             extname: item.name.split('.')[1],
                             name: item.name,
                             ...item,