natasha před 2 týdny
rodič
revize
96e12ed1a8

+ 1 - 0
src/components/NavMenu.vue

@@ -4,6 +4,7 @@
       icon-class="menu"
       class="nav-menu-btn"
       @click="showMenu = !showMenu"
+      v-if="isPhone"
     ></svg-icon>
     <el-menu
       :default-active="activeMenuIndex"

+ 62 - 1
src/components/Setting.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="setting" v-if="info">
+  <div class="setting" v-if="info" :class="[isPhone ? 'setting-phone' : '']">
     <template v-if="!settingFlag">
       <div class="setting-top">
         <div class="avator-box">
@@ -121,6 +121,7 @@
             ref="ruleForm"
             label-width="150px"
             class="setting-form"
+            :label-position="isPhone ? 'top' : ''"
           >
             <el-form-item label="用户名" prop="name">
               <el-input
@@ -478,6 +479,7 @@
             :model="managerForm"
             ref="managerForm"
             label-width="150px"
+            :label-position="isPhone ? 'top' : ''"
             class="setting-form"
           >
             <el-form-item label="机构管理员" prop="is_manager">
@@ -522,6 +524,7 @@
         ref="passwordForm"
         label-width="100px"
         class="passwordForm"
+        :label-position="isPhone ? 'top' : ''"
       >
         <!-- <el-form-item label="原始密码" prop="oldPwd">
                 <el-input v-model="passwordForm.oldPwd" :type="oldPwdFlag?'text':'password'" autocomplete="off" placeholder="请输入密码" >
@@ -607,6 +610,7 @@
         ref="phoneForm"
         label-width="100px"
         class="phoneForm"
+        :label-position="isPhone ? 'top' : ''"
       >
         <el-form-item
           label="原手机号"
@@ -660,6 +664,7 @@
         ref="emailForm"
         label-width="100px"
         class="emailForm"
+        :label-position="isPhone ? 'top' : ''"
       >
         <el-form-item label="原邮箱" prop="email" v-if="emailForm.email">
           <el-input
@@ -911,6 +916,8 @@ export default {
           this.page === "editOrgPerson"
             ? JSON.parse(JSON.stringify(this.info.is_can_see_all_content))
             : "false",
+        isPhone: false,
+        showSearch: true,
       },
     };
   },
@@ -1356,6 +1363,11 @@ export default {
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {
+    const regExp = /Android|webOS|iPhone|BlackBerry|IEMobile|Opera Mini/i;
+    this.isPhone = regExp.test(navigator.userAgent) && window.innerWidth < 860;
+    if (this.isPhone) {
+      this.showSearch = false;
+    }
     if (this.info) {
       this.handleUserAuth();
     }
@@ -1500,6 +1512,7 @@ export default {
           font-size: 14px;
           line-height: 22px;
           color: #165dff;
+          word-break: keep-all;
         }
       }
     }
@@ -1571,6 +1584,54 @@ export default {
   font-size: 12px;
   line-height: 20px;
 }
+.setting-phone {
+  .setting-top {
+    display: block;
+    padding: 20px 10px;
+    .center {
+      .info-items {
+        width: 100%;
+      }
+      label {
+        width: auto;
+        padding-right: 0;
+      }
+    }
+  }
+  .setting-bottom {
+    padding: 20px 10px;
+    .tabs-box {
+      a {
+        margin-right: 0;
+      }
+    }
+    .setting-form {
+      padding-top: 0;
+    }
+    .el-form-item {
+      margin-bottom: 10px;
+    }
+    :deep .el-form--label-top .el-form-item__label {
+      padding-bottom: 0;
+    }
+    .safe-items {
+      padding: 10px 0;
+    }
+  }
+
+  :deep .el-input,
+  :deep .el-textarea {
+    width: 100%;
+  }
+  .passwordForm,
+  .phoneForm,
+  .emailForm {
+    padding-top: 20px;
+  }
+  .setting-iframe {
+    padding: 20px 10px;
+  }
+}
 </style>
 <style lang="scss">
 .setting {

+ 26 - 5
src/views/content_manage/newspaper_manage/CreateArticle.vue

@@ -216,10 +216,10 @@
           size="small"
           @click="handleSaveArticle('articleForm')"
           :loading="loading"
-          >下一步</el-button
+          >保存文章</el-button
         >
         <el-button size="small" @click="onCancel('articleForm')"
-          >取消</el-button
+          >返回上一页</el-button
         >
       </div>
       <el-button
@@ -614,7 +614,7 @@ export default {
                   }
                 } else {
                   this.$message.success("文章保存成功");
-                  this.$router.go(-1);
+                  // this.$router.go(-1);
                 }
               }
             })
@@ -905,6 +905,7 @@ export default {
             if (res.data.art.page_no_in_pub === 0) {
               this.articleForm.page_no_in_pub = null;
             }
+            this.en_flag = res.data && res.data.art ? res.data.art.en_flag : 0;
             this.subtitleLoading = false;
           }
         })
@@ -967,6 +968,7 @@ export default {
           this.changeCnLoading = false;
           if (res.status === 1) {
             this.$message.success(res.msg);
+            this.getArticleInfo();
             // this.handleSaveArticle("articleForm", "1");
           }
         })
@@ -998,8 +1000,27 @@ export default {
                 }
               });
             } else if (res.data.code === 1) {
-              this.$message.success("tts重新生成成功");
-              this.getArticleInfo();
+              this.$confirm("tts数据已经就绪", "提示", {
+                confirmButtonText: "重新生成",
+                cancelButtonText: "刷新详情",
+                type: "success",
+                dangerouslyUseHTMLString: true,
+              })
+                .then(() => {
+                  let Mnames =
+                    "/PaperServer/Manager/ArticleManager/ReqNewTtsTask";
+
+                  getLogin(Mnames, data).then((res) => {
+                    if (res.status === 1) {
+                      this.$message.success(
+                        "已成功发送tts重新生成请求,请稍后查看文章详情"
+                      );
+                    }
+                  });
+                })
+                .catch(() => {
+                  this.getArticleInfo();
+                });
             } else if (res.data.code === 2) {
               let str =
                 "已成功发送tts请求,等待tts服务器返回数据中,目前已等待" +

+ 3 - 1
src/views/organize_manage/EditPerson.vue

@@ -42,7 +42,9 @@ export default {
   data() {
     //这里存放数据
     return {
-      activeMenuIndex: "organize_manage",
+      activeMenuIndex: this.$route.query.type
+        ? this.$route.query.type
+        : "organize_manage",
       breadcrumbList: [],
       tableHeight: "", // 表格高度
       id: this.$route.query.id ? this.$route.query.id : "",

+ 2 - 0
src/views/organize_manage/PersonListAll.vue

@@ -926,6 +926,7 @@ export default {
         path: "/editOrgPerson",
         query: {
           id: row ? row.id : "",
+          type: "organize_people_manage",
         },
       });
     },
@@ -938,6 +939,7 @@ export default {
         query: {
           id: row ? row.id : "",
           page: "personCheck",
+          type: "organize_people_manage",
         },
       });
     },