flx:广深高速项目 新增字段桥梁

public/js/config.js

@@ -23,7 +23,8 @@ var COMPANY = ""; //通用
 // COMPANY = 'hfqc' //乌丹站舍(合肥启程)
 // COMPANY = 'mulei'   //木垒
 // COMPANY = 'xjw' //新金湾
-COMPANY = 'chaozhou' //潮州
+// COMPANY = 'chaozhou' //潮州
+COMPANY = 'gsgs' //广深高速
 
 var PROJECT = {
     local_test: "common", // 普通版

src/assets/i18n/langs/cn/companyAdmin/companyDiagram.js

@@ -72,7 +72,7 @@ export default {
         companyName: '机构名称',
     },
 
-    dialog_Account_box: {/*账号弹框*/
+    dialog_Account_box: { /*账号弹框*/
         account: '账号',
         password: '密码',
         showPassword: '密码',
@@ -92,6 +92,7 @@ export default {
         engineeringPurpose: '工程用途',
         structureType: '结构类型',
         projectAcreage: '项目面积(m²)',
+        bridgeLength: '桥梁长度(m)',
         bulidStatus: '工程状态',
         startWorkDate: '开工日期',
         date_placeholder: '请选择日期',
@@ -103,40 +104,37 @@ export default {
         placeholder: '请输入数字',
         shopDrawing: '现场施工图',
     },
-    goProjectBackEnd:'进入项目后台',
+    goProjectBackEnd: '进入项目后台',
-    projectBackEnd:'项目后台',
+    projectBackEnd: '项目后台',
-    goDevCenter:'进入设备中台',
+    goDevCenter: '进入设备中台',
-    devCenter:'设备中台',
+    devCenter: '设备中台',
-    operatingCenter:'运营后台',
+    operatingCenter: '运营后台',
-    BUILDSTATUS:[
+    BUILDSTATUS: [
-        {id:0,name:'未开工'},{id:1,name:'在建'},{id:2,name:'停工'},{id:3,name:'竣备'}
+        { id: 0, name: '未开工' }, { id: 1, name: '在建' }, { id: 2, name: '停工' }, { id: 3, name: '竣备' }
     ],
-    PROJECTTYPE:[
+    PROJECTTYPE: [
-        {id:1,name:'房建'},{id:2,name:'市政'},{id:3,name:'安装'},{id:4,name:'装饰'},{id:5,name:'公路'},{id:6,name:'冶炼'},{id:7,name:'矿山'},
+        { id: 1, name: '房建' }, { id: 2, name: '市政' }, { id: 3, name: '安装' }, { id: 4, name: '装饰' }, { id: 5, name: '公路' }, { id: 6, name: '冶炼' }, { id: 7, name: '矿山' },
-        {id:8,name:'化工石油'},{id:9,name:'水利水电'},{id:10,name:'电力'}
+        { id: 8, name: '化工石油' }, { id: 9, name: '水利水电' }, { id: 10, name: '电力' }, { id: 11, name: '农林' }, { id: 12, name: '港口与航道' }, { id: 13, name: '航天航空' }, { id: 14, name: '通信' }, { id: 15, name: '其他' }
-        ,{id:11,name:'农林'},{id:12,name:'港口与航道'},{id:13,name:'航天航空'},{id:14,name:'通信'},{id:15,name:'其他'}
+    ], //工程类别
-      ],//工程类别
 
-      CONSTRUCTIONSTAGE:CONSTRUCTIONSTAGE,//施工阶段
+    CONSTRUCTIONSTAGE: CONSTRUCTIONSTAGE, //施工阶段
-      ENGINEERINGPRUPOSE:[
+    ENGINEERINGPRUPOSE: [
-        {id:1,name:'住宅建筑'},{id:2,name:'宿舍建筑'},{id:3,name:'教育建筑'},{id:4,name:'办公建筑'},{id:5,name:'科研建筑'},
+        { id: 1, name: '住宅建筑' }, { id: 2, name: '宿舍建筑' }, { id: 3, name: '教育建筑' }, { id: 4, name: '办公建筑' }, { id: 5, name: '科研建筑' },
-        {id:6,name:'文化建筑'},{id:7,name:'商业建筑'},
+        { id: 6, name: '文化建筑' }, { id: 7, name: '商业建筑' },
-        {id:8,name:'体育建筑'},{id:9,name:'医疗建筑'},{id:10,name:'交通建筑'}
+        { id: 8, name: '体育建筑' }, { id: 9, name: '医疗建筑' }, { id: 10, name: '交通建筑' }, { id: 11, name: '司法建筑' }, { id: 12, name: '纪念建筑' }, { id: 13, name: '园林建筑' }, { id: 14, name: '综合建筑' },
-        ,{id:11,name:'司法建筑'},{id:12,name:'纪念建筑'},{id:13,name:'园林建筑'},{id:14,name:'综合建筑'},
+        { id: 15, name: '工业厂房' }, { id: 16, name: '电子厂房' }, { id: 17, name: '其他' }
-        {id:15,name:'工业厂房'},{id:16,name:'电子厂房'},{id:17,name:'其他'}
+    ], //工程用途
-      ],//工程用途
+    STRUCTURETYPE: [
-      STRUCTURETYPE:[
+        { id: 1, name: '装配整体式框级结构' }, { id: 2, name: '装配整体式剪力墙结构' }, { id: 3, name: '装配整体式框级-现浇剪力墙结构' }, { id: 4, name: '装配整体式框级-现浇核心筒结构' },
-        {id:1,name:'装配整体式框级结构'},{id:2,name:'装配整体式剪力墙结构'},{id:3,name:'装配整体式框级-现浇剪力墙结构'},{id:4,name:'装配整体式框级-现浇核心筒结构'},
+        { id: 5, name: '装配整体式部分框支剪力墙结构' }, { id: 6, name: '混合结构' }, { id: 7, name: '框架结构' },
-        {id:5,name:'装配整体式部分框支剪力墙结构'},{id:6,name:'混合结构'},{id:7,name:'框架结构'},
+        { id: 8, name: '剪力墙结构' }, { id: 9, name: '框架-剪力墙结构' }, { id: 10, name: '简体结构' }, { id: 11, name: '钢结构' }, { id: 12, name: '型钢混凝土结构' }, { id: 13, name: '砖混结构' }, { id: 14, name: '砖木结构' }
-        {id:8,name:'剪力墙结构'},{id:9,name:'框架-剪力墙结构'},{id:10,name:'简体结构'}
+    ], //结构类型
-        ,{id:11,name:'钢结构'},{id:12,name:'型钢混凝土结构'},{id:13,name:'砖混结构'},{id:14,name:'砖木结构'}
-      ],//结构类型
 
-      projectSchedule:'项目进度',
+    projectSchedule: '项目进度',
-      sheet:'项目信息表',
+    sheet: '项目信息表',
-      pageTitle:'运营后台管理系统',
+    pageTitle: '运营后台管理系统',
-      menuName1:'组织架构管理',
+    menuName1: '组织架构管理',
-      menuName2:'文档资料上传',
+    menuName2: '文档资料上传',
     projectInfo: '项目信息',
     projectAddress: '项目地址',
     projectManager: '项目经理',
@@ -177,22 +175,21 @@ export default {
     noRectificationSafeQuestion: '未整改安全问题',
     qualityManage: '质量管理',
     // sunRainTable: '晴雨表',
-      devAlarm:'设备报警',
+    devAlarm: '设备报警',
     rectificationQualityQuestion: '已整改',
     noRectificationQualityQuestion: '未整改',
     alarmRecord: '报警列表',
     noData: '暂无数据',
-      optionList:[
+    optionList: [{
-        {
+            name: '宣传视频',
-          name:'宣传视频',
+            index: 1
-          index:1
         },
         {
-          name:'效果图',
+            name: '效果图',
-          index:2
+            index: 2
         }
     ],
-      echarTitleData: ['视频设备','人脸设备','特种设备','环境设备'],
+    echarTitleData: ['视频设备', '人脸设备', '特种设备', '环境设备'],
     devNum: '设备数',
     safeQuestion: '安全问题数',
     qualityQuestion: '质量问题数',
@@ -201,4 +198,4 @@ export default {
     uploadError: '上传失败，请重试',
     resultImg: '效果图',
     uploadSuccess: '上传成功',
-    }
+}

src/views/projectFront/projectSummary/baseInfo.vue

@@ -88,7 +88,17 @@
                   projectDetail.projectNumber
                 }}</span>
               </div>
-              <div class="flex3">
+              <div class="flex3" v-if="company == 'gsgs'">
+                <span class="width_35">{{
+                  $t(
+                    'message.companyDiagram.dialog_ProjectPop_up.bridgeLength'
+                  )
+                }}</span>
+                <span class="width_65"
+                  >{{ projectDetail.bridgeLength }}(m)</span
+                >
+              </div>
+              <div class="flex3" v-else>
                 <span class="width_35">{{
                   $t(
                     'message.companyDiagram.dialog_ProjectPop_up.projectAcreage'
@@ -456,6 +466,20 @@
             </el-select>
           </el-form-item>
           <el-form-item
+          v-if="company == 'gsgs'"
+            :label="
+              $t('message.companyDiagram.dialog_ProjectPop_up.bridgeLength')
+            "
+            prop="bridgeLength"
+          >
+            <el-input
+              v-model="addProjectForm.bridgeLength"
+              :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              type="number"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            v-else
             :label="
               $t('message.companyDiagram.dialog_ProjectPop_up.projectAcreage')
             "
@@ -467,6 +491,7 @@
               type="number"
             ></el-input>
           </el-form-item>
+          
           <el-form-item
             :label="
               $t('message.companyDiagram.dialog_ProjectPop_up.bulidStatus')
@@ -717,6 +742,7 @@ export default {
         constructionMapUrl: '',
         longitude: "",
         projectAcreage: "",
+        bridgeLength: "",
         projectAddress: "",
         projectName: "",
         projectNumber: "",
@@ -743,6 +769,7 @@ export default {
         constructionMapUrl: '',
         longitude: "",
         projectAcreage: "",
+        bridgeLength: "",
         projectAddress: "",
         projectName: "",
         projectNumber: "",