Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/api/business/device.js

@@ -54,7 +54,14 @@ export function listDevice(query) {
     params: query
   })
 }
-
+// 查询设备列表不分页
+export function listDeviceAll(query) {
+  return request({
+    url: '/business/device/deviceList',
+    method: 'get',
+    params: query
+  })
+}
 // 查询设备详细
 export function getDevice(id) {
   return request({

src/views/equipment-management/equipment-management/equipment-add.vue

@@ -156,7 +156,7 @@
             <!--            5-->
             <el-row>
 
-              <el-col :span="8">
+              <el-col :span="8" style="margin-left: 33.5%">
                 <el-form-item label="下午开始时间">
                   <el-time-select
                     style="width: 250px"
@@ -268,8 +268,8 @@
           </el-form>
           <el-row>
             <el-col style="display: flex;justify-content: center;margin-top: 20px">
-              <el-button class="queryBtn" type="primary" size="mini" @click="submitForm">确 认</el-button>
-              <el-button class="resetBtn" size="mini" @click="cancel">返 回</el-button>
+              <el-button class="queryBtn" type="primary" size="mini"  icon="el-icon-check"  @click="submitForm">提交</el-button>
+              <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
             </el-col>
           </el-row>
 

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -160,7 +160,7 @@
             <!--            5-->
             <el-row>
 
-              <el-col :span="8">
+              <el-col :span="8"  style="margin-left: 33.5%">
                 <el-form-item label="下午开始时间" prop="userTime">
                   <el-time-select
                     v-model="useTime.pms"
@@ -275,7 +275,7 @@
           </el-form>
           <el-row>
             <el-col style="display: flex;justify-content: center;margin-top: 20px">
-              <el-button class="resetBtn" size="mini" @click="cancel">返 回</el-button>
+              <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
             </el-col>
           </el-row>
         </el-card>
@@ -448,7 +448,7 @@
             <!--            5-->
             <el-row>
 
-              <el-col :span="8">
+              <el-col :span="8"  style="margin-left: 33.5%">
                 <el-form-item label="下午开始时间" prop="userTime">
                   <el-time-select
                     style="width: 250px"
@@ -560,8 +560,8 @@
           </el-form>
           <el-row>
             <el-col style="display: flex;justify-content: center;margin-top: 20px">
-              <el-button class="queryBtn" type="primary" size="mini" @click="submitForm">确 认</el-button>
-              <el-button class="resetBtn" size="mini" @click="cancel">返 回</el-button>
+              <el-button class="queryBtn" type="primary" size="mini"  icon="el-icon-check"  @click="submitForm">提交</el-button>
+              <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
             </el-col>
           </el-row>
         </el-card>

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -160,11 +160,11 @@
             style="color: #DB4747;"
           >{{ showStatus(scope.row.status) || '-' }}</span>
         </template>
-<!--        <template slot-scope="scope">-->
-<!--          <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">-->
-<!--            {{ showStatus(scope.row.status)||'-' }}-->
-<!--          </span>-->
-<!--        </template>-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <span :style="showStatus(scope.row.status) ==='• 可使用' ? 'color: #67C23A' : 'color: #F56C6C'">-->
+        <!--            {{ showStatus(scope.row.status)||'-' }}-->
+        <!--          </span>-->
+        <!--        </template>-->
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -346,10 +346,9 @@
 
 <script>
 import { regionData, CodeToText } from 'element-china-area-data'
-import { listDevice, getDevice, delDevice } from '@/api/business/device'
+import { listDevice, getDevice, delDevice, listDeviceAll } from '@/api/business/device'
 import { getInfo } from '@/api/login'
 import { parseTime } from '@/utils/ruoyi'
-import {listUseManagementAll} from "@/api/business/use";
 
 export default {
   name: 'EquipmentManagement',
@@ -604,7 +603,6 @@ export default {
         // this.deviceList.forEach(item => {
         //   this.$set(item, 'checkTypeArr', item.checkType.split(','))
         // })
-        console.log('deviceList', this.deviceList)
         this.total = response.total
         this.loading = false
       })
@@ -699,22 +697,22 @@ export default {
         name: 'EquipmentAdd'
       })
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const id = row.id || this.ids
-      getDevice(id).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改设备'
-        this.serviceAreaS = this.form.serviceArea.split(';')
-        this.serviceArea = []
-        for (let i = 0; i < this.serviceAreaS.length; i++) {
-          this.serviceAreaS[i] = this.serviceAreaS[i].split(',')
-          this.serviceArea.push(this.serviceAreaS[i])
-        }
-      })
-    },
+    // /** 修改按钮操作 */
+    // handleUpdate(row) {
+    //   this.reset()
+    //   const id = row.id || this.ids
+    //   getDevice(id).then(response => {
+    //     this.form = response.data
+    //     this.open = true
+    //     this.title = '修改设备'
+    //     this.serviceAreaS = this.form.serviceArea.split(';')
+    //     this.serviceArea = []
+    //     for (let i = 0; i < this.serviceAreaS.length; i++) {
+    //       this.serviceAreaS[i] = this.serviceAreaS[i].split(',')
+    //       this.serviceArea.push(this.serviceAreaS[i])
+    //     }
+    //   })
+    // },
     // // 全部选择
     // selectAll() {
     //   this.$refs.table.toggleAllSelection()
@@ -731,7 +729,7 @@ export default {
      * @param all 是否永远进行全选操作
      */
     async selectAll(selection = [], all = true) {
-      if (this.userList.length !== selection.length && !all) {
+      if (this.deviceList.length !== selection.length && !all) {
         this.effectTableSelect([])
       } else {
         await this.changeTableSelect()
@@ -753,7 +751,7 @@ export default {
      */
     async changeTableSelect(notIncludeIds = []) {
       // 获取反选的数据
-      const { data } = await listUseManagementAll({ notIncludeIds })
+      const { data } = await listDeviceAll({ notIncludeIds })
       this.effectTableSelect(data)
     },
     // 反向选择