功能调试

common/api/device.js

@@ -48,12 +48,13 @@ export function addDevice(params) {
 }
 
 // 直连设备注册
-export function registerDevice(nDid) {
+export function registerDevice(nDid, type) {
     return request({
         url: '/access-boot/device/register',
         method: 'post',
         data: {
             nDid,
+            type,
         },
     })
 }
@@ -95,7 +96,7 @@ export const transferDevice = (id, userId) => {
         method: 'POST',
         data: {
             ids: id,
-            userId: userId || uni.getStorageSync('userInfo').userIndex
+            userId: userId || uni.getStorageSync('userInfo').userIndex,
         },
     })
 }
@@ -163,7 +164,7 @@ export const queryDeviceUser = (devId) => {
         url: '/cs-device-boot/deviceUser/queryUserById',
         method: 'POST',
         data: {
-            devId
+            devId,
         },
     })
 }
@@ -176,3 +177,21 @@ export const cancelShare = (params) => {
         data: params,
     })
 }
+
+// 取消调试
+export const cancelDebug = (params) => {
+    return request({
+        url: '/cs-device-boot/EquipmentDelivery/deleteTest',
+        method: 'POST',
+        data: params,
+    })
+}
+
+// 完成调试
+export const finishDebug = (params) => {
+    return request({
+        url: '/cs-device-boot/EquipmentDelivery/testcompletion',
+        method: 'POST',
+        data: params,
+    })
+}

components/Cn-device-card/Cn-device-card.vue

@@ -19,6 +19,10 @@
                 <text>项目名称</text>
                 <text>{{ device.projectName }}</text>
             </view>
+            <view class="device-body-item mt6" v-if="device.process == 2 || device.process == 3">
+                <text>设备状态</text>
+                <text>{{ device.process == 2 ? '功能调试' : '出厂调试' }}</text>
+            </view>
         </view>
     </uni-card>
 </template>
@@ -30,9 +34,8 @@ export default {
     props: {
         device: {
             type: Object,
-            default: () => {
+            default: () => {},
-            }
+        },
-        }
     },
     methods: {
         deviceIcon(e) {
@@ -52,13 +55,19 @@ export default {
         },
         jump() {
             uni.navigateTo({
-                url: '/pages/device/APF/detail?id=' + this.device.equipmentId + '&isPrimaryUser=' + this.device.isPrimaryUser,
+                url:
+                    '/pages/device/APF/detail?id=' +
+                    this.device.equipmentId +
+                    '&isPrimaryUser=' +
+                    this.device.isPrimaryUser +
+                    '&process=' +
+                    this.device.process,
             })
         },
-    }
+    },
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .device-body {
     padding: 20rpx;
 

pages/device/APF/detail.vue

@@ -36,7 +36,6 @@
                                                 <view v-if="item.value"> °C</view>
                                             </view>
                                         </template>
-
                                     </view>
                                 </view>
                             </view>
@@ -87,6 +86,18 @@
                     <uni-popup-share title="分享到"></uni-popup-share>
                     <view style="height: 40rpx; background: #fff"></view>
                 </uni-popup>
+                <!-- 完成调试输入框 -->
+                <uni-popup ref="inputDialog" type="dialog">
+                    <uni-popup-dialog
+                        ref="inputClose"
+                        mode="input"
+                        :title="dialogType"
+                        placeholder="请输入备注"
+                        :before-close="true"
+                        @close="dialogInputClose"
+                        @confirm="dialogInputConfirm"
+                    ></uni-popup-dialog>
+                </uni-popup>
             </view>
         </view>
     </Cn-page>
@@ -97,7 +108,7 @@ import xieBo from './comp/xieBo.vue'
 import power from './comp/power.vue'
 import oscillogram from './comp/oscillogram.vue'
 import IO from './comp/IO.vue'
-import {queryTopologyDiagram, deleteDevice} from '@/common/api/device'
+import { queryTopologyDiagram, deleteDevice, cancelDebug, finishDebug } from '@/common/api/device'
 import { MQTT_IP, MQTT_OPTIONS } from '@/common/js/mqtt.js'
 import mqtt from 'mqtt/dist/mqtt.js'
 import { base64ToPath, pathToBase64 } from 'image-tools'
@@ -112,6 +123,7 @@ export default {
     },
     data() {
         return {
+            dialogType: '',
             domLoading: true,
             loading: true,
             deviceInfo: {},
@@ -159,6 +171,7 @@ export default {
             topolodyData: [],
             basicData: [],
             IOData: [],
+            pageOptions: {},
         }
     },
     methods: {
@@ -215,9 +228,56 @@ export default {
                 uni.navigateTo({
                     url: '/pages/device/edit?deviceInfo=' + encodeURIComponent(JSON.stringify(data)),
                 })
+            } else if (e.item.text === '取消调试') {
+                this.cancelDebug()
+            } else if (e.item.text === '完成调试') {
+                this.finishDebug()
             }
             this.$refs.fab.close()
         },
+        // 取消调试
+        cancelDebug() {
+            this.dialogType = '取消调试'
+            this.$refs.inputDialog.open()
+        },
+        // 完成调试
+        finishDebug() {
+            this.dialogType = '完成调试'
+            this.$refs.inputDialog.open()
+        },
+        dialogInputClose() {
+            this.$refs.inputDialog.close()
+        },
+        dialogInputConfirm(val) {
+            if (!val) {
+                this.$util.toast('请输入备注')
+                return
+            }
+            if (this.dialogType == '取消调试') {
+                cancelDebug({
+                    deviceId: this.devId,
+                    remark: val,
+                    type: Number(this.pageOptions.process),
+                }).then((res) => {
+                    this.$util.toast(res.message)
+                    setTimeout(() => {
+                        uni.navigateBack()
+                    }, 1500)
+                })
+            } else {
+                finishDebug({
+                    deviceId: this.devId,
+                    remark: val,
+                    type: Number(this.pageOptions.process),
+                }).then((res) => {
+                    console.log(res)
+                    this.$util.toast(res.message)
+                    setTimeout(() => {
+                        uni.navigateBack()
+                    }, 1500)
+                })
+            }
+        },
         navMenuClick(idx) {
             this.navMenuActive = idx
             uni.pageScrollTo({ scrollTop: 0, duration: 0 })
@@ -231,11 +291,9 @@ export default {
                     })
                 },
             })
-
         },
         init() {
             console.log('init')
-
             this.loading = true
             this.domLoading = true
             queryTopologyDiagram(this.devId).then((res) => {
@@ -344,7 +402,7 @@ export default {
                         //     }
                         // })
                         this.IOData = JSON.parse(message.toString())
-                        this.IOData.forEach(item => {
+                        this.IOData.forEach((item) => {
                             if (item.value === 0) {
                                 item.value = '0'
                             } else if (!item.value) {
@@ -377,9 +435,28 @@ export default {
         this.client.end()
     },
     onLoad(options) {
+        this.pageOptions = options
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
         this.devId = options.id
         this.isPrimaryUser = options.isPrimaryUser
+        if (this.pageOptions.process == 2 || this.pageOptions.process == 3) {
+            this.content.splice(
+                0,
+                0,
+                {
+                    iconPath: '/static/feedback.png',
+                    text: '编辑',
+                },
+                {
+                    iconPath: '/static/delate.png',
+                    text: '取消调试',
+                },
+                {
+                    iconPath: '/static/delate.png',
+                    text: '完成调试',
+                },
+            )
+        } else {
             if (this.isPrimaryUser == 1) {
                 this.content.splice(
                     0,
@@ -403,7 +480,6 @@ export default {
                         text: '分享',
                     })
                 }
-
             }
             if (this.userInfo.authorities !== 'tourist') {
                 this.content.splice(0, 0, {
@@ -411,7 +487,8 @@ export default {
                     text: '用户',
                 })
             }
-        this.topolodyData = this.$util.getDictData('Line_Position').map(item => {
+        }
+        this.topolodyData = this.$util.getDictData('Line_Position').map((item) => {
             switch (item.name) {
                 case '电网侧':
                     item.showKey = ['Apf_ThdA_Sys(%)']

pages/device/new.vue

@@ -314,7 +314,7 @@ export default {
             if (!this.formData.nDid) {
                 return this.$util.toast('请输入设备识别码')
             }
-            registerDevice(this.formData.nDid).then((res) => {
+            registerDevice(this.formData.nDid, Number(this.options.type)).then((res) => {
                 getModel(this.formData.nDid).then((res) => {
                     console.log(res)
                     this.pointList = res.data.map((item) => {

pages/message/report.vue

@@ -13,20 +13,37 @@
 </template>
 
 <script>
+import list from "@/common/js/list";
+
 export default {
+    mixins: [list],
     data() {
         return {
-            title: '灿能'
+            loading: true,
         }
     },
-    onLoad () {
+    onShow() {
-
+        this.init()
     },
     methods: {
-        jump () {
+        init() {
-            console.log(123);
+            let dictData = this.$util.getDictData('app_event')
-            uni.navigateTo({ url: '/pages/message/termList' })
+            console.log(dictData)
+            this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList')
+            this.store.params.type = 3
+            this.store.firstCallBack = (res) => {
+                this.store.data.forEach(item => {
+                    item.title = item.equipmentName + dictData.find(item2 => item2.code === item.tag).name
+                })
+                console.log(this.store.data)
+                this.loading = false
             }
+            this.store.reload()
+        },
+        jump(item) {
+            let str = JSON.stringify(item).replace(/%/g,'百分比')
+            uni.navigateTo({url: '/pages/message/transientDetail?detail=' + encodeURIComponent(str)})
+        },
     }
 }
 </script>

pages/message/run.vue

@@ -13,13 +13,37 @@
     </Cn-page>
 </template>
 <script>
+import list from "@/common/js/list";
+
 export default {
+    mixins: [list],
     data() {
         return {
-            loading: false
+            loading: true,
         }
     },
+    onShow() {
+        this.init()
+    },
     methods: {
+        init() {
+            let dictData = this.$util.getDictData('app_event')
+            console.log(dictData)
+            this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList')
+            this.store.params.type = 2
+            this.store.firstCallBack = (res) => {
+                this.store.data.forEach(item => {
+                    item.title = item.equipmentName + dictData.find(item2 => item2.code === item.tag).name
+                })
+                console.log(this.store.data)
+                this.loading = false
+            }
+            this.store.reload()
+        },
+        jump(item) {
+            let str = JSON.stringify(item).replace(/%/g,'百分比')
+            uni.navigateTo({url: '/pages/message/transientDetail?detail=' + encodeURIComponent(str)})
+        },
     }
 }
 </script>

pages/message/steady.vue

@@ -10,21 +10,38 @@
         <uni-load-more status="nomore"></uni-load-more>
     </view>
 </template>
-
 <script>
+import list from "@/common/js/list";
+
 export default {
+    mixins: [list],
     data() {
         return {
-            title: '灿能'
+            loading: true,
         }
     },
-    onLoad () {
+    onShow() {
-
+        this.init()
     },
     methods: {
-        jump(){
+        init() {
-            uni.navigateTo({ url: '/pages/message/steadyList' })
+            let dictData = this.$util.getDictData('app_event')
+            console.log(dictData)
+            this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList')
+            this.store.params.type = 1
+            this.store.firstCallBack = (res) => {
+                this.store.data.forEach(item => {
+                    item.title = item.equipmentName + dictData.find(item2 => item2.code === item.tag).name
+                })
+                console.log(this.store.data)
+                this.loading = false
             }
+            this.store.reload()
+        },
+        jump(item) {
+            let str = JSON.stringify(item).replace(/%/g,'百分比')
+            uni.navigateTo({url: '/pages/message/transientDetail?detail=' + encodeURIComponent(str)})
+        },
     }
 }
 </script>