Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd

src/api/report/measure-log.js

@@ -33,3 +33,20 @@ export function exportMonthReport (parameter) {
     responseType: 'blob'
   })
 }
+
+/**
+ * export file
+ * parameter: { }
+ * @param parameter :
+  * @returns {*}
+ */
+export function exportMonthReportMonth (parameter) {
+  return axios({
+    url: '/report/measure/logs/export/month?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}

src/views/dashboard/MeasureLogReport.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import { getMonthReport, exportMonthReport } from '@/api/report/measure-log'
+import { getMonthReport, exportMonthReport, exportMonthReportMonth } from '@/api/report/measure-log'
 import { Chart } from '@antv/g2'
 import PrintInMeasureLogReport from '@/views/dashboard/modules/PrintInMeasureLogReport'
 import DetailMeasureLogReport from '@/views/dashboard/modules/DetailMeasureLogReport'
@@ -108,8 +108,7 @@ export default {
         // year: 2021,
         startMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-01-01',
         endMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-12-01',
-        standardLevel: 2,
-        sbLevel: 1
+        type: 1
       },
       years: [],
       levelMap: {},
@@ -167,10 +166,6 @@ export default {
   },
   methods: {
     moment,
-    changeLevel (value) {
-      this.queryParam.standardLevel = value
-      this.getData()
-    },
     onStartChange (date, dateString) {
       this.$nextTick(() => {
         this.queryParam.startMonth = this.BaseTool.Date.formatter(dateString + '-01', this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
@@ -242,7 +237,7 @@ export default {
         month: record.month,
         year: record.year
       }
-      exportMonthReport(parameter).then(file => {
+      exportMonthReportMonth(parameter).then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },

src/views/dashboard/modules/DetailMeasureLogReport.vue

@@ -59,37 +59,55 @@ export default {
         {
           title: '序号',
           dataIndex: 'index',
+          width: 70,
           customRender: (text, record, index) => {
             return `${index + 1}`
           }
         },
+        {
+          title: '设备位号',
+          dataIndex: 'positionNo',
+          width: 150
+        },
+        {
+          title: '出厂编号',
+          dataIndex: 'initNo',
+          width: 150
+        },
         {
           title: '设备名称',
-          dataIndex: 'sbName'
+          dataIndex: 'sbName',
+          width: 150
         },
         {
           title: '设备编号',
-          dataIndex: 'sbNo'
+          dataIndex: 'sbNo',
+          width: 150
         },
         {
           title: '设备型号',
-          dataIndex: 'sbModel'
+          dataIndex: 'sbModel',
+          width: 200
         },
         {
           title: '检定日期',
-          dataIndex: 'lastDate'
+          dataIndex: 'lastDate',
+          width: 150
         },
         {
           title: '检定人',
-          dataIndex: 'name'
+          dataIndex: 'name',
+          width: 150
         },
         {
           title: '检定单位',
-          dataIndex: 'dph'
+          dataIndex: 'dph',
+          width: 150
         },
         {
           title: '检定编号',
-          dataIndex: 'no'
+          dataIndex: 'no',
+          width: 150
         }
       ],
       data: []

src/views/repair/application-form/modules/RemarkForm.vue

@@ -13,7 +13,7 @@
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol">
         <a-textarea
-          v-model="model.content"
+          v-model="content"
           placeholder="请输入内容！"
         />
       </a-form-item>
@@ -44,15 +44,16 @@ export default {
     base (record) {
       this.visible = true
       this.model = record
+      this.content = record.content
     },
     save () {
-      if (this.model.content === '' || this.model.content == null) {
+      if (this.content === '' || this.content == null) {
         this.$message.error('请填写故障描述!')
         return
       }
       changeEditForm({
         id: this.model.id,
-        content: this.model.content
+        content: this.content
       }).then(() => {
         this.$message.info('故障描述已修改!')
         this.handleCancel(this.model.content)

src/views/sb/info/SbInfo.vue

@@ -384,9 +384,10 @@ export default {
           }
         }, */
         {
-          title: '设备编号',
-          dataIndex: 'no',
+          title: '设备位号',
+          dataIndex: 'positionNo',
           width: 150,
+          scopedSlots: { customRender: 'positionNo' },
           checked: true
         },
         {
@@ -396,10 +397,9 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '设备位号',
-          dataIndex: 'positionNo',
+          title: '设备编号',
+          dataIndex: 'no',
           width: 150,
-          scopedSlots: { customRender: 'positionNo' },
           checked: true
         },
         {