施工继教需求调整

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 中正云教育管理后台
+VUE_APP_TITLE = 加载中...
 
 # 生产环境配置
 NODE_ENV = 'production'

src/newApi/classTab.js

@@ -125,6 +125,17 @@ export default {
             params: data
         })
     },
+    //查询学员学时列表New
+    inquireGradegradelistUserPeriodsNew(data) {
+        return request({
+            url: '/grade/grade/listUserPeriod/new',
+            method: 'get',
+            headers: {
+                isToken: false
+            },
+            params: data
+        })
+    },
     //获取班级详细信息
     obtainGradegrade(data) {
         return request({
@@ -352,6 +363,17 @@ export default {
             params: data
         })
     },
+    //查询学员视频学习记录列表New
+    inquireGradegradelistUserVideoRecordNew(data) {
+        return request({
+            url: '/grade/grade/listUserVideoRecord/new',
+            method: 'get',
+            headers: {
+                isToken: false
+            },
+            params: data
+        })
+    },
     //按周查询学员学时学习记录列表
     inquireGradegradelistUserPeriodWeekRecord(data) {
         return request({

src/permission.js

@@ -60,6 +60,10 @@ router.beforeEach(async (to, from, next) => {
             token: res.data.token,
             keyId: `${res.data.userId}-${res.data.goodsId}-${res.data.gradeId}-${res.data.orderGoodsId}`,
           };
+          if (res.data.tenantName) {
+            store.state.user.companyName = res.data.tenantName
+            document.title = res.data.tenantName
+          }
           sessionStorage.TenantId = res.data.tenantId
           setToken(data.token)
           store.commit('SET_TOKEN', data.token)

src/utils/request.js

@@ -9,7 +9,7 @@ import { paramMate } from "@/utils/common";
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 export const baseURL = process.env.VUE_APP_BASE_API
-// export const baseURL = 'http://192.168.1.7:5030/'
+// export const baseURL = 'https://cloud.xyyxt.net/'
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 // export const BASE_IMG_URL = 'https://file.xyyxt.net'
 const service = axios.create({
@@ -25,7 +25,11 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['AuthorizationToken'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
-  config.headers.TenantId = sessionStorage.TenantId || methods.getQueryVariable('TenantId')
+  if(config.params && config.params.tenantIdReplace){
+    config.headers.TenantId = config.params.tenantIdReplace
+  }else{
+    config.headers.TenantId = sessionStorage.TenantId || methods.getQueryVariable('TenantId')
+  }
 
   // 转换时间戳
   if (config.isProce) {

src/views/classHoursReview/component/LessonTable.vue

@@ -151,11 +151,11 @@
           </span>
           <span v-else-if="item.scope === 'durTime' && scope2.row.type !== 5">
             <span v-if="scope2.row['type'] == 3">
-            {{(scope2.row[item.prop] / 60).toFixed(0) + "分钟" || "0分钟0"}}
-            {{(scope2.row[item.prop] % 60) || 0}}秒
+              {{ (scope2.row[item.prop] / 60).toFixed(0) + "分钟" || "0分钟0" }}
+              {{ scope2.row[item.prop] % 60 || 0 }}秒
             </span>
             <span v-else>
-              {{"分数：" + scope2.row["performance"]}}
+              {{ "分数：" + scope2.row["performance"] }}
             </span>
           </span>
           <span
@@ -279,7 +279,9 @@
                     (scope2.row[item.prop2] - scope2.row[item.prop1]) /
                     60
                   ).toFixed(0) || 0
-                }}分钟{{(scope2.row[item.prop2] - scope2.row[item.prop1]) % 60}}秒
+                }}分钟{{
+                  (scope2.row[item.prop2] - scope2.row[item.prop1]) % 60
+                }}秒
               </div>
             </div>
           </div>
@@ -477,6 +479,7 @@ export default {
         goodsId,
         gradeId,
         orderGoodsId: this.setData.orderGoodsId,
+        tenantIdReplace: this.setData.tenantId,
       };
       if (item.type === 3) {
         data.sectionId = item.id;

src/views/classHoursReview/studyTimes.vue

@@ -72,7 +72,7 @@ export default {
   },
   mounted() {
     this.getUserInfo(true);
-    console.log(this.setData,'setData')
+    console.log(this.setData, "setData");
   },
   methods: {
     /**
@@ -103,6 +103,7 @@ export default {
         userId: this.setData.userId,
         goodsId: this.setData.goodsId,
         gradeId: this.setData.id,
+        tenantIdReplace: this.setData.tenantId,
       };
       if (item.type === 3) {
         data.sectionId = item.id;
@@ -133,6 +134,7 @@ export default {
         goodsId: this.setData.goodsId,
         gradeId: this.setData.id,
         orderGoodsId: this.setData.orderGoodsId,
+        tenantIdReplace: this.setData.tenantId,
       };
       if (item.type === 3) {
         data.sectionId = item.id;
@@ -168,6 +170,7 @@ export default {
         goodsId: this.setData.goodsId,
         gradeId: this.setData.id,
         orderGoodsId: this.setData.orderGoodsId,
+        tenantIdReplace: this.setData.tenantId,
       };
       if (item.type === 3) {
         data.sectionId = item.id;
@@ -192,14 +195,19 @@ export default {
           userId: this.setData.userId,
           goodsId: this.setData.goodsId,
           orderGoodsId: this.setData.orderGoodsId,
+          tenantIdReplace: this.setData.tenantId,
         })
         .then(async (res) => {
-          let data = res.rows[0];
-          var result = await this.$api.obtainGoods(this.setData.goodsId);
-          data["fullName"] =
-            result.data.educationName +
-            result.data.projectName +
-            result.data.businessName;
+          let data = res.rows[0] || {};
+          if (this.setData.fullName) {
+            data["fullName"] = this.setData.fullName;
+          } else {
+            var result = await this.$api.obtainGoods(this.setData.goodsId);
+            data["fullName"] =
+              result.data.educationName +
+              result.data.projectName +
+              result.data.businessName;
+          }
 
           data["supervise"] = true;
           this.userData = data;
@@ -238,6 +246,7 @@ export default {
         userId: this.setData.userId,
         goodsId: this.setData.goodsId,
         orderGoodsId: this.setData.orderGoodsId,
+        tenantIdReplace: this.setData.tenantId,
       };
       this.loading = true;
       this.$api

src/views/secondBuild/completionList/index.vue

@@ -158,7 +158,7 @@ export default {
         {
           label: "填写资料审核状态",
           prop: "profileStatus",
-          hidden: true,
+          hidden: false,
           scope: "isOptions",
           options: [
             {
@@ -178,13 +178,13 @@ export default {
         {
           label: "学时审批状态",
           prop: "periodStatus",
-          hidden: true,
+          hidden: false,
           scope: "statusPeriod",
         },
         {
           label: "审核通过时间",
           prop: "periodTime",
-          hidden: true,
+          hidden: false,
           scope: "aTimeList",
         },
         {
@@ -251,6 +251,8 @@ export default {
         goodsId: v.goodsId,
         goodsName: v.goodsName,
         orderGoodsId: v.orderGoodsId,
+        tenantId: v.tenantId,
+        fullName: v.fullName,
         keyId: `${v.userId}-${v.goodsId}-${v.gradeId}-${v.orderGoodsId}`,
       };
       this.checkSession(data)
@@ -287,7 +289,7 @@ export default {
       }
       var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
-        .inquireGradegradelistUserPeriods(data)
+        .inquireGradegradelistUserPeriodsNew(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;

src/views/secondBuild/learningList/index.vue

@@ -228,7 +228,7 @@ export default {
       }
       var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
-        .inquireGradegradelistUserVideoRecord(data)
+        .inquireGradegradelistUserVideoRecordNew(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;