huangbin vor 4 Jahren
Ursprung
Commit
fd90d53236

+ 2 - 1
src/common/config/projectName.ts

@@ -5,7 +5,8 @@ export enum OemType {
     manager = 'qyfg', // 企业风管
     qinghaijin = 'qhj', // 千海金
     wrspot = 'yrdz', // 仓单贸易
-    pingan = 'pingan' // 平安
+    pingan = 'pingan', // 平安
+    tian_jing_mai_dun = 'tjmd', // 天津麦顿
 }
 
 // 获取当前项目

+ 1 - 1
src/common/config/theme.ts

@@ -33,7 +33,7 @@ export function setTheme(value: ThemeEnum) {
  */
 export function initTheme() {
     initData(() => {
-        if (isOemByEnum(OemType.wrspot)) { // 云融 项目 主题缓存
+        if (isOemByEnum(OemType.wrspot) || isOemByEnum(OemType.tian_jing_mai_dun)) { // 云融 项目 主题缓存
             const theme = localStorageUtil.getItem('theme')
             if (theme) {
                 changeTheme(theme)

+ 29 - 30
src/layout/components/bottom.vue

@@ -1,33 +1,32 @@
 <template>
-    <section
-        :class="['layout-bottom', isShowBottom ? 'layout-bottom-all' : 'layout-bottom-hidden']"
-    >
-        <CapitalInfo class="capital-info-container" v-if="isCapitalLeft"></CapitalInfo>
-        <main :class="[isCapitalLeft ? 'main-some' : 'main-all']">
-            <firstMenu :list="orderList" :value="'title'" @selectMenu="selectMenu">
-                <div class="right-menu-content">
-                    <!-- 资金信息 -->
-                    <a-select
-                        class="capitalSelect"
-                        style="width: 180px"
-                        v-if="!isCapitalLeft"
-                        @change="accountChange"
-                        v-model:value="selectedAccountId"
-                    >
-                        <a-select-option
-                            v-for="item in getAllTaAccount()"
-                            :value="item.accountid"
-                            :key="item.accountid"
-                        >{{item.accountid}}</a-select-option>
-                    </a-select>
-                    <div class="conditionIcon icon iconfont icon-shouqi" @click="handleShowBottom"></div>
-                </div>
-            </firstMenu>
-            <div v-show="isShowBottom">
-                <component :is="componentId" v-if="componentId"></component>
-            </div>
-        </main>
-    </section>
+  <section :class="['layout-bottom', isShowBottom ? 'layout-bottom-all' : 'layout-bottom-hidden']">
+    <CapitalInfo class="capital-info-container"
+                 v-if="isCapitalLeft"></CapitalInfo>
+    <main :class="[isCapitalLeft ? 'main-some' : 'main-all']">
+      <firstMenu :list="orderList"
+                 :value="'title'"
+                 @selectMenu="selectMenu">
+        <div class="right-menu-content">
+          <!-- 资金信息 -->
+          <a-select class="capitalSelect"
+                    style="width: 180px"
+                    v-if="!isCapitalLeft"
+                    @change="accountChange"
+                    v-model:value="selectedAccountId">
+            <a-select-option v-for="item in getAllTaAccount()"
+                             :value="item.accountid"
+                             :key="item.accountid">{{item.accountid}}</a-select-option>
+          </a-select>
+          <div class="conditionIcon icon iconfont icon-shouqi"
+               @click="handleShowBottom"></div>
+        </div>
+      </firstMenu>
+      <div v-show="isShowBottom">
+        <component :is="componentId"
+                   v-if="componentId"></component>
+      </div>
+    </main>
+  </section>
 </template>
 <script lang="ts">
 import { defineAsyncComponent, defineComponent, reactive, ref } from 'vue';
@@ -77,7 +76,7 @@ export default defineComponent({
         // 控制资金面板是否显示在左边
         const isCapitalLeft = ref<boolean>(true);
         initData(() => {
-            if (isOemByEnum(OemType.wrspot)) {
+            if (isOemByEnum(OemType.wrspot) || isOemByEnum(OemType.tian_jing_mai_dun)) {
                 isCapitalLeft.value = false;
             }
         });

+ 11 - 4
src/layout/components/header.vue

@@ -1,21 +1,28 @@
 <template>
-  <!-- 风险管理 -->
 
+  <!-- 风险管理 -->
   <div v-if="isOemByEnum(OemType.manager)">
     <img src="../../assets/images/logoHeader.png" />
     <span>{{getCompanyName()}}</span>
   </div>
-  <!-- 云融 -->
 
+  <!-- 云融 -->
   <div v-else-if="isOemByEnum(OemType.wrspot)">
     <img src="../../assets/images/headLogo.jpg" />
     <span>云融</span>
   </div>
+  <!-- 天津麦顿 -->
+  <div v-else-if="isOemByEnum(OemType.tian_jing_mai_dun)">
+    <img src="../../assets/images/headLogo.jpg" />
+    <span>云融</span>
+  </div>
+
   <!-- 千海金 -->
   <div v-else-if="isOemByEnum(OemType.qinghaijin)">
     <img src="../../assets/images/qianhaijin_logo.jpg" />
     <span>{{getCompanyName()}}</span>
   </div>
+
   <div v-else>
     <img src="../../assets/images/logoHeader.png" />
     <span>{{getCompanyName()}}</span>
@@ -33,7 +40,7 @@
             </a-input-search>-->
       <!-- <a-icon type="search" /> -->
     </div>
-    <div v-if="isOemByEnum(OemType.wrspot)">
+    <div v-if="isOemByEnum(OemType.wrspot) || isOemByEnum(OemType.tian_jing_mai_dun)">
       <a-popover trigger="click"
                  placement="bottom"
                  overlayClassName="friendPopover">
@@ -113,7 +120,7 @@ const setFn = () => {
     //     { name: '退出', path: 'logout' },
     // ];
     initData(() => {
-        if (isOemByEnum(OemType.wrspot)) {
+        if (isOemByEnum(OemType.wrspot) || isOemByEnum(OemType.tian_jing_mai_dun)) {
             const theme = [
                 { name: '白主题', path: ThemeEnum.light },
                 { name: '黑主题', path: ThemeEnum.dark },

+ 2 - 0
src/services/bus/index.ts

@@ -71,6 +71,8 @@ function getIco(): string {
         result = 'yunrong'
     } else if (isOemByEnum(OemType.qinghaijin)) {
         result = 'qianhaijin'
+    } else if (isOemByEnum(OemType.tian_jing_mai_dun)) {
+        result = 'yunrong'
     }
 
     return `./${result}.ico`