isv-robot 2 лет назад
Родитель
Сommit
fac25428a9
23 измененных файлов с 755 добавлено и 34 удалено
  1. 1 0
      src/views/dashboard-screen/dlsdxl/index.vue
  2. 1 0
      src/views/dashboard-screen/qb-dlsbxjdx/index.vue
  3. 3 1
      src/views/dashboard-screen/screen/screenSbxjdxqk/screenSbxjdxqk.vue
  4. 65 0
      src/views/dashboard-screen/screen/sjdr/dlydts/index.vue
  5. 3 4
      src/views/dashboard-screen/screen/sjdr/dlydts/tab1.vue
  6. 0 0
      src/views/dashboard-screen/screen/sjdr/dlydts/tab1Columns.js
  7. 3 4
      src/views/dashboard-screen/screen/sjdr/dlydts/tab2.vue
  8. 0 0
      src/views/dashboard-screen/screen/sjdr/dlydts/tab2Columns.js
  9. 104 0
      src/views/dashboard-screen/screen/sjdr/dlydts/tab3.vue
  10. 0 0
      src/views/dashboard-screen/screen/sjdr/dlydts/tab3Columns.js
  11. 35 19
      src/views/dashboard-screen/screen/sjdr/index.vue
  12. 59 0
      src/views/dashboard-screen/screen/sjdr/syjhdxqk/index.vue
  13. 104 0
      src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab1.vue
  14. 70 0
      src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab1Columns.js
  15. 104 0
      src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab2.vue
  16. 70 0
      src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab2Columns.js
  17. 1 1
      src/views/dashboard-screen/screen/sjdr/tab3.vue
  18. 2 2
      src/views/dashboard-screen/screen/sjdr/tab6.vue
  19. 59 0
      src/views/dashboard-screen/screen/sjdr/ycxn/index.vue
  20. 0 2
      src/views/dashboard-screen/screen/sjdr/ycxn/tab1.vue
  21. 0 0
      src/views/dashboard-screen/screen/sjdr/ycxn/tab1Columns.js
  22. 1 1
      src/views/dashboard-screen/screen/sjdr/ycxn/tab2.vue
  23. 70 0
      src/views/dashboard-screen/screen/sjdr/ycxn/tab2Columns.js

+ 1 - 0
src/views/dashboard-screen/dlsdxl/index.vue

@@ -298,6 +298,7 @@ $xHeight: 120px;
     height: 100%;
     width: 100%;
     flex-shrink: 0;
+    overflow: hidden;
   }
 
 }

+ 1 - 0
src/views/dashboard-screen/qb-dlsbxjdx/index.vue

@@ -344,6 +344,7 @@ export default {
     flex-grow: 1;
     width: 100%;
     height: 100%;
+    overflow: hidden;
   }
 
   .r-coner {

+ 3 - 1
src/views/dashboard-screen/screen/screenSbxjdxqk/screenSbxjdxqk.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="screen-common-wrap">
       <a-table
+        v-if="dataSource.length > 0"
         ref="table"
         size="middle"
         bordered
@@ -83,7 +84,8 @@ export default {
           arr = arr.concat(cur.children)
           return arr
         }, [])
-        this.dataSource = newList || basicDataSource
+        this.dataSource = newList || []
+        window['dataSource'] = this.dataSource;
       })
     }
   }

+ 65 - 0
src/views/dashboard-screen/screen/sjdr/dlydts/index.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="screen-common-wrap">
+    <el-card class="content-z" style="position: relative">
+      <a-button
+        class="right-upload-btn"
+        ghost
+        type="primary"
+        icon="upload"
+        @click="handleExportXls()"
+      >导入
+      </a-button>
+      <a-tabs v-model="activeKey" type="card">
+        <a-tab-pane
+          v-for="item in tabs"
+          :key="item.name"
+          :tab="item.title"
+        >
+          <component
+            :is="item.name"
+            v-if="activeKey === item.name"
+          />
+        </a-tab-pane>
+      </a-tabs>
+    </el-card>
+  </div>
+
+</template>
+<script>
+
+import Tab1 from './tab2.vue'
+import Tab2 from './tab2.vue'
+import Tab3 from './tab3.vue'
+
+export default {
+  name: 'Ycxx',
+  components: {
+    Tab1,
+    Tab2,
+    Tab3
+  },
+  data() {
+    return {
+      activeKey: 'Tab1',
+      tabs: [{
+        title: '远动调试',
+        name: 'Tab1'
+      },
+        {
+          title: '高受电',
+          name: 'Tab2'
+        },
+        {
+          title: '高试验',
+          name: 'Tab3'
+        }
+      ]
+    }
+  },
+  computed: {},
+  methods: {}
+}
+</script>
+<style scoped>
+@import '~@/assets/less/common.less'
+</style>

+ 3 - 4
src/views/dashboard-screen/screen/sjdr/tab5.vue → src/views/dashboard-screen/screen/sjdr/dlydts/tab1.vue

@@ -4,7 +4,6 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right">
-        <a-button ghost type="danger" icon="download" @click="handleExportXls()">导出</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel">
@@ -63,11 +62,11 @@
 </template>
 <script>
 import {listMixin} from '@/mixin/listMixin'
-import columns from './tab5Columns'
+import columns from './tab1Columns'
 import {getAction} from '@/api/request'
 
 export default {
-  name: 'Tab5',
+  name: 'Tab1',
   components: {},
   mixins: [listMixin],
   data() {
@@ -78,7 +77,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/show/dlyc/list',
+        list: '/show/ydts/list',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

+ 0 - 0
src/views/dashboard-screen/screen/sjdr/tab2Columns.js → src/views/dashboard-screen/screen/sjdr/dlydts/tab1Columns.js


+ 3 - 4
src/views/dashboard-screen/screen/sjdr/tab4.vue → src/views/dashboard-screen/screen/sjdr/dlydts/tab2.vue

@@ -4,7 +4,6 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right">
-        <a-button ghost type="danger" icon="download" @click="handleExportXls()">导出</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel">
@@ -63,11 +62,11 @@
 </template>
 <script>
 import {listMixin} from '@/mixin/listMixin'
-import columns from './tab4Columns'
+import columns from './tab2Columns'
 import {getAction} from '@/api/request'
 
 export default {
-  name: 'Tab4',
+  name: 'Tab2',
   components: {},
   mixins: [listMixin],
   data() {
@@ -78,7 +77,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/show/dlyc/list',
+        list: '/show/gsd/list',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

+ 0 - 0
src/views/dashboard-screen/screen/sjdr/tab4Columns.js → src/views/dashboard-screen/screen/sjdr/dlydts/tab2Columns.js


+ 104 - 0
src/views/dashboard-screen/screen/sjdr/dlydts/tab3.vue

@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel">
+              <a-icon type="delete"/>
+              删除
+            </a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作
+            <a-icon type="down"/>
+          </a-button>
+        </a-dropdown>
+      </div>
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <j-dict-select-tag
+            v-model="queryParam.ssgq"
+            style="width: 150px"
+            placeholder="选择工区"
+            dict-code="dlyc_sygq"
+          />
+        </a-form-item>
+        <a-form-item>
+          <j-dict-select-tag
+            v-model="queryParam.gravity"
+            style="width: 150px"
+            placeholder="选择严重性"
+            dict-code="dlycyzx"
+          />
+        </a-form-item>
+
+        <a-form-item>
+          <a-button type="primary" @click="searchQuery">查询</a-button>
+          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        row-key="id"
+        :columns="columns"
+        :data-source="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+      />
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+  </div>
+</template>
+<script>
+import {listMixin} from '@/mixin/listMixin'
+import columns from './tab3Columns'
+import {getAction} from '@/api/request'
+
+export default {
+  name: 'Tab2',
+  components: {},
+  mixins: [listMixin],
+  data() {
+    return {
+      // 查询条件
+      queryParam: {},
+      treeData: [],
+      // 表头
+      columns: columns(this),
+      url: {
+        list: '/show/gsy/list',
+        delete: '/business/catenary/bus/jcb/fdfxjyq/',
+        tree: '/system/dept/treeSelect',
+        exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'
+      }
+    }
+  },
+  created() {
+    this.loadTree()
+  },
+  methods: {
+    loadTree() {
+      this.treeData = []
+      getAction(this.url.tree).then((res) => {
+        if (res.code === 200) {
+          this.treeData = res.data
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@/assets/less/common.less'
+</style>

+ 0 - 0
src/views/dashboard-screen/screen/sjdr/tab5Columns.js → src/views/dashboard-screen/screen/sjdr/dlydts/tab3Columns.js


+ 35 - 19
src/views/dashboard-screen/screen/sjdr/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="screen-common-wrap">
     <el-card class="content-z">
-      <a-tabs v-model="activeKey">
+      <a-tabs v-model="activeKey" class="sjdr">
         <a-tab-pane
           v-for="item in tabs"
           :key="item.name"
@@ -19,44 +19,40 @@
 </template>
 <script>
 
-import Tab1 from './tab1.vue'
-import Tab2 from './tab2.vue'
+import Ycxx from './ycxn/index.vue'
+import Syjj from './syjhdxqk/index.vue'
 import Tab3 from './tab3.vue'
-import Tab4 from './tab4.vue'
-import Tab5 from './tab5.vue'
+import Dlyd from './dlydts/index.vue'
 import Tab6 from './tab6.vue'
 
 export default {
   name: 'ScreenSjdr',
   components: {
-    Tab1,
-    Tab2,
+    Ycxx,
     Tab3,
-    Tab4,
-    Tab5,
+    Syjj,
+    Dlyd,
     Tab6
   },
   data() {
     return {
-      activeKey: 'Tab1',
+      activeKey: 'Ycxx',
       tabs: [{
-        title: '异常信息(变电)',
-        name: 'Tab1'
-      }, {
-        title: '异常信息(电力)',
-        name: 'Tab2'
+        title: '异常信息',
+        name: 'Ycxx'
       },
+
         {
           title: '变配电所检修兑现情况',
           name: 'Tab3'
         },
         {
           title: '实验计划兑现情况',
-          name: 'Tab4'
+          name: 'Syjj'
         },
         {
           title: '电力远动调试',
-          name: 'Tab5'
+          name: 'Dlyd'
         },
         {
           title: '牵变、电力设备巡视兑现(本月)',
@@ -70,6 +66,26 @@ export default {
   methods: {}
 }
 </script>
-<style scoped>
-@import '~@/assets/less/common.less'
+<style scoped lang="scss">
+.el-card {
+  margin: 0 0 !important;
+}
+
+::v-deep {
+  .el-card {
+    margin: 0 0 !important;
+    padding: 0 12px;
+    border: none !important;
+  }
+
+  .el-card__body {
+    padding: 0 0 !important;
+  }
+
+  .right-upload-btn {
+    position: absolute;
+    right: 10px;
+    top: 0;
+  }
+}
 </style>

+ 59 - 0
src/views/dashboard-screen/screen/sjdr/syjhdxqk/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="screen-common-wrap">
+    <el-card class="content-z" style="position: relative">
+      <a-button
+        class="right-upload-btn"
+        ghost
+        type="primary"
+        icon="upload"
+        @click="handleExportXls()"
+      >导入
+      </a-button>
+      <a-tabs v-model="activeKey" type="card">
+        <a-tab-pane
+          v-for="item in tabs"
+          :key="item.name"
+          :tab="item.title"
+        >
+          <component
+            :is="item.name"
+            v-if="activeKey === item.name"
+          />
+        </a-tab-pane>
+      </a-tabs>
+    </el-card>
+  </div>
+
+</template>
+<script>
+
+import Tab1 from './tab2.vue'
+import Tab2 from './tab2.vue'
+
+export default {
+  name: 'Ycxx',
+  components: {
+    Tab1,
+    Tab2
+  },
+  data() {
+    return {
+      activeKey: 'Tab1',
+      tabs: [{
+        title: '开关分合',
+        name: 'Tab1'
+      },
+        {
+          title: '单体',
+          name: 'Tab2'
+        }
+      ]
+    }
+  },
+  computed: {},
+  methods: {}
+}
+</script>
+<style scoped>
+@import '~@/assets/less/common.less'
+</style>

+ 104 - 0
src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab1.vue

@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel">
+              <a-icon type="delete"/>
+              删除
+            </a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作
+            <a-icon type="down"/>
+          </a-button>
+        </a-dropdown>
+      </div>
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <j-dict-select-tag
+            v-model="queryParam.ssgq"
+            style="width: 150px"
+            placeholder="选择工区"
+            dict-code="dlyc_sygq"
+          />
+        </a-form-item>
+        <a-form-item>
+          <j-dict-select-tag
+            v-model="queryParam.gravity"
+            style="width: 150px"
+            placeholder="选择严重性"
+            dict-code="dlycyzx"
+          />
+        </a-form-item>
+
+        <a-form-item>
+          <a-button type="primary" @click="searchQuery">查询</a-button>
+          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        row-key="id"
+        :columns="columns"
+        :data-source="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+      />
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+  </div>
+</template>
+<script>
+import {listMixin} from '@/mixin/listMixin'
+import columns from './tab1Columns'
+import {getAction} from '@/api/request'
+
+export default {
+  name: 'Tab1',
+  components: {},
+  mixins: [listMixin],
+  data() {
+    return {
+      // 查询条件
+      queryParam: {},
+      treeData: [],
+      // 表头
+      columns: columns(this),
+      url: {
+        list: '/show/syjhdx/kg/list',
+        delete: '/business/catenary/bus/jcb/fdfxjyq/',
+        tree: '/system/dept/treeSelect',
+        exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'
+      }
+    }
+  },
+  created() {
+    this.loadTree()
+  },
+  methods: {
+    loadTree() {
+      this.treeData = []
+      getAction(this.url.tree).then((res) => {
+        if (res.code === 200) {
+          this.treeData = res.data
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@/assets/less/common.less'
+</style>

+ 70 - 0
src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab1Columns.js

@@ -0,0 +1,70 @@
+function columns(vm) {
+  const cols = [
+    {
+      title: '序号',
+      key: 'rowIndex',
+      width: 60,
+      align: 'center',
+      customRender: function(t, r, index) {
+        return parseInt(index) + 1
+      }
+    },
+    {
+      title: '缺陷设备名称',
+      align: 'center',
+      dataIndex: 'qxsbmc',
+      key: 'qxsbmc'
+    },
+    {
+      title: '工区',
+      align: 'center',
+      dataIndex: 'ssgq',
+      key: 'ssgq'
+    },
+    {
+      title: '线别',
+      align: 'center',
+      dataIndex: 'lineName',
+      key: 'lineName'
+    },
+    {
+      title: '发现日期',
+      align: 'center',
+      dataIndex: 'foundDate',
+      key: 'foundDate'
+    },
+    {
+      title: '缺陷内容',
+      align: 'center',
+      dataIndex: 'qxnr',
+      key: 'qxnr'
+    },
+    {
+      title: '故障类别',
+      align: 'center',
+      dataIndex: 'gzlb',
+      key: 'gzlb'
+    },
+    {
+      title: '原因',
+      align: 'center',
+      dataIndex: 'reason',
+      key: 'reason'
+    },
+    {
+      title: '严重性',
+      align: 'center',
+      dataIndex: 'gravity',
+      key: 'gravity'
+    },
+    {
+      title: '处理措施',
+      align: 'center',
+      dataIndex: 'rectifyWay',
+      key: 'rectifyWay'
+    }
+  ]
+  return cols
+}
+
+export default columns

+ 104 - 0
src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab2.vue

@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel">
+              <a-icon type="delete"/>
+              删除
+            </a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作
+            <a-icon type="down"/>
+          </a-button>
+        </a-dropdown>
+      </div>
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <j-dict-select-tag
+            v-model="queryParam.ssgq"
+            style="width: 150px"
+            placeholder="选择工区"
+            dict-code="dlyc_sygq"
+          />
+        </a-form-item>
+        <a-form-item>
+          <j-dict-select-tag
+            v-model="queryParam.gravity"
+            style="width: 150px"
+            placeholder="选择严重性"
+            dict-code="dlycyzx"
+          />
+        </a-form-item>
+
+        <a-form-item>
+          <a-button type="primary" @click="searchQuery">查询</a-button>
+          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+    <!-- table区域-begin -->
+    <div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        row-key="id"
+        :columns="columns"
+        :data-source="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+      />
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
+  </div>
+</template>
+<script>
+import {listMixin} from '@/mixin/listMixin'
+import columns from './tab2Columns'
+import {getAction} from '@/api/request'
+
+export default {
+  name: 'Tab2',
+  components: {},
+  mixins: [listMixin],
+  data() {
+    return {
+      // 查询条件
+      queryParam: {},
+      treeData: [],
+      // 表头
+      columns: columns(this),
+      url: {
+        list: '/show/syjhdx/dt/list',
+        delete: '/business/catenary/bus/jcb/fdfxjyq/',
+        tree: '/system/dept/treeSelect',
+        exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'
+      }
+    }
+  },
+  created() {
+    this.loadTree()
+  },
+  methods: {
+    loadTree() {
+      this.treeData = []
+      getAction(this.url.tree).then((res) => {
+        if (res.code === 200) {
+          this.treeData = res.data
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@/assets/less/common.less'
+</style>

+ 70 - 0
src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab2Columns.js

@@ -0,0 +1,70 @@
+function columns(vm) {
+  const cols = [
+    {
+      title: '序号',
+      key: 'rowIndex',
+      width: 60,
+      align: 'center',
+      customRender: function(t, r, index) {
+        return parseInt(index) + 1
+      }
+    },
+    {
+      title: '缺陷设备名称',
+      align: 'center',
+      dataIndex: 'qxsbmc',
+      key: 'qxsbmc'
+    },
+    {
+      title: '工区',
+      align: 'center',
+      dataIndex: 'ssgq',
+      key: 'ssgq'
+    },
+    {
+      title: '线别',
+      align: 'center',
+      dataIndex: 'lineName',
+      key: 'lineName'
+    },
+    {
+      title: '发现日期',
+      align: 'center',
+      dataIndex: 'foundDate',
+      key: 'foundDate'
+    },
+    {
+      title: '缺陷内容',
+      align: 'center',
+      dataIndex: 'qxnr',
+      key: 'qxnr'
+    },
+    {
+      title: '故障类别',
+      align: 'center',
+      dataIndex: 'gzlb',
+      key: 'gzlb'
+    },
+    {
+      title: '原因',
+      align: 'center',
+      dataIndex: 'reason',
+      key: 'reason'
+    },
+    {
+      title: '严重性',
+      align: 'center',
+      dataIndex: 'gravity',
+      key: 'gravity'
+    },
+    {
+      title: '处理措施',
+      align: 'center',
+      dataIndex: 'rectifyWay',
+      key: 'rectifyWay'
+    }
+  ]
+  return cols
+}
+
+export default columns

+ 1 - 1
src/views/dashboard-screen/screen/sjdr/tab3.vue

@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right">
-        <a-button ghost type="danger" icon="download" @click="handleExportXls()">导出</a-button>
+        <a-button ghost type="primary" icon="upload" @click="handleExportXls()">导入</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel">

+ 2 - 2
src/views/dashboard-screen/screen/sjdr/tab6.vue

@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right">
-        <a-button ghost type="danger" icon="download" @click="handleExportXls()">导出</a-button>
+        <a-button ghost type="primary" icon="upload" @click="handleExportXls()">导入</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel">
@@ -78,7 +78,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/show/dlyc/list',
+        list: '/show/sbxj/list',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

+ 59 - 0
src/views/dashboard-screen/screen/sjdr/ycxn/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="screen-common-wrap">
+    <el-card class="content-z" style="position: relative">
+      <a-button
+        class="right-upload-btn"
+        ghost
+        type="primary"
+        icon="upload"
+        @click="handleExportXls()"
+      >导入
+      </a-button>
+      <a-tabs v-model="activeKey" type="card">
+        <a-tab-pane
+          v-for="item in tabs"
+          :key="item.name"
+          :tab="item.title"
+        >
+          <component
+            :is="item.name"
+            v-if="activeKey === item.name"
+          />
+        </a-tab-pane>
+      </a-tabs>
+    </el-card>
+  </div>
+
+</template>
+<script>
+
+import Tab1 from './tab2.vue'
+import Tab2 from './tab2.vue'
+
+export default {
+  name: 'Ycxx',
+  components: {
+    Tab1,
+    Tab2
+  },
+  data() {
+    return {
+      activeKey: 'Tab1',
+      tabs: [{
+        title: '变电',
+        name: 'Tab1'
+      },
+        {
+          title: '电力',
+          name: 'Tab2'
+        }
+      ]
+    }
+  },
+  computed: {},
+  methods: {}
+}
+</script>
+<style scoped>
+@import '~@/assets/less/common.less'
+</style>

+ 0 - 2
src/views/dashboard-screen/screen/sjdr/tab1.vue → src/views/dashboard-screen/screen/sjdr/ycxn/tab1.vue

@@ -4,8 +4,6 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right">
-        <a-button ghost type="primary" icon="upload" @click="handleExportXls()">导入</a-button>
-        <a-button ghost type="danger" icon="download" @click="handleExportXls()">导出</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel">

+ 0 - 0
src/views/dashboard-screen/screen/sjdr/tab1Columns.js → src/views/dashboard-screen/screen/sjdr/ycxn/tab1Columns.js


+ 1 - 1
src/views/dashboard-screen/screen/sjdr/tab2.vue → src/views/dashboard-screen/screen/sjdr/ycxn/tab2.vue

@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right">
-        <a-button ghost type="danger" icon="download" @click="handleExportXls()">导出</a-button>
+<!--        <a-button ghost type="primary" icon="upload" @click="handleExportXls()">导入</a-button>-->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel">

+ 70 - 0
src/views/dashboard-screen/screen/sjdr/ycxn/tab2Columns.js

@@ -0,0 +1,70 @@
+function columns(vm) {
+  const cols = [
+    {
+      title: '序号',
+      key: 'rowIndex',
+      width: 60,
+      align: 'center',
+      customRender: function(t, r, index) {
+        return parseInt(index) + 1
+      }
+    },
+    {
+      title: '缺陷设备名称',
+      align: 'center',
+      dataIndex: 'qxsbmc',
+      key: 'qxsbmc'
+    },
+    {
+      title: '工区',
+      align: 'center',
+      dataIndex: 'ssgq',
+      key: 'ssgq'
+    },
+    {
+      title: '线别',
+      align: 'center',
+      dataIndex: 'lineName',
+      key: 'lineName'
+    },
+    {
+      title: '发现日期',
+      align: 'center',
+      dataIndex: 'foundDate',
+      key: 'foundDate'
+    },
+    {
+      title: '缺陷内容',
+      align: 'center',
+      dataIndex: 'qxnr',
+      key: 'qxnr'
+    },
+    {
+      title: '故障类别',
+      align: 'center',
+      dataIndex: 'gzlb',
+      key: 'gzlb'
+    },
+    {
+      title: '原因',
+      align: 'center',
+      dataIndex: 'reason',
+      key: 'reason'
+    },
+    {
+      title: '严重性',
+      align: 'center',
+      dataIndex: 'gravity',
+      key: 'gravity'
+    },
+    {
+      title: '处理措施',
+      align: 'center',
+      dataIndex: 'rectifyWay',
+      key: 'rectifyWay'
+    }
+  ]
+  return cols
+}
+
+export default columns