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

src/router/index.js

@@ -562,34 +562,37 @@ export const constantRoutes = [{
   },
   {
     path: '/virtualDevices',
-    component: () =>
-    import('@/views/Platform/presentation/testa'),
+    component: () => import('@/views/Platform/presentation/testa'),
     redirect: '/virtualDevices/HTvehicle',
     name: '虚拟硬件',
     meta: { title: '虚拟硬件' },
     children: [{
       path: 'HTvehicle',
       name: '单车',
-      component: () =>
-            import('@/views/virtualDevices/HTvehicle'),
+      component: () => import('@/views/virtualDevices/HTvehicle'),
       meta: { title: '单车' }
     },
     {
       path: 'ebike',
       name: '电单车',
-      component: () =>
-            import('@/views/virtualDevices/HMvehicle.vue'),
+      component: () => import('@/views/virtualDevices/HMvehicle.vue'),
       meta: { title: '电单车' }
     },
     {
       path: 'ebike/ebikeCreate',
       name: '新增电单车',
       hidden: true,
-      component: () =>
-            import('@/views/virtualDevices/HMvehicleCreate.vue'),
+      component: () => import('@/views/virtualDevices/HMvehicleCreate.vue'),
       meta: { title: '新增电单车' }
     }
     ]
+  },
+  {
+    path: '/newWeb',
+    component: () => import('@/views/newWeb/index'),
+    // redirect: '/newWeb/index',
+    name: '发布管理',
+    meta: { title: '发布管理' }
   }
   ]
 },

src/views/newWeb/index.vue

@@ -0,0 +1,27 @@
+<template>
+  <div>
+    <iframe :src="envUrl" style="width:100%;" scrolling="no" frameborder="0" :height="iframeHeight" />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'NEWWEB',
+  data() {
+    return {
+      show: true,
+      iframeHeight: '720px'
+    }
+  },
+  computed: {
+    envUrl() {
+      return 'http://cp-stable.intra.xiaojukeji.com/list/'
+    }
+  },
+  mounted() {
+    var height = window.innerHeight > document.body.clientHeight ? window.innerHeight : document.body.clientHeight
+    this.iframeHeight = height + 'px'
+  }
+}
+</script>
+

src/views/projectManage/dialog_vue.vue

@@ -139,6 +139,7 @@ export default {
           this.ascription_demand = false
           this.ascription_project = false
           this.$set(this.task_form, 'notest', 0)
+          this.$set(this.task_form, 'followVersion', 2)
           this.show_Client = false
           this.$nextTick(() => {
             this.$refs['task_form'].clearValidate()
@@ -157,10 +158,10 @@ export default {
               that.ascription_project = true
               that.$set(that.task_form, 'source', 3)
               that.$set(that.task_form, 'notest', 0)
-              that.$set(that.task_form, 'followVersion', '')
+              that.$set(that.task_form, 'followVersion', 2)
               that.$set(that.task_form, 'requireId', res.data[0].id)
               that.$set(that.task_form, 'projectId', res.data[0].id)
-              that.task_form.followVersion === '' ? that.show_Client = false : ''
+              that.task_form.followVersion === 2 ? that.show_Client = false : ''
             }, 300)
           })
           break
@@ -208,10 +209,10 @@ export default {
               that.ascription_project = false
               that.$set(that.task_form, 'source', 2)
               that.$set(that.task_form, 'notest', 0)
-              that.$set(that.task_form, 'followVersion', '')
+              that.$set(that.task_form, 'followVersion', 2)
               that.$set(that.task_form, 'requireId', ss.code)
               that.$set(that.task_form, 'projectId', '')
-              that.task_form.followVersion === '' ? that.show_Client = false : ''
+              that.task_form.followVersion === 2 ? that.show_Client = false : ''
             }, 300)
           })
           break

src/views/projectManage/projectList/projectViewDetails.vue

@@ -266,7 +266,8 @@
                   <template
                     slot-scope="scope"
                     @click="click_name(scope.row.id)"
-                  >{{ 'P' + scope.row.status }}</template>
+                  >
+                    <span />{{ scope.row.statusStr }}</template>
                 </el-table-column>
               </el-table>
             </div>
@@ -590,6 +591,7 @@ import {
 } from '@/api/projectIndex'
 import openDialog from '@/views/projectManage/dialog_vue'
 import RequirementCreate from '@/views/projectManage/requirement/list/create'
+import { showRequirementEnum } from '@/api/requirement.js'
 export default {
   components: {
     openDialog,
@@ -724,6 +726,7 @@ export default {
       get_Milepost_data: {}, // 点击原点数据
       condition: '',
       noRequire: '',
+      formBackgroungInfo: [],
       requirement: null
     }
   },
@@ -744,6 +747,9 @@ export default {
         this.requirement.belongingProject = Number(this.projectId[1]) // 这里传入项目id
         this.requirement.bizId = res.data[0].bizId // 这里传入业务线id
       })
+      showRequirementEnum().then(res => {
+        this.formBackgroungInfo = res.data.requirementStatus
+      })
     },
     test2(item, e) {
       // 获取团队人员信息
@@ -1072,7 +1078,15 @@ export default {
       this.condition = Number(this.projectId[1])
       this.loading = true
       requirementQueryRequirementInfoList({ belongingProject: Number(this.projectId[1]) }).then(res => {
+        res.data.list.map(item => {
+          this.formBackgroungInfo.map(itrem1 => {
+            if (item.status === itrem1.code) {
+              item.statusStr = itrem1.msg
+            }
+          })
+        })
         this.tableData = res.data.list
+        console.log(this.tableData)
         this.total = res.data.total
         this.loading = false
         this.$refs.all_tasks.style.color = '#000'

src/views/projectManage/taskList/taskViewDetails.vue

@@ -494,12 +494,18 @@
         >
           <span>实际上线时间：</span>
           <el-date-picker
+            v-model="NewDate"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy 年 MM 月 dd 日"
+          />
+          <!-- <el-date-picker
             v-model="NewDate"
             :default-value="new Date()"
             type="date"
             placeholder="选择日期"
             style="width:100%"
-          />
+          /> -->
         </el-col>
       </el-row>
       <span slot="footer" class="dialog-footer">
@@ -554,7 +560,6 @@ export default {
     naspOut(value) {
       if (!value) return ''
       var da = value.split(/\s+/)
-      console.log(da)
       return da[0]
     }
   },
@@ -835,20 +840,22 @@ export default {
     },
     task_status_uptate(e) {
       this.task_form.statusString = '已上线'
+      var resDate = e.getFullYear() + '-' + (e.getMonth() + 1) + '-' + e.getDate() + ' ' + e.getHours() + ':' + e.getMinutes() + ':' + e.getSeconds()
       var taskInfoDO = this.task_form
       taskInfoDO.status = 5
-      taskInfoDO.onlineRealTime = e
+      taskInfoDO.onlineRealTime = resDate
       var user = { name: this.userNames, ename: this.userInformation, id: '' }
       taskUpdate({ taskInfoDO, user }).then(res => {
+        this.centerDialogVisible_status = false
         if (res.code === 200) {
           this.centerDialogVisible_status = false
-          this.$message({
-            message: res.msg,
-            type: 'success',
-            duration: 1000,
-            offset: 150
-          })
         }
+        this.$message({
+          message: res.msg,
+          type: 'success',
+          duration: 1000,
+          offset: 150
+        })
       })
     },
     // 事件删除