Merge branch 'http_test' into qinzhipeng

src/components/click/overClick.vue

@@ -0,0 +1,89 @@
+<template>
+  <div :id="id" class="over-click">
+    <div v-show="visible" class="active-context">
+      <slot name="active" />
+    </div>
+    <div
+      v-show="!visible"
+      class="over-context"
+      @mouseover="hide(false)"
+      @mouseleave="hide(true)"
+      @click="handleClick()"
+    >
+      <slot name="overMouse" />
+      <i
+        class="el-icon-edit"
+        :class="{'hide-edit': hideEdit}"
+      />
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    active: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    id: {
+      type: String,
+      default: 'click-parent',
+      required: true
+    }
+  },
+  data() {
+    return {
+      visible: this.active,
+      listener: null,
+      hideEdit: true
+    }
+  },
+  watch: {
+    active: {
+      handler(newV) {
+        this.visible = this.active
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    const parent = document.getElementById(this.id)
+    this.listener = document.addEventListener('click', (event) => {
+      const isInner = parent.contains(event.target)
+      if (!isInner && this.visible) {
+        this.visible = false
+        this.$emit('update:active', this.visible)
+        this.$emit('overMouse')
+      }
+    })
+  },
+  destroyed() {
+    document.removeEventListener(this.listener)
+  },
+  methods: {
+    handleClick() {
+      this.visible = true
+      this.$emit('update:active', this.visible)
+      this.$emit('click')
+    },
+    hide(val) {
+      this.hideEdit = val
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.over-context:hover{
+  color: #409EFF;
+}
+.el-icon-edit {
+  cursor: pointer;
+  margin-left: 5px;
+  padding-right: 5px;
+  color: #409EFF;
+}
+.hide-edit {
+  visibility: hidden;
+}
+</style>

src/router/index.js

@@ -589,22 +589,90 @@ export const constantRoutes = [{
     name: '发布管理',
     meta: { title: '发布管理' }
   },
+
   {
-    path: '/automation',
+    path: '/',
     component: (resolve) => require(['@/views/automation/index'], resolve),
     name: '自动化',
     meta: { title: '自动化' },
     children: [{
-      path: '/automation',
-      name: '扁鹊',
+      path: '/tech_esfe_tr_h5_platform_dev_multi_service_support_test#',
+      component: (resolve) => require(['@/views/automation/index'], resolve),
+      name: '用例管理',
+      meta: { title: '用例管理' },
+      children: [{
+        path: '/useCase/list',
+        name: '/useCase/list',
+        component: (resolve) => require(['@/views/automation/index'], resolve),
+        meta: { title: '用例列表' }
+      },
+      {
+        path: '/useRecord/batch',
+        name: '/useRecord/batch',
+        component: (resolve) => require(['@/views/automation/index'], resolve),
+        meta: { title: '批次记录' }
+      },
+      {
+        path: '/useRecord/list',
+        name: '/useRecord/list',
+        component: (resolve) => require(['@/views/automation/index'], resolve),
+        meta: { title: '执行记录' }
+      },
+      {
+        path: '/useCase/globalConf',
+        name: '/useCase/globalConf',
+        component: (resolve) => require(['@/views/automation/index'], resolve),
+        meta: { title: '用例配置' }
+      }
+      ]
+    },
+    {
+      path: '/tech_esfe_tr_h5_platform_dev',
       component: (resolve) => require(['@/views/automation/index'], resolve),
-      meta: { title: '扁鹊' }
+      name: '校验模块',
+      meta: { title: '校验模块' },
+      children: [{
+        path: '/apiRule/list',
+        name: '/apiRule/list',
+        component: (resolve) => require(['@/views/automation/index'], resolve),
+        meta: { title: '校验列表' }
+      },
+      {
+        path: '/apiRule/lisst',
+        name: '/apiRule/lisst'
+      }]
     },
     {
-      path: '/apiManagement',
-      name: 'api管理'
-      // component: (resolve) => require(['@/views/apiManagement/automatic.vue'], resolve),
-      // meta: { title: 'api管理' }
+      path: '/tech_esfe_tr_h5_platform',
+      component: (resolve) => require(['@/views/automation/index'], resolve),
+      name: 'APP管理',
+      meta: { title: 'APP管理' },
+      children: [{
+        path: '/appManage/add',
+        name: '/appManage/add',
+        component: (resolve) => require(['@/views/automation/index'], resolve),
+        meta: { title: '上传app' }
+      },
+      {
+        path: '/useCase/globalConnf',
+        name: '/useCase/globalConnf'
+      }]
+    },
+    {
+      path: '/tech_esfe_tr_h5',
+      component: (resolve) => require(['@/views/automation/index'], resolve),
+      name: '截图管理',
+      meta: { title: '截图管理' },
+      children: [{
+        path: '/appCapture/list',
+        name: '/appCapture/list',
+        component: (resolve) => require(['@/views/automation/index'], resolve),
+        meta: { title: '截图查询' }
+      },
+      {
+        path: '/useCase/globalConnf',
+        name: '/useCase/globalConnf'
+      }]
     }
     ]
   }

src/views/automation/index.vue

@@ -5,24 +5,19 @@
 </template>
 
 <script>
-import { envTag } from '@/apiConfig/requestIP.js'
+// import { envTag, host } from '@/apiConfig/requestIP.js'
 export default {
   name: 'Automation',
   data() {
     return {
       show: true,
-      iframeHeight: '720px',
-      stable: ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test'
+      iframeHeight: '720px'
     }
   },
   computed: {
-    envUrl: {
-      get() {
-        return envTag === 'test' ? ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test' : ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_mars_test'
-      },
-      set(newValue) {
-        return envTag === 'test' ? ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test' : ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_mars_test'
-      }
+    envUrl() {
+      return `http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test#` + this.$route.name
+      //   return envTag === 'test' ? ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test' : ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_mars_test'
     }
   },
   mounted() {

src/views/projectManage/components/demand.vue

@@ -574,9 +574,9 @@ export default {
   background:rgba(248,248,248,0.6);
 }
 .sty-icon {
-  position: absolute;
-  left: 63px;
-  bottom: 37px;
+  position: relative;
+  left: -6px;
+  bottom: 8px;
   background: #eee;
   border-radius: 50%;
 }

src/views/projectManage/components/scheduleList.vue

@@ -33,7 +33,7 @@
             <div v-for="(item, index) in scope.row.taskObjectList" :key="index" class="Layout_space_between" style="max-height: 300px; padding: 0 10px 10px" align="center">
               <span>TASK-{{ item.id }}</span>
               <span class="public_Jump" @click="Task_Jump(item.id)">{{ item.name }}</span>
-              <span v-show="item.moduleInfoName">{{ item.moduleInfoName.length > 10 ? item.moduleInfoName.substring(0,10) + '...' : item.moduleInfoName }}</span>
+              <span v-show="item.moduleInfoName !== null">{{ item.moduleInfoName | ellipsis }}</span>
             </div>
             <el-button slot="reference" type="text">{{ scope.row.taskObjectList.length }}</el-button>
           </el-popover>
@@ -69,6 +69,15 @@ export default {
   components: {
     modifySchedule
   },
+  filters: {
+    ellipsis(value) {
+      if (!value) return ''
+      if (value.length > 10) {
+        return value.slice(0, 10) + '...'
+      }
+      return value
+    }
+  },
   props: {
     id: {
       type: Number,

src/views/projectManage/projectList/projectViewDetails.vue

@@ -161,7 +161,7 @@
       </el-dialog>
       <!-- 弹窗 -->
       <openDialog v-if="task_open" ref="task_createdUpdata" :no-jump="true" @change="reloadList" />
-      <createdBug v-if="bug_open" ref="createdBug" @reloadList="reloadList" />
+      <createdBug v-if="bug_open" ref="createdBug" @getBugList="reloadList" />
       <requirement-create
         class="diologPadding"
         title="新建需求"

src/views/projectManage/requirement/requirementDetail.vue

@@ -107,7 +107,7 @@
                 <template v-else>{{ form_query.belongingProjectName }}</template>
               </el-form-item>
               <el-form-item label="所属迭代：">
-                <el-select v-model="form_query.iterationId" placeholder="请选择" @change="changeArea">
+                <el-select v-model="form_query.iterationId" placeholder="请选择" size="small" @change="changeArea">
                   <el-option v-for="(item,index) in iterationList" :key="item.name + index" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -117,7 +117,7 @@
             </el-form>
             <el-form :inline="true" :model="form_query" class="demo-form-inline" label-position="left" label-width="100px">
               <el-form-item label="需求方向：">
-                <el-cascader v-model="form_query.rqmtOrntIds" size="medium" collapse-tags :props="props" :options="demandDirection" placeholder="请选择" @change="changeArea" />
+                <el-cascader v-model="form_query.rqmtOrntIds" size="small" collapse-tags :props="props" :options="demandDirection" placeholder="请选择" @change="changeArea" />
               </el-form-item>
               <el-form-item label="需求来源：">
                 <el-select v-model="form_query.sourceType" size="small" filterable placeholder="请选择" @change="changeArea">
@@ -515,7 +515,7 @@ export default {
       appClient: [], // 跟版客户端列表
       taskScheduleEvent: [], // 排期类型列表
       dependList: [{ msg: '否', code: 0 }, { msg: '是', code: 1 }], // 是否跟版
-      form_query: { pm: {}, rqmtOrntIds: [] },
+      form_query: { pm: null, rqmtOrntIds: [] },
       display: false, // 设置成员弹框
       num: 0, // 成员数量
       availableStatusList: [], // 状态
@@ -532,7 +532,10 @@ export default {
       lockHide: false, // 隐藏排期变更记录
       isScheduleLocked: '', // 锁定状态1锁定0未锁定
       SchedulingContent: [], // 排期历史变更记录
-      listOrGannt: '列表'
+      listOrGannt: '列表',
+      activeClick: {
+        pm: false
+      }
     }
   },
   computed: {

src/views/workbench/components/statisticsSection.vue

@@ -123,8 +123,8 @@ export default {
       handler(newV) {
         this.clickItem = 0
         this.initData()
-      },
-      immediate: true
+      }
+      // immediate: true
     }
   },
   methods: {