瀏覽代碼

Merge remote-tracking branch 'origin/master'

ljy121 1 年之前
父節點
當前提交
bce5ec9b59
共有 2 個文件被更改,包括 17 次插入29 次删除
  1. 0 13
      client/src/App.vue
  2. 17 16
      zjugis-business/src/main/resources/templates/AssetProcure/index.ftl

+ 0 - 13
client/src/App.vue

@@ -1,8 +1,6 @@
 <script lang="ts" setup>
-import { isDark } from '@/utils/is'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
-import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import routerSearch from '@/components/RouterSearch/index.vue'
 import subscribe from '@/utils/Subscribe'
 import LinkRouteMap from './LinkRouteMap'
@@ -14,17 +12,6 @@ const prefixCls = getPrefixCls('app')
 const appStore = useAppStore()
 const currentSize = computed(() => appStore.getCurrentSize)
 const greyMode = computed(() => appStore.getGreyMode)
-const { wsCache } = useCache()
-
-// 根据浏览器当前主题设置系统主题色
-// const setDefaultTheme = () => {
-//   let isDarkTheme = wsCache.get(CACHE_KEY.IS_DARK)
-//   if (isDarkTheme === null) {
-//     isDarkTheme = isDark()
-//   }
-//   appStore.setIsDark(isDarkTheme)
-// }
-// setDefaultTheme()
 
 //订阅相应路由name
 const router = useRouter()

+ 17 - 16
zjugis-business/src/main/resources/templates/AssetProcure/index.ftl

@@ -187,23 +187,24 @@
       </div>
       </div>
       </div>
-    </div>
-    <div class="ow-tab-content" name="yj">
-      <#if WORKFLOW.OPINION! !="">
-        <div class="form-title">
-          <div class="form-icon">
-            <img src="/imgs/titleIcon.png" alt="">
-            <span>审批意见</span>
-          </div>
-          <div class="form-btn">
-          </div>
-        </div>
-        <div class="qjsjxx-box">
-          <div class="z-form-wrap" name="opinionsDiv">
-            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
-          </div>
+
+        <div class="ow-tab-content" name="yj">
+          <#if WORKFLOW.OPINION! !="">
+              <div class="form-title">
+                  <div class="form-icon">
+                      <img src="/imgs/titleIcon.png" alt="">
+                      <span>审批意见</span>
+                  </div>
+                  <div class="form-btn">
+                  </div>
+              </div>
+              <div class="qjsjxx-box">
+                  <div class="z-form-wrap" name="opinionsDiv">
+                      <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                  </div>
+              </div>
+          </#if>
         </div>
-      </#if>
     </div>
   </div>
   <script language="javascript" src="/timeSelector/TimeSelector.js"></script>