Changes

src/mixin/datePickerZh.js

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

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 :showToday="true" :locale="locale"
+        <a-date-picker :showToday="true" :locale="localeZH"
           @click="$refs.datePicker.open = false"
           style="position: absolute;right:20px;top:10px;z-index: -1"
           ref="datePicker"

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

@@ -33,9 +33,9 @@ export default {
       const res = await chartMapTable()
       if (res.code === 200) {
         arrMap = [
-          [res.info.series[0].data[0], res.info.series[1].data[0]],
-          [res.info.series[0].data[1], res.info.series[1].data[1]],
-          [res.info.series[0].data[2], res.info.series[1].data[2]]
+          [res.info.series[0].data[0], res.info.series[1].data[0]].reverse(),
+          [res.info.series[0].data[1], res.info.series[1].data[1]].reverse(),
+          [res.info.series[0].data[2], res.info.series[1].data[2]].reverse()
         ]
       }
       var xData2 = ['变电']

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

@@ -45,7 +45,12 @@ export default {
       basicOption: {
         xAxis: {
           type: 'category',
-          data: ['本月计划', '本月完成']
+          data: ['本月计划', '本月完成'],
+          axisLabel: {
+            show: true,
+            fontSize: this.EchartfontSize(14)
+          }
+
         },
         yAxis: {
           type: 'value'
@@ -182,6 +187,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
+    font-size: 1.1vw;
 
     &.a-scrool{
       overflow-y: auto;

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

@@ -9,12 +9,12 @@ function columns(vm) {
         return parseInt(index) + 1
       }
     },
-    {
-      title: '段',
-      align: 'center',
-      dataIndex: 'branchName',
-      key: 'branchName'
-    },
+    // {
+    //   title: '段',
+    //   align: 'center',
+    //   dataIndex: 'branchName',
+    //   key: 'branchName'
+    // },
     {
       title: '车间',
       align: 'center',
@@ -24,8 +24,8 @@ function columns(vm) {
     {
       title: '铁路线别',
       align: 'center',
-      dataIndex: 'lineId',
-      key: 'lineId'
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     // {
     //   title: '线路名称',

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

@@ -50,7 +50,7 @@ export default {
         name: 'Tab3'
       },
       {
-        title: '实验计划兑现情况',
+        title: '试验计划兑现情况',
         name: 'Syjhdxqk'
       },
       {
@@ -58,7 +58,7 @@ export default {
         name: 'Dlyd'
       },
       {
-        title: '牵变、电力设备巡检兑现（本月）',
+        title: '牵变、电力设备巡检兑现',
         name: 'QbDl'
       }
 

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

@@ -59,7 +59,7 @@ export default {
       window.console.log('evt', evt)
       const file = evt.target.files[0]
       evt.target.value = null
-      ChartImport('jxjhdxb', file).then(res => {
+      ChartImport('xjdxb', file).then(res => {
         console.log('res => ', res)
         if (res.code === 200) {
           this.$message.success('导入成功')

src/views/dashboard-screen/screen/sjdr/qb-dl/tab1.vue

@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right;position: relative">
-        <input id="fileDom" type="file" ref="fileDom" style="display: none" @change="handleImport($event)">
+w        <input id="fileDom" type="file" ref="fileDom" style="display: none" @change="handleImport($event)">
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel">

src/views/dashboard-screen/screen/sjdr/qb-dl/tab1Columns.js

@@ -1,6 +1,6 @@
 function columns(vm) {
   const cols = [{
-    width: 150, title: '序号', key: 'rowIndex', align: 'center', customRender: function(t, r, index) {
+    width: 150, title: '巡检单元号', key: 'rowIndex', align: 'center', customRender: function(t, r, index) {
       return parseInt(index) + 1
     }
   }, {

src/views/dashboard-screen/screen/sjdr/qb-dl/tab2.vue

@@ -40,17 +40,17 @@
           />
         </a-form-item>
         <a-form-item>
-          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间（起始）"/>
+          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间（起始）"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间（结束）"/>
+          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间（结束）"/>
         </a-form-item>
 
         <a-form-item>
-          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间（起始）"/>
+          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间（起始）"/>
         </a-form-item>
         <a-form-item>
-          <a-date-picker :showToday="true" :locale="locale"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间（结束）"/>
+          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间（结束）"/>
         </a-form-item>
 
         <a-form-item>
@@ -96,7 +96,7 @@ export default {
       // 表头
       columns: columns(this),
       url: {
-        list: '/show/syjhdx/dt/list',
+        list: '/show/sbxj/listBd',
         delete: '/business/catenary/bus/jcb/fdfxjyq/',
         tree: '/system/dept/treeSelect',
         exportXlsUrl: '/business/catenary/bus/jcb/fdfxjyq/export'

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

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

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

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

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

@@ -19,7 +19,14 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-input
+          <!--          <a-input-->
+          <!--            v-model="queryParam.lineName"-->
+          <!--            style="width: 150px"-->
+          <!--            placeholder="线别"-->
+          <!--          />-->
+
+          <j-dict-select-tag
+            ref="xbEl"
             v-model="queryParam.lineName"
             style="width: 150px"
             placeholder="线别"
@@ -113,6 +120,17 @@ export default {
   created() {
     this.loadTree()
   },
+  mounted() {
+    getAction('/show/bdyc/listLine').then(res => {
+      console.log('res', res)
+      this.$refs.xbEl.dictOptions = res.data.map(item => {
+        return {
+          dictLabel: item,
+          dictValue: item
+        }
+      })
+    })
+  },
   methods: {
     loadTree() {
       this.treeData = []

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

@@ -20,7 +20,8 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-input
+          <j-dict-select-tag
+            ref="xbEl"
             v-model="queryParam.lineName"
             style="width: 150px"
             placeholder="线别"
@@ -106,6 +107,17 @@ export default {
   created() {
     this.loadTree()
   },
+  mounted() {
+    getAction('/show/dlyc/listLine').then(res => {
+      console.log('res', res)
+      this.$refs.xbEl.dictOptions = res.data.map(item => {
+        return {
+          dictLabel: item,
+          dictValue: item
+        }
+      })
+    })
+  },
   methods: {
     loadTree() {
       this.treeData = []

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

@@ -19,7 +19,8 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-input
+          <j-dict-select-tag
+            ref="xbEl"
             v-model="queryParam.lineName"
             style="width: 150px"
             placeholder="线别"
@@ -113,6 +114,17 @@ export default {
   created() {
     this.loadTree()
   },
+  mounted() {
+    getAction('/show/bdyc/listLineSelf').then(res => {
+      console.log('res', res)
+      this.$refs.xbEl.dictOptions = res.data.map(item => {
+        return {
+          dictLabel: item,
+          dictValue: item
+        }
+      })
+    })
+  },
   methods: {
     loadTree() {
       this.treeData = []

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

@@ -20,7 +20,8 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-input
+          <j-dict-select-tag
+            ref="xbEl"
             v-model="queryParam.lineName"
             style="width: 150px"
             placeholder="线别"
@@ -106,6 +107,17 @@ export default {
   created() {
     this.loadTree()
   },
+  mounted() {
+    getAction('/show/dlyc/listLineSelf').then(res => {
+      console.log('res', res)
+      this.$refs.xbEl.dictOptions = res.data.map(item => {
+        return {
+          dictLabel: item,
+          dictValue: item
+        }
+      })
+    })
+  },
   methods: {
     loadTree() {
       this.treeData = []