1、调整项目信息展示

client/.env

@@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=瑞安OA系统
+VITE_APP_TITLE=浙江万维空间企业管理系统
 
 # 项目本地运行端口号
 VITE_PORT=3000

client/.env.dev

@@ -1,16 +1,18 @@
 # 开发环境
-NODE_ENV=production
+NODE_ENV=development
 
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://60.191.110.205:28080'
+# VITE_BASE_URL='http://10.10.9.113:48080'
+VITE_BASE_URL='http://10.10.8.247:48080'
+# VITE_BASE_URL='https://oa.zjugis.com:28080'
 
 # 上传路径
 VITE_UPLOAD_URL='/infra/file/upload'
 
 # websocket地址路径
-VITE_SOCKET='ws://60.191.110.205:48080/ws/'
+VITE_SOCKET='ws://10.10.10.7:6091/ws/'
 
 # 上传配置对应的编号ID
 VITE_UPLOAD_CLIENT_ID=20
@@ -19,7 +21,7 @@ VITE_UPLOAD_CLIENT_ID=20
 VITE_FILE_BASE_URI='/infra/file'
 
 # 流程详情页面路径
-VITE_PROCESS_DETAIL_URI = 'http:/60.191.110.205:48080/workflow'
+VITE_PROCESS_DETAIL_URI = 'http://10.10.10.7:48080/workflow'
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api

client/src/api/system/area/index.ts

@@ -1,19 +0,0 @@
-import request from '@/config/axios'
-
-// 获得地区树
-export const getAreaTree = async () => {
-  return await request.get({ url: '/system/area/tree' })
-}
-
-export const getChildrenArea = async (id: number) => {
-  return await request.get({ url: '/system/area/get-children?id=' + id })
-}
-
-export const getAreaListByIds = async (ids) => {
-  return await request.get({ url: '/system/area/get-by-ids?ids=' + ids })
-}
-
-// 获得 IP 对应的地区名
-export const getAreaByIp = async (ip: string) => {
-  return await request.get({ url: '/system/area/get-by-ip?ip=' + ip })
-}

client/src/router/modules/remaining.ts

@@ -95,6 +95,18 @@ const remainingRouter: AppRouteRecordRaw[] = [
       hidden: true
     },
     children: [
+      {
+        path: 'profile',
+        component: () => import('@/views/Profile/Index.vue'),
+        name: 'Profile',
+        meta: {
+          canTo: true,
+          hidden: true,
+          noTagsView: false,
+          icon: 'ep:user',
+          title: t('common.profile')
+        }
+      },
       {
         path: 'notify-message',
         component: () => import('@/views/system/notify/my/index.vue'),

client/src/views/Login/OALogin.vue

@@ -2,7 +2,7 @@
   <div class="oa-login">
     <div class="login_box">
       <div class="title_box">
-        <img src="../../assets/imgs/RuiAn/logo_icon.png" />
+        <img src="../../assets/imgs/OA/title_bg.png" />
         <span class="circle"></span>
         <span class="title">自然资源和规划局一体化系统</span>
       </div>
@@ -93,7 +93,7 @@ onMounted(() => {
 .oa-login {
   width: 100%;
   height: 100%;
-  background: url(@/assets/imgs/RuiAn/loginBj.png) no-repeat;
+  background: url(@/assets/imgs/OA/loginBj.png) no-repeat;
   background-size: 100% 100%;
   position: relative;
   > .login_box {
@@ -109,10 +109,8 @@ onMounted(() => {
       align-items: center;
       justify-content: center;
       margin-bottom: 15px;
-      border: 1p solid #f00;
       > img {
         margin-top: 5px;
-        height: 80px;
       }
       > .circle {
         display: block;

client/src/views/OaSystem/mainOfficeCenter/index.vue

@@ -495,8 +495,8 @@ const {
       type === InullyApplyEnum.Recover
         ? '恢复作废成功!'
         : type === InullyApplyEnum.Nully
-        ? '作废成功!'
-        : '彻底作废成功!'
+          ? '作废成功!'
+          : '彻底作废成功!'
     )
     if (type === InullyApplyEnum.Recover || type === InullyApplyEnum.Nully) {
       subscribe.emit('updateHandleCenterCorner', null)
@@ -564,5 +564,5 @@ const keydownHandle = (evt) => {
 </script>
 
 <style lang="scss" scoped>
-@import url('./index.scss');
+@import './index.scss';
 </style>

client/src/views/OaSystem/oaLayout/tagList.vue

@@ -97,13 +97,13 @@
                     effect="dark"
                     :disabled="(item?.query?.name ?? '') === ''"
                     :content="`${item.meta.title}
-                    ${item.meta.title === '' ? item?.query?.title ?? '' : ''}
+                    ${item.meta.title === '' ? (item?.query?.title ?? '') : ''}
                     ${(item?.query?.name ?? '') !== '' ? `（ ${item?.query?.name} ）` : ''}`"
                     placement="top-start"
                   >
                     <p>
                       {{ item.meta.title }}
-                      {{ item.meta.title === '' ? item?.query?.title ?? '' : '' }}
+                      {{ item.meta.title === '' ? (item?.query?.title ?? '') : '' }}
                       <!-- 用于多开页面的区分展示（例如详情页）-->
                       <!-- {{ (item?.query?.name ?? '') !== '' ? `(${item?.query?.name})` : '' }}-->
                     </p>
@@ -332,14 +332,14 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 ._tagList {
-  display: flex;
   width: 100%;
-  height: 54px;
   padding: 0 30px;
-  color: #000;
-  background: rgb(255 255 255 / 60%);
+  height: 54px;
+  background: rgba(255, 255, 255, 0.6);
   border-radius: 20px;
+  display: flex;
   align-items: center;
+  color: #000000;
 
   .tag-view {
     display: flex;
@@ -353,18 +353,18 @@ onMounted(() => {
     }
 
     .tags-draggable-list {
-      display: flex;
+      overflow-x: auto;
       width: 100%;
       height: 100%;
+      display: flex;
       padding-top: 6px;
-      overflow-x: auto;
 
       &::-webkit-scrollbar-thumb {
         background-color: transparent;
       }
 
       &::-webkit-scrollbar-thumb:hover {
-        background-color: rgb(0 0 0 / 20%);
+        background-color: rgba(0, 0, 0, 0.2);
       }
 
       .tag-body {
@@ -402,12 +402,11 @@ onMounted(() => {
 
         .homeBox,
         .fhomeBox {
-          display: flex;
           height: 48px;
           opacity: 1;
+          display: flex;
           align-items: center;
           justify-content: center;
-
           .el-icon {
             margin-right: 5px;
           }
@@ -418,12 +417,12 @@ onMounted(() => {
 
           .close {
             display: flex;
-            margin-left: 5px;
-            font-size: 24px;
-            font-weight: 200;
             align-items: center;
             justify-content: center;
             flex-shrink: 0;
+            margin-left: 5px;
+            font-weight: 200;
+            font-size: 24px;
 
             &:hover {
               color: #2e77e6;
@@ -436,8 +435,8 @@ onMounted(() => {
           justify-content: space-between;
 
           .pBox {
-            display: flex;
             width: calc(100% - 17px);
+            display: flex;
             align-items: center;
             justify-content: center;
 

zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ProjectInfo/js/index.js

@@ -197,10 +197,10 @@
         if (!(!paymentList[i].proportion || paymentList[i].proportion.trim() === '')) {
             z.ui.input("[name='InstallmentPaymentDTO[" + i + "]$proportion']").setValue(paymentList[i].proportion)
         }
-        if (!(!paymentList[i].payableAmount || paymentList[i].payableAmount.trim() === '')) {
+        if (!(!paymentList[i].payableAmount || paymentList[i].payableAmount === 0)) {
             z.ui.input("[name='InstallmentPaymentDTO[" + i + "]$payableAmount']").setValue(paymentList[i].payableAmount)
         }
-        if (!(!paymentList[i].paidAmount || paymentList[i].paidAmount.trim() === '')) {
+        if (!(!paymentList[i].paidAmount || paymentList[i].paidAmount === 0)) {
             z.ui.input("[name='InstallmentPaymentDTO[" + i + "]$paidAmount']").setValue(paymentList[i].paidAmount)
         }
         if (!(!paymentList[i].paymentTime || paymentList[i].paymentTime.trim() === '')) {
@@ -209,7 +209,7 @@
         if (!(!paymentList[i].budgetNumber || paymentList[i].budgetNumber.trim() === '')) {
             z.ui.input("[name='InstallmentPaymentDTO[" + i + "]$budgetNumber']").setValue(paymentList[i].budgetNumber)
         }
-        if (!(!paymentList[i].invoiceAmount || paymentList[i].invoiceAmount.trim() === '')) {
+        if (!(!paymentList[i].invoiceAmount || paymentList[i].invoiceAmount === 0)) {
             z.ui.input("[name='InstallmentPaymentDTO[" + i + "]$invoiceAmount']").setValue(paymentList[i].invoiceAmount)
         }
         if (!(!paymentList[i].invoiceDate || paymentList[i].invoiceDate.trim() === '')) {