|
|
@@ -151,9 +151,9 @@ INTERFACE_EXPORT = (() => {
|
|
|
"03WHF": "2",
|
|
|
"04ACFZF": "3"
|
|
|
}
|
|
|
- const reg1 = new RegExp('\n','g'), reg2 = new RegExp('\r','g'),
|
|
|
- reg3 = new RegExp(' ','g'), reg4 = new RegExp('\t','g')
|
|
|
- ;
|
|
|
+ const reg1 = new RegExp('\n', 'g'), reg2 = new RegExp('\r', 'g'),
|
|
|
+ reg3 = new RegExp(' ', 'g'), reg4 = new RegExp('\t', 'g')
|
|
|
+ ;
|
|
|
|
|
|
function getBasePrice(projectGLJID, tenderProject) {
|
|
|
let glj = _.find(tenderProject.projectGLJ.datas.gljList, {
|
|
|
@@ -1773,6 +1773,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
function Params(tenderProject) {
|
|
|
let feature = tenderProject.property.projectFeature ? tenderProject.property.projectFeature : [];
|
|
|
let featrueMap = {};
|
|
|
+ debugger;
|
|
|
let baseMap = {};
|
|
|
for (let f of feature) {
|
|
|
featrueMap[f.key] = f;
|
|
|
@@ -1792,7 +1793,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
if (baseMap["natureConstruction"].value == "新建") BuildType = 0;
|
|
|
if (baseMap["natureConstruction"].value == "改扩建") BuildType = 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
let Terrain = "";
|
|
|
if (baseMap["terrainCategory"]) {
|
|
|
if (baseMap["terrainCategory"].value == "平原微丘") Terrain = 0;
|
|
|
@@ -1800,7 +1801,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
|
let DesignSpeed = parseFloat(featrueMap["designSpeed"].value);
|
|
|
if (isNaN(DesignSpeed)) DesignSpeed = 0;
|
|
|
-
|
|
|
+
|
|
|
let Structure = 0;
|
|
|
if (featrueMap["pavementStructure"]) {
|
|
|
if (featrueMap["pavementStructure"].value == "沥青路面") Structure = 0;
|
|
|
@@ -1808,8 +1809,8 @@ INTERFACE_EXPORT = (() => {
|
|
|
if (featrueMap["pavementStructure"].value == "其他类型路面") Structure = 2;
|
|
|
}
|
|
|
let RoadGrade = "";
|
|
|
- if (RoadGradeMap[baseMap["roadGrade"]]) {
|
|
|
- if (RoadGradeMap[baseMap["roadGrade"].value]) RoadGrade = RoadGradeMap[baseMap["roadGrade"].value];
|
|
|
+ if (baseMap["roadGrade"] && RoadGradeMap[baseMap["roadGrade"].value]) {
|
|
|
+ RoadGrade = RoadGradeMap[baseMap["roadGrade"].value];
|
|
|
}
|
|
|
|
|
|
const attrs = [{
|