Merge branch 'master' of http://47.92.161.104:10080/shuzhan/enterprise-portal

.env.development

@@ -1,6 +1,6 @@
 OUT_PUT_DIR=dist/enterprise-portal
 
-VUE_APP_BACKEND_URL=http://127.0.0.1:8085/enterprise-federation
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/enterprise-federation
 #VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server
 #VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server
 

src/views/Home.vue

@@ -7,7 +7,7 @@
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
-    <el-card class="diagram_jkgs" style="padding-left:-10px">
+    <!-- <el-card class="diagram_jkgs" style="padding-left:-10px">
       <el-button style="font-size:24px" type="primary" @click="openView">
         健康
         <br />公示
@@ -72,7 +72,7 @@
     </el-card>
     <el-card class="diagram">
       <div id="everyDayMeasuringDiv" style="width:100%;height: 280px;"></div>
-    </el-card>
+    </el-card> -->
   </div>
 </template>
 <script>
@@ -244,13 +244,13 @@ export default {
     //   //day
     // });
 
-    await userApi.userInfo().then(resp => {
-      if (resp.data.result) {
-        this.user = resp.data.data;
-      }
-    });
+    // await userApi.userInfo().then(resp => {
+    //   if (resp.data.result) {
+    //     this.user = resp.data.data;
+    //   }
+    // });
 
-    this.everyDayMeasuringView();
+    // this.everyDayMeasuringView();
   }
 };
 </script>

src/views/base/companyInfo-detail.vue

@@ -104,6 +104,43 @@
                 ></el-option> </el-select></el-form-item
           ></el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="企联职务" prop="position">
+              <el-select
+                v-model="formModel.position"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="position in positionResult"
+                  :key="position.value"
+                  :label="position.name"
+                  :value="position.value"
+                ></el-option> </el-select></el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业logo" prop="logoUrl">
+              <el-upload
+                class="avatar-uploader"
+                name="photoFile"
+                :action="uploadUrl"
+                :show-file-list="false"
+                :headers="headers"
+                :data="uploadData"
+                :on-success="handleAvatarSuccessLogo"
+                :before-upload="beforeAvatarUploadLogo"
+                accept="image/png,image/jpeg"
+              >
+                <img v-if="fileUrlLogo" :src="fileUrlLogo" class="avatar" />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="营业执照" prop="businessLicenseUrl">
@@ -234,6 +271,8 @@ export default {
         value: "id",
         label: "industryName",
       },
+      positionResult:[],
+      fileUrlLogo: "",
     };
   },
   created() {
@@ -274,6 +313,17 @@ export default {
         var jsonData = response.data;
         this.regionResult = jsonData.data;
       });
+
+      dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "企联职务",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.positionResult = jsonData.data;
+      });
+
+      
   },
   methods: {
     closeDialog() {
@@ -325,6 +375,26 @@ export default {
       // const isJPG = file.type === "image/jpeg";
       const isLt2M = file.size / 1024 / 1024 < 2;
 
+      // if (!isJPG) {
+      //   this.$message.error("上传图片只能是 JPG 格式!");
+      // }
+      if (!isLt2M) {
+        this.$message.error("上传图片大小不能超过 2MB!");
+      }
+      return isLt2M;
+    },
+    handleAvatarSuccessLogo(res, file) {
+      this.loading = false;
+      var self = this;
+      self.formModel.logoUrl = res.data;
+      self.fileUrlLogo =
+        res.data + "?x-oss-process=image/resize,m_lfit,w_200";
+    },
+    beforeAvatarUploadLogo(file) {
+      this.loading = true;
+      // const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
       // if (!isJPG) {
       //   this.$message.error("上传图片只能是 JPG 格式!");
       // }
@@ -356,6 +426,12 @@ export default {
             self.fileUrl =
               businessLicenseUrl + "?x-oss-process=image/resize,m_lfit,h_200";
           }
+
+          let logoUrl = self.formModel.logoUrl;
+          if (logoUrl != null) {
+            self.fileUrlLogo =
+              logoUrl + "?x-oss-process=image/resize,m_lfit,h_200";
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/companyInfo-list.vue

@@ -153,6 +153,7 @@
         prop="typeN"
         label="企业类型"
         width="120"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="scaleN"
@@ -164,6 +165,11 @@
         label="所属行业"
         width="150"
       ></el-table-column>
+      <el-table-column
+        prop="positionName"
+        label="企联职务"
+        width="150"
+      ></el-table-column>
       <el-table-column
         prop="companyName"
         label="企业名称"
@@ -182,6 +188,26 @@
         width="180"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        prop="logoUrl"
+        label="企业logo"
+        width="180"
+        show-overflow-tooltip
+      >
+        <template slot-scope="{ row }">
+          <a :href="row.logoUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.logoUrl +
+                '?x-oss-process=image/resize,m_fill,w_64,h_64'
+              "
+              :key="row.id"
+            ></el-avatar>
+          </a>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="businessLicenseUrl"
         label="营业执照"

src/views/base/personInfo-detail.vue

@@ -96,7 +96,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="身份证号码" prop="idCard">
               <el-input
                 v-model="formModel.idCard"
@@ -105,6 +105,23 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="头衔" prop="title">
+              <el-select
+                v-model="formModel.title"
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="title in titleResult"
+                  :key="title.value"
+                  :label="title.name"
+                  :value="title.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -218,8 +235,9 @@ export default {
       headers: {
         Authorization: getToken(),
       },
-      fileUrlIdCard:""
+      fileUrlIdCard: "",
       //上传图片end
+      titleResult: [],
     };
   },
   created() {
@@ -233,6 +251,15 @@ export default {
         var jsonData = response.data;
         this.registerTypeResult = jsonData.data;
       });
+      
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "用户头衔",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.titleResult = jsonData.data;
+      });
 
     // companyInfoApi.list().then((response) => {
     //   var jsonData = response.data;
@@ -301,7 +328,8 @@ export default {
       this.loading = false;
       var self = this;
       self.formModel.idCardUrl = res.data;
-      self.fileUrlIdCard = res.data + "?x-oss-process=image/resize,m_lfit,w_200";
+      self.fileUrlIdCard =
+        res.data + "?x-oss-process=image/resize,m_lfit,w_200";
     },
     beforeAvatarUploadIdcard(file) {
       this.loading = true;
@@ -349,15 +377,13 @@ export default {
           let faceImageUrl = self.formModel.faceImageUrl;
           if (faceImageUrl != null) {
             self.fileUrl =
-              faceImageUrl +
-              "?x-oss-process=image/resize,m_lfit,h_200";
+              faceImageUrl + "?x-oss-process=image/resize,m_lfit,h_200";
           }
 
           let idCardUrl = self.formModel.idCardUrl;
           if (idCardUrl != null) {
             self.fileUrlIdCard =
-              idCardUrl +
-              "?x-oss-process=image/resize,m_lfit,h_200";
+              idCardUrl + "?x-oss-process=image/resize,m_lfit,h_200";
           }
 
           let companyId = self.formModel.companyId;
@@ -373,9 +399,6 @@ export default {
               }
             });
           }
-
-
-
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/personInfo-list.vue

@@ -146,6 +146,11 @@
         label="注册类型"
         width="120"
       ></el-table-column>
+      <el-table-column
+        prop="titleName"
+        label="头衔"
+        width="120"
+      ></el-table-column>
       <el-table-column
         prop="personName"
         label="姓名"