Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

# Conflicts:
#	src/views/main-shuju/main-navbar.vue

src/views/main-shuju/main-navbar.vue

@@ -2,7 +2,7 @@
   <div>
     <nav v-if="showHeader" class="m-navbar">
       <div class="navbar__header">
-        <h1 class="navbar__brand" @click="$router.push({ name: 'home' })">
+        <h1 class="navbar__brand">
           <a class="navbar__brand-lg" href="javascript:;">{{
             $store.state.user.agencyName
           }}</a>

src/views/main-sidebar-sub-menu.vue

@@ -31,6 +31,7 @@
 
 <script>
 import SubMenu from "./main-sidebar-sub-menu";
+import jointUrl from "dai-js/tools/jointUrl";
 export default {
   name: "sub-menu",
   props: {
@@ -50,7 +51,13 @@ export default {
       )[0];
       if (route) {
         console.log(route);
-        if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
+        if (route.meta.iframeURL.endsWith("【跳转新页面免登】")) {
+          window.open(
+            jointUrl(route.meta.iframeURL.slice(0, -9), {
+              token: localStorage.getItem("token"),
+            })
+          );
+        } else if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
           window.open(route.meta.iframeURL.slice(0, -7));
         } else {
           this.$router.push({ name: route.name });

src/views/modules/base/resi.vue

@@ -223,6 +223,7 @@
                            :form-info="item.formInfo && item.formInfo"
                            :support-add="item.supportAdd"
                            :form-id="item.columnName"
+                           :labelWidth="'140px'"
                            :form-list="item.itemList" />
               </el-tab-pane>
             </el-tabs>
@@ -275,7 +276,7 @@
                            :muti-list="item.mutiList"
                            :form-list="item.itemList"
                            :disabled="disabled"
-                           :label-width="'140px'"
+                           :labelWidth="'140px'"
                            :agency-id="editAgencyId" />
               </el-tab-pane>
             </el-tabs>

src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue

@@ -149,7 +149,8 @@
                       label="附件"
                       label-width="150px"
                       prop="attach">
-          <el-upload :headers="$getElUploadHeaders()"  class="upload-demo"
+          <el-upload :headers="$getElUploadHeaders()"
+                     class="upload-demo"
                      :action="uploadUlr"
                      accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
                      :on-success="handleFileSuccess"
@@ -170,14 +171,14 @@
 
     </div>
 
-    <div class="div_btn">
+    <!-- <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -586,9 +587,9 @@ export default {
     },
 
 
-    handlePreview(src) {
+    handlePreview (src) {
       console.log(src)
-      if(src){
+      if (src) {
         window.open(src);
       }
     },