From 054bdb8ba2626babf5e165ef8d0b3146c7aecb29 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: Mon, 18 Sep 2023 10:36:14 +0800
Subject: [PATCH] t

---
 pages/device/new.vue                | 36 +++++++++++++++--------------
 pages/home/selectEngineering.vue    | 25 +++++++++++---------
 pages/index/comp/indexGongCheng.vue |  2 +-
 pages/index/message.vue             | 17 +++++++-------
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/pages/device/new.vue b/pages/device/new.vue
index fea10bc..16d2ae3 100644
--- a/pages/device/new.vue
+++ b/pages/device/new.vue
@@ -5,7 +5,7 @@
                 <uni-forms>
                     <uni-forms-item label="设备识别码">
                         <view style="display: flex">
-                            <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码"/>
+                            <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码" />
                             <uni-icons
                                 type="camera"
                                 color="#007aff"
@@ -25,7 +25,7 @@
             <view class="content">
                 <uni-forms>
                     <uni-forms-item label="项目">
-                        <view style="display: flex;align-items: center">
+                        <view style="display: flex; align-items: center">
                             <uni-data-select
                                 v-model="formData.projectId"
                                 :localdata="projectRange"
@@ -39,7 +39,6 @@
                                 @click="createProject"
                             ></uni-icons>
                         </view>
-
                     </uni-forms-item>
                     <!-- <uni-forms-item label="型号">
                         <uni-data-select v-model="formData.type" :localdata="typeRange"
@@ -67,7 +66,7 @@
                         <view style="display: flex">
                             <view style="flex: 1">
                                 <view v-if="formData.topologyDiagramUrl">
-                                    <image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix"/>
+                                    <image :src="formData.topologyDiagramUrl" style="width: 100%" mode="widthFix" />
                                 </view>
                                 <view v-else class="gplot gplot-empty center" @click="chooseGplot"> 选择拓扑图</view>
                             </view>
@@ -94,7 +93,7 @@
                     </uni-forms-item>
                 </uni-forms>
             </view>
-            <image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix"/>
+            <image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
             <view class="btn-wrap">
                 <!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
                 <view class="btn-wrap-item" @click="submit"> 提交</view>
@@ -111,7 +110,8 @@
                             v-for="(item, key) in imageList"
                             :key="key"
                         />
-                        <view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50">暂无拓扑图
+                        <view v-if="imageList.length === 0" style="text-align: center" class="mt50 mb50"
+                            >暂无拓扑图
                         </view>
                         <view class="btn-wrap">
                             <view class="btn-wrap-item" @click="closeDrawer"> 取消</view>
@@ -124,7 +124,7 @@
                 <scroll-view style="height: 100%" scroll-y="true">
                     <view style="background: #fff">
                         <view class="map-pin-box">
-                            <image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl"/>
+                            <image class="gplot" mode="widthFix" :src="formData.topologyDiagramUrl" />
 
                             <movable-area class="map-pin-box-area">
                                 <movable-view :x="point.lat" :y="point.lng" direction="all" @change="dragPoint">
@@ -163,8 +163,8 @@
     </view>
 </template>
 <script>
-import {registerDevice, getModel, addDevice, queryByTopoId} from '@/common/api/device.js'
-import {getProjectList, queryTopologyDiagramPage} from '@/common/api/project.js'
+import { registerDevice, getModel, addDevice, queryByTopoId } from '@/common/api/device.js'
+import { getProjectList, queryTopologyDiagramPage } from '@/common/api/project.js'
 
 export default {
     data() {
@@ -184,7 +184,8 @@ export default {
             positionList: [],
             imageList: [],
             isAdaptive: false, // 是否适应当前项目
-            dialogOpen: false
+            dialogOpen: false,
+            options: {},
         }
     },
     onBackPress() {
@@ -200,7 +201,8 @@ export default {
             return false
         }
     },
-    onLoad() {
+    onLoad(o) {
+        this.options = o
         let dictData = uni.getStorageSync(this.$cacheKey.dictData)
         dictData.forEach((item) => {
             if (item.code == 'Line_Position') {
@@ -241,7 +243,7 @@ export default {
             })
         },
         resize() {
-            console.log(this.$refs['gplot-image']);
+            console.log(this.$refs['gplot-image'])
         },
         confirmGplot() {
             this.formData.topologyDiagramUrl = this.imageList[this.activeGplot].filePath
@@ -271,10 +273,10 @@ export default {
                 queryTopologyDiagramPage({
                     projectId: this.formData.projectId,
                 }).then((res) => {
-                    this.imageList = res.data.records.map(item => {
+                    this.imageList = res.data.records.map((item) => {
                         return {
                             ...item,
-                            filePath: this.$config.static + item.filePath
+                            filePath: this.$config.static + item.filePath,
                         }
                     })
                     this.activeGplot = 0
@@ -293,8 +295,7 @@ export default {
         positionChange(e) {
             console.log(e)
         },
-        projectChange(e) {
-        },
+        projectChange(e) {},
         scanCode() {
             uni.scanCode({
                 success: (res) => {
@@ -422,12 +423,13 @@ export default {
                 ...this.formData,
                 list: this.pointList,
                 ndid: this.formData.nDid,
+                process: Number(this.options.type),
             }).then((res) => {
                 console.log(res)
                 this.$util.toast('提交成功')
                 setTimeout(() => {
                     this.type = 3
-                    uni.navigateBack({delta: 1})
+                    uni.navigateBack({ delta: 1 })
                 }, 1500)
             })
         },
diff --git a/pages/home/selectEngineering.vue b/pages/home/selectEngineering.vue
index 0324f6a..01c7813 100644
--- a/pages/home/selectEngineering.vue
+++ b/pages/home/selectEngineering.vue
@@ -1,7 +1,7 @@
 <template>
-    <Cn-page :loading='loading'>
-        <view slot='body'>
-            <view class='select-enineering'>
+    <Cn-page :loading="loading">
+        <view slot="body">
+            <view class="select-enineering">
                 <uni-indexed-list
                     :options="engineeringListFilter"
                     :showSelect="false"
@@ -12,22 +12,22 @@
     </Cn-page>
 </template>
 <script>
-import {pinyin} from 'pinyin-pro'
-import {queryEngineering} from "@/common/api/engineering";
+import { pinyin } from 'pinyin-pro'
+import { queryEngineering } from '@/common/api/engineering'
 
 export default {
     data() {
         return {
             loading: false,
             engineeringList: [],
-            options: {}
+            options: {},
         }
     },
     computed: {
         engineeringListFilter() {
             let result = []
             this.engineeringList.forEach((item) => {
-                let arr = pinyin(item.name[0], {toneType: 'none', type: 'array'})
+                let arr = pinyin(item.name[0], { toneType: 'none', type: 'array' })
                 let letter = arr[0][0].toUpperCase()
                 console.log(letter)
                 let index = result.findIndex((item) => item.letter === letter)
@@ -47,9 +47,12 @@ export default {
         this.options = options
         this.engineeringList = uni.getStorageSync('engineeringList')
         this.userInfo = uni.getStorageSync(this.$cacheKey.userInfo)
+        if (!(this.userInfo.authorities === 'app_vip_user' || this.userInfo.authorities === 'engineering_user')) {
+            
+        }
     },
     onShow() {
-        queryEngineering().then(res => {
+        queryEngineering().then((res) => {
             this.engineeringList = res.data
         })
     },
@@ -77,11 +80,11 @@ export default {
             }
             uni.navigateBack()
         },
-    }
+    },
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .index {
     padding: 34rpx;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue
index 7cdc2bd..3808fe9 100644
--- a/pages/index/comp/indexGongCheng.vue
+++ b/pages/index/comp/indexGongCheng.vue
@@ -39,7 +39,7 @@
         <view class="canneng-index-title mt20">常用功能</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/device2.png" text="设备注册" @click="registerDevice(4)"></Cn-grid-item>
                 <Cn-grid-item src="/static/device2.png" text="功能调试" @click="registerDevice(2)"></Cn-grid-item>
                 <Cn-grid-item src="/static/device2.png" text="出厂调试" @click="registerDevice(3)"></Cn-grid-item>
                 <!-- <Cn-grid-item src="/static/gateway2.png" text="网关注册" @click="registerGateway"></Cn-grid-item> -->
diff --git a/pages/index/message.vue b/pages/index/message.vue
index 57b5d39..3818169 100644
--- a/pages/index/message.vue
+++ b/pages/index/message.vue
@@ -3,14 +3,7 @@
         <view class="message">
             <view class="message-nav" @click="jump('system')">
                 <image mode="aspectFill" class="message-nav-icon" src="/static/message3.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>
-<!--                <uni-badge text="3"></uni-badge>-->
+                <view class="message-nav-label">运行事件</view>
                 <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
             </view>
             <view class="message-nav" @click="jump('incident')">
@@ -19,9 +12,15 @@
 <!--                <uni-badge text="2"></uni-badge>-->
                 <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>
+<!--                <uni-badge text="3"></uni-badge>-->
+                <uni-icons type="forward" color="#aaa" size="20"></uni-icons>
+            </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>