'增加学有义方'

config/dev.env.js

@@ -6,5 +6,6 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   BASE_API: '"http://res.yifangjiaoyu.cn/cms"',
   SKILL_API: '"http://audioskill.efunbox.cn/audio"',
-  ali_API: '"http://audio-skill-test.ai160.com/audio"'
+  ali_API: '"http://audio-skill-test.ai160.com/audio"',
+  XYYF_API: '"https://asxx.efunbox.cn"'
 })

config/prod.env.js

@@ -3,5 +3,6 @@ module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"http://resources.ai160.com/cms"',
   SKILL_API: '"https://baidu-audio-skill.ai160.com/audio"',
-  ali_API: '"https://ali-audio-skill.ai160.com/audio"'
+  ali_API: '"https://ali-audio-skill.ai160.com/audio"',
+  XYYF_API: '"https://asxx.efunbox.cn"'
 }

src/api/skill.js

@@ -52,9 +52,9 @@ service.interceptors.response.use(
 
 
 export function getSkillList (code) {
-  if (code === 'ALI') {
+  if (code === 'XYYF') {
     return service({
-      url: `${process.env.ali_API}/skillInfo`,
+      url: `${process.env.XYYF_API}/course/courseAll`,
       method: 'get',
       params: {
         code
@@ -78,11 +78,21 @@ export function getSkillData (params) {
       params
     })
   } else {
+    // return service({
+    //   url: `${process.env.ali_API}/statistics`,
+    //   method: 'get',
+    //   params: {
+    //     skillId: params.skillId,
+    //     startDate: params.startDate,
+    //     endDate: params.endDate,
+    //   }
+    // })
+    console.log(123123123,params)
     return service({
-      url: `${process.env.ali_API}/statistics`,
+      url: `${process.env.XYYF_API}/statistics`,
       method: 'get',
       params: {
-        skillId: params.skillId,
+        courseId: params.skillId,
         startDate: params.startDate,
         endDate: params.endDate,
       }

src/pages/skill/Skill.vue

@@ -1,9 +1,15 @@
 <template>
-  <div >
-    <el-card  >
-      <el-form :model="skillParams" ref="skillParams"  class="clearfix topForm">
+  <div>
+    <el-card>
+      <el-form :model="skillParams" ref="skillParams" class="clearfix topForm">
         <div class="leftForm-skill">
-          <el-form-item  style="display:flex;" prop="channel" name="channel" :rules="[{ required: true, message: '请选择渠道', trigger: 'blur' }]" label="渠道选择">
+          <el-form-item
+            style="display:flex;"
+            prop="channel"
+            name="channel"
+            :rules="[{ required: true, message: '请选择渠道', trigger: 'blur' }]"
+            label="渠道选择"
+          >
             <el-select
               v-model="skillParams.channel"
               @change="channelChange"
@@ -14,32 +20,44 @@
                 v-for="item in skillChanneList"
                 :key="item.code"
                 :label="item.title"
-                :value="item.code"  
+                :value="item.code"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="pruductForm-skill" prop="skillId"  label="技能选择" :rules="[{ required: true, message: '请选择技能', trigger: 'blur' }]">
-            <el-select
-              v-model="skillParams.skillId"
-              placeholder="请选择技能"
-              style="width:160px"
-            >
+          <el-form-item
+            class="pruductForm-skill"
+            prop="skillId"
+            label="技能选择"
+            :rules="[{ required: true, message: '请选择技能', trigger: 'blur' }]"
+          >
+          <!-- 兼容小度在家和学有义方不同的返回内容 -->
+            <el-select v-model="skillParams.skillId" placeholder="请选择技能" style="width:160px">
               <el-option
                 v-for="item in skillList"
-                :key="item.skillId"
-                :label="item.skillName"
-                :value="item.skillId"
+                :key="item.skillId ? item.skillId : item.id" 
+                :label="item.skillName ? item.skillName : item.title"
+                :value="item.skillId ? item.skillId : item.id"
               ></el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item class="dateForm-skill" name="data" label="查询日期" style="display:flex">
-            <el-date-picker style="width:140px" v-model="skillParams.startDate" type="date" placeholder="起"></el-date-picker>
-            <el-date-picker style="width:140px" v-model="skillParams.endDate" type="date" placeholder="止"></el-date-picker>
+            <el-date-picker
+              style="width:140px"
+              v-model="skillParams.startDate"
+              type="date"
+              placeholder="起"
+            ></el-date-picker>
+            <el-date-picker
+              style="width:140px"
+              v-model="skillParams.endDate"
+              type="date"
+              placeholder="止"
+            ></el-date-picker>
           </el-form-item>
         </div>
         <el-form-item>
-        <el-button type="primary"  @click="submitForm('skillParams')">搜索</el-button>
+          <el-button type="primary" @click="submitForm('skillParams')">搜索</el-button>
         </el-form-item>
       </el-form>
       <el-table :data="skillData" border style="width: 100%" :height="tableHeight">
@@ -204,6 +222,7 @@ export default {
       skillChanneList: [
         { title: "百度-小度在家", code: "BAIDU" },
         // { title: "阿里-天猫精灵", code: "ALI" },
+        { title: "百度-学有义方", code: "XYYF" }
       ],
       rules: {
         channel: [{ required: true, trigger: "blur" }],
@@ -263,7 +282,7 @@ export default {
       return formatDate(yesterday, 2);
     },
     channelChange(val) {
-      this.skillParams.skillId = ""
+      this.skillParams.skillId = "";
       this.$store.dispatch("getSkillList", val);
     },
     columnZero() {