Merge remote-tracking branch 'origin/master'

jiangping

2024-11-29 8eb708f2b6d792f03725a0ff437f51da5af45a45

 admin/src/views/platform/oil.vue

@@ -36,7 +36,8 @@
      <ul class="toolbar" v-permissions="['business:platformwatergas:create','business:platformwatergas:delete','business:notice:exportExcel']">
        <li><el-button type="primary" @click="$refs.OperaPlatformOilWindow.open('新建油耗')" icon="el-icon-plus" v-permissions="['business:platformwatergas:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:platformwatergas:delete']">删除</el-button></li>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:notice:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformwatergas:exportExcel']" @click="exportExcel">导出</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformwatergas:exportExcel']" @click="handleImport">导入</el-button>
      </ul>
      <el-table
        v-loading="isWorking.search"
@@ -76,6 +77,7 @@
    </template>
    <!-- 新建/修改 -->
    <OperaPlatformOilWindow ref="OperaPlatformOilWindow" @success="handlePageChange"/>
    <oilImportTem ref="oilImportTem" @success="handlePageChange"/>
  </TableLayout>
</template>

@@ -86,10 +88,11 @@
import Pagination from '@/components/common/Pagination'
import OperaPlatformOilWindow from '@/components/business/OperaPlatformOilWindow'
import { allList } from '@/api/platform/platformGroup'
import oilImportTem from './components/oilImportTem'
export default {
  name: 'Platform',
  extends: BaseTable,
  components: { SearchFormCollapse, TableLayout, Pagination, OperaPlatformOilWindow },
  components: { SearchFormCollapse, TableLayout, Pagination, OperaPlatformOilWindow, oilImportTem },
  data () {
    return {
      groupList: [],
@@ -115,6 +118,9 @@
    this.loadGroupList()
  },
  methods: {
    handleImport() {
      this.$refs.oilImportTem.open('批量导入')
    },
    loadGroupList () {
      allList({})
        .then(res => {