新增中航演示环境

public/boe/index.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="./boe/favicon.ico">
-  <title>BOE追溯平台</title>
+  <title>森田钰泽</title>
   <link rel="stylesheet" href="//at.alicdn.com/t/font_1321935_49vw1tllkgn.css">
   <script src="https://cdn.bootcss.com/tinymce/4.7.4/tinymce.min.js"></script>
 </head>

src/entry/boe/router.ts

@@ -10,7 +10,7 @@ let router = new Router({ // todo 移除旧页面
     {
       path: '/',
       name: 'home',
-      component: () => import('./views/Home.vue'),
+      component: () => import('./views/SignIn.vue'),
     },
     // 登录
     {

src/entry/boe/views/MainHeader.vue

@@ -57,8 +57,8 @@ export default class MainHeader extends Vue {
 // logo
 .icon_logo {
   margin-left: 27px;
-  margin-top: 11px;
-  height: 28px;
+  margin-top: 8px;
+  height: 33px;
 }
 
 .user_wrapper {

src/entry/boe/views/SignIn.vue

@@ -81,8 +81,8 @@ export default {
   position: absolute;
   left: 26px;
   top: 14px;
-  width: 166px;
-  height: 28px;
+  width: 99px;
+  height: 33px;
   background: url("../images/Home/home_logo.png") no-repeat center;
   background-size: 100% 100%;
 }

src/entry/boe/views/template/editTemplate.vue

@@ -30,7 +30,10 @@
             ref="editor"
           >
             <!-- 新增三个按钮 -->
-            <div class="header-btnbox" v-if="!ShowPastData">
+            <div
+              class="header-btnbox"
+              v-if="!ShowPastData && !enterFromTemplate"
+            >
               <div class="header-btnbox__btn" @click="UpperChain">
                 <span> <i class="iconfont iconshanglian"></i> </span>上链
               </div>
@@ -301,6 +304,8 @@ export default class editTemplate extends Vue {
   public showUncertified: Boolean = false;
   public ClassificationPopups: boolean = false;
   public MemoryCardType: String = ""; //存证类型
+  public personalTemplate: number = 0; // 个人模版的 id
+  public enterFromTemplate: boolean = false;
   // 系统模板>建立个人模板or建立存证
   // 个人模板>建立存证or更新模板
   // 建立存证>保存存证or保存模板
@@ -318,10 +323,12 @@ export default class editTemplate extends Vue {
     // 取值
     const query = this.$route.query;
     if (query.personalTemplate) {
+      this.enterFromTemplate = true;
       this.gettemplate(query.personalTemplate);
       this.TemplateType = 1;
     } else if (query.systemTemplateId) {
       // 模板进入
+      this.enterFromTemplate = true;
       this.gettemplate(query.systemTemplateId);
     } else if (query.personalTemplateId && !query.childId) {
       // 个人存证进入
@@ -377,13 +384,12 @@ export default class editTemplate extends Vue {
     });
     if (res) {
       this.$message({
-        message: "创建成功",
+        message: "保存成功",
         type: "success",
       });
-      this.$router.push({
-        path: "/categoryManage",
-        query: { type: "MyTemplate" },
-      });
+      this.ClassificationPopups = false;
+      this.TemplateType = 1;
+      this.personalTemplate = res.data.id;
     }
   }
   // 创建个人模板
@@ -398,7 +404,7 @@ export default class editTemplate extends Vue {
       type: "put",
       url: GO_URLS.updateCustomize,
       params: {
-        id: Number(this.$route.query.personalTemplate),
+        id: Number(this.$route.query.personalTemplate) || this.personalTemplate,
         name: this.templateName,
         detail: JSON.stringify(formatApiJson(this.rootUnitList)),
       },
@@ -408,10 +414,12 @@ export default class editTemplate extends Vue {
         message: "更新成功",
         type: "success",
       });
-      this.$router.push({
-        path: "/categoryManage",
-        query: { type: "MyTemplate" },
-      });
+      if (this.$route.query.personalTemplate) {
+        this.$router.push({
+          path: "/categoryManage",
+          query: { type: "MyTemplate" },
+        });
+      }
     }
   }
   // 获取基础信息

src/views/template/editTemplate.vue

@@ -30,7 +30,10 @@
             ref="editor"
           >
             <!-- 新增三个按钮 -->
-            <div class="header-btnbox" v-if="!ShowPastData && !enterFromTemplate">
+            <div
+              class="header-btnbox"
+              v-if="!ShowPastData && !enterFromTemplate"
+            >
               <div class="header-btnbox__btn" @click="UpperChain">
                 <span> <i class="iconfont iconshanglian"></i> </span>上链
               </div>
@@ -238,7 +241,7 @@
 import { Component, Vue, Watch } from "vue-property-decorator";
 import { formatTemplateApi2Local, formatApiJson } from "@/plugins/Template";
 import { PropertyType } from "@/plugins/types";
-import { Property, Unit,ResUploadFiles } from "@/plugins/types2";
+import { Property, Unit, ResUploadFiles } from "@/plugins/types2";
 import { GO_URLS } from "@/config/URLS";
 import { ImageInfo, ImageItem } from "@/utils/app/AddProductTypes";
 import CommonDialog from "@/components/CommonDialog.vue";