Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

package.json

@@ -26,6 +26,8 @@
     "@tinymce/tinymce-vue": "^3.2.0",
     "animate.css": "^3.7.2",
     "axios": "0.18.0",
+    "browserslist": "^4.12.0",
+    "caniuse-lite": "^1.0.30001084",
     "crypto-js": "^4.0.0",
     "dayjs": "^1.8.17",
     "echarts": "^4.2.1",
@@ -65,7 +67,7 @@
     "@vue/cli-plugin-unit-jest": "3.6.3",
     "@vue/cli-service": "3.6.0",
     "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "^9.5.1",
+    "autoprefixer": "^9.8.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",

src/views/Platform/presentation/presentationReport.vue

@@ -42,8 +42,8 @@
       <div class="double">
         <el-form-item label="是否跟版" prop="isEdition"><el-input v-model="fromDev.isEdition" size="small" style="width:15vw;" placeholder="请填写" /></el-form-item>
         <el-form-item label="开发时间" prop="devTimeStart">
-          <el-date-picker v-model="fromDev.devTimeStart" type="date" size="small" style="width:12.5vw; margin-right:2%;" placeholder="选择日期" />
-          <el-date-picker v-model="fromDev.devTimeEnd" type="date" size="small" style="width:12.5vw;" placeholder="选择日期" />
+          <el-date-picker v-model="fromDev.devTimeStart" value-format="yyyy-MM-dd" type="date" size="small" style="width:12.5vw; margin-right:2%;" placeholder="选择日期" />
+          <el-date-picker v-model="fromDev.devTimeEnd" value-format="yyyy-MM-dd" type="date" size="small" style="width:12.5vw;" placeholder="选择日期" />
         </el-form-item>
       </div>
 
@@ -54,14 +54,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="计划提测时间" prop="planLaunchTime">
-          <el-date-picker v-model="fromDev.planLaunchTime" size="small" type="date" style="width:25vw;" placeholder="选择日期" />
+          <el-date-picker v-model="fromDev.planLaunchTime" value-format="yyyy-MM-dd" size="small" type="date" style="width:25vw;" placeholder="选择日期" />
         </el-form-item>
       </div>
 
       <div class="double">
         <el-form-item label=" prd地址 " prop="prdUrl"><el-input v-model="fromDev.prdUrl" size="small" style="width:15vw;" placeholder="请提供wiki链接" /></el-form-item>
         <el-form-item label="实际提测时间" prop="launchTime">
-          <el-date-picker v-model="fromDev.launchTime" type="date" size="small" style="width:25vw;" placeholder="选择日期" />
+          <el-date-picker v-model="fromDev.launchTime" value-format="yyyy-MM-dd" type="date" size="small" style="width:25vw;" placeholder="选择日期" />
         </el-form-item>
       </div>
       <div class="double">
@@ -105,6 +105,8 @@
 </template>
 
 <script>
+const _ = require('lodash')
+import moment from 'moment'
 import { launchTestUpdate, launchTestCreate } from '@/api/InterfaceReport'
 import E from 'wangeditor'
 
@@ -233,13 +235,17 @@ export default {
     getQueryData(ele) {
       this.$refs['fromDev'].validate((valid) => {
         if (valid) {
-          this.fromDev = ele
-          typeof (this.editorContent) === 'string' ? this.fromDev.joinTest = this.editorContent : ''
-          typeof (this.DetailsOfProposal) === 'string' ? this.fromDev.moduleInfo = this.DetailsOfProposal : ''
-          this.fromDev.lateStatus = this.lateStatus
-          this.fromDev.id === undefined ? this.fromDev.id = this.clien : ''
+          const params = _.cloneDeep(this.fromDev)
+          typeof (this.editorContent) === 'string' ? params.joinTest = this.editorContent : ''
+          typeof (this.DetailsOfProposal) === 'string' ? params.moduleInfo = this.DetailsOfProposal : ''
+          params.lateStatus = this.lateStatus
+          params.devTimeStart = moment(params.devTimeStart).format('YYYY.MM.DD')
+          params.devTimeEnd = moment(params.devTimeEnd).format('YYYY.MM.DD')
+          params.planLaunchTime = moment(params.planLaunchTime).format('YYYY.MM.DD')
+          params.launchTime = moment(params.launchTime).format('YYYY.MM.DD')
+          params.id === undefined ? params.id = this.clien : ''
           this.userData = { id: '', ename: this.userInformation, name: this.userNames }
-          this.objData = { launchTestInfo: this.fromDev, user: this.userData }
+          this.objData = { launchTestInfo: params, user: this.userData }
           launchTestUpdate(this.objData).then(res => {
             if (res.code === 200) {
               this.$message({ type: 'success', message: '更新成功' })