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

src/icons/svg/team.svg

@@ -1,8 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" width="11.879" height="12.695" viewBox="0 0 11.879 12.695">
-  <g id="组_2647" data-name="组 2647" transform="translate(5310.744 -5223.186)">
-    <g id="成员" transform="translate(-5310.744 5223.186)">
-      <path id="路径_13035" data-name="路径 13035" d="M450.669,295.783a3.243,3.243,0,1,1,3.239-3.243A3.243,3.243,0,0,1,450.669,295.783Zm0-5.754a2.5,2.5,0,1,1,0,.018Z" transform="translate(-444.728 -289.297)" fill="#444"/>
-      <path id="路径_13036" data-name="路径 13036" d="M373.582,493.535a.364.364,0,0,1-.364-.364,5.211,5.211,0,1,0-10.418,0,.364.364,0,0,1-.729,0,5.939,5.939,0,1,1,11.875,0A.364.364,0,0,1,373.582,493.535Z" transform="translate(-362.069 -480.84)" fill="#444"/>
-    </g>
-  </g>
-</svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#333333" d="M 634.061 483.328 c 58.1632 -37.0688 97.0752 -102.195 97.0752 -176.128 c 0 -115.098 -93.7984 -208.896 -208.896 -208.896 S 313.344 192.102 313.344 307.2 c 0 74.1376 38.912 139.059 97.0752 176.128 C 248.013 531.661 129.024 682.189 129.024 860.16 c 0 13.5168 11.0592 24.576 24.576 24.576 s 24.576 -11.0592 24.576 -24.576 c 0 -189.645 154.419 -344.064 344.064 -344.064 S 866.304 670.515 866.304 860.16 c 0 13.5168 11.0592 24.576 24.576 24.576 s 24.576 -11.0592 24.576 -24.576 c 0 -177.971 -118.989 -328.499 -281.395 -376.832 Z M 362.496 307.2 c 0 -88.064 71.68 -159.744 159.744 -159.744 s 159.744 71.68 159.744 159.744 s -71.68 159.744 -159.744 159.744 s -159.744 -71.68 -159.744 -159.744 Z" /></svg>

src/views/projectManage/bugList/details/index.vue

@@ -38,7 +38,7 @@
                   <el-input
                     v-model="bugNameForm.bugName"
                     type="textarea"
-                    autosize
+                    :autosize="{ minRows: 1, maxRows: 3}"
                     maxlength="150"
                     :show-word-limit="showWordLimit"
                     :style="bugNameTextareaStyle"

src/views/workbench/components/createDialog.vue

@@ -106,7 +106,10 @@ export default {
         this.$message({ type: 'warning', message: '请选择业务线!' })
         return false
       }
-      this.$emit('change', this.bizList.find(item => item.code === this.bizId))
+      const list = this.bizList.reduce((pre, cur) => {
+        return [...pre.options, ...cur.options]
+      })
+      this.$emit('change', list.find(item => item.code === this.bizId))
     },
     cancel() { // 关闭弹框
       this.show = false