测试bug反馈修复

pages/device/APF/about.vue

@@ -3,12 +3,12 @@
         <view slot="body">
             <view class="about">
                 <view class="about-title">{{ deviceInfo.name }}</view>
-                <view class="about-text">装置类型：{{ deviceInfo.devTypeName }}</view>
-                <view class="about-text">装置型号：{{ deviceInfo.devModelName }}</view>
+                <view class="about-text">设备类型：{{ deviceInfo.devTypeName }}</view>
+                <view class="about-text">设备型号：{{ deviceInfo.devModelName }}</view>
                 <view class="about-text"
-                    >装置接入方式：{{ deviceInfo.devAccessMethod === 'cloud' ? '云直连' : 'mqtt' }}</view
+                    >设备接入方式：{{ deviceInfo.devAccessMethod === 'cloud' ? '云直连' : 'mqtt' }}</view
                 >
-                <!-- <view class="about-text">装置注册时间：永久使用</view> -->
+                <!-- <view class="about-text">设备注册时间：永久使用</view> -->
                 <view class="about-text">程序版本：{{ deviceInfo.programVersionName }}</view>
                 <view class="about-text">网络设备ID：{{ deviceInfo.ndid }}</view>
             </view>

pages/device/edit.vue

@@ -112,7 +112,7 @@
                         <uni-forms>
                             <uni-data-select
                                 v-model="point.position"
-                                :localdata="positionList"
+                                :localdata="positionListRange"
                                 @change="positionChange"
                             ></uni-data-select>
                             <uni-easyinput
@@ -159,6 +159,16 @@ export default {
             deviceInfo: {},
         }
     },
+    computed:{
+        positionListRange(){
+            return this.positionList.map(item => {
+                return {
+                    ...item,
+                    disable: this.point.linePostion !== item.id && this.pointList.some(item2 => item2.linePostion === item.id)
+                }
+            })
+        }
+    },
     onLoad(options) {
         this.deviceInfo = JSON.parse(decodeURIComponent(options.deviceInfo))
         console.log(this.deviceInfo)

pages/device/list.vue

@@ -7,7 +7,7 @@
                     <uni-card
                         :title="item.name"
                         :sub-title="item.projectName"
-                        :extra="item.projectType"
+                        :extra="item.mac"
                         padding="0"
                         v-for="(item, index) in projectList"
                         :key="index"

pages/device/new.vue

@@ -139,7 +139,7 @@
                         <uni-forms>
                             <uni-data-select
                                 v-model="point.position"
-                                :localdata="positionList"
+                                :localdata="positionListRange"
                                 @change="positionChange"
                             ></uni-data-select>
                             <uni-easyinput
@@ -185,8 +185,17 @@ export default {
             isAdaptive: false, // 是否适应当前项目
         }
     },
+    computed:{
+        positionListRange(){
+            return this.positionList.map(item => {
+                return {
+                    ...item,
+                    disable: this.point.linePostion !== item.id && this.pointList.some(item2 => item2.linePostion === item.id)
+                }
+            })
+        }
+    },
     onLoad() {
-
         let dictData = uni.getStorageSync(this.$cacheKey.dictData)
         dictData.forEach((item) => {
             if (item.code == 'Line_Position') {