修改样式以及清单名录

build/config/themeConfig.ts

 import { generate } from '@ant-design/colors';
 
-export const primaryColor = '#1890FF';
+export const primaryColor = '#438EB9';
 
 export const darkMode = 'light';
 

build/generate/generateModifyVars.ts

@@ -30,7 +30,7 @@ export function generateModifyVars(dark = false) {
     'warning-color': '#EFBD47', //   Warning color
     //'border-color-base': '#EEEEEE',
     'font-size-base': '14px', //  Main font size
-    'border-radius-base': '2px', //  Component/float fillet
+    'border-radius-base': '7px', //  Component/float fillet
     'link-color': primary, //   Link color
     'app-content-background': '#fafafa', //   Link color
   };

src/layouts/default/header/components/user-dropdown/index.vue

@@ -271,11 +271,11 @@
 
     &--light {
       &:hover {
-        background-color: #438eb9;
+        background-color: @primary-color;
       }
 
       .@{prefix-cls}__name {
-        color: #fff;
+        color: @white;
       }
 
       .@{prefix-cls}__desc {

src/layouts/default/header/index.less

@@ -134,7 +134,7 @@
   }
 
   &--light {
-    background-color: #438EB9 !important;
+    background-color:@primary-color !important;
     border-bottom: 1px solid @header-light-bottom-border-color;
     border-left: 1px solid @header-light-bottom-border-color;
 

src/layouts/default/index.vue

@@ -125,7 +125,7 @@
       // 获取当天日期
       const day = ref(dayjs().format('YYYY-MM-DD'));
       const userStore: any = useUserStore();
-      if (userStore?.userInfo?.loginTenantId == 1) open.value = true;
+      // if (userStore?.userInfo?.loginTenantId == 1) open.value = true;
       //自定义表单字段
       const formSchemas: FormSchema[] = [
         {

src/layouts/default/sider/LayoutSider.vue

@@ -138,7 +138,7 @@
 
     &.ant-layout-sider-dark {
       // background-color: #F7F7F7;
-      background-color: #fff;
+      background-color: @white;
 
       .ant-layout-sider-trigger {
         color: darken(@white, 25%);

src/layouts/default/sider/MixSider.vue

@@ -248,7 +248,6 @@
       }
 
       function handleMenuClick(path: string) {
-  
         go(path);
       }
 
@@ -431,7 +430,7 @@
         transition: all 0.3s ease;
 
         &:hover {
-          color: @white;
+          // color: @white;
         }
         // &:hover,
         &--active {
@@ -480,7 +479,7 @@
 
     &.light &-trigger {
       color: rgba(0, 0, 0, 0.65);
-      background-color: #fff;
+      background-color: @white;
       border-top: 1px solid #eee;
     }
 
@@ -489,7 +488,7 @@
       top: 0;
       width: 200px;
       height: calc(100%);
-      background-color: #fff;
+      background-color: @white;
       transition: all 0.2s;
 
       &__title {
@@ -516,7 +515,7 @@
           cursor: pointer;
 
           &:hover {
-            color: #fff;
+            color: @white;
           }
         }
       }
@@ -557,10 +556,9 @@
       border-bottom: none;
       box-shadow: 0 0 4px 0 rgba(28, 36, 56, 0.15);
     }
-    
-  }
-.jeecg-menu-dark.jeecg-menu-vertical .jeecg-menu-item-active:not(.jeecg-menu-submenu),.jeecg-menu-dark.jeecg-menu-vertical .jeecg-menu-item:hover{
-    background-color:#EDEDED!important;
-    color:#2B7DBC!important;
   }
+  // .jeecg-menu-dark.jeecg-menu-vertical .jeecg-menu-item-active:not(.jeecg-menu-submenu),.jeecg-menu-dark.jeecg-menu-vertical .jeecg-menu-item:hover{
+  //     background-color:#EDEDED!important;
+  //     color:#2B7DBC!important;
+  //   }
 </style>

src/views/dashboard/workbench/components/DynamicInfo.vue

@@ -254,7 +254,7 @@
       top: 15px;
       font-size: 18px;
       font-weight: bold;
-      color: #ffffff;
+      color: @white;
     }
 
     .title-move {

src/views/directory/components/GWrdkjbxxb.data.ts

@@ -253,24 +253,28 @@ export const formSchema: FormSchema[] = [
     field: 'cityCode',
     component: 'ApiSelect',
     required: true,
-    ifShow: () => {
+    ifShow: ({ }) => {
+      console.log('行政区show', userStore?.userInfo?.userIdentity)
       return userStore?.userInfo?.userIdentity == '1' ? true : false
     },
     colProps: { span: 12 },
     // slot: 'form-city',
     componentProps: ({ formModel, formActionType }) => {
-      console.log(userStore?.userInfo?.userIdentity, '行政区里面的')
+      // handeCount(formActionType, formModel)
+      console.log('行政区componentProps')
       return {
         api: getTown,
         params: 440000, // 行政区划编码
         labelField: 'name',
         valueField: 'id',
         onChange: (val: any) => {
-          const { updateSchema } = formActionType;
-          formModel.countryCode = undefined;
+          const { updateSchema } = formActionType
+          console.log('行政区onChange')
           if (val) {
+            formModel.countryCode = undefined;
             updateSchema({
               field: 'countryCode',
+              show: true,
               componentProps: {
                 api: getTown,
                 params: val,
@@ -280,6 +284,7 @@ export const formSchema: FormSchema[] = [
             });
           } else {
             updateSchema({
+              show: true,
               field: 'countryCode',
               componentProps: {
                 api: undefined,
@@ -296,26 +301,14 @@ export const formSchema: FormSchema[] = [
     field: 'countryCode',
     colProps: { span: 12 },
     component: 'ApiSelect',
-    ifShow: () => {
+
+    show: () => {
+      console.log('区县show')
       return (userStore?.userInfo?.userIdentity == '2' || userStore?.userInfo?.userIdentity == '1') ? true : false
     },
     componentProps: ({ formModel, formActionType }) => {
-      console.log(userStore?.userInfo?.userIdentity, '走不走呀')
-      if (userStore?.userInfo?.userIdentity == '2' && !formModel.wrdkid) {
-        const { updateSchema } = formActionType;
-        updateSchema({
-          label: '区县',
-          labelWidth: 220,
-          field: 'countryCode',
-          ifShow: true,
-          componentProps: {
-            api: getTown,
-            params: userStore?.userInfo?.codeRegion,
-            labelField: 'name',
-            valueField: 'id',
-          },
-        });
-      }
+      console.log('区县componentProps', formModel.cityCode)
+      handeCount(formActionType, formModel)
       return {
         api: getTown,
         params: formModel.cityCode, // 行政区划编码
@@ -948,4 +941,23 @@ function handeFlyj(val, formActionType) {
 
     });
   }
+}
+// 县回显处理
+function handeCount(formActionType, formModel) {
+  const { updateSchema } = formActionType;
+  if (userStore?.userInfo?.userIdentity == '2' && !formModel.wrdkid) {
+
+    updateSchema({
+      label: '区县',
+      labelWidth: 220,
+      field: 'countryCode',
+      show: true,
+      componentProps: {
+        api: getTown,
+        params: userStore?.userInfo?.codeRegion,
+        labelField: 'name',
+        valueField: 'id',
+      },
+    });
+  }
 }
\ No newline at end of file

src/views/dkgl/fxpg/data.ts

@@ -68,11 +68,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'hylb',
     resizable: true,
   },
-  {
-    title: '当前阶段',
-    dataIndex: 'jdnzt',
-    resizable: true,
-  },
+  // {
+  //   title: '当前阶段',
+  //   dataIndex: 'jdnzt',
+  //   resizable: true,
+  // },
   {
     title: '政策依据',
     dataIndex: 'faliYiju',

src/views/dkgl/investigate/data.ts

@@ -67,11 +67,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'hylb',
     resizable: true,
   },
-  {
-    title: '当前阶段',
-    dataIndex: 'jdnzt',
-    resizable: true,
-  },
+  // {
+  //   title: '当前阶段',
+  //   dataIndex: 'jdnzt',
+  //   resizable: true,
+  // },
   {
     title: '政策依据',
     dataIndex: 'faliYiju',

src/views/system/loginmini/MiniLogin.vue

@@ -174,7 +174,7 @@
     float: right;
     position: relative;
     z-index: 3;
-    background: #ffffff;
+    background: @white;
     color: #1573e9;
     border-radius: 100px;
     padding: 5px 16px;