ss

src/components/newLayout/components/menu.vue

@@ -2,44 +2,44 @@
   <span style="margin-top: auto">
     <el-popover placement="right-end" trigger="hover" width="400" :open-delay="200">
       <div class="menu-wrapper">
-        <div class="children-menu-wrapper borderBottom normal">
-          <div v-for="(elm, index) in menuBaseData" :key="elm.key">
+        <div class="children-menu-wrapper borderBottom normal no-children">
+          <div v-for="(elm, index) in menuBaseData" :key="elm.key" :style="{width: elm.width}">
             <div
-              v-if="index < 3"
+              v-if="index < 4"
               class="title"
               :class="{ active: active === elm.key }"
               @click="switchProjects(elm)"
             >
             <!-- :style="{ display:index === 2 ? 'none' : 'auto' }" -->
               <img width="16" height="14" :src="elm.iconData" style="position: relative; top: -2px;">
-              {{ elm.name }}
-              <span v-if="elm.key === 'thothFrontend'" style="  position: absolute; top: -8px; right: -25px;">
+              <span class="content">{{ elm.name }}</span>
+              <span v-if="elm.key === 'thothFrontend'" style="  position: absolute; top: -5px; right: -10-px;">
                 <svg xmlns="http://www.w3.org/2000/svg" width="25.925" height="11.431" viewBox="0 0 25.925 11.431"> <g id="组_3108" data-name="组 3108" transform="translate(-1132.681 -133.742)"> <path id="标签_3_" data-name="标签 (3)" d="M10.629,0c.443,0,.8.548.8,1.224V20.483a1.328,1.328,0,0,1-.51,1.14L6.007,25.842a.55.55,0,0,1-.583,0L.511,21.623A1.328,1.328,0,0,1,0,20.483V1.224C0,.548.359,0,.8,0Z" transform="translate(1158.606 133.742) rotate(90)" fill="#409eff" /> <text id="当前" transform="translate(1140 142)" fill="#fff" font-size="8" fontFamily="PingFangSC-Regular, PingFang SC" letterSpacing="0.038em"> <tspan x="0" y="0">当前</tspan> </text> <circle id="椭圆_263" data-name="椭圆 263" cx="1.5" cy="1.5" r="1.5" transform="translate(1136 138)" fill="#fff" /> </g> </svg>
               </span>
             </div>
           </div>
         </div>
-        <div :key="menuBaseData[3].key" class="children-menu-wrapper">
+        <div :key="menuBaseData[4].key" class="children-menu-wrapper">
           <div
             class="title"
-            :class="{ active: active === menuBaseData[3].key }"
-            @click="switchProjects(menuBaseData[3])"
+            :class="{ active: active === menuBaseData[4].key }"
+            @click="switchProjects(menuBaseData[4])"
           >
             <img
               width="16"
               height="16"
-              :src="menuBaseData[3].iconData"
+              :src="menuBaseData[4].iconData"
               style="position: relative; top: -2px;"
             >
-            {{ menuBaseData[3].name }}
+            {{ menuBaseData[4].name }}
           </div>
           <el-row
-            v-if="menuBaseData[3].menuList.length"
+            v-if="menuBaseData[4].menuList.length"
             class="box"
             style="margin-top: 5px"
           >
             <el-col
-              v-for="elm in menuBaseData[3].menuList"
+              v-for="elm in menuBaseData[4].menuList"
               :key="elm.key"
               :span="6"
               class="item-wrapper"
@@ -176,6 +176,18 @@ export default {
         right: 20px;
       }
     }
+    &.no-children {
+      flex-wrap: wrap;
+      padding-bottom: 10px;
+      .title{
+        margin-bottom: 10px;
+        width: 91px;
+        .content {
+          position: relative;
+          margin-left: 5px;
+        }
+      }
+    }
 
     .title {
       cursor: pointer;

src/icons/svg/autoCode.svg

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="38.097" height="36.754" viewBox="0 0 38.097 36.754">
+  <g id="组_4814" data-name="组 4814" transform="translate(-75.434 -425.109)">
+    <g id="组_4811" data-name="组 4811" transform="translate(75.971 425.609)">
+      <g id="组_4815" data-name="组 4815" transform="translate(0 0)">
+        <path id="路径_14877" data-name="路径 14877" d="M17.931,0A17.9,17.9,0,0,0,2.45,26.887l-1.256-.4a.914.914,0,0,0-.559,1.74L3.056,29,4,29.307a.833.833,0,0,0,1.049-.538L6.136,25.4a.915.915,0,0,0-1.742-.56l-.362,1.126a15.732,15.732,0,0,1-.988-2.022A16.077,16.077,0,0,1,23.98,3.006a15.856,15.856,0,0,1,2.68,1.4.914.914,0,1,0,.993-1.535A17.862,17.862,0,0,0,17.931,0" transform="translate(0 0)" fill="#406cff" stroke="#406cff" stroke-width="1"/>
+        <path id="路径_14878" data-name="路径 14878" d="M66.265,30.613l-1.083,3.369a.914.914,0,1,0,1.741.56l.33-1.028A16.276,16.276,0,0,1,68.3,35.633,16.07,16.07,0,0,1,44.68,55.17a.91.91,0,1,0-.987,1.529,19.184,19.184,0,0,0,10,2.834,17.15,17.15,0,0,0,12.374-5.2,17.9,17.9,0,0,0,2.689-21.871l1.367.44a.914.914,0,1,0,.56-1.741l-2.419-.778-.946-.309a.833.833,0,0,0-1.052.537" transform="translate(-34.26 -23.78)" fill="#406cff" stroke="#406cff" stroke-width="1"/>
+        <path id="减去_2" data-name="减去 2" d="M19.4,16.756c-.062,0-.125,0-.185-.005L5.2,16.756a5.207,5.207,0,0,1-3.685-1.8A6.15,6.15,0,0,1,0,10.864a5.669,5.669,0,0,1,5.4-5.89,5.239,5.239,0,0,1,.83.07A7.088,7.088,0,0,1,12.824,0c3.862,0,7,3.423,7,7.63v.045A4.409,4.409,0,0,1,23.574,12.2,4.38,4.38,0,0,1,19.4,16.756ZM5.86,7.045a3.5,3.5,0,0,0-3.331,3.632A3.8,3.8,0,0,0,3.464,13.2a3.191,3.191,0,0,0,2.269,1.109l.074,0H18.754a.647.647,0,0,0,.1.005,2.3,2.3,0,0,0,2.192-2.389,2.511,2.511,0,0,0-.569-1.606,2.125,2.125,0,0,0-1.395-.77l-1.06-.117a.539.539,0,0,1-.46-.557l0-1.161V7.68a5.455,5.455,0,0,0-1.409-3.706,4.54,4.54,0,0,0-6.2-.57A5.254,5.254,0,0,0,8.217,5.9l-.331,1a.508.508,0,0,1-.474.362.465.465,0,0,1-.075-.006l-.96-.161A3.158,3.158,0,0,0,5.86,7.045Z" transform="translate(6.742 9.605)" fill="#24d5f0"/>
+      </g>
+    </g>
+    <g id="自动化测试" transform="translate(92.034 441.421)">
+      <g id="组_4812" data-name="组 4812" transform="translate(0 0)">
+        <g id="组_4813" data-name="组 4813" transform="translate(0)">
+          <path id="路径_14883" data-name="路径 14883" d="M413.9,587.9m-1.9,0a1.9,1.9,0,1,0,1.9-1.9A1.9,1.9,0,0,0,412,587.9Z" transform="translate(-412 -583.154)" fill="#24d5f0"/>
+          <path id="路径_14884" data-name="路径 14884" d="M405.8,334.12a.447.447,0,0,1-.388-.671l3.022-5.246a.448.448,0,1,1,.775.447l-3.021,5.246A.447.447,0,0,1,405.8,334.12Z" transform="translate(-404.448 -327.978)" fill="#24d5f0" stroke="#24d5f0" stroke-width="0.5"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
+

src/views/business/bizIdSelect.vue

@@ -103,7 +103,7 @@ export default {
       this.settingUserSetBiz(biz.code)
       // 如果是其他业务过来的，优先回到其他业务的主页面中
       if (fromPath) {
-        const url = `${location.origin}/${fromPath}/#/env?bizId=${biz.code}`
+        const url = `${location.origin}/${fromPath}/#/script?bizId=${biz.code}`
         // const url = `http://localhost:7101/#/env?bizId=${biz.code}`
         // 如果是来自自动化的，
         location.href = url

src/views/home/index.vue

@@ -42,8 +42,8 @@
           <el-button plain class="enter-button" @click.native="handleSelect('1')"><svg-icon icon-class="env-enter" />环境管理</el-button>
           <el-button plain class="enter-button" @click.native="handleSelect('playback')"><svg-icon icon-class="playback-enter" />流量回放</el-button>
           <el-button plain class="enter-button" @click.native="handleSelect('9')"><svg-icon icon-class="tool-enter" />工具集合</el-button>
-          <el-button v-if="false" plain class="enter-button" @click.native="handleSelect('auto')">
-            <svg-icon icon-class="tool-enter" />自动化测试</el-button>
+          <el-button plain class="enter-button" @click.native="handleSelect('auto')">
+             <svg-icon icon-class="autoCode" />自动化测试</el-button>
         </div>
         <div class="home-carousel">
           <el-carousel :height="imgHeight + 'px'" indicator-position="outside">
@@ -195,7 +195,7 @@ img.img-arrow {
 }
 .enter-button {
   width: 120px;
-  margin-top: 6vh;
+  margin-top: 5vh;
   margin-right: 30px;
   margin-left: 0px;
   padding: 14px 10px;

src/views/projectManage/components/demand.vue

@@ -127,6 +127,7 @@
       <el-table-column width="150" align="center">
         <template slot-scope="scope">
           <el-select
+            v-if="showunlock"
             v-model="scope.row.status"
             :class="{
               'status0':scope.row.status===0,
@@ -143,6 +144,7 @@
           >
             <el-option v-for="item in scope.row.availableStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
+          <div v-else>{{ scope.row.statusString }}</div>
         </template>
       </el-table-column>
       <el-table-column label="任">
@@ -239,7 +241,8 @@ export default {
       type: [Object, Array],
       default: () => null,
       required: false
-    }
+    },
+    showunlock: { type: Boolean, required: true }
   },
   data() {
     return {

src/views/projectManage/publishTask/components/multipleSelect.vue

@@ -90,7 +90,7 @@ export default {
       this.query = query
       if (query !== '') {
         this.loading = true
-        const res = await taskList({ taskId: this.taskId, name: query })
+        const res = await taskList({ taskId: this.taskId, id: query })
         this.options = res.data
         this.loading = false
       } else {

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -425,7 +425,6 @@ export default {
         delete newFrom[key]
       })
       this.from = { ...newFrom, ...params }
-      console.log(customs, params, 'customs')
     },
 
     customDialong() { // 点击自定义字段

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -292,13 +292,13 @@ export default {
       }
     },
     async remoteMethod_data(query) { // 远程搜索任务
-      const res = await taskList({ name: query })
+      const res = await taskList({ id: query })
       this.tasksDetailList = [...this.tasksDetailList, ...res.data]
       this.taskId = this.tasksDetailList.map(item => item.id)
     },
 
     async remoteMethod(query) { // 远程搜索任务
-      const res = await taskList({ name: query })
+      const res = await taskList({ id: query })
       if (res.code === 200) {
         this.tasksOptions = res.data
       }