Changes

src/api/dashboard-json.js

@@ -119,3 +119,20 @@ export function chartMapTable(params) {
     params
   })
 }
+
+export function bdycList(params) {
+  return request({
+    url: '/show/bdyc/list',
+    method: 'get',
+    params
+  })
+}
+
+
+export function dlycList(params) {
+  return request({
+    url: '/show/dlyc/list',
+    method: 'get',
+    params
+  })
+}

src/assets/less/common.less

@@ -57,8 +57,10 @@
 }
 
 /**隐藏样式-modal确定按钮 */
-.jee-hidden{display: none}
+.jee-hidden {
+  display: none
+}
 
-.content-z{
+.content-z {
   margin: -5px 15px 15px 15px;
 }

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

@@ -1,7 +1,7 @@
 <template>
   <div class="chart-wrap">
-    <div class="child c-1">
-      <div class="cr">
+    <div class="child c-1" v-if="arrMap['一季度']">
+      <div class="cr" >
         <div class="cr-1">
           {{ arrMap['一季度'].per }}%
         </div>

src/views/dashboard-screen/index.vue

@@ -153,7 +153,7 @@ export default {
   created() {
     const doResize = _.debounce(() => {
       console.log('doResize')
-      this.render = false;
+      this.render = false
       setTimeout(() => {
         this.render = true
       }, 100)
@@ -359,6 +359,18 @@ export default {
     background-image: url("/static/images/bg.png");
     background-repeat: no-repeat;
     background-size: cover;
+    height: 100vh;
+    width: 100vw;
+
+    .screen-common-wrap {
+      max-height: calc(100vh - 100px);
+      overflow: hidden;
+      overflow-y: auto;
+
+      height: fit-content;
+      background-color: #fff;
+      border-radius: 0.5vw;
+    }
 
     header {
       color: #fff;

src/views/dashboard-screen/qb-dlsbxjdx/index.vue

@@ -3,7 +3,7 @@
     <div class="l-coner">
       <v-chart autoresize :option="option"/>
     </div>
-    <div class="r-coner">
+    <div class="r-coner" v-if="arrMap['单元']">
       <div class="c-item">{{ arrMap['单元'].per }}%</div>
       <div class="c-item">{{ arrMap['变电所'].per }}%</div>
       <div class="c-item">{{ arrMap['配电所'].per }}%</div>

src/views/dashboard-screen/screen/screenDbsx/ScreenDbsx.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="screen-common-wrap">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->

src/views/dashboard-screen/screen/screenDbsx/indexColumns.js

@@ -5,7 +5,7 @@ function columns(vm) {
       key: 'rowIndex',
       width: 60,
       align: 'center',
-      customRender: function (t, r, index) {
+      customRender: function(t, r, index) {
         return parseInt(index) + 1
       }
     },
@@ -13,7 +13,8 @@ function columns(vm) {
       title: '车间',
       align: 'center',
       dataIndex: 'cj',
-      key: 'cj'
+      key: 'cj',
+
     },
     {
       title: '线别',

src/views/dashboard-screen/screen/screenSbxjdxqk/indexColumns.js

@@ -5,64 +5,85 @@ function columns(vm) {
       key: 'rowIndex',
       width: 60,
       align: 'center',
-      customRender: function (t, r, index) {
+      customRender: (t, r, index) => {
         return parseInt(index) + 1
       }
     },
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'cj',
-      key: 'cj'
+      dataIndex: 'deptName',
+      key: 'deptName',
+      customRender: (value, row, index) => {
+        const obj = {
+          children: value,
+          attrs: {}
+        }
+        if (index % 5 === 0) {
+          obj.attrs.rowSpan = 5
+        } else {
+          obj.attrs.rowSpan = 0
+        }
+        return obj
+      }
     },
     {
-      title: '线别',
+      title: '工区',
       align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
+      dataIndex: 'teamName',
+      key: 'teamName',
+      customRender: (value, row, index) => {
+        const obj = {
+          children: value,
+          attrs: {}
+        }
+        if (index % 5 === 0) {
+          obj.attrs.rowSpan = 5
+        } else {
+          obj.attrs.rowSpan = 0
+        }
+        return obj
+      }
     },
     {
-      title: '区间（站区）',
+      title: '设备',
       align: 'center',
       dataIndex: 'qj',
       key: 'qj'
     },
     {
-      title: '所亭名称',
-      align: 'center',
-      dataIndex: 'stmc',
-      key: 'stmc'
-    },
-    {
-      title: '开关高压数量',
-      align: 'center',
-      dataIndex: 'kggy',
-      key: 'kggy'
-    },
-    {
-      title: '开关低压数量',
+      title: '总数',
       align: 'center',
-      dataIndex: 'kgdy',
-      key: 'kgdy'
+      dataIndex: 'zs',
+      key: 'zs'
     },
     {
-      title: '上次调试年度',
+      title: '月份',
       align: 'center',
-      dataIndex: 'dctsnd',
-      key: 'dctsnd'
-    },
-    {
-      title: '月份计划',
-      align: 'center',
-      dataIndex: 'yfjh',
-      key: 'yfjh'
-    },
-    {
-      title: '完成时间',
-      align: 'center',
-      dataIndex: 'wcsj',
-      key: 'wcsj'
+      dataIndex: 'yf',
+      key: 'yf',
+      children: [
+        {
+          title: '计划',
+          align: 'center',
+          dataIndex: 'jh',
+          key: 'jh'
+        },
+        {
+          title: '完成',
+          align: 'center',
+          dataIndex: 'wc',
+          key: 'wc'
+        },
+        {
+          title: '兑现',
+          align: 'center',
+          dataIndex: 'dx',
+          key: 'dx'
+        }
+      ]
     }
+
   ]
   return cols
 }

src/views/dashboard-screen/screen/screenSbxjdxqk/screenSbxjdxqk.vue

@@ -1,72 +1,5 @@
 <template>
-  <div>
-    <!-- 查询区域 -->
-    <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">
-              <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>
-          <a-tree-select
-            v-model="queryParam.deptId"
-            style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-list-select-tag
-            v-model="queryParam.stationId"
-            style="width: 150px"
-            placeholder="选择站场区间"
-            dict-code="station"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.pillarCode"
-            style="width: 150px"
-            placeholder="输入支柱号"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.checkUser"
-            style="width: 150px"
-            placeholder="输入检查人"
-          />
-        </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>
-      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
-        <i class="anticon anticon-info-circle ant-alert-icon"/> 已选择&nbsp;<a
-        style="font-weight: 600"
-      >{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+  <div class="screen-common-wrap">
       <a-table
         ref="table"
         size="middle"
@@ -78,7 +11,6 @@
         :loading="loading"
         @change="handleTableChange"
       />
-    </div>
     <!-- table区域-end -->
     <!-- 表单区域 -->
   </div>
@@ -100,7 +32,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/business/catenary/bus/jcb/fdfxjyq/list',
+        list: '/show/sbxj/list',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

src/views/dashboard-screen/screen/screen_Bd_Dl_Ycxx/ScreenBdDlYcxx.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    activeKey:{{activeKey}}
     <el-card class="content-z">
       <a-tabs v-model="activeKey">
         <a-tab-pane

src/views/dashboard-screen/screen/screen_Bd_Dl_Ycxx/bd.vue

@@ -20,39 +20,22 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
+          <j-dict-select-tag
+            v-model="queryParam.ssgq"
             style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+            placeholder="选择工区"
+            dict-code="dlyc_sygq"
           />
         </a-form-item>
         <a-form-item>
-          <j-list-select-tag
-            v-model="queryParam.stationId"
+          <j-dict-select-tag
+            v-model="queryParam.gravity"
             style="width: 150px"
-            placeholder="选择站场区间"
-            dict-code="station"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.pillarCode"
-            style="width: 150px"
-            placeholder="输入支柱号"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.checkUser"
-            style="width: 150px"
-            placeholder="输入检查人"
+            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>
@@ -100,7 +83,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/business/catenary/bus/jcb/fdfxjyq/list',
+        list: '/show/bdyc/list',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

src/views/dashboard-screen/screen/screen_Bd_Dl_Ycxx/dl.vue

@@ -20,39 +20,22 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
+          <j-dict-select-tag
+            v-model="queryParam.ssgq"
             style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+            placeholder="选择工区"
+            dict-code="dlyc_sygq"
           />
         </a-form-item>
         <a-form-item>
-          <j-list-select-tag
-            v-model="queryParam.stationId"
+          <j-dict-select-tag
+            v-model="queryParam.gravity"
             style="width: 150px"
-            placeholder="选择站场区间"
-            dict-code="station"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.pillarCode"
-            style="width: 150px"
-            placeholder="输入支柱号"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.checkUser"
-            style="width: 150px"
-            placeholder="输入检查人"
+            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>
@@ -100,7 +83,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/business/catenary/bus/jcb/fdfxjyq/list',
+        list: '/show/dlyc/list',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

src/views/dashboard-screen/screen/screen_Bd_Dl_Ycxx/dlColumns.js

@@ -18,8 +18,8 @@ function columns(vm) {
     {
       title: '工区',
       align: 'center',
-      dataIndex: 'gq',
-      key: 'gq'
+      dataIndex: 'ssgq',
+      key: 'ssgq'
     },
     {
       title: '线别',
@@ -48,8 +48,8 @@ function columns(vm) {
     {
       title: '原因',
       align: 'center',
-      dataIndex: 'yy',
-      key: 'yy'
+      dataIndex: 'reason',
+      key: 'reason'
     },
     {
       title: '严重性',
@@ -60,8 +60,8 @@ function columns(vm) {
     {
       title: '处理措施',
       align: 'center',
-      dataIndex: 'clcs',
-      key: 'clcs'
+      dataIndex: 'rectifyWay',
+      key: 'rectifyWay'
     }
   ]
   return cols