mm

src/views/dashboard-screen/index.vue

@@ -135,10 +135,10 @@ export default {
       render: true,
       dateTitle: dayjs().locale('zh-cn').format('YYYY年MM月DD日  d'),
       drawer: {
-        title: '',
-        visible: false,
+        title: '数据管理',
+        visible: true,
         direction: 'btt',
-        comp: null
+        comp: ScreenSjdr
       }
     }
   },
@@ -328,6 +328,7 @@ export default {
         .o-item {
           width: 100%;
           overflow: hidden;
+
           &.map {
             grid-column-start: 1;
             grid-column-end: 4;

src/views/dashboard-screen/screen/sjdr/dlydts/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="screen-common-wrap">
+  <div class="common-wrap">
     <el-card class="content-z" style="position: relative">
       <a-button
         class="right-upload-btn"
@@ -27,7 +27,7 @@
 </template>
 <script>
 
-import Tab1 from './tab2.vue'
+import Tab1 from './tab1.vue'
 import Tab2 from './tab2.vue'
 import Tab3 from './tab3.vue'
 
@@ -45,14 +45,14 @@ export default {
         title: '远动调试',
         name: 'Tab1'
       },
-        {
-          title: '高受电',
-          name: 'Tab2'
-        },
-        {
-          title: '高试验',
-          name: 'Tab3'
-        }
+      {
+        title: '高受电',
+        name: 'Tab2'
+      },
+      {
+        title: '高试验',
+        name: 'Tab3'
+      }
       ]
     }
   },

src/views/dashboard-screen/screen/sjdr/dlydts/tab1Columns.js

@@ -10,58 +10,76 @@ function columns(vm) {
       }
     },
     {
-      title: '缺陷设备名称',
+      title: '段',
       align: 'center',
-      dataIndex: 'qxsbmc',
-      key: 'qxsbmc'
+      dataIndex: 'branchName',
+      key: 'branchName'
     },
     {
-      title: '工区',
+      title: '车间',
       align: 'center',
-      dataIndex: 'ssgq',
-      key: 'ssgq'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
-      title: '线别',
+      title: '高速/普速',
+      align: 'center',
+      dataIndex: 'lineSddj',
+      key: 'lineSddj'
+    },
+    {
+      title: '铁路线别',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '发现日期',
+      title: '区间（站区）',
+      align: 'center',
+      dataIndex: 'stationName',
+      key: 'stationName'
+    },
+    {
+      title: '所亭名称',
+      align: 'center',
+      dataIndex: 'substationName',
+      key: 'substationName'
+    },
+    {
+      title: '开关数量（高压）',
       align: 'center',
-      dataIndex: 'foundDate',
-      key: 'foundDate'
+      dataIndex: 'switchHigh',
+      key: 'switchHigh'
     },
     {
-      title: '缺陷内容',
+      title: '开关数量（低压）',
       align: 'center',
-      dataIndex: 'qxnr',
-      key: 'qxnr'
+      dataIndex: 'switchLow',
+      key: 'switchLow'
     },
     {
-      title: '故障类别',
+      title: '上次调试年度',
       align: 'center',
-      dataIndex: 'gzlb',
-      key: 'gzlb'
+      dataIndex: 'lastYear',
+      key: 'lastYear'
     },
     {
-      title: '原因',
+      title: '计划月份',
       align: 'center',
-      dataIndex: 'reason',
-      key: 'reason'
+      dataIndex: 'planMonth',
+      key: 'planMonth'
     },
     {
-      title: '严重性',
+      title: '超期提醒',
       align: 'center',
-      dataIndex: 'gravity',
-      key: 'gravity'
+      dataIndex: 'overdueReminder',
+      key: 'overdueReminder'
     },
     {
-      title: '处理措施',
+      title: '完成日期',
       align: 'center',
-      dataIndex: 'rectifyWay',
-      key: 'rectifyWay'
+      dataIndex: 'completionDate',
+      key: 'completionDate'
     }
   ]
   return cols

src/views/dashboard-screen/screen/sjdr/dlydts/tab2Columns.js

@@ -10,59 +10,71 @@ function columns(vm) {
       }
     },
     {
-      title: '缺陷设备名称',
+      title: '段',
       align: 'center',
-      dataIndex: 'qxsbmc',
-      key: 'qxsbmc'
+      dataIndex: 'branchName',
+      key: 'branchName'
     },
     {
-      title: '工区',
+      title: '车间',
       align: 'center',
-      dataIndex: 'ssgq',
-      key: 'ssgq'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
-      title: '线别',
+      title: '铁路线别',
+      align: 'center',
+      dataIndex: 'lineId',
+      key: 'lineId'
+    },
+    {
+      title: '线路名称',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '发现日期',
+      title: '维修方式',
       align: 'center',
-      dataIndex: 'foundDate',
-      key: 'foundDate'
+      dataIndex: 'wxfs',
+      key: 'wxfs'
     },
     {
-      title: '缺陷内容',
+      title: '上次维修年度',
       align: 'center',
-      dataIndex: 'qxnr',
-      key: 'qxnr'
+      dataIndex: 'lastTestYear',
+      key: 'lastTestYear'
     },
     {
-      title: '故障类别',
+      title: '计划完成月份',
       align: 'center',
-      dataIndex: 'gzlb',
-      key: 'gzlb'
+      dataIndex: 'planMonth',
+      key: 'planMonth'
     },
     {
-      title: '原因',
+      title: '到期提醒',
       align: 'center',
-      dataIndex: 'reason',
-      key: 'reason'
+      dataIndex: 'overdueReminder',
+      key: 'overdueReminder'
     },
     {
-      title: '严重性',
+      title: '完成日期',
       align: 'center',
-      dataIndex: 'gravity',
-      key: 'gravity'
+      dataIndex: 'completionDate',
+      key: 'completionDate'
     },
     {
-      title: '处理措施',
+      title: '计划调整建议',
       align: 'center',
-      dataIndex: 'rectifyWay',
-      key: 'rectifyWay'
-    }
+      dataIndex: 'planChangeDesc',
+      key: 'planChangeDesc'
+    },
+    {
+      title: '当月未完成原因',
+      align: 'center',
+      dataIndex: 'overdueReason',
+      key: 'overdueReason'
+    },
   ]
   return cols
 }

src/views/dashboard-screen/screen/sjdr/dlydts/tab3Columns.js

@@ -10,59 +10,96 @@ function columns(vm) {
       }
     },
     {
-      title: '缺陷设备名称',
+      title: '段',
       align: 'center',
-      dataIndex: 'qxsbmc',
-      key: 'qxsbmc'
+      dataIndex: 'branchName',
+      key: 'branchName'
     },
     {
-      title: '工区',
+      title: '车间',
       align: 'center',
-      dataIndex: 'ssgq',
-      key: 'ssgq'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
-      title: '线别',
+      title: '铁路线别',
       align: 'center',
-      dataIndex: 'lineName',
-      key: 'lineName'
+      dataIndex: 'lineId',
+      key: 'lineId'
     },
+    // {
+    //   title: '线路名称',
+    //   align: 'center',
+    //   dataIndex: 'lineName',
+    //   key: 'lineName'
+    // },
     {
-      title: '发现日期',
+      title: '变配电所名称',
       align: 'center',
-      dataIndex: 'foundDate',
-      key: 'foundDate'
+      dataIndex: 'substationName',
+      key: 'substationName'
     },
     {
-      title: '缺陷内容',
+      title: '保护类型',
       align: 'center',
-      dataIndex: 'qxnr',
-      key: 'qxnr'
+      dataIndex: 'bhlx',
+      key: 'bhlx'
     },
     {
-      title: '故障类别',
+      title: '上次试验年度',
       align: 'center',
-      dataIndex: 'gzlb',
-      key: 'gzlb'
+      dataIndex: 'lastTestYear',
+      key: 'lastTestYear'
     },
     {
-      title: '原因',
+      title: '试验计划（电源一）',
       align: 'center',
-      dataIndex: 'reason',
-      key: 'reason'
+      dataIndex: 'testPlan1',
+      key: 'testPlan1'
     },
     {
-      title: '严重性',
+      title: '试验计划（电源二）',
       align: 'center',
-      dataIndex: 'gravity',
-      key: 'gravity'
+      dataIndex: 'testPlan2',
+      key: 'testPlan2'
     },
     {
-      title: '处理措施',
+      title: '到期提醒',
       align: 'center',
-      dataIndex: 'rectifyWay',
-      key: 'rectifyWay'
-    }
+      dataIndex: 'overdueReminder',
+      key: 'overdueReminder'
+    },
+    {
+      title: '完成日期（电源一）',
+      align: 'center',
+      dataIndex: 'completionDate1',
+      key: 'completionDate1'
+    },
+    {
+      title: '完成日期（电源二）',
+      align: 'center',
+      dataIndex: 'completionDate2',
+      key: 'completionDate2'
+    },
+    {
+      title: '计划调整建议（电源一）',
+      align: 'center',
+      dataIndex: 'planChange1',
+      key: 'planChange1'
+    },
+    {
+      title: '计划调整建议（电源二）',
+      align: 'center',
+      dataIndex: 'planChange2',
+      key: 'planChange2'
+    },
+    {
+      title: '当月未完成原因',
+      align: 'center',
+      dataIndex: 'overdueReason',
+      key: 'overdueReason'
+    },
+
   ]
   return cols
 }

src/views/dashboard-screen/screen/sjdr/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="screen-common-wrap">
+  <div class="common-wrap">
     <el-card class="content-z">
       <a-tabs v-model="activeKey" class="sjdr">
         <a-tab-pane
@@ -20,7 +20,7 @@
 <script>
 
 import Ycxx from './ycxn/index.vue'
-import Syjj from './syjhdxqk/index.vue'
+import Syjhdxqk from './syjhdxqk/index.vue'
 import Tab3 from './tab3.vue'
 import Dlyd from './dlydts/index.vue'
 import Tab6 from './tab6.vue'
@@ -30,7 +30,7 @@ export default {
   components: {
     Ycxx,
     Tab3,
-    Syjj,
+    Syjhdxqk,
     Dlyd,
     Tab6
   },
@@ -42,22 +42,22 @@ export default {
         name: 'Ycxx'
       },
 
-        {
-          title: '变配电所检修兑现情况',
-          name: 'Tab3'
-        },
-        {
-          title: '实验计划兑现情况',
-          name: 'Syjj'
-        },
-        {
-          title: '电力远动调试',
-          name: 'Dlyd'
-        },
-        {
-          title: '牵变、电力设备巡视兑现（本月）',
-          name: 'Tab6'
-        }
+      {
+        title: '变配电所检修兑现情况',
+        name: 'Tab3'
+      },
+      {
+        title: '实验计划兑现情况',
+        name: 'Syjhdxqk'
+      },
+      {
+        title: '电力远动调试',
+        name: 'Dlyd'
+      },
+      {
+        title: '牵变、电力设备巡视兑现（本月）',
+        name: 'Tab6'
+      }
 
       ]
     }

src/views/dashboard-screen/screen/sjdr/syjhdxqk/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="screen-common-wrap">
+  <div class="common-wrap">
     <el-card class="content-z" style="position: relative">
       <a-button
         class="right-upload-btn"
@@ -27,11 +27,11 @@
 </template>
 <script>
 
-import Tab1 from './tab2.vue'
+import Tab1 from './tab1.vue'
 import Tab2 from './tab2.vue'
 
 export default {
-  name: 'Ycxx',
+  name: 'Syjhdxqk',
   components: {
     Tab1,
     Tab2

src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab1Columns.js

@@ -1,3 +1,5 @@
+import dayjs from 'dayjs'
+
 function columns(vm) {
   const cols = [
     {
@@ -9,18 +11,6 @@ function columns(vm) {
         return parseInt(index) + 1
       }
     },
-    {
-      title: '缺陷设备名称',
-      align: 'center',
-      dataIndex: 'qxsbmc',
-      key: 'qxsbmc'
-    },
-    {
-      title: '工区',
-      align: 'center',
-      dataIndex: 'ssgq',
-      key: 'ssgq'
-    },
     {
       title: '线别',
       align: 'center',
@@ -28,41 +18,35 @@ function columns(vm) {
       key: 'lineName'
     },
     {
-      title: '发现日期',
+      title: '控制单元处所',
       align: 'center',
-      dataIndex: 'foundDate',
-      key: 'foundDate'
+      dataIndex: 'substationName',
+      key: 'substationName'
     },
     {
-      title: '缺陷内容',
+      title: '开关编号',
       align: 'center',
-      dataIndex: 'qxnr',
-      key: 'qxnr'
+      dataIndex: 'kgbh',
+      key: 'kgbh'
     },
     {
-      title: '故障类别',
+      title: '试验(计划时间)',
       align: 'center',
-      dataIndex: 'gzlb',
-      key: 'gzlb'
-    },
-    {
-      title: '原因',
-      align: 'center',
-      dataIndex: 'reason',
-      key: 'reason'
+      dataIndex: 'testPlanDate',
+      key: 'testPlanDate',
+      customRender: function(data, r, index) {
+        return dayjs(data).format('YYYY-MM-DD')
+      }
     },
     {
-      title: '严重性',
+      title: '试验(实际时间)',
       align: 'center',
-      dataIndex: 'gravity',
-      key: 'gravity'
+      dataIndex: 'completionDate',
+      key: 'completionDate',
+      customRender: function(data, r, index) {
+        return dayjs(data).format('YYYY-MM-DD')
+      }
     },
-    {
-      title: '处理措施',
-      align: 'center',
-      dataIndex: 'rectifyWay',
-      key: 'rectifyWay'
-    }
   ]
   return cols
 }

src/views/dashboard-screen/screen/sjdr/syjhdxqk/tab2Columns.js

@@ -1,3 +1,5 @@
+import dayjs from 'dayjs'
+
 function columns(vm) {
   const cols = [
     {
@@ -9,18 +11,6 @@ function columns(vm) {
         return parseInt(index) + 1
       }
     },
-    {
-      title: '缺陷设备名称',
-      align: 'center',
-      dataIndex: 'qxsbmc',
-      key: 'qxsbmc'
-    },
-    {
-      title: '工区',
-      align: 'center',
-      dataIndex: 'ssgq',
-      key: 'ssgq'
-    },
     {
       title: '线别',
       align: 'center',
@@ -28,40 +18,46 @@ function columns(vm) {
       key: 'lineName'
     },
     {
-      title: '发现日期',
+      title: '所亭名称',
       align: 'center',
-      dataIndex: 'foundDate',
-      key: 'foundDate'
+      dataIndex: 'substationName',
+      key: 'substationName'
     },
     {
-      title: '缺陷内容',
+      title: '设备名称',
       align: 'center',
-      dataIndex: 'qxnr',
-      key: 'qxnr'
+      dataIndex: 'sbmc',
+      key: 'sbmc'
     },
     {
-      title: '故障类别',
+      title: '运行编号',
       align: 'center',
-      dataIndex: 'gzlb',
-      key: 'gzlb'
+      dataIndex: 'yxbh',
+      key: 'yxbh'
     },
     {
-      title: '原因',
+      title: '试验周期',
       align: 'center',
-      dataIndex: 'reason',
-      key: 'reason'
+      dataIndex: 'testCycle',
+      key: 'testCycle'
     },
     {
-      title: '严重性',
+      title: '计划试验日期',
       align: 'center',
-      dataIndex: 'gravity',
-      key: 'gravity'
+      dataIndex: 'testPlanDate',
+      key: 'testPlanDate',
+      customRender: function(data, r, index) {
+        return dayjs(data).format('YYYY-MM-DD')
+      }
     },
     {
-      title: '处理措施',
+      title: '完成日期',
       align: 'center',
-      dataIndex: 'rectifyWay',
-      key: 'rectifyWay'
+      dataIndex: 'completionDate',
+      key: 'completionDate',
+      customRender: function(data, r, index) {
+        return dayjs(data).format('YYYY-MM-DD')
+      }
     }
   ]
   return cols

src/views/dashboard-screen/screen/sjdr/tab3Columns.js

@@ -9,59 +9,47 @@ function columns(vm) {
         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'
+      dataIndex: 'linName',
+      key: 'linName'
     },
     {
-      title: '发现日期',
+      title: '所别',
       align: 'center',
-      dataIndex: 'foundDate',
-      key: 'foundDate'
+      dataIndex: 'substation',
+      key: 'substation'
     },
     {
-      title: '缺陷内容',
+      title: '所亭名称',
       align: 'center',
-      dataIndex: 'qxnr',
-      key: 'qxnr'
+      dataIndex: 'substationName',
+      key: 'substationName'
     },
     {
-      title: '故障类别',
+      title: '检修计划(月)',
       align: 'center',
-      dataIndex: 'gzlb',
-      key: 'gzlb'
+      dataIndex: 'jhMonth',
+      key: 'jhMonth'
     },
     {
-      title: '原因',
+      title: '检修计划(日)',
       align: 'center',
-      dataIndex: 'reason',
-      key: 'reason'
+      dataIndex: 'jhDay',
+      key: 'jhDay'
     },
     {
-      title: '严重性',
+      title: '兑现情况',
       align: 'center',
-      dataIndex: 'gravity',
-      key: 'gravity'
+      dataIndex: 'completionState',
+      key: 'completionState'
     },
     {
-      title: '处理措施',
+      title: '兑现日期',
       align: 'center',
-      dataIndex: 'rectifyWay',
-      key: 'rectifyWay'
+      dataIndex: 'completionDate',
+      key: 'completionDate'
     }
   ]
   return cols

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

@@ -46,6 +46,7 @@
     <div>
 
       <a-table
+        :scroll="{ x: 500 | true}"
         ref="table"
         size="middle"
         bordered
@@ -62,9 +63,9 @@
   </div>
 </template>
 <script>
-import {listMixin} from '@/mixin/listMixin'
+import { listMixin } from '@/mixin/listMixin'
 import columns from './tab6Columns'
-import {getAction} from '@/api/request'
+import { getAction } from '@/api/request'
 
 export default {
   name: 'Tab6',

src/views/dashboard-screen/screen/sjdr/tab6Columns.js

@@ -1,68 +1,178 @@
 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'
+  const cols = [{
+    width: 150, title: '序号', key: 'rowIndex', align: 'center', customRender: function(t, r, index) {
+      return parseInt(index) + 1
     }
+  }, {
+    width: 150, title: '段', align: 'center', dataIndex: 'branchName', key: 'branchName'
+  }, {
+    width: 150, title: '车间', align: 'center', dataIndex: 'deptName', key: 'deptName'
+  }, {
+    width: 150, title: '班组', align: 'center', dataIndex: 'teamName', key: 'teamName'
+  }, // {
+  //    width: 150,title: '线路名称',
+  //   align: 'center',
+  //   dataIndex: 'lineName',
+  //   key: 'lineName'
+  // },
+  {
+    width: 150, title: '巡检单元(杆号、箱变名称、变配电所）', align: 'center', dataIndex: 'xjdy', key: 'xjdy'
+  }, {
+    width: 150, title: '箱变', align: 'center', dataIndex: 'xb', key: 'xb'
+  }, {
+    width: 150, title: '10/0.4变电所', align: 'center', dataIndex: 'bds', key: 'bds'
+  }, {
+    width: 150, title: '受电线路', align: 'center', dataIndex: 'sdxl', key: 'sdxl'
+  }, {
+    width: 150, title: '牵引变电所', align: 'center', dataIndex: 'qybds', key: 'qybds'
+  }, {
+    width: 150, title: 'AT/分区所', align: 'center', dataIndex: 'atfqs', key: 'atfqs'
+  },
+  {
+    width: 150, title: '1月计划',
+    'align': 'center',
+    'dataIndex': 'plan1',
+    'key': 'plan1'
+  },
+  {
+    width: 150, title: '1月实际',
+    'align': 'center',
+    'dataIndex': 'actual1',
+    'key': 'actual1'
+  },
+  {
+    width: 150, title: '2月计划',
+    'align': 'center',
+    'dataIndex': 'plan2',
+    'key': 'plan2'
+  },
+  {
+    width: 150, title: '2月实际',
+    'align': 'center',
+    'dataIndex': 'actual2',
+    'key': 'actual2'
+  },
+  {
+    width: 150, title: '3月计划',
+    'align': 'center',
+    'dataIndex': 'plan3',
+    'key': 'plan3'
+  },
+  {
+    width: 150, title: '3月实际',
+    'align': 'center',
+    'dataIndex': 'actual3',
+    'key': 'actual3'
+  },
+  {
+    width: 150, title: '4月计划',
+    'align': 'center',
+    'dataIndex': 'plan4',
+    'key': 'plan4'
+  },
+  {
+    width: 150, title: '4月实际',
+    'align': 'center',
+    'dataIndex': 'actual4',
+    'key': 'actual4'
+  },
+  {
+    width: 150, title: '5月计划',
+    'align': 'center',
+    'dataIndex': 'plan5',
+    'key': 'plan5'
+  },
+  {
+    width: 150, title: '5月实际',
+    'align': 'center',
+    'dataIndex': 'actual5',
+    'key': 'actual5'
+  },
+  {
+    width: 150, title: '6月计划',
+    'align': 'center',
+    'dataIndex': 'plan6',
+    'key': 'plan6'
+  },
+  {
+    width: 150, title: '6月实际',
+    'align': 'center',
+    'dataIndex': 'actual6',
+    'key': 'actual6'
+  },
+  {
+    width: 150, title: '7月计划',
+    'align': 'center',
+    'dataIndex': 'plan7',
+    'key': 'plan7'
+  },
+  {
+    width: 150, title: '7月实际',
+    'align': 'center',
+    'dataIndex': 'actual7',
+    'key': 'actual7'
+  },
+  {
+    width: 150, title: '8月计划',
+    'align': 'center',
+    'dataIndex': 'plan8',
+    'key': 'plan8'
+  },
+  {
+    width: 150, title: '8月实际',
+    'align': 'center',
+    'dataIndex': 'actual8',
+    'key': 'actual8'
+  },
+  {
+    width: 150, title: '9月计划',
+    'align': 'center',
+    'dataIndex': 'plan9',
+    'key': 'plan9'
+  },
+  {
+    width: 150, title: '9月实际',
+    'align': 'center',
+    'dataIndex': 'actual9',
+    'key': 'actual9'
+  },
+  {
+    width: 150, title: '10月计划',
+    'align': 'center',
+    'dataIndex': 'plan10',
+    'key': 'plan10'
+  },
+  {
+    width: 150, title: '10月实际',
+    'align': 'center',
+    'dataIndex': 'actual10',
+    'key': 'actual10'
+  },
+  {
+    width: 150, title: '11月计划',
+    'align': 'center',
+    'dataIndex': 'plan11',
+    'key': 'plan11'
+  },
+  {
+    width: 150, title: '11月实际',
+    'align': 'center',
+    'dataIndex': 'actual11',
+    'key': 'actual11'
+  },
+  {
+    width: 150, title: '12月计划',
+    'align': 'center',
+    'dataIndex': 'plan12',
+    'key': 'plan12'
+  },
+  {
+    width: 150, title: '12月实际',
+    'align': 'center',
+    'dataIndex': 'actual12',
+    'key': 'actual12'
+  }
+
   ]
   return cols
 }

src/views/dashboard-screen/screen/sjdr/ycxn/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="screen-common-wrap">
+  <div class="common-wrap">
     <el-card class="content-z" style="position: relative">
       <a-button
         class="right-upload-btn"
@@ -27,7 +27,7 @@
 </template>
 <script>
 
-import Tab1 from './tab2.vue'
+import Tab1 from './tab1.vue'
 import Tab2 from './tab2.vue'
 
 export default {