测试bug反馈修复

common/api/device.js

@@ -76,7 +76,7 @@ export const queryByTopoId = (id) => {
         },
     })
 }
-// 查询装置拓扑图
+// 查询设备拓扑图
 export const queryTopologyDiagram = (devId) => {
     return request({
         url: '/cs-device-boot/lineTopologyDiagram/queryTopologyDiagram',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "灿能物联",
     "appid" : "__UNI__88BC25B",
     "description" : "",
-    "versionName" : "1.1.4",
+    "versionName" : "1.1.5",
-    "versionCode" : 114,
+    "versionCode" : 115,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -132,7 +132,7 @@
                 "/api" : {
                     "https" : true,
                     // "target" : "https://china.indpecker.com",
-                    "target" : "http://192.168.1.139:10215",
+                    "target" : "http://192.168.1.115:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""

pages.json

@@ -198,19 +198,19 @@
         {
             "path": "pages/message/term",
             "style": {
-                "navigationBarTitleText": "终端状态消息"
+                "navigationBarTitleText": "设备状态消息"
             }
         },
         {
             "path": "pages/message/termList",
             "style": {
-                "navigationBarTitleText": "异常终端列表"
+                "navigationBarTitleText": "异常设备列表"
             }
         },
         {
             "path": "pages/message/termDetail",
             "style": {
-                "navigationBarTitleText": "异常终端详情"
+                "navigationBarTitleText": "异常设备详情"
             }
         },
         {
@@ -253,7 +253,6 @@
                         "titleText": "灿能物联",
                         // 窗口的标题
                         "titleAlign": "center",
-                        "padding-left": "16rpx",
                         "padding-right": "20rpx",
                         "buttons": [
                             {
@@ -469,8 +468,9 @@
         "navigationBarTextStyle": "black",
         "navigationBarTitleText": "灿能电力",
         "navigationBarBackgroundColor": "#ffffff",
-        "backgroundColor": "#f3f4f5",
+        "backgroundColor": "#f3f4f5"
         // #ifdef H5
+        ,
         "navigationStyle": "custom"
         // #endif
     },

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.devTypeName }}</view>
-                <view class="about-text">装置型号：{{ deviceInfo.devModelName }}</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') {

pages/engineering/detail.vue

@@ -26,7 +26,7 @@
                     <view v-show="navMenuActive == 0">
                         <uni-card
                             :title="item.name"
-                            :extra="item.projectType"
+                            :extra="item.mac"
                             @click="jumpProject(item)"
                             v-for="(item, index) in store.data"
                             :key="index"

pages/engineering/list.vue

@@ -22,7 +22,7 @@
         <view class="message">
             <uni-card
                 :title="item.name"
-                :extra="item.projectType"
+                :extra="item.mac"
                 @click="jump(item)"
                 v-for="(item, index) in store.data"
                 :style="{marginTop:index===0?'0':''}"

pages/engineering/setting.vue

@@ -4,7 +4,7 @@
         <view class="message">
             <!-- <uni-card
                 :title="item.engineerName"
-                :extra="item.projectType"
+                :extra="item.mac"
                 @click="jump(item)"
                 v-for="(item, index) in list"
                 :key="index"

pages/home/feedback.vue

@@ -102,7 +102,8 @@ export default {
         },
     },
     onLoad(options) {
-        this.formData.userId = uni.getStorageSync('userInfo').id
+        this.formData.userId = uni.getStorageSync('userInfo').userIndex
+        this.formData.engineeringId = uni.getStorageSync('engineering').engineeringId
     }
 }
 </script>

pages/home/selectEngineering.vue

@@ -13,6 +13,8 @@
 </template>
 <script>
 import {pinyin} from 'pinyin-pro'
+import {queryEngineering} from "@/common/api/engineering";
+
 export default {
     data() {
         return {
@@ -43,6 +45,16 @@ export default {
     onLoad() {
         this.engineeringList = uni.getStorageSync('engineeringList')
     },
+    onShow() {
+        queryEngineering().then(res => {
+            this.engineeringList = res.data
+        })
+    },
+    onNavigationBarButtonTap(e) {
+        uni.redirectTo({
+            url: '/pages/engineering/new',
+        })
+    },
     methods: {
         confirm(e) {
             console.log(e)

pages/index/comp/device.vue

@@ -65,7 +65,7 @@
             <uni-card
                 :title="item.equipmentName"
                 :sub-title="item.projectName"
-                :extra="item.projectType"
+                :extra="item.mac"
                 padding="0"
                 v-for="(item, index) in deviceListFilter"
                 :key="index"
@@ -298,7 +298,7 @@ export default {
             uni.showModal({
                 title: '提示',
                 content: '请选择设备类型',
-                confirmText: '直连装置',
+                confirmText: '直连设备',
                 cancelText: '网关接入',
                 cancelColor: '#007aff',
                 success: ({confirm, cancel}) => {

pages/index/comp/indexGongCheng.vue

@@ -67,7 +67,7 @@ export default {
             uni.showModal({
                 title: '提示',
                 content: '请选择设备类型',
-                confirmText: '直连装置',
+                confirmText: '直连设备',
                 cancelText: '网关接入',
                 cancelColor: '#007aff',
                 success: ({confirm, cancel}) => {

pages/index/comp/indexYouKe.vue

@@ -35,6 +35,13 @@
                 <view class="header-item-label">离线设备</view>
             </view>
         </view>
+        <view style="padding: 20rpx 20rpx 0">
+            <Cn-grid title="">
+                <Cn-grid-item src="/static/device2.png" text="设备注册" @click="registerDevice"></Cn-grid-item>
+                <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
+                <Cn-grid-item src="/static/feedback2.png" text="问题反馈" @click="submitFeedBack"></Cn-grid-item>
+            </Cn-grid>
+        </view>
     </view>
 </template>
 <script>
@@ -59,6 +66,12 @@ export default {
                     break
             }
         },
+        submitFeedBack() {
+            uni.navigateTo({url: '/pages/home/feedback'})
+        },
+        registerDevice() {
+            this.$util.toast('此功能仅对VIP用户开放')
+        },
     },
 }
 </script>

pages/index/comp/indexZhuYongHu.vue

@@ -67,7 +67,7 @@ export default {
             uni.showModal({
                 title: '提示',
                 content: '请选择设备类型',
-                confirmText: '直连装置',
+                confirmText: '直连设备',
                 cancelText: '网关接入',
                 cancelColor: '#007aff',
                 success: ({confirm, cancel}) => {

pages/index/index.vue

@@ -15,8 +15,11 @@
                     <text style="font-size: 32rpx; font-weight: 500">灿能物联</text>
                 </template>
                 <template slot="right">
-                    <text class="hide-txt mr5" style="font-size: 28rpx">{{ select.engineeringName }}</text>
+                    <text class="hide-txt mr5" style="font-size: 28rpx">{{
-                    <uni-icons type="bottom" size="16" color="#111"></uni-icons>
+                            select.engineeringName || '创建工程'
+                        }}
+                    </text>
+                    <uni-icons type="bottom" size="16" color="#111" v-if="select.engineeringName"></uni-icons>
                 </template>
             </uni-nav-bar>
             <view class="index">
@@ -71,11 +74,18 @@ export default {
             navTabHeight: 0
         }
     },
+
     methods: {
         selectEngineering() {
+            if (this.select.engineeringName) {
                 uni.navigateTo({
                     url: '/pages/home/selectEngineering',
                 })
+            } else {
+                uni.navigateTo({
+                    url: '/pages/engineering/new',
+                })
+            }
         },
         async init() {
             let engineering = uni.getStorageSync('engineering')

pages/index/message.vue

@@ -6,11 +6,7 @@
                 <view class="message-nav-label">设备消息</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
-            <view class="message-nav" @click="jump('feedback')" v-if="userInfo.authorities === 'app_vip_user'">
+
-                <image mode="aspectFill" class="message-nav-icon" src="/static/feedback.png" />
-                <view class="message-nav-label">反馈回复</view>
-                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
-            </view>
             <view class="message-nav" @click="jump('report')">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/report.png" />
                 <view class="message-nav-label">稳态越限</view>
@@ -25,7 +21,7 @@
             </view>
             <view class="message-nav" @click="jump('term')">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/term.png" />
-                <view class="message-nav-label">终端状态</view>
+                <view class="message-nav-label">设备状态</view>
                 <uni-badge text="1"></uni-badge>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>

pages/index/mine.vue

@@ -60,6 +60,11 @@
                 <view class="mine-nav-label">项目列表</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
+            <view class="mine-nav" @click="jump('feedback')">
+                <image mode="aspectFill" class="mine-nav-icon" src="/static/feedback.png"/>
+                <view class="mine-nav-label">反馈列表</view>
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </view>
             <!-- <view
                 class="mine-nav"
                 @click="jump('gateway')"
@@ -206,6 +211,11 @@ export default {
                         url: `/pages/engineering/setting`,
                     })
                     break
+                case 'feedback':
+                    uni.navigateTo({
+                        url: `/pages/message/feedback`,
+                    })
+                    break
                 default:
                     uni.navigateTo({
                         url: `/pages/mine/${type}`,

pages/message/term.vue

@@ -1,11 +1,11 @@
 <template>
     <view class="content">
         <uni-list :border="false">
-            <uni-list-item :show-badge="true" badgeType="error" isDot badge-text="未读" title="终端异常共4台"
+            <uni-list-item :show-badge="true" badgeType="error" isDot badge-text="未读" title="设备异常共4台"
                 note="2023-02-27 15:13:29" clickable @click="jump" />
-            <uni-list-item badgeType="error" isDot badge-text="未读" title="终端异常共1台" note="2023-02-14 15:10:29" clickable
+            <uni-list-item badgeType="error" isDot badge-text="未读" title="设备异常共1台" note="2023-02-14 15:10:29" clickable
                 @click="jump" />
-            <uni-list-item badgeType="error" isDot badge-text="未读" title="终端异常共4台" note="2023-02-10 15:10:29" clickable
+            <uni-list-item badgeType="error" isDot badge-text="未读" title="设备异常共4台" note="2023-02-10 15:10:29" clickable
                 @click="jump" />
         </uni-list>
         <uni-load-more status="nomore"></uni-load-more>

pages/message/termDetail.vue

@@ -7,21 +7,21 @@
                     <view>2023-02-14</view>
                 </view>
                 <view class="detail-content ">
-                    <view class="detail-content-title mb20">终端基础信息</view>
+                    <view class="detail-content-title mb20">设备基础信息</view>
                     <view class="mb10">灿能园区，NPQS_681</view>
                     <view>网络参数：00-B7-8D-A8-00-D3</view>
                 </view>
                 <view class="detail-content ">
-                    <view class="detail-content-title mb20">终端通讯信息</view>
+                    <view class="detail-content-title mb20">设备通讯信息</view>
-                    <view class="mb10">NPQS_681通讯终端1次，具体如下所示</view>
+                    <view class="mb10">NPQS_681通讯设备1次，具体如下所示</view>
                     <view>2023-02-14 10:59:10至2023-02-14 10:59:57</view>
                 </view>
                 <view class="detail-content ">
-                    <view class="detail-content-title mb20">终端告警信息</view>
+                    <view class="detail-content-title mb20">设备告警信息</view>
                     <view class="mb10">暂无告警信息</view>
                 </view>
                 <view class="detail-content ">
-                    <view class="detail-content-title mb20">终端流量信息</view>
+                    <view class="detail-content-title mb20">设备流量信息</view>
                     <view class="mb10">NPQS_681的流量于2023-02-14 23:59:59占总流量的0.0%</view>
                 </view>
 

pages/message/termList.vue

@@ -1,66 +1,66 @@
 <template>
     <view class="content">
 
-        <uni-card title="灿能园区，NPQS_682发生终端状态异常一次" sub-title="2023-02-27 15:13:29" @click="jump">
+        <uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 15:13:29" @click="jump">
             <view class="term-list-bottom">
                 <view class="term-list-bottom-item">
-                    <view>终端告警</view>
+                    <view>设备告警</view>
                     <view>0次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>通讯终端</view>
+                    <view>通讯设备</view>
                     <view>1次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>终端流量</view>
+                    <view>设备流量</view>
                     <view>0次</view>
                 </view>
             </view>
         </uni-card>
-        <uni-card title="灿能园区，NPQS_681发生终端状态异常一次" sub-title="2023-02-27 13:13:29" @click="jump">
+        <uni-card title="灿能园区，NPQS_681发生设备状态异常一次" sub-title="2023-02-27 13:13:29" @click="jump">
             <view class="term-list-bottom">
                 <view class="term-list-bottom-item">
-                    <view>终端告警</view>
+                    <view>设备告警</view>
                     <view>0次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>通讯终端</view>
+                    <view>通讯设备</view>
                     <view>1次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>终端流量</view>
+                    <view>设备流量</view>
                     <view>0次</view>
                 </view>
             </view>
         </uni-card>
-        <uni-card title="灿能园区，NPQS_682发生终端状态异常一次" sub-title="2023-02-27 11:13:29" @click="jump">
+        <uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 11:13:29" @click="jump">
             <view class="term-list-bottom">
                 <view class="term-list-bottom-item">
-                    <view>终端告警</view>
+                    <view>设备告警</view>
                     <view>0次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>通讯终端</view>
+                    <view>通讯设备</view>
                     <view>1次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>终端流量</view>
+                    <view>设备流量</view>
                     <view>0次</view>
                 </view>
             </view>
         </uni-card>
-        <uni-card title="灿能园区，NPQS_682发生终端状态异常一次" sub-title="2023-02-27 09:13:29" @click="jump">
+        <uni-card title="灿能园区，NPQS_682发生设备状态异常一次" sub-title="2023-02-27 09:13:29" @click="jump">
             <view class="term-list-bottom">
                 <view class="term-list-bottom-item">
-                    <view>终端告警</view>
+                    <view>设备告警</view>
                     <view>0次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>通讯终端</view>
+                    <view>通讯设备</view>
                     <view>1次</view>
                 </view>
                 <view class="term-list-bottom-item">
-                    <view>终端流量</view>
+                    <view>设备流量</view>
                     <view>0次</view>
                 </view>
             </view>

pages/project/detail.vue

@@ -24,6 +24,7 @@
                         <uni-card
                             :title="item.equipmentName"
                             :sub-title="'创建时间：' + item.createTime"
+                            :extra="item.mac"
                             v-for="item in store.data"
                             :key="item.equipmentId"
                             @click="goDevice(item)"

pages/project/new.vue

@@ -1,15 +1,15 @@
 <template>
     <Cn-page :loading="loading">
         <view slot="body">
-            <view class="new">
+            <view class="new" :class="{'project-new':!this.options.project}">
                 <view class="content">
                     <uni-forms :label-width="80">
-                        <uni-forms-item label="工程名称">
+                        <uni-forms-item label="工程名称" @click.native.stop.prevent="selectEngineering">
                             <uni-easyinput
                                 v-model="formData.engineeringName"
                                 placeholder="请输入项目名称"
                                 :clearable="false"
-                                disabled
+                                :disabled="true"
                             />
                         </uni-forms-item>
                         <uni-forms-item label="项目名称">
@@ -71,13 +71,6 @@
                 <view class="btn-wrap">
                     <view class="btn-wrap-item" @click="submit"> 提交</view>
                 </view>
-                <uni-drawer ref="showRight" mode="right" :mask-click="false">
-                    <uni-indexed-list
-                        :options="engineeringListFilter"
-                        :showSelect="false"
-                        @click="closeDrawer"
-                    ></uni-indexed-list>
-                </uni-drawer>
                 <uni-popup ref="showTemp" type="bottom" :mask-click="false">
                     <view class="popup-header">
                         <view class="popup-header-title">模版库</view>
@@ -127,31 +120,17 @@ export default {
                 lat: '',
                 lng: '',
             },
-            engineeringList: [],
             tempList: [],
             project: null,
             options: {}
         }
     },
-    computed: {
+    onShow() {
-        engineeringListFilter() {
+        if (!this.options.project) {
-            let result = []
+            let engineering = uni.getStorageSync(this.$cacheKey.engineering)
-            this.engineeringList.forEach((item) => {
+            this.formData.engineeringId = engineering.id
-                let arr = pinyin(item.name[0], {toneType: 'none', type: 'array'})
+            this.formData.engineeringName = engineering.name
-                let letter = arr[0][0].toUpperCase()
-                console.log(letter)
-                let index = result.findIndex((item) => item.letter === letter)
-                if (index === -1) {
-                    result.push({
-                        letter,
-                        data: [item.name],
-                    })
-                } else {
-                    result[index].data.push(item.name)
         }
-            })
-            return result
-        },
     },
     onLoad(options) {
         this.options = options
@@ -166,10 +145,6 @@ export default {
                     this.formData[key] = this.project[key]
                 }
             }
-        } else {
-            let engineering = uni.getStorageSync(this.$cacheKey.engineering)
-            this.formData.engineeringId = engineering.id
-            this.formData.engineeringName = engineering.name
         }
         uni.getLocation({
             type: 'wgs84',
@@ -179,9 +154,6 @@ export default {
                 console.log('当前位置的纬度：' + res.latitude)
             },
         })
-        queryEngineering().then((res) => {
-            this.engineeringList = res.data
-        })
         getTopoTemplate().then((res) => {
             console.log(res)
             this.tempList = res.data
@@ -202,6 +174,12 @@ export default {
         })
     },
     methods: {
+        selectEngineering() {
+            if (this.options.project) return
+            uni.navigateTo({
+                url: '/pages/home/selectEngineering',
+            })
+        },
         beforeRemove(e) {
             console.log(e)
             if (!e.tempFile.id) {
@@ -244,15 +222,6 @@ export default {
         openTemp() {
             this.$refs.showTemp.open()
         },
-        showDrawer() {
-            this.$refs.showRight.open()
-        },
-        closeDrawer(e) {
-            console.log(e)
-            this.formData.engineeringName = e.item.name
-            this.formData.engineeringId = this.engineeringList.find((item) => item.name === e.item.name).id
-            this.$refs.showRight.close()
-        },
         select(e) {
             console.log(e)
             this.formData.files.push(...e.tempFiles)
@@ -348,10 +317,16 @@ export default {
     },
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
+.project-new /deep/ .is-disabled {
+    background: #fff !important;
+    color: #111;
+}
 .new {
     padding: 34rpx;
+    .project-new{
 
+    }
     .content {
         .content-des {
             font-size: 28rpx;