Merge remote-tracking branch 'origin/dev' into dev

entry/src/main/ets/pages/Judge.ets

@@ -336,20 +336,26 @@ struct Index {
   // 获取场地设备信息
   async initCDSBInfo() {
     const cdsbParams = await getSyncData('MA_CDSBINFO')
+    //只记录考试项目的模型
+    const projectsObj = this.projectsObj
     //@ts-ignore
     cdsbParams.forEach((cdsb) => {
       const key = decodeURI(cdsb.itemsno);
       const newKey = key.split('~').join('_')
-      this.cdsbInfoObj[newKey] = {
+      //@ts-ignore
-        kdid: cdsb.kdid,
+      const xmdm = key.split('~')[0] * 1
-        sbbh: cdsb.sbbh,
+      if(projectsObj[xmdm]){
-        sbbm: cdsb.sbbm,
+        this.cdsbInfoObj[newKey] = {
-        itemsno: key,
+          kdid: cdsb.kdid,
-        modelKey: newKey,
+          sbbh: cdsb.sbbh,
-        //@ts-ignore
+          sbbm: cdsb.sbbm,
-        xmdm: key.split('~')[0] * 1,
+          itemsno: key,
-        xmxh: key.split('~')[1],
+          modelKey: newKey,
+          xmdm,
+          xmxh: key.split('~')[1],
+        }
       }
+
     })
   }