isv-robot 2 gadi atpakaļ
vecāks
revīzija
694d379b9d

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

@@ -26,17 +26,17 @@
           />
         </a-form-item>
         <a-form-item>
-          <a-date-picker v-model="queryParam.testPlanDateStart" placeholder="计划时间(起始)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间(起始)"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker v-model="queryParam.testPlanDateEnd" placeholder="计划时间(结束)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间(结束)"/>
         </a-form-item>
 
         <a-form-item>
-          <a-date-picker v-model="queryParam.completionDateStart" placeholder="实际时间(起始)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间(起始)"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker v-model="queryParam.completionDateEnd" placeholder="实际时间(结束)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间(结束)"/>
         </a-form-item>
 
         <a-form-item>

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

@@ -40,17 +40,17 @@
           />
         </a-form-item>
         <a-form-item>
-          <a-date-picker v-model="queryParam.testPlanDateStart" placeholder="计划时间(起始)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间(起始)"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker v-model="queryParam.testPlanDateEnd" placeholder="计划时间(结束)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间(结束)"/>
         </a-form-item>
 
         <a-form-item>
-          <a-date-picker v-model="queryParam.completionDateStart" placeholder="实际时间(起始)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间(起始)"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker v-model="queryParam.completionDateEnd" placeholder="实际时间(结束)"/>
+          <a-date-picker valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间(结束)"/>
         </a-form-item>
 
         <a-form-item>

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

@@ -36,9 +36,9 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.substation"
+            v-model="queryParam.substationName"
             style="width: 150px"
-            placeholder="所"
+            placeholder="所亭名称"
           />
         </a-form-item>
         <a-form-item>

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

@@ -15,12 +15,12 @@ function columns(vm) {
       dataIndex: 'linName',
       key: 'linName'
     },
-    {
-      title: '所别',
-      align: 'center',
-      dataIndex: 'substation',
-      key: 'substation'
-    },
+    // {
+    //   title: '所别',
+    //   align: 'center',
+    //   dataIndex: 'substation',
+    //   key: 'substation'
+    // },
     {
       title: '所亭名称',
       align: 'center',

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

@@ -56,7 +56,7 @@
             v-model="queryParam.rectifyResult"
             style="width: 150px"
             placeholder="整改情况"
-            dict-code="dlyc_sygq"
+            dict-code="bdyc_clqk"
           />
         </a-form-item>
 

+ 3 - 2
src/views/dashboard-screen/screen/sjdr/ycxn/tab2.vue

@@ -45,10 +45,11 @@
           />
         </a-form-item>
         <a-form-item>
-          <a-input
-            v-model="queryParam.rectifyWay"
+          <j-dict-select-tag
+            v-model="queryParam.rectifyResult"
             style="width: 150px"
             placeholder="处理结果"
+            dict-code="bdyc_clqk"
           />
         </a-form-item>