Tony Kang před 2 roky
rodič
revize
d2fcae040d

+ 1 - 1
web/building_saas/standard_interface/export/base.js

@@ -464,7 +464,7 @@ const INTERFACE_EXPORT_BASE = (() => {
   async function getProjectByGranularity(granularity, requestForSummaryInfo, tenderID, userID) {
     let projectData = _cache.projectData;
     // 没有数据,需要拉取
-    if (!Object.keys(projectData).length) {
+    if (projectData === undefined || projectData === null || !Object.keys(projectData).length) {
       projectData = await ajaxPost('/pm/api/getProjectByGranularity', {
         user_id: userID,
         tenderID,

+ 18 - 8
web/building_saas/standard_interface/export/guangxi_common.js

@@ -1769,19 +1769,29 @@ INTERFACE_EXPORT = (() => {
 
 
       let BuildType = "";
-      if (baseMap["natureConstruction"].value == "新建") BuildType = 0;
-      if (baseMap["natureConstruction"].value == "改扩建") BuildType = 1;
+      if (baseMap["natureConstruction"]) {
+        if (baseMap["natureConstruction"].value == "新建") BuildType = 0;
+        if (baseMap["natureConstruction"].value == "改扩建") BuildType = 1;
+      }
+      
       let Terrain = "";
-      if (baseMap["terrainCategory"].value == "平原微丘") Terrain = 0;
-      if (baseMap["terrainCategory"].value == "山岭重丘") Terrain = 1;
+      if (baseMap["terrainCategory"]) {
+        if (baseMap["terrainCategory"].value == "平原微丘") Terrain = 0;
+        if (baseMap["terrainCategory"].value == "山岭重丘") Terrain = 1;
+      }
       let DesignSpeed = parseFloat(featrueMap["designSpeed"].value);
       if (isNaN(DesignSpeed)) DesignSpeed = 0;
+      
       let Structure = 0;
-      if (featrueMap["pavementStructure"].value == "沥青路面") Structure = 0;
-      if (featrueMap["pavementStructure"].value == "水泥混凝土路面") Structure = 1;
-      if (featrueMap["pavementStructure"].value == "其他类型路面") Structure = 2;
+      if (featrueMap["pavementStructure"]) {
+        if (featrueMap["pavementStructure"].value == "沥青路面") Structure = 0;
+        if (featrueMap["pavementStructure"].value == "水泥混凝土路面") Structure = 1;
+        if (featrueMap["pavementStructure"].value == "其他类型路面") Structure = 2;
+      }
       let RoadGrade = "";
-      if (RoadGradeMap[baseMap["roadGrade"].value]) RoadGrade = RoadGradeMap[baseMap["roadGrade"].value];
+      if (RoadGradeMap[baseMap["roadGrade"]]) {
+        if (RoadGradeMap[baseMap["roadGrade"].value]) RoadGrade = RoadGradeMap[baseMap["roadGrade"].value];
+      }
 
       const attrs = [{
         name: "PrjArea",