Merge remote-tracking branch 'origin/master'

public/index.html

@@ -224,6 +224,8 @@
     window._CONFIG = {};
     window._CONFIG['domianURL'] = 'http://localhost:8089/happy-boot';
     window._CONFIG['imgDomainURL'] = 'http://localhost:8089/happy-boot/sys/common/view';
+    <!-- oss路径 -->
+    window._CONFIG['imgDomainOssURL'] = 'https://hpjobtest.oss-cn-shanghai.aliyuncs.com';
     window._CONFIG['pdfDomainURL'] = 'http://localhost:8089/happy-boot/sys/common/pdf/pdfPreviewIframe';
   </script>
 </head>

src/components/setting/SettingDrawer.vue

@@ -153,10 +153,10 @@
           <!--</a-alert>-->
         <!--</div>-->
       </div>
-      <div class="setting-drawer-index-handle" @click="toggle">
-        <a-icon type="setting" v-if="!visible"/>
-        <a-icon type="close" v-else/>
-      </div>
+      <!--<div class="setting-drawer-index-handle" @click="toggle">-->
+        <!--<a-icon type="setting" v-if="!visible"/>-->
+        <!--<a-icon type="close" v-else/>-->
+      <!--</div>-->
     </a-drawer>
   </div>
 </template>

src/views/company/modules/CompanyAuthenticationModal.vue

@@ -79,7 +79,7 @@
         url: {
           add: "/company/companyAuthentication/add",
           edit: "/company/companyAuthentication/edit",
-          imgerver: window._CONFIG['imgDomainURL'],
+          imgerver: window._CONFIG['imgDomainOssURL'],
         },
       }
     },
@@ -87,10 +87,10 @@
     },
     methods: {
       getAvatarView(){
-        return this.url.imgerver +"/"+ this.model.licenseFront;
+        return this.url.imgerver + this.model.licenseFront;
       },
       getAvatarView1(){
-        return this.url.imgerver +"/"+ this.model.otherLicense;
+        return this.url.imgerver + this.model.otherLicense;
       },
 
       add () {

src/views/hpuser/modules/UserModal.vue

@@ -81,7 +81,7 @@
         url: {
           add: "/user/user/add",
           edit: "/user/user/edit",
-          imgerver: window._CONFIG['imgDomainURL'],
+          imgerver: window._CONFIG['imgDomainOssURL'],
         },
         sex:{},
       }
@@ -150,10 +150,10 @@
         this.close()
       },
       getCardFrontView(){
-        return this.url.imgerver +"/"+ this.model.idCardFront;
+        return this.url.imgerver + this.model.idCardFront;
       },
       getCardBackView(){
-        return this.url.imgerver +"/"+ this.model.idCardBack;
+        return this.url.imgerver + this.model.idCardBack;
       }
     }
   }

src/views/system/UserList.vue

@@ -270,7 +270,7 @@
 
         ],
         url: {
-          imgerver: window._CONFIG['domianURL'] + "/sys/common/view",
+          imgerver: window._CONFIG['imgDomainOssURL'],
           syncUser: "/process/extActProcess/doSyncUser",
           list: "/sys/user/list",
           delete: "/sys/user/delete",
@@ -287,7 +287,7 @@
     },
     methods: {
       getAvatarView: function (avatar) {
-        return this.url.imgerver + "/" + avatar;
+        return this.url.imgerver +  avatar;
       },
 
       batchFrozen: function (status) {

src/views/system/modules/UserModal.vue

@@ -105,9 +105,9 @@
           <a-input placeholder="请输入手机号码" :disabled="disabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />
         </a-form-item>
 
-        <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>
-        </a-form-item>
+        <!--<a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--<j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>-->
+        <!--</a-form-item>-->
 
       </a-form>
     </a-spin>
@@ -205,8 +205,8 @@
         url: {
           addUDepartIds:"/sys/user/addUDepartIds", // 引入为用户添加部门信息需要的url
           editUDepartIds:"/sys/user/editUDepartIds", // 引入为用户更新部门信息需要的url
-          fileUpload: window._CONFIG['domianURL']+"/sys/common/upload",
-          imgerver: window._CONFIG['domianURL']+"/sys/common/view",
+          fileUpload: window._CONFIG['domianURL']+"/sys/common/ossUpload",
+          imgerver: window._CONFIG['imgDomainOssURL'],
           userWithDepart: "/sys/user/userDepartList", // 引入为指定用户查看部门信息需要的url
           userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url
           syncUserByUserName:"/process/extActProcess/doSyncUserByUserName",//同步用户到工作流
@@ -562,7 +562,7 @@
         }
       },
       getAvatarView(){
-        return this.url.imgerver +"/"+ this.model.avatar;
+        return this.url.imgerver + this.model.avatar;
       },
       // 搜索用户对应的部门API
       onSearch(){