Changes

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

@@ -19,19 +19,17 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.ssgq"
+          <a-input
+            v-model="queryParam.lineName"
             style="width: 150px"
-            placeholder="选择工区"
-            dict-code="dlyc_sygq"
+            placeholder="线别"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.gravity"
+          <a-input
+            v-model="queryParam.planMonth"
             style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
+            placeholder="计划月份"
           />
         </a-form-item>
 

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

@@ -19,19 +19,17 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.ssgq"
+          <a-input
+            v-model="queryParam.wxfs"
             style="width: 150px"
-            placeholder="选择工区"
-            dict-code="dlyc_sygq"
+            placeholder="维修方式"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.gravity"
+          <a-input
+            v-model="queryParam.planMonth"
             style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
+            placeholder="计划完成月份"
           />
         </a-form-item>
 

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

@@ -19,19 +19,17 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.ssgq"
+          <a-input
+            v-model="queryParam.xx_start"
             style="width: 150px"
-            placeholder="选择工区"
-            dict-code="dlyc_sygq"
+            placeholder="试验计划月份"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.gravity"
+          <a-input
+            v-model="queryParam.xx_start"
             style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
+            placeholder="完成日期月份"
           />
         </a-form-item>
 

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

@@ -19,20 +19,24 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.ssgq"
+          <a-input
+            v-model="queryParam.substationName"
             style="width: 150px"
-            placeholder="选择工区"
-            dict-code="dlyc_sygq"
+            placeholder="控制单元处所"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.gravity"
-            style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
-          />
+          <a-date-picker v-model="queryParam.testPlanDate_Start" placeholder="计划时间（起始）"/>
+        </a-form-item>
+        <a-form-item>
+          <a-date-picker v-model="queryParam.testPlanDate_End" placeholder="计划时间（结束）"/>
+        </a-form-item>
+
+        <a-form-item>
+          <a-date-picker v-model="queryParam.completionDate_Start" placeholder="实际时间（起始）"/>
+        </a-form-item>
+        <a-form-item>
+          <a-date-picker v-model="queryParam.completionDate_End" placeholder="实际时间（结束）"/>
         </a-form-item>
 
         <a-form-item>
@@ -45,7 +49,7 @@
     <div>
 
       <a-table
-        :scroll="{ x: 500 | true,y:  'calc(100vh - 400px)'}"
+        :scroll="{ x: 500 | true,y: 'calc(100vh - 400px)'}"
         ref="table"
         size="middle"
         bordered

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

@@ -19,21 +19,39 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.ssgq"
+          <a-input
+            v-model="queryParam.lineName"
             style="width: 150px"
-            placeholder="选择工区"
-            dict-code="dlyc_sygq"
+            placeholder="线别"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.gravity"
+          <a-input
+            v-model="queryParam.substationName"
             style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
+            placeholder="所亭名称"
           />
         </a-form-item>
+        <a-form-item>
+          <a-input
+            v-model="queryParam.sbmc"
+            style="width: 150px"
+            placeholder="设备名称"
+          />
+        </a-form-item>
+        <a-form-item>
+          <a-date-picker v-model="queryParam.testPlanDate_Start" placeholder="计划时间（起始）"/>
+        </a-form-item>
+        <a-form-item>
+          <a-date-picker v-model="queryParam.testPlanDate_End" placeholder="计划时间（结束）"/>
+        </a-form-item>
+
+        <a-form-item>
+          <a-date-picker v-model="queryParam.completionDate_Start" placeholder="实际时间（起始）"/>
+        </a-form-item>
+        <a-form-item>
+          <a-date-picker v-model="queryParam.completionDate_End" placeholder="实际时间（结束）"/>
+        </a-form-item>
 
         <a-form-item>
           <a-button type="primary" @click="searchQuery">查询</a-button>

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

@@ -28,19 +28,24 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.ssgq"
+          <a-input
+            v-model="queryParam.lineName"
             style="width: 150px"
-            placeholder="选择工区"
-            dict-code="dlyc_sygq"
+            placeholder="线别"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.gravity"
+          <a-input
+            v-model="queryParam.substation"
             style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
+            placeholder="所别"
+          />
+        </a-form-item>
+        <a-form-item>
+          <a-input
+            v-model="queryParam.jhMonth"
+            style="width: 150px"
+            placeholder="检修计划(月)"
           />
         </a-form-item>
 
@@ -71,10 +76,10 @@
   </div>
 </template>
 <script>
-import { listMixin } from '@/mixin/listMixin'
+import {listMixin} from '@/mixin/listMixin'
 import columns from './tab3Columns'
-import { getAction } from '@/api/request'
-import { ChartImport } from '@/api/dashboard-json'
+import {getAction} from '@/api/request'
+import {ChartImport} from '@/api/dashboard-json'
 
 export default {
   name: 'Tab3',

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

@@ -28,19 +28,10 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.ssgq"
+          <a-input
+            v-model="queryParam.teamName"
             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"
+            placeholder="班组"
           />
         </a-form-item>
 

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

@@ -18,6 +18,31 @@
         </a-dropdown>
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-input
+            v-model="queryParam.lineName"
+            style="width: 150px"
+            placeholder="线别"
+          />
+        </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-input
+            v-model="queryParam.zrbm"
+            style="width: 150px"
+            placeholder="责任部门"
+          />
+        </a-form-item>
+
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.ssgq"
@@ -28,10 +53,10 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.gravity"
+            v-model="queryParam.rectifyResult"
             style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
+            placeholder="整改情况"
+            dict-code="dlyc_sygq"
           />
         </a-form-item>
 
@@ -45,7 +70,7 @@
     <div>
 
       <a-table
-        :scroll="{ x: 500 | true,y:  'calc(100vh - 400px)'}"
+        :scroll="{ x: 500 | true,y: 'calc(100vh - 400px)'}"
         ref="table"
         size="middle"
         bordered

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

@@ -24,8 +24,8 @@ function columns(vm) {
     {
       title: '所亭名称',
       align: 'center',
-      dataIndex: 'stmc',
-      key: 'stmc'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '缺陷设备名称',

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

@@ -19,6 +19,23 @@
         </a-dropdown>
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-input
+            v-model="queryParam.lineName"
+            style="width: 150px"
+            placeholder="线别"
+          />
+        </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>
           <j-dict-select-tag
             v-model="queryParam.ssgq"
@@ -28,11 +45,10 @@
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.gravity"
+          <a-input
+            v-model="queryParam.rectifyWay"
             style="width: 150px"
-            placeholder="选择严重性"
-            dict-code="dlycyzx"
+            placeholder="处理结果"
           />
         </a-form-item>
 
@@ -46,7 +62,7 @@
     <div>
 
       <a-table
-        :scroll="{ x: 500 | true,y:  'calc(100vh - 400px)'}"
+        :scroll="{ x: 500 | true,y: 'calc(100vh - 400px)'}"
         ref="table"
         size="middle"
         bordered