songxy 10 ヶ月 前
コミット
0436542db6

+ 0 - 24
client/src/router/modules/remaining.ts

@@ -313,30 +313,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
           title: '发出的日志'
         }
       },
-      {
-        path: 'projectReport',
-        component: () => import('@/views/OaSystem/marketCenter/projectReport/index.vue'),
-        name: 'ProjectReport',
-        meta: {
-          title: '产值填报'
-        }
-      },
-      {
-        path: 'projectCheck',
-        component: () => import('@/views/OaSystem/marketCenter/projectCheck/index.vue'),
-        name: 'ProjectCheck',
-        meta: {
-          title: '产值审核'
-        }
-      },
-      {
-        path: 'projectCheckPass',
-        component: () => import('@/views/OaSystem/marketCenter/projectCheckPass/index.vue'),
-        name: 'ProjectCheckPass',
-        meta: {
-          title: '产值审核通过'
-        }
-      },
       {
         path: 'newCustomer',
         component: () => import('@/views/OaSystem/marketCenter/khxjPage/index.vue'),

+ 7 - 4
client/src/views/OaSystem/marketCenter/projectReport/index.vue

@@ -5,7 +5,7 @@
         <li v-for="(item, index) in infoList" :key="index" class="mr-40px">
           <img class="mr-8px" :src="getAssetURL(item.icon)" alt="" />
           <p>{{ item.name }}:</p>
-          <h4 class="font-size-18px" v-money:unit="item.num"></h4>
+          <h4 class="font-size-18px">{{ item.num }}{{ item.unit }}</h4>
         </li>
       </ul>
     </div>
@@ -157,17 +157,20 @@ const infoList: any = reactive([
   {
     icon: 'xmzx/xmzlr',
     name: '项目总数',
-    num: 0
+    num: 0,
+    unit: '个'
   },
   {
     icon: 'xmzx/xmzcb',
     name: '本年度总考核产值',
-    num: 0
+    num: 0,
+    unit: '元'
   },
   {
     icon: 'xmzx/xmzcz',
     name: '本年度总产值',
-    num: 0
+    num: 0,
+    unit: '元'
   }
 ])
 

+ 0 - 2
client_h5/src/router/index.ts

@@ -14,8 +14,6 @@ const router = createRouter({
 })
 // 路由加载前
 router.beforeEach((to, from, next) => {
-  next()
-  return;
   getUserInfoPromise(true).then((isLogin) => {
     next(); 
     if (!isLogin) {