t

pages/device/new.vue

@@ -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"
@@ -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>
@@ -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,6 +423,7 @@ export default {
                 ...this.formData,
                 list: this.pointList,
                 ndid: this.formData.nDid,
+                process: Number(this.options.type),
             }).then((res) => {
                 console.log(res)
                 this.$util.toast('提交成功')

pages/home/selectEngineering.vue

@@ -1,7 +1,7 @@
 <template>
-    <Cn-page :loading='loading'>
+    <Cn-page :loading="loading">
-        <view slot='body'>
+        <view slot="body">
-            <view class='select-enineering'>
+            <view class="select-enineering">
                 <uni-indexed-list
                     :options="engineeringListFilter"
                     :showSelect="false"
@@ -13,14 +13,14 @@
 </template>
 <script>
 import { pinyin } from 'pinyin-pro'
-import {queryEngineering} from "@/common/api/engineering";
+import { queryEngineering } from '@/common/api/engineering'
 
 export default {
     data() {
         return {
             loading: false,
             engineeringList: [],
-            options: {}
+            options: {},
         }
     },
     computed: {
@@ -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,10 +80,10 @@ export default {
             }
             uni.navigateBack()
         },
-    }
+    },
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .index {
     padding: 34rpx;
 }

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> -->

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>
+                <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>-->
                 <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>