From f6b36bd48ee269e04f1a4ed053bb90296222b827 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 5 Aug 2024 10:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E8=B0=83=E4=BB=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/today.vue | 96 ++++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/views/order/today.vue b/src/views/order/today.vue
index 2eca0f2..ea60ce7 100644
--- a/src/views/order/today.vue
+++ b/src/views/order/today.vue
@@ -13,6 +13,8 @@
             <header-content :auths="auths_auth_mixin">
               <template #search>
                 <div style="display: flex">
+                  <el-cascader clearable placeholder="请选择范围" size="small" collapse-tags :value="select.filter[2].value" :options="equipments" :props="{ children: 'children', label: 'name', value: 'id', multiple: true, emitPath: false }" @change="handleCheckChange"></el-cascader>
+
                   <Select clearable v-model="select.filter[1].value" placeholder="请选择类别" style="width: 140px;margin-left: 6px;">
                     <Option v-for="item in abilities" :value="item.value">{{ item.key }}</Option>
                   </Select>
@@ -39,17 +41,17 @@
     </div>
 
     <el-row :gutter="10">
-      <el-col :span="4">
-        <el-tree :data="equipments"
-                 node-key="id"
-                 :style="{ 'max-height':  treeHeight, 'overflow': 'scroll' }"
-                 ref="elTree"
-                 :props="{ children: 'children', label: 'name' }"
-                 show-checkbox
-                 @check="handleCheckChange">
-        </el-tree>
-      </el-col>
-      <el-col :span="20">
+<!--      <el-col :span="4">-->
+<!--        <el-tree :data="equipments"-->
+<!--                 node-key="id"-->
+<!--                 :style="{ 'max-height':  treeHeight, 'overflow': 'scroll' }"-->
+<!--                 ref="elTree"-->
+<!--                 :props="{ children: 'children', label: 'name' }"-->
+<!--                 show-checkbox-->
+<!--                 @check="handleCheckChange">-->
+<!--        </el-tree>-->
+<!--      </el-col>-->
+      <el-col :span="24">
         <xy-table
           :btn-width="240"
           :auths="auths_auth_mixin"
@@ -190,32 +192,32 @@ export default {
           "align": "center",
           formatter: (data,row,val) => this.abilities.find(i => i.value === val)?.key
         },
-        {
-          prop: "status",
-          label: "状态",
-          align: "center",
-          width: 420,
-          customFn: row => (
-            <div class="list-item__operate">
-              {
-                this.progressStatus(row).map((s, si) => (
-                  <el-tooltip effect="dark" content={this.operateTitle(row, s)||'暂无时间'} placement="top">
-                    <div class="step">
-                      <div class="step-icon">
-                        <div class={`step-icon__cir-${this.stepFormat(row.status, s.value)} step-icon__cir`}></div>
-                        {
-                          si < this.progressStatus(row).length - 1 ? (<div
-                            class={`step-icon__line-${this.stepFormat(row.status, s.value)} step-icon__line`}></div>) : ""
-                        }
-                      </div>
-                      <div class="step-label">{s.label}</div>
-                    </div>
-                  </el-tooltip>
-                ))
-              }
-            </div>
-          )
-        },
+        // {
+        //   prop: "status",
+        //   label: "状态",
+        //   align: "center",
+        //   width: 420,
+        //   customFn: row => (
+        //     <div class="list-item__operate">
+        //       {
+        //         this.progressStatus(row).map((s, si) => (
+        //           <el-tooltip effect="dark" content={this.operateTitle(row, s)||'暂无时间'} placement="top">
+        //             <div class="step">
+        //               <div class="step-icon">
+        //                 <div class={`step-icon__cir-${this.stepFormat(row.status, s.value)} step-icon__cir`}></div>
+        //                 {
+        //                   si < this.progressStatus(row).length - 1 ? (<div
+        //                     class={`step-icon__line-${this.stepFormat(row.status, s.value)} step-icon__line`}></div>) : ""
+        //                 }
+        //               </div>
+        //               <div class="step-label">{s.label}</div>
+        //             </div>
+        //           </el-tooltip>
+        //         ))
+        //       }
+        //     </div>
+        //   )
+        // },
         {
           "prop": "act_start_time",
           "label": "实际开始时间",
@@ -492,11 +494,11 @@ export default {
         children: res.filter(j => j.area === i.value)
       }))
 
-      this.$nextTick(() => {
-        this.areas.forEach(i => {
-          this.$refs['elTree'].setChecked(`area_${i.value}`, true, true)
-        })
-      })
+      // this.$nextTick(() => {
+      //   this.areas.forEach(i => {
+      //     this.$refs['elTree'].setChecked(`area_${i.value}`, true, true)
+      //   })
+      // })
     },
 
     async getArea() {
@@ -537,10 +539,12 @@ export default {
     },
 
     handleCheckChange (data, checked, indeterminate) {
-      this.treeValue = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.name).toString()
-      this.select.filter[2].value = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.id)
-
-      this.$refs['xyTable'].getTableData(true)
+      console.log(data)
+      this.select.filter[2].value = data.filter(i => i)
+      // this.treeValue = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.name).toString()
+      // this.select.filter[2].value = this.$refs['elTree'].getCheckedNodes(true)?.filter(i => !i.children)?.map(i => i.id)
+      //
+      // this.$refs['xyTable'].getTableData(true)
     },
   },