ss

src/apiConfig/requestIP.js

@@ -1,4 +1,4 @@
-export let host = 'http://zhihui-test.intra.xiaojukeji.com'
+export let host = 'http://zhihui-pre.intra.xiaojukeji.com'
 export let requestIp = host + '/zuul'
 export let loginUrl = host + '/sso/login?jumpto=' + 'http://zhihui-test.intra.xiaojukeji.com' + location.pathname
 export let logoutUrl = host + '/sso/logout?jumpto=' + 'http://zhihui-test.intra.xiaojukeji.com' + location.pathname

src/components/newLayout/Main.vue

@@ -36,21 +36,35 @@ export default {
       immediate: true
     }
   },
-  created() {
-    this.settingUserGetBiz()
-  },
+  // created() {
+  // this.settingUserGetBiz()
+  // },
   methods: {
-    async settingUserGetBiz() { // 刷新页面
-      if (this.$store.state.global.bizId === -1) {
-        const res = await settingUserGetBiz()
-        if (res.code === 200) {
-          this.showpage = true
-          this.$store.dispatch('global/setBizId', res.data.bizId)
-        }
-      } else {
-        this.showpage = true
-      }
-    },
+    // async settingUserGetBiz() { // 刷新页面
+    //   // const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
+    //   let decodeBizId = ''
+    //   const { bizId = null, bizId_id = null } = this.$route.query
+    //   if(this.$route.query.bizId) {
+    //     decodeBizId = desDecryptId(bizId)
+    //   } else if(this.$route.query.bizId_id){
+    //     decodeBizId = analysisBizId_id(bizId_id)[0]
+    //   } else {
+    //     const res = await settingUserGetBiz()
+    //     if (res.code === 200) {
+    //       // this.showpage = true
+    //       // this.$store.dispatch('global/setBizId', res.data.bizId)
+    //       decodeBizId = res.data.bizId
+    //     }
+    //   }
+    //   console.log(decodeBizId)
+    //   this.showpage = true
+    //   this.$store.dispatch('global/setBizId', decodeBizId)
+    //   // console.log(this.$route.query, bizId_id)
+    //   // if (this.$store.state.global.bizId === -1) {
+    //   // } else {
+    //   //   this.showpage = true
+    //   // }
+    // },
     // 获取业务线列表
     async settingGetBizList() {
       const res = await settingGetBizList({})
@@ -69,9 +83,10 @@ export default {
       // 如果已存在业务线ID（第一优先级）
       if (this.bizId !== -1) this.redirectPage()
       // 业务线不存在，但是url上面带bizId或者bizId_id的（第二优先级）
-      if (this.$route.query.bizId || this.$route.query.bizId_id) this.handlerPage()
+      if (this.$route.query.bizId || this.$route.query.bizId_id) await this.handlerPage()
       // 如果前往路由中参数中bizId和bizId_id都不存在，去获取默认bizId（第三优先级）
-      if (!to.query.bizId && !to.query.bizId_id) this.getDefaultBizId()
+      if (!to.query.bizId && !to.query.bizId_id) await this.getDefaultBizId()
+      this.showpage = true
     },
     // 页面路由替换（增加bizId参数，只替换非详情页）
     redirectPage() {

src/components/searchHeader/index.vue

@@ -39,7 +39,7 @@
       </div>
       <div class="btnWrap">
         <el-button type="primary" size="mini" @click="$emit('search')">筛 选</el-button>
-        <el-button size="mini" @click="moreReset">重 置</el-button>
+        <el-button size="mini" @click="$emit('moreReset')">重 置</el-button>
       </div>
     </div>
   </div>

src/components/select/selectTeam.vue

@@ -35,6 +35,11 @@ export default {
       default: '232',
       requried: false
     },
+    bizIdFlag: {
+      type: Boolean,
+      default: true,
+      required: false
+    },
     size: {
       type: String,
       default: 'small',
@@ -103,7 +108,13 @@ export default {
   },
   methods: {
     async remoteMethod(q = this.searchValue) {
-      const res = await teamQueryTeamInfo({ teamName: q, bizId: this.$store.state.global.bizId })
+      let params = {}
+      if (this.bizIdFlag) {
+        params = { teamName: q, bizId: this.$store.state.global.bizId }
+      } else {
+        params = { teamName: q }
+      }
+      const res = await teamQueryTeamInfo(params)
       this.options = res.data
       console.log(res.data)
     }

src/views/projectManage/onlineproblem/component/header/index.vue

@@ -12,6 +12,7 @@
         v-show="nowTab === 'list'"
         :data="renderList"
         @search="search"
+        @moreReset="moreReset"
         @changeShowMore="changeShowMore"
       />
       <div v-if="nowTab === 'charts'" style="height:324px;">
@@ -66,6 +67,11 @@ export default {
     this.search()
   },
   methods: {
+    moreReset() {
+      this.renderList.adv.map(t => t.map(g => {
+        g.value = null
+      }))
+    },
     changeTab(e) {
       this.nowTab = e
       if (this.nowTab === 'charts') {

src/views/projectManage/onlineproblem/component/header/searchData.js

@@ -17,7 +17,7 @@ const data = {
       type: 'select',
       multiple: false,
       placeholder: '',
-      value: '6',
+      value: '',
       requried: true,
       option: [
         { value: '0', label: 'P0' },
@@ -41,12 +41,12 @@ const data = {
       option: []
     },
     {
-      name: '是否定级',
+      name: '星辰花定级',
       key: 'isGrading',
       type: 'select',
       multiple: false,
       placeholder: '',
-      value: false,
+      value: null,
       option: [
         { value: false, label: '否' },
         { value: true, label: '是' }

src/views/projectManage/onlineproblem/create/component/renderBase.js

@@ -1,5 +1,4 @@
 
-import d from '../../component/header/searchData'
 const data = [
   [{
     name: '名称',
@@ -8,7 +7,23 @@ const data = [
     requried: true
   }],
   [{
-    ...d.adv[0][0]
+    name: '等级',
+    key: 'priority',
+    type: 'select',
+    multiple: false,
+    placeholder: '',
+    value: '6',
+    requried: true,
+    option: [
+      { value: '0', label: 'P0' },
+      { value: '1', label: 'P1' },
+      { value: '2', label: 'P2' },
+      { value: '3', label: 'P3' },
+      { value: '4', label: 'P4' },
+      { value: '5', label: 'P5' },
+      { value: '6', label: 'P6' },
+      { value: '7', label: '未定级' }
+    ]
   }, {
     name: '是否星辰花定级',
     key: 'isGrading',
@@ -28,10 +43,29 @@ const data = [
     type: 'date',
     requried: true
   }, {
-    ...d.adv[0][1]
+    name: '责任团队',
+    key: 'teamId',
+    type: 'remoteSelect',
+    multiple: false,
+    placeholder: '请选择责任团队',
+    value: '',
+    utilName: 'getTeam',
+    option: []
   }],
   [{
-    ...d.adv[1][0]
+    name: '影响面',
+    key: 'influenceSurface',
+    type: 'select',
+    multiple: true,
+    placeholder: '',
+    value: '',
+    option: [
+      { value: 0, label: '用户体验' },
+      { value: 1, label: '客服进线' },
+      { value: 2, label: '资损' },
+      { value: 3, label: '订单' },
+      { value: 4, label: '其他' }
+    ]
   }, {
     name: '影响面描述',
     key: 'influenceDesc',

src/views/projectManage/onlineproblem/detial/component/base.vue

@@ -64,6 +64,7 @@
             <selectTeam
               :value="data.teamId"
               :name="data.teamName"
+              :biz-id-flag="false"
               @onChange="(e) => onChange('teamId', e)"
             />
           </template>