设备补招页面修改

src/views/govern/device/control/supplementaryRecruitment.vue

@@ -1,14 +1,14 @@
 <template>
-    <div class="default-main">
-        <el-tabs v-model="activeName" type="border-card">
+    <div class="default-main device">
+        <currentDevice  ref="currentDeviceRef"/>
+        <!-- <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="当前设备补招" name="0">
-                <!-- <current v-if="activeName == '0'" /> -->
                 <currentDevice v-if="activeName == '0'" ref="currentDeviceRef"/>
             </el-tab-pane>
             <el-tab-pane label="历史设备补招" name="1">
                 <history v-if="activeName == '1'" />
             </el-tab-pane>
-        </el-tabs>
+        </el-tabs> -->
     </div>
 </template>
 <script lang="ts" setup>
@@ -40,4 +40,9 @@ onMounted(() => {
     currentDeviceRef.value&&currentDeviceRef.value.getMakeUpDataList(route.query)
 })
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.device{
+    width: 100%;
+    height: 100%;
+}
+</style>

src/views/govern/device/control/supplementaryRecruitment/currentDevice.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="default-main current_device" v-loading="loading">
+    <div class="default-main current_device" v-loading="loading" v-if="false">
         <!-- <div class="file_path" v-if="dirCheckedList.value && dirCheckedList.value.length != 0">
             <el-breadcrumb separator="/">
                 <el-breadcrumb-item v-for="(item, index) in dirCheckedList" :key="index">
@@ -18,25 +18,87 @@
             <p>{{ item.prjName }}>{{ item.prjDataPath }}</p>
         </div>
     </div>
+    <!-- 设备补招 -->
+    <div class="default-main current_device">
+        <div class="current_header">
+            <el-form-item label="日期">
+                <DatePicker ref="datePickerRef"></DatePicker>
+            </el-form-item>
+            <el-form-item>
+                <el-checkbox-group style="width: 150px" v-model="checkList">
+                    <el-checkbox label="稳态" value="B" />
+                    <el-checkbox label="暂态" value="A" />
+                </el-checkbox-group>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" :icon="Search" @click="handleSearch">查询</el-button>
+                <el-button type="primary" :icon="Plus" @click="handleUpDevice">补招</el-button>
+                <el-button :icon="Back" @click="go(-1)">返回</el-button>
+            </el-form-item>
+        </div>
+        <div class="current_body" ref="tbodyRef">
+            <vxe-table
+                border
+                ref="tableRef"
+                :data="dirList"
+                :height="tableHeight"
+                @checkbox-all="selectAllChangeEvent"
+                @checkbox-change="selectChangeEvent"
+                style="margin-right: 30px"
+            >
+                <vxe-column align="center" type="checkbox" width="60"></vxe-column>
+                <vxe-column align="center" field="name" title="名称"></vxe-column>
+                <vxe-column align="center" field="startTime" title="起始时间"></vxe-column>
+                <vxe-column align="center" field="endTime" title="结束时间"></vxe-column>
+            </vxe-table>
+        </div>
+    </div>
 </template>
 <script lang="ts" setup>
 import { ref, onMounted, defineProps, defineExpose } from 'vue'
 import { getMakeUpData, getAskDirOrFile } from '@/api/cs-harmonic-boot/recruitment.ts'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import { useRouter } from 'vue-router'
+import {
+    Plus,
+    Back,
+    Search,
+    Refresh,
+    RefreshRight,
+    RefreshLeft,
+    ScaleToOriginal,
+    ZoomIn,
+    Cpu,
+    View,
+    Download,
+    ZoomOut,
+    FolderOpened
+} from '@element-plus/icons-vue'
 // const props = defineProps(['lineId'])
+const { push, currentRoute, go } = useRouter() // 路由
 const loading = ref(false)
 const dirList = ref([])
 const route: any = ref({})
+const datePickerRef = ref()
 const getMakeUpDataList = (row: any) => {
     route.value = row
     loading.value = true
     getMakeUpData(row.id).then(res => {
         console.log(res, '????????????')
+        res.data.map((item: any) => {
+            item.name = item.prjDataPath.replace('/bd0/cmn/', item.prjName + '-')
+            item.startTime = item.startTime ? item.startTime : '/'
+            item.endTime = item.endTime ? item.endTime : '/'
+        })
         dirList.value = res.data
+        console.log(dirList.value, '查询3333333333333333')
         loading.value = false
     })
 }
 // 进入文件夹
 const dirCheckedList: any = ref([])
+const tbodyRef = ref()
+const tableHeight = ref(0)
 const handleIntoDir = (row: any) => {
     if (dirCheckedList.value.indexOf(row) == -1) {
         dirCheckedList.value.push(row)
@@ -49,8 +111,8 @@ const handleIntoDir = (row: any) => {
         prjName: row.prjName
     }
     getAskDirOrFile(obj).then(res => {
-        console.log(res, '查询3333333333333333')
         dirList.value = res.data
+        console.log(dirList.value, '查询3333333333333333')
     })
 }
 onMounted(() => {
@@ -60,38 +122,59 @@ onMounted(() => {
 defineExpose({ getMakeUpDataList })
 </script>
 <style lang="scss" scoped>
+// .current_device {
+//     width: 100%;
+//     height: calc(100vh - 200px);
+//     display: flex;
+//     flex-wrap: wrap;
+//     align-items: flex-start;
+//     // justify-content: space-between;
+//     overflow-y: auto;
+//     .device_dir {
+//         width: 24.1%;
+//         height: 120px;
+//         border: 1px solid #eee;
+//         margin: 0 0.3%;
+//         display: flex;
+//         align-items: center;
+//         flex-direction: column;
+//         justify-content: center;
+//         .device_dir_file {
+//             width: 60px;
+//             height: 60px;
+//         }
+//         img {
+//             width: 50px;
+//             height: 50px;
+//         }
+//         img:hover {
+//             cursor: pointer;
+//         }
+//         p {
+//             margin-top: 10px;
+//         }
+//         // margin:10px;
+//     }
+// }
 .current_device {
     width: 100%;
     height: calc(100vh - 200px);
     display: flex;
-    flex-wrap: wrap;
-    align-items: flex-start;
-    // justify-content: space-between;
-    overflow-y: auto;
-    .device_dir {
-        width: 24.1%;
-        height: 120px;
-        border: 1px solid #eee;
-        margin: 0 0.3%;
+    flex-direction: column;
+    .current_header {
+        width: 100%;
+        height: 60px;
         display: flex;
         align-items: center;
-        flex-direction: column;
-        justify-content: center;
-        .device_dir_file {
-            width: 60px;
-            height: 60px;
+        .el-form-item{
+            display: flex;
+            align-items: center;
+            margin-bottom: 0;
         }
-        img {
-            width: 50px;
-            height: 50px;
-        }
-        img:hover {
-            cursor: pointer;
-        }
-        p {
-            margin-top: 10px;
-        }
-        // margin:10px;
+    }
+    .current_body {
+        margin-top: 10px;
+        flex: 1;
     }
 }
 </style>