合并master

src/api/HMvehicle.js

@@ -4,25 +4,25 @@ import { HMvehicleUrl } from '@/apiConfig/api'
 // 创建设备/激活设备
 export function createHmVirtualDevice(data) {
   return request({
-    url: HMvehicleUrl + '/virtual-devices/ebike/createDevice',
+    url: HMvehicleUrl + '/virtual-devices/hm/createDevice',
     method: 'post',
     data
   })
 }
 
 // 查询设备信息
-export function queryDeviceInfo(data) {
+export function queryDeviceInfo(params) {
   return request({
-    url: HMvehicleUrl + '/virtual-devices/ebike/queryDeviceInfo',
-    method: 'post',
-    data
+    url: HMvehicleUrl + '/virtual-devices/hm/queryDeviceInfo',
+    method: 'get',
+    params
   })
 }
 
 // 删除设备
 export function delHmVirtualDevice(params) {
   return request({
-    url: HMvehicleUrl + '/virtual-devices/ebike/delDevice',
+    url: HMvehicleUrl + '/virtual-devices/hm/delDevice',
     method: 'get',
     params
   })
@@ -31,7 +31,7 @@ export function delHmVirtualDevice(params) {
 // 下线设备
 export function offHmvirtualDevice(params) {
   return request({
-    url: HMvehicleUrl + '/virtual-devices/ebike/offDevice',
+    url: HMvehicleUrl + '/virtual-devices/hm/offDevice',
     method: 'get',
     params
   })
@@ -40,7 +40,7 @@ export function offHmvirtualDevice(params) {
 // 更新锁状态
 export function updateLockStatus(params) {
   return request({
-    url: HMvehicleUrl + '/virtual-devices/ebike/updateLockStatus',
+    url: HMvehicleUrl + '/virtual-devices/hm/updateLockStatus',
     method: 'get',
     params
   })

src/api/teamPage.js

@@ -44,3 +44,11 @@ export function getMembers(id) {
     method: 'get'
   })
 }
+// 业务线
+export function queryBizTypeList(data) {
+  return request({
+    url: mockUrl + `/setting/queryBizTypeList`,
+    method: 'post',
+    data
+  })
+}

src/apiConfig/api.js

@@ -1,9 +1,9 @@
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
-export const mockUrl = 'http://10.179.24.176:8980' // 线下
-// export const mockUrl = 'http://10.179.24.123:8980' // 线上
+// export const mockUrl = 'http://10.179.24.176:8980' // 线下
+export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
 // export const mockUrl = 'http://172.23.162.48:8980' // 美双姐本地
 
 export const qualityUrl = 'http://10.179.209.19:8898' // 质量度量
 
-export const HMvehicleUrl = 'http://172.23.162.169:9999' // 电单车
+export const HMvehicleUrl = 'http://172.23.163.15:9999' // 电单车

src/apiConfig/mock.js

@@ -1,4 +1,4 @@
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
-export const mockUrl = 'http://10.179.88.110:8089' // stable
-// export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
+// export const mockUrl = 'http://10.179.88.110:8089' // stable
+export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
 // export const mockUrl = 'http://10.179.101.226:8089' // test

src/apiConfig/virtualDevices.js

@@ -1,3 +1,3 @@
 /*eslint-disable*/ //规避eslint的检查，如没有eslint可不写
-// export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
-export const mockUrl = 'http://10.96.113.197:9999/virtual-devices' // 线下
+export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
+// export const mockUrl = 'http://10.96.113.197:9999/virtual-devices' // 线下

src/views/Platform/bugManage/bugQuery.vue

@@ -228,7 +228,6 @@ export default {
       })
       bugGet(this.$route.query.id).then(res => {
         this.form = res.data
-        // if (res.data.accessory === '') {
         var str = res.data.accessory
         if (str !== '') {
           var obj = JSON.parse(str.split('{}')[0])
@@ -236,7 +235,6 @@ export default {
             this.uptataKey.push(a)
           }
         }
-        // }
         for (const a of this.bizIdEnumList) {
           if (this.form.bizId === a.code) {
             this.bizId = this.form.bizName

src/views/Platform/defectManagement.vue

@@ -129,7 +129,7 @@
             >
               <el-table-column
                 prop="totalBug"
-                label="总数"
+                label="有效Bug总数"
                 align="center"
               />
               <el-table-column

src/views/Platform/presentation/acceptTheReport.vue

@@ -4,7 +4,7 @@
     <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 8px; overflow: hidden;">
       <div id="resumeId" style="padding:2% 9%;">
         <div style="display: flex; font-size: 19px;  white-space: nowrap; font-weight: bold;">
-          <span style="flex:2;">标题 : {{ fromCreateData.name }}</span>
+          <span style="flex:2;">{{ fromCreateData.name }}</span>
           <span style="flex:1;">by : {{ fromCreateData.submitter }} </span>
           <span style="flex:1;">
             <el-button type="primary" size="mini" style="margin:0 2% 0 0%;" @click="promptEmail(fromCreateData)">发送报告</el-button>

src/views/Platform/presentation/testPresentation.vue

@@ -39,7 +39,7 @@
           </div>
           <div>
             <el-select v-model="queryDataState" filterable placeholder="请选择项目还是任务" style="width:100%;">
-              <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
+              <el-option v-for="item in restaurants" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </div>
           <span slot="footer" class="dialog-footer">
@@ -66,7 +66,7 @@ export default {
       centerDialogVisible: false,
       centerDialogVisible1: false,
       getListAllData: [],
-      queryDataState: '',
+      queryDataState: {},
       pageSize: 5,
       curIndex: 1,
       total: 0,
@@ -137,7 +137,6 @@ export default {
             var type = ele
           }
         }
-        console.log(type)
         this.queryData.state = ''
         this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { state1: type }})
       } else {
@@ -161,12 +160,13 @@ export default {
     getQueryData(e) {
       this.restaurants = []
       this.states = ''
+      this.$set(this.queryDataState, 'code', '')
       taskListCreate({ status: 7 }).then(res => {
         const arr = []
         switch (e) {
           case 1:
             for (var ele of res.data.projectInfoList) {
-              arr.push({ value: ele.name, projectId: ele.id, type: ele.platForm, bizId: ele.bizId })
+              arr.push({ name: ele.name, id: ele.id, type: ele.platForm, bizId: ele.bizId })
             }
             this.restaurants = arr
             this.$refs['btn1'].$el.style.background = '#409EFF'
@@ -176,7 +176,7 @@ export default {
             break
           case 2:
             for (var vel of res.data.taskInfoList) {
-              arr.push({ value: vel.name, taskId: vel.id, type: vel.type, bizId: vel.bizId })
+              arr.push({ name: vel.name, id: vel.id, type: vel.type, bizId: vel.bizId })
             }
             this.restaurants = arr
             this.$refs['btn1'].$el.style.background = '#FFFFFF'

src/views/Platform/presentation/testPresenyL.vue

@@ -5,7 +5,7 @@
       <el-form :inline="true" :model="fromCreat" style="margin:2% 9%">
         <div id="resumeId">
           <div style="display: flex; font-size: 19px;  white-space: nowrap; font-weight: bold;">
-            <span style="flex:1;">标题 : {{ fromCreat.reportName }}</span>
+            <span style="flex:1;">{{ fromCreat.reportName }}</span>
             <span style="flex:1;">by : {{ fromCreat.ownner }}
               <el-button type="primary" size="mini" style="margin:0 2% 0 30%;" @click="promptEmail(fromCreat)">发送报告</el-button>
               <el-button size="mini" @click="download()">下载测试报告</el-button>

src/views/Platform/setUp/teamPage.vue

@@ -1,104 +1,98 @@
 <template>
-  <el-container>
-    <el-aside width="150pt">
-      <el-tree
-        style="background: #E9EEF3; height:110vh; padding:15%;"
-        :data="bizOptions"
-        node-key="id"
-        undraggable
-        :highlight-current="true"
-        @node-click="clickFun"
-      />
-    </el-aside>
-    <el-container>
-      <el-header style="height: auto; text-align:left">
-        <div style="margin: 4%;">
-          <el-input v-model="form.name" clearable filterable placeholder="姓名" style="width:22%;margin-right:5px;" />
-          <el-input v-model="form.email" clearable filterable placeholder="邮箱" style="width:22%;margin-right:5px;" />
-          <el-select v-model="form.role" width="200" clearable placeholder="请选择角色">
+  <!-- 团队管理 -->
+  <div class="set-background">
+    <div class="block">
+      <el-form :model="teamForm">
+        <div class="set-head">
+          姓名<el-input v-model="teamForm.name" clearable placeholder="请填写" style="margin-left:10px;width:18%;" /> &nbsp;&nbsp;
+          角色<el-select v-model="teamForm.role" placeholder="请选择" filterable clearable style="margin-left:10px;width:18%;" @change="choosePlatType()">
             <el-option v-for="item in roleStrings" :key="item.value" :label="item.name" :value="item.name" />
           </el-select>
-          <el-button type="primary" style="margin-left:8%;" @click="queryList(form)">查询</el-button>
-          <el-button type="primary" @click="createGetShow">新增</el-button>
+          <div style="float:right">
+            <el-button type="primary" @click="queryList(teamForm)">查询</el-button>
+            <el-button type="primary" plain @click="handleteam()">新增</el-button>
+          </div>
         </div>
+      </el-form>
+      <div class="set-locate">
+        <el-table :key="tableKey" :data="list" fit highlight-current-row style="width: 100%;" border :header-cell-style="{background:'#F0F2F4',color:'#606266'}">
+          <el-table-column label="ID" prop="id" min-width="40px" align="center"><template slot-scope="scope"><span>{{ scope.row.id }}</span></template> </el-table-column>
+          <el-table-column label="姓名" prop="name" min-width="80px" align="center"><template slot-scope="scope"><span>{{ scope.row.name }}</span></template> </el-table-column>
+          <el-table-column label="邮箱" prop="email" min-width="90px" align="center"><template slot-scope="scope"><span>{{ scope.row.email }}</span></template> </el-table-column>
+          <el-table-column label="角色" prop="role" min-width="80px" align="center"><template slot-scope="scope"><span>{{ scope.row.role }}</span></template> </el-table-column>
+          <el-table-column label="业务线" prop="bizName" min-width="80px" align="center"> <template slot-scope="scope"><span>{{ scope.row.bizName }}</span></template></el-table-column>
+          <el-table-column label="创建时间" prop="gmtCreate" min-width="100px" align="center"><template slot-scope="scope"><span>{{ scope.row.gmtCreate }}</span></template> </el-table-column>
+          <el-table-column label="操作" align="center" min-width="130px" class-name="small-padding fixed-width">
+            <template slot-scope="{row}">
+              <el-button type="primary" size="mini" @click="dialogFormVisible = true,changeData(row)">编辑</el-button>
+              <el-button type="danger" size="mini" @click="handelDelete(row)">删除</el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
 
         <el-dialog :title="titleName" width="40%" :visible.sync="dialogFormVisible">
-          <el-form ref="MemberData" :model="MemberData" status-icon :rules="serviceDataRules" label-width="60px">
-            <el-form-item v-show="hide" label="id" prop="Id" :label-width="formLabelWidths">
-              <el-input v-model="MemberData.id" autocomplete="off" style="width:75%" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="姓名" prop="name" :label-width="formLabelWidths">
-              <el-input v-model="MemberData.name" autocomplete="off" style="width:75%" />
-            </el-form-item>
-            <el-form-item label="邮箱" prop="email" :label-width="formLabelWidths">
-              <el-input v-model="MemberData.email" autocomplete="off" style="width:75%" />
-            </el-form-item>
-            <el-form-item label="业务线" prop="bizId" :label-width="formLabelWidths">
-              <el-select v-model="MemberData.bizId" placeholder="请选择业务线" style="width:75%">
-                <el-option v-for="item in bizOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="角色" prop="role" :label-width="formLabelWidths">
-              <el-select v-model="MemberData.role" placeholder="请选择角色" style="width:75%">
-                <el-option v-for="item in roleStrings" :key="item.value" :label="item.name" :value="item.name" />
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="dialogFormVisible = false,clickClose()">关 闭</el-button>
-            <el-button v-show="Determine" type="primary" @click="titleName === '新增'?createMembers(MemberData):updateData(MemberData)">确 定</el-button>
+          <div style="margin-left:38px">
+            <el-form ref="addTeamForms" :rules="addTeamDataRules" :model="addTeamData">
+              <el-form-item label="业务线" prop="bizId">
+                <el-select v-model="addTeamData.bizId" placeholder="请选择" filterable clearable style="margin-left:10px;width:60%;">
+                  <el-option v-for="item in bizOptions" :key="item.id" :label="item.bizName" :value="item.id" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="姓名" prop="name">
+                <el-input v-model="addTeamData.name" clearable placeholder="请填写姓名" style="margin-left:23px;margin-top:-10px;width:60%;" />
+              </el-form-item>
+              <el-form-item label="邮箱" prop="email">
+                <el-input v-model="addTeamData.email" clearable placeholder="公司邮箱前缀" style="margin-left:23px;margintop:-10px;width:60%;" />
+              </el-form-item>
+              <el-form-item label="角色" prop="role">
+                <el-select v-model="addTeamData.role" clearable placeholder="请选择角色" filterable style="margin-left:23px;width:60%;">
+                  <el-option v-for="item in roleStrings" :key="item.value" :label="item.name" :value="item.name" />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div align="center" style="margin-top:18px">
+            <el-button type="info" plain size="mini" @click="dialogFormVisible=false">取消</el-button>
+            <el-button type="primary" size="mini" @click="titleName === '新增' ? createMembers(addTeamData) :updateData(addTeamData)">确定</el-button>
+          </div>
+          <div style="margin-top:6%" />
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogDeleteVisible" width="30%">
+          <div align="center" style="margin-top:-6%">
+            <b>确定要删除该业务模块吗？</b>
           </div>
+          <div align="center" style="margin-top:38px">
+            <el-button type="primary" size="mini" @click="deleteMembers()">确定</el-button>
+            <el-button type="danger" size="mini" @click="dialogDeleteVisible=false">取消</el-button>
+          </div>
+          <div style="margin-top:4%" />
         </el-dialog>
-      </el-header>
-      <el-table :data="list" style="width: 100%; height:570vh;" row-key="id" lazy align="center">
-        <el-table-column prop="id" label="ID" width="150" align="center"><template slot-scope="scope"><span>{{ scope.row.id }}</span></template></el-table-column>
-        <el-table-column prop="name" label="姓名" width="180" align="center"><template slot-scope="scope"><span>{{ scope.row.name }}</span></template> </el-table-column>
-        <!-- <el-table-column label="team" width="180" align="center"><template slot-scope="scope"><span>{{ scope.row.teamName }}</span></template></el-table-column> -->
-        <el-table-column label="邮箱" width="180" align="center"><template slot-scope="scope"><span>{{ scope.row.email }}</span></template></el-table-column>
-        <el-table-column prop="role" label="角色" width="150" align="center"><template slot-scope="scope"><span>{{ scope.row.role }}</span></template></el-table-column>
-        <el-table-column label="操作" align="center" min-width="220px" fixed="right">
-          <template slot-scope="{row}">
-            <el-button size="mini" type="primary" @click="dialogFormVisible = true,queryData(row)">查看</el-button>
-            <el-button size="mini" type="primary" @click="dialogFormVisible = true,changeData(row)">编辑</el-button>
-            <el-button size="mini" type="primary" @click="deleteCodeData(row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-footer>
-        <el-pagination :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" align="center" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-      </el-footer>
-    </el-container>
-  </el-container>
-</template>
+        <div>
+          <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+        </div>
+      </div>
+
+    </div>
+  </div></template>
 
 <script>
-import { createMembers, updateMembers, deleteMembers, getMemberList } from '@/api/teamPage.js'
+import { createMembers, updateMembers, deleteMembers, getMemberList, queryBizTypeList } from '@/api/teamPage.js'
 
-const operateType = {
-  OPER_ADD: 1, // 新增
-  OPER_EDIT: 2, // 编辑
-  OPER_QUERY: 3 // 查看
-}
 export default {
   name: 'TeamPage',
   data() {
     return {
-      centerDialogVisible: false,
       dialogFormVisible: false,
-      Determine: true,
-      hide: true,
-      radioButton: 0,
       titleName: '',
-      parameter: '',
-      startId: '',
-      startName: '',
-      parentFolderId: '',
       formLabelWidths: '120px',
       roleStrings: [{ value: 1, name: 'rd' }, { value: 2, name: 'qa' }, { value: 3, name: 'pm' }, { value: 4, name: 'other' }],
-      bizOptions: [{ label: '滴滴代驾', value: 261 }, { label: '企业级', value: 100 }, { label: 'prado', value: 330 }, { label: 'carbo', value: 331 }, { label: '海马', value: 309 }, { label: '万象', value: 102 }],
+      // bizOptions: [{ label: '滴滴代驾', value: 261 }, { label: '企业级', value: 100 }, { label: 'prado', value: 330 }, { label: 'carbo', value: 331 }, { label: '海马', value: 309 }, { label: '万象', value: 102 }],
+      bizOptions: [],
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
-      bizId: '',
+      bizJson: localStorage.getItem('key'),
       curIndex: 1, // 初始页
       pageSize: 10, // 每页的数据
       total: 0,
@@ -107,13 +101,12 @@ export default {
       list: [],
       form: {},
       queryListData: {},
-      bizData: {},
-      MemberData: {
+      addTeamData: {
         bizId: '',
-        teamId: '',
         email: '',
         role: '',
         name: ''
+
       },
       formData: {
         bizId: '',
@@ -123,7 +116,7 @@ export default {
         name: ''
 
       },
-      serviceDataRules: {
+      addTeamDataRules: {
         name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
         bizId: [{ required: true, message: '业务线不能为空', trigger: 'change' }],
         teamId: [{ required: true, message: '业务线不能为空', trigger: 'change' }],
@@ -134,26 +127,34 @@ export default {
         children: 'children',
         label: 'label'
       },
-      multipleSelection: []
+      multipleSelection: [],
+      teamForm: {
+        name: '',
+        role: ''
+
+      },
+      tableKey: 0,
+      dialogDeleteVisible: false,
+      bizMaps: new Map([[261, '滴滴代驾'], [100, '企业级'], [330, 'prado'], [331, 'carbo'], [309, '海马'], [102, '万象']])
     }
   },
   created() {
     this.getAllList()
+    this.getBIzList()
   },
 
   methods: {
-    updateDetailDialog(type) {
-      if (type === operateType.OPER_ADD) {
-        this.Determine = true
-        this.hide = false
-      } else if (type === operateType.OPER_EDIT) {
-        this.hide = true
-        this.Determine = true
-      } else if (type === operateType.OPER_QUERY) {
-        this.hide = true
-        this.Determine = false
+  // 获取业务线
+    getBIzList() {
+      this.indexPage = {
+        pageSize: 100,
+        curIndex: this.curIndex - 1
       }
+      queryBizTypeList(this.indexPage).then(response => {
+        this.bizOptions = response.data.list
+      })
     },
+
     handleSizeChange(size) {
       this.pageSize = size
       this.getAllList({
@@ -186,16 +187,11 @@ export default {
     getAllList() {
       var indexPage = {
         pageSize: this.pageSize,
-        curIndex: this.curIndex
+        curIndex: this.curIndex,
+        bizId: this.bizJson
       }
       getMemberList(indexPage).then(res => {
         this.list = res.data
-        for (var a of this.list) {
-          var b = a.teamId
-          for (var c of this.bizOptions) {
-            b === c ? b = c.label : ''
-          }
-        }
         this.total = res.total
       })
     },
@@ -210,8 +206,11 @@ export default {
     // 查询
     queryList(val) {
       console.log(val)
-      getMemberList(val).then(res => {
+      var data = val
+      data.bizId = this.bizJson
+      getMemberList(data).then(res => {
         this.list = res.data
+        this.total = res.total
         // this.form = {}
       })
     },
@@ -231,15 +230,18 @@ export default {
         })
       })
     },
-
     // 删除
-    handleDelete(e) {
+    handelDelete(ele) {
+      this.addTeamData = ele
+      this.dialogDeleteVisible = true
+    },
+    deleteMembers() {
       this.userData = { id: '', ename: this.userInformation, name: this.userNames }
-      deleteMembers(e.id, this.userData).then(response => {
+      deleteMembers(this.addTeamData.id, this.userData).then(response => {
         if (response.code === 200) {
-          this.getAllList()
-          // this.queryList({ 'teamId': e.teamId })
+          this.dialogDeleteVisible = false
           this.successFun()
+          this.getAllList()
         } else {
           this.errorFun(response.msg)
         }
@@ -247,113 +249,110 @@ export default {
     },
 
     // 编辑
-    changeData(vel) {
-      console.log(vel)
+    changeData(ele) {
+      // 不能直接赋值变量，使用Object.assign复制一级属性(注意Object.assign不算完全的深拷贝)
+      this.addTeamData = Object.assign({}, ele)
       this.titleName = '编辑'
-      this.MemberData = vel
-      this.updateDetailDialog(2)
+      this.dialogFormVisible = true
     },
-
-    updateData(vel) {
-      if (vel === this.MemberData) {
-        this.bizData = {
-          name: vel.name,
-          id: vel.id,
-          role: vel.role,
-          email: vel.email,
-          teamId: vel.bizId,
-          bizId: vel.bizId
-        }
-      } else {
-        this.bizData = vel
-        this.bizData.name = vel.name
-        this.bizData.role = vel.role
-        this.bizData.email = vel.email
-        this.bizData.teamId = vel.teamId
-        this.bizData.bizId = vel.bizId
-      }
-      this.userData = { id: '', ename: this.userInformation, name: this.userNames }
-      this.objData = { teamMembersInfo: this.bizData, user: this.userData }
-      updateMembers(this.objData).then(response => {
-        if (response.code === 200) {
-          this.dialogFormVisible = false
-          this.successFun()
-          this.getAllList()
-        } else {
-          this.errorFun()
+    updateData(ele) {
+      this.$refs['addTeamForms'].validate((valid) => {
+        if (valid) {
+          // var myDate = new Date()
+          this.addTeamData = ele
+          // this.addTeamData.modifyTime = myDate
+          this.addTeamData.modifier = this.userInformation
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { teamMembersInfo: this.addTeamData, user: this.userData }
+          updateMembers(this.objData).then(response => {
+            if (response.code === 200) {
+              this.dialogFormVisible = false
+              this.successFun()
+              this.getAllList()
+            } else {
+              this.errorFun(response.msg)
+            }
+          })
         }
       })
     },
-    // 新增需提示选择目录
-    createGetShow() {
+    // 新增
+    handleteam() {
       this.titleName = '新增'
-      if (this.startId === '') {
-        this.$notify({ title: '提示', message: '请选择目录', duration: 2000 })
-      } else {
-        this.MemberData = {}
-        this.dialogFormVisible = true
-        this.$nextTick(() => {
-          this.$refs['MemberData'].clearValidate()
-        })
-        this.updateDetailDialog(1)
-      }
+      this.dialogFormVisible = true
+      this.$refs.addTeamForms.resetFields()
+      this.$set(this.addTeamData, 'bizId', '')
+      this.$set(this.addTeamData, 'name', '')
+      this.$set(this.addTeamData, 'email', '')
+      this.$set(this.addTeamData, 'role', '')
+      this.addTeamData = {}
     },
-    clickFun(e) {
-      console.log(e)
-      this.startId = e.value
-      this.startName = e.label
-      getMemberList({ teamId: e.value }).then(res => {
-        this.list = res.data
-      })
-    },
-
-    clickClose() {
-      this.startId = ''
-    },
-
-    // 新增
-    createMembers(vel) {
-      this.$refs['MemberData'].validate((valid) => {
+    createMembers(ele) {
+      this.$refs['addTeamForms'].validate((valid) => {
         if (valid) {
-          if (vel !== '') {
-            this.bizData = {
-              name: vel.name,
-              id: vel.id,
-              role: vel.role,
-              email: vel.email,
-              teamId: this.startId,
-              bizId: vel.bizId
-            }
-          }
+          // var myDate = new Date()
+          this.addTeamData = ele
+          this.addTeamData.creator = this.userInformation
+          this.addTeamData.modifier = this.userInformation
+          // this.addTeamData.gmtCreate = myDate
           this.userData = { id: '', ename: this.userInformation, name: this.userNames }
-          this.objData = { teamMembersInfo: this.bizData, user: this.userData }
+          this.objData = { teamMembersInfo: this.addTeamData, user: this.userData }
           createMembers(this.objData).then(response => {
             if (response.code === 200) {
               this.dialogFormVisible = false
-              this.successFun()
+              // this.getList()
               this.getAllList()
+              this.successFun()
+              this.dialogFormVisible = false
             } else {
-              this.errorFun()
+              this.errorFun(response.msg)
             }
           })
-        } else {
-          return false
         }
       })
     },
-
     successFun() {
       this.$notify({ title: 'Success', message: 'Created Successfully', type: 'success', duration: 5000 })
     },
-    errorFun() {
-      this.$notify({ title: 'Failed', message: 'Created Failed', type: 'error', duration: 5000 })
+    errorFun(ele) {
+      this.$notify({ title: 'Failed', message: ele, type: 'error', duration: 5000 })
     }
   }}
 
 </script>
-
-<style>
-.headerStyle {
-  margin: 10px;
-}
+<style lang="stylus" scoped>
+  .set-background
+    background-color #F1F4F7
+    display flex
+    justify-content center
+    min-width 700px
+    .setPercent >>> .el-dialog__body
+      width 100%
+    .block
+      background-color rgba(255,255,255,1)
+      box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
+      border-radius 7px
+      width 93%
+      margin 25px 0
+      padding 20px
+      min-height calc(100vh - 100px)
+    .set-head
+      font-size 13px
+      width 100%
+      color #333B4A
+      white-space nowrap
+    .set-dialogfont
+      font-size 13px
+      .set-dialogfont >>> .el-input
+        width 70%
+    // .set-between
+    //   display flex
+    // .set-between >>> .el-button
+      // height 40px
+    .set-locate
+      margin-top 25px
+      // border-bottom 1px solid #BFC6DC
+      // border-left 1px solid #BFC6DC
+      // border-top 1px solid #BFC6DC
+      // border-right 1px solid #BFC6DC
 </style>

src/views/Platform/workbench.vue

@@ -489,7 +489,7 @@ export default {
   .abc .el-tabs__nav-wrap::after {
     background-color:#FFFFFF !important;
   }
-  .el-tabs__nav-scroll {
+  .bgColorSz .el-tabs__nav-scroll {
     padding: 1% 2% !important;
   }
   .item .el-badge__content.is-fixed {