完善功能

src/store/modules/admin.js

@@ -8,6 +8,12 @@ const state = {
 
 const mutations = {
   GET_DEVICE: (state, data) => {
+    if (data.length > 0) {
+      data.forEach(item => {
+        item.gmtModified = (parseTime(item.gmtModified))
+        item.gmtCreated = (parseTime(item.gmtCreated))
+      })
+    }
     state.deviceData = data
   },
   GET_MODIFIER: (state, data) => {

src/views/admin/allocateDevice/index.vue

@@ -1,10 +1,32 @@
 <template>
   <div class="dashboard-container">
+    <div class="demo-input-size">
+      <el-input
+        v-model="loginName"
+        size="mini"
+        placeholder="请输入登录名"
+      />
+      <el-input
+        v-model="name"
+        size="mini"
+        placeholder="请输入姓名"
+      />
+      <el-input
+        v-model="mobile"
+        size="mini"
+        placeholder="请输入电话"
+      />
+      <el-button type="primary" size="mini" style="float: right;" @click="search">查询</el-button>
+    </div> 
     <el-table
-      :data="modifierData.filter(data => !search || data.name.toLowerCase().includes(search.toLowerCase()))"
+      :data="modifierData"
       style="width: 100%"
     >
       <el-table-column
+        label="登录名"
+        prop="loginName"
+      />
+      <el-table-column
         label="名字"
         prop="name"
       />
@@ -22,13 +44,6 @@
       <el-table-column
         align="right"
       >
-        <template slot="header">
-          <el-input
-            v-model="search"
-            size="mini"
-            placeholder="输入关键字搜索"
-          />
-        </template>
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -116,7 +131,6 @@ export default {
         deviceIds: []
       },
       addInput: [],
-      search: '',
       dialogFormVisible: false,
       gridData: [],
       gridTile: '',
@@ -126,7 +140,10 @@ export default {
       multipleSelection: [],
       okBtn: '确 定',
       dialogFormMoveVisible: false,
-      multipleMoveSelection: []
+      multipleMoveSelection: [],
+      loginName: '',
+      name: '',
+      mobile: ''
     }
   },
   computed: {
@@ -139,7 +156,9 @@ export default {
   methods: {
     handleAdd(index, row) {
       this.dialogFormVisible = true
-      this.$store.dispatch('admin/getDeviceData')
+      this.$store.dispatch('admin/getDeviceData', {
+        modifierStatus: 'UNDISTRIBUTED'
+      })
       this.title = '添加设备'
       this.okBtn = '确 定'
       this.form.modifierId = row.id
@@ -187,6 +206,14 @@ export default {
     },
     handleSelectionMoveChange(val) {
       this.multipleMoveSelection = val
+    },
+    search() {
+      this.$store.dispatch('admin/getDeviceModifierData', { 
+        type: 2,
+        loginName: this.loginName,
+        name: this.name,
+        mobile: this.mobile
+      })
     }
   }
 }
@@ -202,5 +229,8 @@ export default {
     line-height: 46px;
   }
 }
+.el-input {
+  width: auto;
+}
 </style>
 

src/views/admin/device/index.vue

@@ -1,11 +1,46 @@
 <template>
   <div class="dashboard-container">
+    <div class="demo-input-size">
+      <el-input
+        v-model="deviceCode"
+        size="mini"
+        placeholder="请输入设备编号"
+      />
+      <el-input
+        v-model="deviceType"
+        size="mini"
+        placeholder="请输入设备型号"
+      />
+      <el-input
+        v-model="region"
+        size="mini"
+        placeholder="请输入设备地区"
+      />
+      <el-input
+        v-model="address"
+        size="mini"
+        placeholder="请输入设备地址"
+      />
+      <el-date-picker
+        v-model="gmtCreated"
+        size="mini"
+        type="date"
+        placeholder="选择设备安装日期"
+        format="yyyy 年 MM 月 dd 日"
+        value-format="timestamp"
+      />
+      <el-button type="primary" size="mini" style="float: right;" @click="search">查询</el-button>
+    </div>
     <el-table
-      :data="deviceData.filter(data => !search || data.author.toLowerCase().includes(search.toLowerCase()))"
+      :data="deviceData"
       style="width: 100%"
     >
       <el-table-column
-        label="设备码"
+        label="设备安装时间"
+        prop="gmtCreated"
+      />    
+      <el-table-column
+        label="设备编号"
         prop="deviceCode"
       />
       <el-table-column
@@ -17,15 +52,16 @@
         prop="deviceType"
       />
       <el-table-column
+        label="设备地区"
+        prop="region"
+      />
+      <el-table-column
+        label="设备地址"
+        prop="address"
+      />      
+      <el-table-column
         align="right"
       >
-        <template slot="header" slot-scope="scope">
-          <el-input
-            v-model="search"
-            size="mini"
-            placeholder="输入关键字搜索"
-          />
-        </template>
         <template slot-scope="scope">
           <el-button
             v-show="type === '0'"
@@ -38,7 +74,7 @@
           <el-button
             size="mini"
             style="float: left; margin: 0 10px 0 0;"
-            @click="handleMaintain(scope.$index, scope.row)"
+            @click="handleMaintainMessage(scope.$index, scope.row)"
           >
             维护信息
           </el-button>
@@ -71,6 +107,38 @@
         />
       </el-table>
     </el-dialog>
+    <el-dialog
+      title="安装信息"
+      :visible.sync="dialogVisible"
+      width="60%"
+    >
+      <div class="install">
+        安装日期: {{ gridData.length > 0 ? gridData[0].deviceLog.gmtCreated : '' }}
+      </div>
+      <div class="install">
+        安装人员: {{ gridData.length > 0 ? gridData[0].deviceModifier.name : '' }}
+      </div>
+      <div class="install">
+        安装地区: {{ gridData.length > 0 ? gridData[0].deviceLog.region : '' }}
+      </div>
+      <div class="install">
+        安装地址: {{ gridData.length > 0 ? gridData[0].deviceLog.address : '' }}
+      </div>
+      <div class="install">
+        备注信息: {{ gridData.length > 0 ? gridData[0].deviceLog.description : '' }}
+      </div>
+    </el-dialog>
+    <el-dialog title="立即维护" :visible.sync="dialogFormVisible">
+      <el-form :model="solveForm" label-width="80px">
+        <el-form-item label="解决方案">
+          <el-input v-model="solveForm.description" type="textarea" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handSolve">确 定</el-button>
+      </div>
+    </el-dialog>    
   </div>
 </template>
 
@@ -82,13 +150,25 @@ export default {
   name: 'Device',
   data() {
     return {
-      search: '',
       dialogTableVisible: false,
+      dialogVisible: false,
       gridData: [],
       gridTile: '',
       type: getType(),
       uid: getToken(),
-      information: []
+      information: [],
+      deviceCode: '',
+      deviceType: '',
+      region: '',
+      address: '',
+      gmtCreated: '',
+      dialogFormVisible: false,
+      solveForm: {
+        deviceCode: '',
+        deviceId: '',
+        opType: 'MODIFIED',
+        description: ''
+      }
     }
   },
   computed: {
@@ -105,8 +185,25 @@ export default {
     }
   },
   methods: {
-    onSubmit() {
-      this.$message('submit!')
+    search() {
+      if (this.type === '2') {
+        this.$store.dispatch('admin/getDeviceData', {
+          deviceCode: this.deviceCode,
+          deviceType: this.deviceType,
+          region: this.region,
+          address: this.address,
+          gmtCreated: this.gmtCreated,
+          modifier: this.uid
+        })
+      } else {
+        this.$store.dispatch('admin/getDeviceData', {
+          deviceCode: this.deviceCode,
+          deviceType: this.deviceType,
+          region: this.region,
+          address: this.address,
+          gmtCreated: this.gmtCreated
+        })
+      }
     },
     handleInstall(index, row) {
       this.$store.dispatch('admin/queryLogData', {
@@ -116,27 +213,10 @@ export default {
       }).then(() => {
         this.gridData = this.$store.getters.logData
         // this.gridData.push(row)
-        this.gridTile = '安装信息'
-        this.information = [{
-          label: '安装日期',
-          type: 'deviceLog[gmtCreated]'
-        }, {
-          label: '安装人员',
-          type: 'deviceModifier[name]'
-        }, {
-          label: '安装地区',
-          type: 'deviceLog[gmtCreated]'
-        }, {
-          label: '安装地址',
-          type: 'deviceLog[gmtCreated]'
-        }, {
-          label: '备注信息',
-          type: 'deviceLog[description]'
-        }]
-        this.dialogTableVisible = true
+        this.dialogVisible = true
       })
     },
-    handleMaintain(index, row) {
+    handleMaintainMessage(index, row) {
       this.$store.dispatch('admin/queryLogData', {
         deviceId: row.id,
         deviceCode: row.deviceCode,
@@ -161,7 +241,12 @@ export default {
           type: 'deviceLog[description]'
         }]
         this.dialogTableVisible = true
-      })
+      })      
+    },
+    handleMaintain(index, row) {
+      this.solveForm.deviceCode = row.deviceCode
+      this.solveForm.deviceId = row.id
+      this.dialogFormVisible = true
     },
     handleUse(index, row) {
       console.log(index, row)
@@ -179,13 +264,17 @@ export default {
         }, {
           label: '设备连接日期',
           type: 'deviceModifier[name]'
-        }]        
+        }]
         this.dialogTableVisible = true
       })
       // this.gridData = []
       // this.gridData.push(row)
       // this.gridTile = '使用日志'
       // this.dialogTableVisible = true
+    },
+    handSolve() {
+      this.$store.dispatch('install/addDeviceLog', this.solveForm)
+      this.dialogFormVisible = false
     }
   }
 }
@@ -201,4 +290,10 @@ export default {
     line-height: 46px;
   }
 }
+.el-input {
+  width: auto;
+}
+.install {
+  margin-bottom: 10px;
+}
 </style>

src/views/admin/installMaintain/index.vue

@@ -1,13 +1,40 @@
 <template>
   <div class="dashboard-container">
-    <el-button type="primary" @click="handleAdd">
-      添加人员
-    </el-button>
+    <div class="demo-input-size">
+      <el-input
+        v-model="loginName"
+        size="mini"
+        placeholder="请输入登录名称"
+      />
+      <el-input
+        v-model="name"
+        size="mini"
+        placeholder="请输入名字"
+      />
+      <el-input
+        v-model="mobile"
+        size="mini"
+        placeholder="请输入手机号"
+      />
+      <el-select v-model="type" placeholder="请输入人员类型" size="mini">
+        <el-option label="管理员" value="0" />
+        <el-option label="安装员" value="1" />
+        <el-option label="维护员" value="2" />
+      </el-select>
+      <el-button type="primary" size="mini" style="float: right; margin-left: 20px;" @click="handleAdd">
+        添加人员
+      </el-button>
+      <el-button type="primary" size="mini" style="float: right;" @click="search">查询</el-button>
+    </div>
     <el-table
-      :data="modifierData.filter(data => !search || data.name.toLowerCase().includes(search.toLowerCase()))"
+      :data="modifierData"
       style="width: 100%"
     >
       <el-table-column
+        label="登录名"
+        prop="loginName"
+      />
+      <el-table-column
         label="名字"
         prop="name"
       />
@@ -25,13 +52,6 @@
       <el-table-column
         align="right"
       >
-        <template slot="header">
-          <el-input
-            v-model="search"
-            size="mini"
-            placeholder="输入关键字搜索"
-          />
-        </template>
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -94,6 +114,20 @@
         <el-button type="primary" @click="handleOk">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="修改密码" :visible.sync="dialogFormPassVisible">
+      <el-form ref="formPass" :model="formPass" :rules="rules" label-width="120px">
+        <el-form-item label="请输入密码" label-width="120px" prop="password">
+          <el-input v-model="formPass.password" type="password" autocomplete="off" />
+        </el-form-item>
+        <el-form-item label="再次输入密码" label-width="120px" prop="twoPassword">
+          <el-input v-model="formPass.twoPassword" type="password" autocomplete="off" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormPassVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handlePassOk('formPass')">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -103,16 +137,51 @@ import { setDeviceStatus } from '@/api/admin'
 export default {
   name: 'InstallMaintain',
   data() {
+    var validatePass = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请输入密码'))
+      } else {
+        if (this.formPass.twoPassword !== '') {
+          this.$refs.formPass.validateField('twoPassword')
+        }
+        callback()
+      }
+    }
+    var validatePass2 = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('请再次输入密码'))
+      } else if (value !== this.formPass.password) {
+        callback(new Error('两次输入密码不一致!'))
+      } else {
+        callback()
+      }
+    }
     return {
       form: {},
       addInput: [],
-      search: '',
       dialogFormVisible: false,
       gridData: [],
       gridTile: '',
       handleType: '',
       title: '',
-      peopleType: ['管理员', '安装员', '维护员']
+      peopleType: ['管理员', '安装员', '维护员'],
+      loginName: '',
+      name: '',
+      mobile: '',
+      type: '',
+      rules: {
+        password: [
+          { validator: validatePass, trigger: 'blur' }
+        ],
+        twoPassword: [
+          { validator: validatePass2, trigger: 'blur' }
+        ]
+      },
+      dialogFormPassVisible: false,
+      formPass: {
+        password: '',
+        twoPassword: ''
+      }
     }
   },
   computed: {
@@ -123,8 +192,13 @@ export default {
     this.$store.dispatch('admin/getDeviceModifierData')
   },
   methods: {
-    onSubmit() {
-      this.$message('submit!')
+    search() {
+      this.$store.dispatch('admin/getDeviceModifierData', {
+        loginName: this.loginName,
+        name: this.name,
+        mobile: this.mobile,
+        type: this.type
+      })
     },
     handleAdd() {
       this.dialogFormVisible = true
@@ -168,6 +242,21 @@ export default {
       }
       this.dialogFormVisible = false
     },
+    handlePassOk(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          console.log(this.formPass)
+          this.$store.dispatch('admin/setDeviceModifierData', {
+            id: this.formPass.id,
+            password: this.formPass.password
+          })
+          this.dialogFormPassVisible = false
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
     handleSet(index, row) {
       console.log(index, row)
       this.dialogFormVisible = true
@@ -190,17 +279,8 @@ export default {
     },
     handleSetPassword(index, row) {
       console.log(index, row)
-      this.dialogFormVisible = true
-      this.addInput = [{
-        name: '请输入新密码',
-        type: 'password'
-      }]
-      this.form = {
-        id: row.id,
-        password: ''
-      }
-      this.title = '修改密码'
-      this.handleType = 'set'
+      this.formPass.id = row.id
+      this.dialogFormPassVisible = true
     },
     handleSetStatus(index, row) {
       console.log(row)
@@ -241,5 +321,8 @@ export default {
     line-height: 46px;
   }
 }
+.el-input {
+  width: auto;
+}
 </style>
 

src/views/installer/index.vue

@@ -44,14 +44,42 @@
         <el-button type="primary" @click="onSubmit('form')">下一步</el-button>
       </el-form-item>
     </el-form>
-    <div v-show="active === 1">
-      第二步
-      <el-button style="margin-top: 12px;" @click="next">下一步</el-button>
+    <div v-show="active === 1" class="two">
+      <el-form ref="ruleForm" :model="ruleForm" :rules="radioRules" label-width="100px" class="demo-ruleForm">
+        <el-form-item label="白板通讯是否正常" prop="resource1" label-width="200px">
+          <el-radio-group v-model="ruleForm.resource1">
+            <el-radio label="是" />
+            <el-radio label="否" />
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="白板尺寸校队正确" prop="resource2" label-width="200px">
+          <el-radio-group v-model="ruleForm.resource2">
+            <el-radio label="是" />
+            <el-radio label="否" />
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="信息采集是否通畅" prop="resource3" label-width="200px">
+          <el-radio-group v-model="ruleForm.resource3">
+            <el-radio label="是" />
+            <el-radio label="否" />
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="笔记记录是否清晰" prop="resource4" label-width="200px">
+          <el-radio-group v-model="ruleForm.resource4">
+            <el-radio label="是" />
+            <el-radio label="否" />
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="客户端功能是否正常" prop="resource5" label-width="200px">
+          <el-radio-group v-model="ruleForm.resource5">
+            <el-radio label="是" />
+            <el-radio label="否" />
+          </el-radio-group>
+        </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="deviceCode">
-        <el-input v-model="formLog.deviceCode" />
-      </el-form-item>
       <el-form-item label="测试报告" prop="description">
         <el-input v-model="formLog.description" />
       </el-form-item>
@@ -121,6 +149,30 @@ export default {
         description: [
           { required: true, message: '请输入备注信息', trigger: 'blur' }
         ]
+      },
+      ruleForm: {
+        resource1: '',
+        resource2: '',
+        resource3: '',
+        resource4: '',
+        resource5: ''
+      },
+      radioRules: {
+        resource1: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
+        resource2: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
+        resource3: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
+        resource4: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
+        resource5: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ]                  
       }
     }
   },
@@ -147,13 +199,20 @@ export default {
         }
       })
     },
-    next() {
-      this.active++
+    next(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.active++
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
     onSubmitLog(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.$store.dispatch('install/addDeviceLog', this.form).then(() => {
+          this.$store.dispatch('install/addDeviceLog', this.formLog).then(() => {
             this.active++
           })
         } else {
@@ -176,4 +235,7 @@ export default {
     line-height: 46px;
   }
 }
+.two {
+  text-align: center;
+}
 </style>