完善后台管理

src/layout/components/Navbar.vue

@@ -10,8 +10,8 @@
           <img src="@/assets/head.png" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
-        <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <el-dropdown-item divided>
+        <el-dropdown-menu slot="dropdown" class="user-dropdown" style="margin-top: -15px;">
+          <el-dropdown-item>
             <span style="display:block;" @click="logout">退出</span>
           </el-dropdown-item>
         </el-dropdown-menu>

src/layout/components/Sidebar/index.vue

@@ -26,29 +26,34 @@ import variables from '@/styles/variables.scss'
 import { getType } from '@/utils/auth'
 
 export default {
+  components: { SidebarItem, Logo },
   data() {
     return {
       type: getType()
     }
   },
-  components: { SidebarItem, Logo },
   computed: {
     ...mapGetters([
       'sidebar'
     ]),
     routes() {
-      let sidebarArr = [];
-      if(this.type === '0') {
-        sidebarArr = ['设备管理', '安装/维护人员管理', '维护人员分配设备管理', '设备安装']
+      let sidebarArr = []
+      if (this.type === '0') {
+        sidebarArr = ['设备管理', '安装/维护人员管理', '维护人员分配设备管理']
       }
-      if(this.type === '1, ' || this.type === '1') {
+      if (this.type === '1, ' || this.type === '1' || this.type === ' ,1') {
         sidebarArr = ['设备安装']
       }
-      if(this.type === '2' || this.type === ' ,2') {
-        sidebarArr = ['设备管理']
+      if (this.type === '2' || this.type === ' ,2' || this.type === '2, ') {
+        sidebarArr = ['维护设备']
+      }
+      if (this.type === '1,2' || this.type === '2,1') {
+        sidebarArr = ['维护设备', '设备安装']
       }
-      if(this.type === '1,2') {
-        sidebarArr = ['设备管理', '设备安装']
+      if (this.type.indexOf(2) !== -1) {
+        this.$router.options.routes[2].children[0].meta.title = '维护设备'
+      } else {
+        this.$router.options.routes[2].children[0].meta.title = '设备管理'
       }
       this.$router.options.routes.forEach((item, index) => {
         if (item.children !== undefined) {

src/store/modules/admin.js

@@ -17,17 +17,18 @@ const mutations = {
     state.deviceData = data
   },
   GET_MODIFIER: (state, data) => {
+    const fileData = []
     if (data.length > 0) {
       data.forEach(item => {
         const length = item.type.length
-        let peopleType = [...item.type]
-        if (length > 2) {
-          peopleType = item.type.split(',')
-        }
+        const peopleType = length > 2 ? item.type.split(',') : item.type !== '0' ? [...item.type] : item.type
         item.type = peopleType
+        if (item.type !== '0') {
+          fileData.push(item)
+        }
       })
     }
-    state.modifierData = data
+    state.modifierData = fileData
   },
   GET_Log: (state, data) => {
     if (data.length > 0) {

src/views/admin/allocateDevice/index.vue

@@ -17,7 +17,7 @@
         placeholder="请输入电话"
       />
       <el-button type="primary" size="mini" style="float: right;" @click="search">查询</el-button>
-    </div> 
+    </div>
     <el-table
       :data="modifierData"
       style="width: 100%"
@@ -210,7 +210,7 @@ export default {
       this.multipleMoveSelection = val
     },
     search() {
-      this.$store.dispatch('admin/getDeviceModifierData', { 
+      this.$store.dispatch('admin/getDeviceModifierData', {
         type: 2,
         loginName: this.loginName,
         name: this.name,

src/views/admin/device/index.vue

@@ -38,7 +38,7 @@
       <el-table-column
         label="设备安装时间"
         prop="gmtCreated"
-      />    
+      />
       <el-table-column
         label="设备编号"
         prop="deviceCode"
@@ -58,7 +58,7 @@
       <el-table-column
         label="设备地址"
         prop="address"
-      />      
+      />
       <el-table-column
         align="right"
       >
@@ -79,7 +79,7 @@
             维护信息
           </el-button>
           <el-button
-            v-show="type === '2'"
+            v-show="type === '2' || type === '1,2' || type === '2,1'"
             size="mini"
             style="float: left; margin: 0 10px 0 0;"
             @click="handleMaintain(scope.$index, scope.row)"
@@ -138,7 +138,7 @@
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="handSolve">确 定</el-button>
       </div>
-    </el-dialog>    
+    </el-dialog>
   </div>
 </template>
 
@@ -186,7 +186,7 @@ export default {
   },
   methods: {
     search() {
-      if (this.type === '2') {
+      if (this.type === '2' || this.type === '1,2' || this.type === '2,1') {
         this.$store.dispatch('admin/getDeviceData', {
           deviceCode: this.deviceCode,
           deviceType: this.deviceType,
@@ -241,7 +241,7 @@ export default {
           type: 'deviceLog[description]'
         }]
         this.dialogTableVisible = true
-      })      
+      })
     },
     handleMaintain(index, row) {
       this.solveForm.deviceCode = row.deviceCode

src/views/admin/installMaintain/index.vue

@@ -83,11 +83,9 @@
       <el-form ref="form" :model="form" label-width="120px">
         <el-form-item v-for="item in addInput" :key="item.type" :label="item.name" label-width="120px">
           <el-input v-if="!item.select" v-model="form[item.type]" autocomplete="off" />
-          <el-select  v-else v-for="(peopleItem, index) in item.peopleType" :key="index" v-model="form[item.type][index]" :placeholder="item.select">
-            <el-option label="管理员" value="0" />
+          <el-select v-else v-model="form[item.type]" multiple :placeholder="item.select">
             <el-option label="安装员" value="1" />
             <el-option label="维护员" value="2" />
-            <el-option label="无" value=" " />
           </el-select>
         </el-form-item>
         <!--
@@ -232,7 +230,7 @@ export default {
         mobile: '',
         password: '',
         loginName: '',
-        type: [' ', ' ']
+        type: []
       }
       this.title = '添加人员'
       this.handleType = 'add'
@@ -255,6 +253,10 @@ export default {
             id: this.formPass.id,
             password: this.formPass.password
           })
+          this.formPass = {
+            password: '',
+            twoPassword: ''
+          }
           this.dialogFormPassVisible = false
         } else {
           console.log('error submit!!')
@@ -263,8 +265,7 @@ export default {
       })
     },
     handleSet(index, row) {
-      const length = row.type.length
-      const peopleType = length >= 2 ? row.type : [...row.type, ' ']
+      const peopleType = row.type
       this.dialogFormVisible = true
       this.addInput = [{
         name: '人员名称',
@@ -277,7 +278,6 @@ export default {
       {
         name: '人员类型',
         type: 'type',
-        peopleType,
         select: '请选择人员类型'
       }]
       this.form = {
@@ -295,26 +295,22 @@ export default {
       this.dialogFormPassVisible = true
     },
     handleSetStatus(index, row) {
-      console.log(row)
+      const type = row.type.join(',')
       if (row.status === 'NORMAL') {
         setDeviceStatus({
           id: row.id,
           name: row.name,
-          type: row.type,
-          password: row.password,
+          type,
+          password: null,
           status: 'DEL'
-        }).then((res) => {
-          console.log(res)
         })
       } else if (row.status === 'DEL') {
         setDeviceStatus({
           id: row.id,
           name: row.name,
-          type: row.type,
-          password: row.password,
+          type,
+          password: null,
           status: 'NORMAL'
-        }).then((res) => {
-          console.log(res)
         })
       }
       this.$store.dispatch('admin/getDeviceModifierData')

src/views/installer/index.vue

@@ -22,12 +22,7 @@
         <el-input v-model="form.address" />
       </el-form-item>
       <el-form-item label="备注信息" prop="description">
-        <el-input type="textarea" v-model="form.description" />
-      </el-form-item>
-      <el-form-item label="安装人员" prop="setter">
-        <el-select v-model="form.setter" placeholder="请选择安装人员">
-          <el-option v-for="item in modifierData" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
+        <el-input v-model="form.description" type="textarea" />
       </el-form-item>
       <el-form-item label="安装日期" prop="activateTime">
         <el-col :span="11">
@@ -75,24 +70,25 @@
             <el-radio label="是" />
             <el-radio label="否" />
           </el-radio-group>
-        </el-form-item>             
-      </el-form>      
+        </el-form-item>
+      </el-form>
       <el-button style="margin-top: 12px;" @click="next('ruleForm')">下一步</el-button>
     </div>
     <el-form v-show="active === 2" ref="formLog" :model="formLog" :rules="rulesLog" label-width="120px" class="demo-ruleForm">
       <el-form-item label="测试报告" prop="description">
-        <el-input type="textarea" v-model="formLog.description" />
+        <el-input v-model="formLog.description" type="textarea" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="onSubmitLog('formLog')">确定</el-button>
+        <el-button type="primary" @click="onSubmitLog('formLog')">完成调试</el-button>
       </el-form-item>
     </el-form>
+    <div v-show="active === 3">设备安装完成</div>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-
+import { getToken } from '@/utils/auth'
 export default {
   name: 'Install',
   data() {
@@ -128,9 +124,6 @@ export default {
         description: [
           { required: true, message: '请输入备注信息', trigger: 'blur' }
         ],
-        setter: [
-          { required: true, message: '请选择安装人员', trigger: 'change' }
-        ],
         activateTime: [
           { required: true, message: '请选择日期', trigger: 'change' }
         ]
@@ -172,7 +165,7 @@ export default {
         ],
         resource5: [
           { required: true, message: '请选择', trigger: 'change' }
-        ]                  
+        ]
       }
     }
   },
@@ -185,12 +178,12 @@ export default {
   },
   methods: {
     onSubmit(formName) {
+      this.form.setter = getToken()
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.$store.dispatch('install/addDeviceData', this.form).then((data) => {
             this.formLog.deviceId = data.id
             this.formLog.deviceCode = data.deviceCode
-            this.formLog.description = data.description
             this.active++
           })
         } else {
@@ -204,7 +197,7 @@ export default {
         if (valid) {
           for (let i = 1; i <= 5; i++) {
             if (this.ruleForm[`resource${i}`] === '否') {
-              this.$message.error('请先解决问题在安装')
+              this.$message.error('请先解决问题再安装')
               return false
             }
           }

src/views/login/index.vue

@@ -95,6 +95,11 @@ export default {
         if (valid) {
           this.loading = true
           this.$store.dispatch('user/login', this.loginForm).then((data) => {
+            if (data.status === 'DEL') {
+              this.$message.error('暂无权限登录，请联系管理员')
+              this.loading = false
+              return false
+            }
             if (data.type.indexOf('1') !== -1) {
               this.$router.push({ path: this.redirect || '/install/install' })
             } else {