Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai

acs/qd/src/views/monitor/logback/index.vue

@@ -31,6 +31,8 @@
         </el-form-item>
         <el-form-item label="时间范围" style="margin-left: 10px" v-show="!showOptions">
           <el-date-picker
+            @change="queryData"
+            @blur="queryData"
             v-model="timeRange"
             size="mini"
             clearable
@@ -251,6 +253,9 @@ export default {
       if (this.timeRange.length !== 0) { // 如果是输入时间范围
         queryParam.start = (new Date(this.timeRange[0]).getTime() * 1000000).toString()
         queryParam.end = (new Date(this.timeRange[1]).getTime() * 1000000).toString()
+        console.log(queryParam.start)
+        console.log('-----------------------------')
+        console.log(queryParam.end)
       }
       if (this.timeZoneValue) {
         // console.log('时差：', this.timeZoneValue)

wms/qd/src/api/wms/pdm/producetask.js

@@ -101,7 +101,7 @@ export function mandFinish(data) {
 
 export function issued(data) {
   return request({
-    url: 'api/producetask/npm',
+    url: 'api/producetask/issued',
     method: 'put',
     data
   })