update

src/permission.js

@@ -20,7 +20,8 @@ const whiteList = [
   '/gride-work-info',
   '/beam-carrier-work-info',
   '/client-credential-info',
-  '/device-manage'
+  '/device-manage',
+  '/device-manage-insert'
 ] // no redirect whitelist
 
 router.beforeEach(async(to, from, next) => {

src/router/index.js

@@ -69,6 +69,12 @@ export const constantRoutes = [
     hidden: true
   },
   {
+    path: '/device-manage-insert',
+    component: () => import('@/views/bridge/device-manage/index'),
+    name: 'diviceInsertMng',
+    hidden: true
+  },
+  {
     path: '/device-manage',
     component: () => import('@/views/bridge/device-manage/device-work'),
     name: 'diviceMng',

src/views/bridge/device-manage/index.vue

@@ -44,7 +44,6 @@
             @click="handleFilter"
           >查询</el-button>
           <el-button
-            v-if="$requirePermission('BSET.DVMG.C')"
             v-waves
             class="filter-item"
             type="primary"
@@ -79,8 +78,8 @@
             <el-table-column label="类型名称" prop="categoryName" :show-overflow-tooltip="true" align="center" />
             <el-table-column label="规格型号" prop="spec" :show-overflow-tooltip="true" align="center" />
             <el-table-column label="制造厂家" prop="madeFactory" :show-overflow-tooltip="true" align="center" />
-            <el-table-column label="司机姓名" prop="driverName" width="80" align="center" />
-            <el-table-column label="联系电话" prop="telephone" width="120" align="center" />
+            <!-- <el-table-column label="司机姓名" prop="driverName" width="80" align="center" />
+            <el-table-column label="联系电话" prop="telephone" width="120" align="center" /> -->
             <el-table-column label="累计过孔数" prop="viaCount" width="100" align="center" />
             <el-table-column label="累计工作时间" prop="allTime" width="110" align="center" />
             <el-table-column label="是否在线" width="80" align="center">
@@ -98,13 +97,11 @@
             >
               <template slot-scope="{ row }">
                 <el-button
-                  v-if="$requirePermission('BSET.DVMG.U')"
                   type="primary"
                   size="mini"
                   @click="handleUpdate(row)"
                 >修改</el-button>
                 <el-button
-                  v-if="$requirePermission('BSET.DVMG.D')"
                   size="mini"
                   type="danger"
                   @click="handleDelete(row)"
@@ -182,15 +179,32 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="铁科院信息" prop="deviceType">
-                  <el-select v-model="entity.tkySectionId" class="w100p">
-                    <el-option
-                      v-for="item in authSections"
-                      :key="item.key"
-                      :value="item.sectionId"
-                      :label="item.sectionName"
-                    />
-                  </el-select>
+                <el-form-item label="授权码" align="left">
+                  <el-input v-model="entity.authCode" align="left" controls-position="right" style="width: 100%;" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="16">
+              <el-col :span="12">
+                <el-form-item label="铁科院项目ID" align="left">
+                  <el-input v-model="entity.tkyProjectId" align="left" controls-position="right" style="width: 100%;" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="铁科院项目名称" align="left">
+                  <el-input v-model="entity.tkyProjectName" align="left" controls-position="right" style="width: 100%;" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="16">
+              <el-col :span="12">
+                <el-form-item label="铁科院标段ID" align="left">
+                  <el-input v-model="entity.tkySectionId" align="left" controls-position="right" style="width: 100%;" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="铁科院标段名称" align="left">
+                  <el-input v-model="entity.tkySectionName" align="left" controls-position="right" style="width: 100%;" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -220,7 +234,6 @@ import * as areaApi from '@/api/backbone/section-area'
 
 import waves from '@/directive/waves' // waves directive
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
-import _ from 'lodash'
 // import InnerSidebar from '@/components/InnerSidebar'
 
 export default {
@@ -255,8 +268,7 @@ export default {
         update: '修改',
         create: '创建'
       },
-      areas: [],
-      authSections: [],
+      sections: [],
       rules: {
         deviceNo: [
           { required: true, message: '请输入设备编号', trigger: 'blur' },
@@ -269,19 +281,15 @@ export default {
         deviceType: [
           { required: true, message: '请选择设备类型', trigger: 'blur' }
         ]
-      }
+      },
+      areas: [],
+      authSection: []
     }
   },
   mounted() {
-    try {
-      this.$store.dispatch('user/clientCredentials')
-      this.loading = false
-    } catch (ex) {
-      console.log(ex)
-    }
     tkyApi.getAuthSectionInfo()
       .then(res => {
-        this.authSections = res.data
+        this.authSection = res.data
       })
     this.getList()
   },
@@ -352,20 +360,19 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
     },
-    loadAuthSection(sectionId) {
-      var authSeciton = _.find(this.authSections, { 'sectionId': sectionId })
-      if (authSeciton !== undefined) {
-        this.entity.tkyProjectId = authSeciton.projectId
-        this.entity.tkyProjectName = authSeciton.projectName
-        this.entity.tkySectionName = authSeciton.sectionName
-        this.entity.authCode = authSeciton.authCode
-      }
+    // 提示
+    verificationTips(message) {
+      this.$notify({
+        title: '提示',
+        message: message,
+        type: 'error',
+        duration: 2000
+      })
     },
     // 创建
     createData() {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
-          this.loadAuthSection(this.entity.tkySectionId)
           this.formLoading = true
           interfaceApi
             .create(this.entity)
@@ -399,7 +406,6 @@ export default {
     updateData() {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
-          this.loadAuthSection(this.entity.tkySectionId)
           const submitData = Object.assign({}, this.entity)
           this.formLoading = true
           interfaceApi

src/views/projects/components/DeviceTree.vue

@@ -33,7 +33,7 @@ export default {
       type: String,
       default: 'calc(100vh - 220px)'
     },
-    deviceType: {
+    serctionid: {
       type: String,
       default: undefined
     }
@@ -46,7 +46,8 @@ export default {
         children: 'children',
         label: 'name',
         isLeaf: 'isSite'
-      }
+      },
+      tkySectionId: this.$route.query.token
     }
   },
   watch: {
@@ -69,7 +70,7 @@ export default {
     },
     loadTreeNode(node, resolve) {
       if (node.level === 0) {
-        manageApi.getDeviceList('10648')
+        manageApi.getDeviceList(this.tkySectionId)
           .then(res => {
             res.forEach(t => {
               t.isDevice = true