Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/basicData/warehouseMaintenance.vue

@@ -646,30 +646,34 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep.trans_ware{
+::v-deep.trans_ware {
   .el-transfer-panel {
-    width: 44.5% !important;
+    width: 44.2% !important;
 
-    .el-transfer-panel__body{
-      height: 494px !important;
+    .el-transfer-panel__body {
+      height: calc(100vh - 54px - 40px - 40px - 56px - 37px - 140px) !important;
+      min-height: 300px !important;
+      max-height: calc(100vh - 54px - 40px - 40px - 56px - 37px - 140px) !important;
+
+      .el-transfer-panel__list {
+        height: 100% !important;
+      }
     }
   }
 }
 
-
-// ::v-deep.el-transfer {
-//     .el-transfer-panel {
-//         width: 44% !important;
-//     }
-// }
-
 .setup-height {
   height: calc(100vh - 54px - 40px - 40px - 56px - 37px);
-  ::v-deep .tree-transfer-vue3{
-    height: 535px !important;
+  min-height: 500px;
+
+  ::v-deep .tree-transfer-vue3 {
+    height: calc(100vh - 54px - 40px - 40px - 56px - 37px - 140px) !important;
+    min-height: 320px !important;
+    max-height: calc(100vh - 54px - 40px - 40px - 56px - 37px - 140px) !important;
 
-    .el-tree{
-      height: 422px !important;
+    .el-tree {
+      height: 100% !important;
+      max-height: calc(100% - 20px) !important;
     }
   }
 }

src/views/energyManagement/components/electricityQuota.vue

@@ -45,6 +45,7 @@ export default {
   },
   data() {
     return {
+         data:[],
       isShowImport:false,
       selectionList: [],
       option: {

src/views/energyManagement/components/electricityTarget.vue

@@ -44,6 +44,7 @@ export default {
   },
   data() {
     return {
+         data:[],
       isShowImport:false,
       selectionList: [],
       option: {

src/views/energyManagement/components/waterQuota.vue

@@ -30,6 +30,7 @@ export default {
   },
   data() {
     return {
+         data:[],
       isShowImport: false,
       selectionList: [],
       query: {},

src/views/energyManagement/components/waterTarget.vue

@@ -1,46 +1,44 @@
 <template>
   <div>
     <avue-crud
-    :option="option"
-    v-model:search="search"
-    :table-loading="loading"
-    :data="data"
-    v-model="form"
-    v-model:page="page"
-    ref="crud"
-    @row-del="rowDel"
-    @row-save="rowSave"
-    @row-update="rowUpdate"
-    @search-change="searchChange"
-    @search-reset="searchReset"
-    @selection-change="selectionChange"
-    @current-change="currentChange"
-    @size-change="sizeChange"
-    @refresh-change="refreshChange"
-    @on-load="onLoad"
-  >
-    <template #menu-left>
- 
-      <el-button type="danger" icon="el-icon-delete" @click="handleDelete"
-        >删除
-      </el-button>
-    </template>
-    <template #menu-right>
-      <el-button type="primary" icon="el-icon-upload" @click="handleImport"
-        >导入
-      </el-button>
-           <el-button type="primary" icon="el-icon-download" @click="handleExport"
-        >导出
-      </el-button>
-    </template>
-    <template #menu> </template>
-  </avue-crud>
-  <!-- 导入 -->
-    <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
+      :option="option"
+      v-model:search="search"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+         <el-button type="primary" icon="el-icon-download" @click="handleExport">导出 </el-button>
+        <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删除 </el-button>
+      </template>
+      <template #menu-right>
+        <el-button type="primary" icon="el-icon-upload" @click="handleImport">导入 </el-button>
+       
+      </template>
+      <template #menu> </template>
+    </avue-crud>
+    <!-- 导入 -->
+    <basic-import
+      v-if="isShowImport"
+      title="导入"
+      :isShow="isShowImport"
       templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
       templateName="试验项目模板.xls"
       importUrl="/blade-desk/QA/CycleTestItem/import-excel"
-      @closeDialog="closeDialog"></basic-import>
+      @closeDialog="closeDialog"
+    ></basic-import>
   </div>
 </template>
 <script>
@@ -56,6 +54,8 @@ export default {
       selectionList: [],
       query: {},
       search: {},
+      loading: false,
+      data: [],
       option: {
         height: "auto",
         calcHeight: 32,
@@ -261,51 +261,94 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
-    onLoad() {
-      this.loading = true;
+    onLoad(page, params = {}) {
       console.log('=== onLoad 开始 ===');
       console.log('请求参数:', {
         current: this.page.currentPage,
         size: this.page.pageSize,
-        type: 1
+        type: 1,
+        ...params
       });
+
+      this.loading = true;
       pageList(
         this.page.currentPage,
         this.page.pageSize,
-        { type: 1 }
+        { type: 1, ...params }
       ).then(res => {
-        console.log('API返回数据:', res);
+        console.log('API 响应:', res);
         console.log('res.data:', res.data);
-        console.log('res.data.data:', res.data.data);
 
         if (res.data && res.data.data) {
           this.data = res.data.data.records || [];
           this.page.total = res.data.data.total || 0;
-          console.log('最终数据:', {
+          console.log('数据处理成功:', {
             records: this.data,
             total: this.page.total,
             dataLength: this.data.length
           });
-          
         } else {
-          console.error('响应数据格式不正确:', res);
+          console.warn('响应数据格式不正确:', res);
           this.data = [];
           this.page.total = 0;
         }
 
-        // 使用 nextTick 确保 loading 状态更新
-        this.$nextTick(() => {
-          this.loading = false;
-          setTimeout(() => {
-            this.selectionClear();
-          }, 500);
-        });
+        console.log('准备设置 loading = false');
+        this.loading = false;
+        console.log('loading 状态:', this.loading);
+
+        // 强制更新视图
+        this.$forceUpdate();
       }).catch(err => {
         console.error('请求失败:', err);
         this.loading = false;
+        this.data = [];
+        this.page.total = 0;
       });
       console.log('=== onLoad 结束 ===');
     },
+    // onLoad() {
+    //   this.loading = true;
+    //   console.log('=== onLoad 开始 ===');
+    //   console.log('请求参数:', {
+    //     current: this.page.currentPage,
+    //     size: this.page.pageSize,
+    //     type: 1
+    //   });
+    //   pageList(
+    //     this.page.currentPage,
+    //     this.page.pageSize,
+    //     { type: 1 }
+    //   ).then(res => {
+
+    //     if (res.data && res.data.data) {
+    //       this.data = res.data.data.records || [];
+    //       this.page.total = res.data.data.total || 0;
+    //       console.log('最终数据:', {
+    //         records: this.data,
+    //         total: this.page.total,
+    //         dataLength: this.data.length
+    //       });
+          
+    //     } else {
+    //       console.error('响应数据格式不正确:', res);
+    //       this.data = [];
+    //       this.page.total = 0;
+    //     }
+
+    //     // 使用 nextTick 确保 loading 状态更新
+    //     this.$nextTick(() => {
+    //       this.loading = false;
+    //       setTimeout(() => {
+    //         this.selectionClear();
+    //       }, 500);
+    //     });
+    //   }).catch(err => {
+    //     console.error('请求失败:', err);
+    //     this.loading = false;
+    //   });
+    //   console.log('=== onLoad 结束 ===');
+    // },
   },
 };
 </script>

src/views/energyManagement/electricityManagement.vue

@@ -83,6 +83,7 @@
 export default {
   data() {
     return {
+         data:[],
       loading: false,
       form: {},
       data: [],

src/views/energyManagement/energyMonitoring.vue

@@ -50,6 +50,7 @@ export default {
   },
   data() {
     return {
+      data:[],
       isShowImport:false,
       selectionList: [],
       query: {},