isv-robot 2 년 전
부모
커밋
d121000b7b

+ 2 - 0
src/main.js

@@ -53,6 +53,7 @@ Vue.component('VChart', ECharts)
 Vue.use(Antd)
 Vue.use(JDictSelectTag)
 Vue.use(JMultiSelectTag)
+Vue.mixin(datePickerZhMixin)
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
@@ -99,6 +100,7 @@ Object.keys(filters).forEach(key => {
 Vue.config.productionTip = false
 
 import * as globalFunction from './utils/globalFunction.js'
+import {datePickerZhMixin} from "@/mixin/datePickerZh";
 
 Vue.use(globalFunction.EchartfontSize)
 new Vue({

+ 11 - 0
src/mixin/datePickerZh.js

@@ -0,0 +1,11 @@
+import moment from 'moment'
+import locale from 'ant-design-vue/es/date-picker/locale/zh_CN'
+
+moment.locale('zh-cn')
+export const datePickerZhMixin = {
+  data() {
+    return {
+      locale
+    }
+  }
+}

+ 4 - 3
src/views/dashboard-screen/index.vue

@@ -6,7 +6,7 @@
       </div>
       <div class="r-title">
         <span @click="$refs.datePicker.open = true" style="cursor: pointer"> {{ dateTitle }}</span>
-        <a-date-picker
+        <a-date-picker :showToday="true" :locale="locale"
           @click="$refs.datePicker.open = false"
           style="position: absolute;right:20px;top:10px;z-index: -1"
           ref="datePicker"
@@ -132,13 +132,14 @@ import ScreenSyjhbydxqk from '@/views/dashboard-screen/screen/ScreenSyjhbydxqk.v
 import ScreenDlts from '@/views/dashboard-screen/screen/screenDlts/screenDlts.vue'
 import ScreenSbxjdxqk from '@/views/dashboard-screen/screen/screenSbxjdxqk/screenSbxjdxqk.vue'
 import ScreenSjdr from '@/views/dashboard-screen/screen/sjdr/index.vue'
-
+// import 'moment/dist/locale/zh-cn'
+// import 'dayjs/locale/zh-cn'
 import * as _ from 'lodash'
 
 require('dayjs/locale/zh-cn')
 export default {
   name: 'Dashboard',
-  components: { ChartMap, Jryl, QbDlsbxjdx, Jxdxqk, Zydbsx, Dlbpds, Dlsdxl, CardWrap, SyjhdxqkChart, Dlydtssx },
+  components: {ChartMap, Jryl, QbDlsbxjdx, Jxdxqk, Zydbsx, Dlbpds, Dlsdxl, CardWrap, SyjhdxqkChart, Dlydtssx},
   data() {
     return {
       render: true,

+ 2 - 2
src/views/dashboard-screen/jxdxqk/index.vue

@@ -453,8 +453,8 @@ export default {
     height: 100%;
     background-repeat: no-repeat;
     background-image: url(/static/images/chart_opacity_bg.png);
-    background-size: 22vh 15vh;
-    background-position: center 28%;
+    background-size: 22vh 84%;
+    background-position: center -10%;
   }
 }
 </style>

+ 2 - 1
src/views/dashboard-screen/screen/screenJxdxqk.vue

@@ -109,7 +109,8 @@ export default {
       }
 
       .bg {
-        background-size: 100% 75% !important;
+        background-size: 92% 80% !important;
+        background-position: center 0%;
       }
     }
   }

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

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