Tang 3 роки тому
батько
коміт
48e3368346

+ 1 - 1
.env.staging

@@ -7,5 +7,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # 中正云教育管理后台/预发布环境
-VUE_APP_BASE_API = 'http://192.168.1.222:6030/'
+VUE_APP_BASE_API = 'http://120.79.166.78:19007/'
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'

BIN
public/favicon.ico


BIN
src/assets/images/logo@2xS.png


BIN
src/assets/images/logo@2xSYT.png


BIN
src/assets/images/logo@2xSYTs.png


BIN
src/assets/images/logo@2xSs.png


+ 2 - 2
src/layout/components/Sidebar/Logo.vue

@@ -68,7 +68,7 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 27px;
+      width: 37.4px;
       height: 27px;
       vertical-align: middle;
       margin-right: 12px;
@@ -81,7 +81,7 @@ export default {
       font-weight: bold;
       line-height: 50px;
       font-size: 16px;
-      font-family: "Lucida Calligraphy", cursive, serif, sans-serif;
+      font-family: "Heiti SC","黑体-简";
       vertical-align: middle;
     }
   }

+ 4 - 3
src/views/Marketing/order/offlineOrder/batchRecord/secondStep/setGoodsList.vue

@@ -230,10 +230,11 @@ export default {
         goodsStatus: 1,
         status: 1,
         businessIds: this.oldObj.businessId,
+        subjectId : subjectId
       };
-      if (type == 1 || type == 2) {
-        data.subjectId = subjectId;
-      }
+      // if (type == 1 || type == 2) {
+      //   data.subjectId = subjectId;
+      // }
       this.$api.inquiregoodslistToInputList(data).then((res) => {
         res.rows.forEach((item) => {
           item.subjectId = subjectId;

+ 9 - 1
src/views/education/examManagement/examArrangement/applicableProducts/checkStudent.vue

@@ -3,7 +3,7 @@
     <el-dialog
       @closed="loadingClose"
       :visible.sync="dialogVisible"
-      width="960px"
+      width="1060px"
       :show-close="false"
       :close-on-click-modal="false"
     >
@@ -161,10 +161,18 @@ export default {
           label: "绑定手机号码",
           prop: "telphone",
         },
+        {
+          label:"所在公司",
+          prop:"companyName"
+        }
       ],
       total: 0,
       //搜索
       formList: [
+        {
+          prop: "companyName",
+          placeholder: "请输入所在公司",
+        },
         {
           prop: "searchKey",
           placeholder: "请输入学员姓名/学员身份证",

+ 1 - 1
src/views/education/questionBankLearning/questionRecordPage/index.vue

@@ -23,7 +23,7 @@
 import bankGoods from "./bankGoods.vue";
 import giftPaper from "./giftPaper.vue";
 export default {
-  name: "questionRecordPage",
+  name: "QuestionRecordPage",
   components: {
     bankGoods,
     giftPaper,

+ 9 - 0
src/views/education/questionBankLearning/questionRecordPage/listOfQuestions/studentData/index.vue

@@ -274,6 +274,7 @@ export default {
       orderGoodsId: "",
       details: [],
       getInfoRecord: [],
+      firstCome:true,
     };
   },
   created() {
@@ -288,6 +289,10 @@ export default {
       })
       .then((res) => {
         this.details = res.data;
+        if(res.data.length){
+          this.activeName = res.data[0].examId
+          this.ActiveName(res.data[0].examId)
+        }
       });
   },
   computed: {
@@ -356,6 +361,10 @@ export default {
           for (let i = 0; i < this.details.length; i++) {
             if (this.details[i].examId === val) {
               this.$set(this.details[i], "recordList", res.rows);
+              if(this.firstCome){
+                this.activeRecordId(res.rows[0])
+                this.firstCome = false
+              }
               break;
             }
           }