项目后台(项目基本信息管理):bug修复

src/assets/i18n/langs/cn/projectInfo.js

@@ -245,7 +245,7 @@ export default {
   room:'户室',
   roomNum:'户数',
   building:'楼栋',
-  floorAndRoomRewriteName:'楼层|户名 重命名',
+  floorAndRoomRewriteName:'楼层|户名 重命名',
   upFloorNum:'地上层数',
   underFloorNum:'地下层数',
   long:'长度',

src/components/map/gd-map.vue

@@ -1,22 +1,37 @@
 <template>
   <div>
     <!-- 坐标拾取 -->
-        <el-dialog @close="closeMap"
+    <el-dialog
+      @close="closeMap"
       :title="$t('message.alarmValueSet.coordinatePick')"
       :visible.sync="dialogVisible"
       :modal-append-to-body="false"
-                   width="80%">
+      width="80%"
+    >
       <div slot="default" class="coordinate-picking">
         <!-- 地址 -->
         {{$t('message.alarmValueSet.gdAddress')}}:
-                <el-input size="medium" v-model="coordinateInfo.city" id="tipinput" :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
+        <el-input
+          size="medium"
+          v-model="coordinateInfo.city"
+          id="tipinput"
+          :placeholder="$t('message.alarmValueSet.placeholder')"
+        ></el-input>
         <!--                <el-button type="primary" size="medium" @click="search">查询</el-button>-->
         <!-- 经度 -->
         {{$t('message.alarmValueSet.longitude')}}:
-                <el-input size="medium" v-model="coordinateInfo.lng" :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
+        <el-input
+          size="medium"
+          v-model="coordinateInfo.lng"
+          :placeholder="$t('message.alarmValueSet.placeholder')"
+        ></el-input>
         <!-- 纬度 -->
         {{$t('message.alarmValueSet.latitude')}}:
-                <el-input size="medium" v-model="coordinateInfo.lat" :placeholder="$t('message.alarmValueSet.placeholder')"></el-input>
+        <el-input
+          size="medium"
+          v-model="coordinateInfo.lat"
+          :placeholder="$t('message.alarmValueSet.placeholder')"
+        ></el-input>
         <el-button size="medium" type="primary" @click="submit">
           <!-- 提交 -->
           {{$t('message.alarmValueSet.submit')}}
@@ -29,24 +44,36 @@
 
 <script>
 export default {
-        name: "gd-map",
+  props: {
-        mounted() {
+    addProjectForm: {
-            this.$nextTick(() => {
+      type: Object,
-                this.initMap();
+      default: {}
-            })
+    }
   },
+  name: "gd-map",
   data() {
     return {
       coordinateInfo: {
-                    lng: '',
+        city:"",
-                    lat: '',
+        lng: "",
+        lat: ""
       },
       map: {},
       auto: {},
       placeSearch: {},
       dialogVisible: true
-            }
+    };
   },
+  mounted() {
+    // console.log("过来了吗", this.addProjectForm);
+    this.coordinateInfo.city = this.addProjectForm.areaName
+    this.coordinateInfo.lng = this.addProjectForm.longitude
+    this.coordinateInfo.lat = this.addProjectForm.latitude
+    this.$nextTick(() => {
+      this.initMap();
+    });
+  },
+ 
   methods: {
     initMap() {
       //地图加载
@@ -62,14 +89,14 @@
         map: this.map
       }); //构造地点查询类
       AMap.event.addListener(this.auto, "select", this.select); //注册监听，当选中某条记录时会触发
-                this.map.on('click', (e) => {
+      this.map.on("click", e => {
         this.coordinateInfo.lng = e.lnglat.getLng();
         this.coordinateInfo.lat = e.lnglat.getLat();
         // console.log('您在 [ ' + e.lnglat.getLng() + ',' + e.lnglat.getLat() + ' ] 的位置单击了地图！');
       });
     },
     select(e) {
-                console.log('select', e)
+      console.log("select", e);
       this.placeSearch.setCity(e.poi.adcode);
       this.placeSearch.search(e.poi.name); //关键字查询查询
     },
@@ -79,13 +106,13 @@
       // this.placeSearch.search(e.poi.name);  //关键字查询查询
     },
     submit() {
-                this.$emit('save', this.coordinateInfo);
+      this.$emit("save", this.coordinateInfo);
     },
     closeMap() {
-                this.$emit('closeMap', false);
+      this.$emit("closeMap", false);
-            }
     }
   }
+};
 </script>
 
 <style lang="less" scoped>

src/store/index.js

@@ -45,8 +45,8 @@ export default new Vuex.Store({
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
-    // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://192.168.34.125:6023/upload/image',
     // FILEURL: 'http://192.168.34.125:6023/image/',
     // 邱平毅的
-    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    FILEURL: 'http://192.168.34.216:6023/image/',
+    // FILEURL: 'http://192.168.34.216:6023/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

src/views/projectFront/projectSummary/baseInfo.vue

@@ -649,7 +649,7 @@
       <img width="100%" :src="bigImageUrl" alt />
     </el-dialog>
     <!--高德地图-->
-    <gd-map v-if="showMap" @closeMap="closeMap" @save="getLngLat"></gd-map>
+    <gd-map v-if="showMap" :addProjectForm="addProjectForm" @closeMap="closeMap" @save="getLngLat"></gd-map>
   </div>
 </template>
 <script>

src/views/projectFront/projectSummary/cooperationUnit.vue

@@ -198,7 +198,7 @@
       :visible.sync="addEnterpriseDialog"
       width="750px"
     >
-      <vue-scroll style="height: 618px">
+      <vue-scroll class="adddialog" style="height: 618px">
         <div class="dialog_content" ref="enterpriseDialog">
           <el-form
             size="small"
@@ -233,13 +233,14 @@
               </el-col>
             </el-row>
             <el-row :gutter="24">
+              <!-- 企业类型 -->
               <el-col :span="12">
                 <el-form-item
                   :label="$t('message.laborMange.formOfBusiness')"
-                  prop="enterpriseTypeId"
+                  prop="companyTypeName"
                 >
                   <el-select
-                    v-model="enterpriseForm.enterpriseTypeId"
+                    v-model="enterpriseForm.companyTypeName"
                     :placeholder="$t('message.laborMange.pleaseChoose')"
                     style="width: 100%"
                     :disabled="true"
@@ -248,7 +249,7 @@
                       v-for="item in enterpriseTypeList"
                       :key="item.id"
                       :label="item.companyTypeName"
-                      :value="item.id"
+                      :value="item.companyTypeName"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -561,7 +562,7 @@
               </el-col>
             </el-row>
           </el-form>
-          <div class="dialog-footer">
+          <div class="dialog-footer addpage">
             <el-button
               class="cancleBtn"
               @click="addEnterpriseDialog = false"
@@ -692,6 +693,7 @@ export default {
         enterpriseEmail: "", //企业邮箱
         enterpriseLegalPerson: "", //法定代表人
         enterpriseName: "", //企业名称
+        companyTypeName:"",//企业类型名称
         enterpriseProperty: "", //单位性质 1.国有企业 2三资企业 3集体企业 4私营企业
         enterpriseQualificationUrl: "", //企业资质图片地址
         enterpriseSafeAllow: "", //企业安全生产许可证
@@ -750,10 +752,11 @@ export default {
       let data = {};
       getEnterpriseTypeList(data).then((res) => {
         if (res.code == 200) {
-          console.log(res);
+          console.log('获取企业类型列表',res);
           this.enterpriseTypeList = res.result;
           this.enterpriseTypeId = res.result[0].id;
           this.enterpriseTypeName = res.result[0].companyTypeName;
+          this.enterpriseForm.companyTypeName= res.result[0].companyTypeName;
           console.log(this.enterpriseTypeList);
           this.getCooperatorList();
         }
@@ -803,9 +806,10 @@ export default {
     },
     //切换 单位类型
     selectMenu(value) {
+      // console.log('切换菜单',value)
       this.checkedId = value.id;
       this.enterpriseTypeId = value.id;
-      this.enterpriseTypeName = value.companyTypeName;
+      this.enterpriseForm.companyTypeName = value.companyTypeName;
       this.getCooperatorList();
     },
     //新增按钮
@@ -820,6 +824,7 @@ export default {
         enterpriseEmail: "", //企业邮箱
         enterpriseLegalPerson: "", //法定代表人
         enterpriseName: "", //企业名称
+        companyTypeName : this.enterpriseForm.companyTypeName,
         enterpriseProperty: "", //单位性质 1.国有企业 2三资企业 3集体企业 4私营企业
         enterpriseQualificationUrl: "", //企业资质图片地址
         enterpriseSafeAllow: "", //企业安全生产许可证
@@ -835,6 +840,7 @@ export default {
         departmentType:"", // 企业管理
         sortNum: 0,
       };
+      // console.log('==========',this.enterpriseForm.companyTypeName)
       this.aptitudeFileList = [];
       this.logoFileList = [];
       this.enterpriseDialogType = 1;
@@ -1250,4 +1256,21 @@ export default {
     margin-top: 10px;
   }
 }
+.adddialog{
+  position: relative;
+  
+  .dialog_content{
+    height: 500px;
+  overflow: auto;
+  }
+  ::-webkit-scrollbar { 
+        width: 2px;
+      } 
+  .addpage{
+  position: absolute;
+  top: 80%;
+  left: 60%;
+}
+}
+
 </style>

src/views/projectFront/projectSummary/cooperatorDatails.vue

@@ -496,8 +496,10 @@ export default {
           let data = this.qualificationForm;
           (data.enterpriseId = this.$props.projectEnterpriseId),
             addEnterpriseQualification(data).then((res) => {
+              // console.log('新增成功了吗',res)
               this.getQueryById();
               this.$refs.upload.clearFiles();
+              this.fileList = [];
               this.$refs.qualificationForm.resetFields();
             });
           this.qualificationDialog = false;

src/views/projectFront/projectSummary/manageTeam.vue

@@ -11,7 +11,7 @@
             <el-table-column prop="personName" :label="$t('message.manageTeam.personName')"
                              align="center"></el-table-column>
             <el-table-column prop="phone" :label="$t('message.manageTeam.phone')" align="center"></el-table-column>
-            <el-table-column width="80" align="center">
+            <el-table-column :label="$t('message.manageTeam.imageUrl')" width="80" align="center">
                 <div slot slot-scope="scope">
                     <img :preview="scope.row.imageUrl[0]?scope.row.imageUrl[0].url:[]"
                          :src="scope.row.imageUrl[0]?scope.row.imageUrl[0].url:[]"