From fd1c56bdabd575f6979214f29c7e78d0f3a31145 Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Wed, 11 Sep 2024 16:58:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/policeManager/index/index.vue   | 103 ++++++++++++------
 .../subPages/pages/policeManager/index.vue    |  48 ++++++--
 2 files changed, 112 insertions(+), 39 deletions(-)

diff --git a/collect_information/src/pages/policeManager/index/index.vue b/collect_information/src/pages/policeManager/index/index.vue
index d2f2d65..94154d2 100644
--- a/collect_information/src/pages/policeManager/index/index.vue
+++ b/collect_information/src/pages/policeManager/index/index.vue
@@ -1,44 +1,85 @@
 <template>
   <view>
-    <view class="content">
-      <div @tap="routerPush(1)" class="grid-item">
-        <image class="grid-item-image"></image>
-        <view class="grid-item-text">企事业单位</view>
-      </div>
-      <div class="grid-item">
-        <image class="grid-item-image"></image>
-        <view class="grid-item-text">监督考核</view>
-      </div>
-      <div class="grid-item">
-        <image class="grid-item-image"></image>
-        <view class="grid-item-text">警保风采</view>
-      </div>
-      <div class="grid-item">
-        <image class="grid-item-image"></image>
-        <view class="grid-item-text">三色预警</view>
-      </div>
+    <view class="swiper-demo">
+      <nut-swiper ref="swiperRef" pagination-visible pagination-color="#e53e31" :auto-play="3000" :init-page="0">
+        <nut-swiper-item v-for="(item, index) in list" :key="index" style="height: 150px">
+          <img :src="item" alt="" style="height: 100%; width: 100%" draggable="false"/>
+        </nut-swiper-item>
+      </nut-swiper>
+    </view>
+    <view class="margin-top">
+      <nut-grid :column-num="3">
+        <nut-grid-item
+          text="企事业单位"
+          @click="Taro.navigateTo({url: '/subPages/pages/policeManager/index'})">
+        </nut-grid-item>
+        <nut-grid-item
+          text="警保风采"
+          @click="Taro.navigateTo({url: '/pages/index/dataEntry/personnelInformationEntry/personnelInformationEntry'})">
+        </nut-grid-item>
+        <nut-grid-item text=".....">
+        </nut-grid-item>
+      </nut-grid>
     </view>
-
   </view>
 </template>
 <script setup lang="ts">
+import './index.scss'
+import {ref} from 'vue'
 import Taro from "@tarojs/taro";
 
-const routerPush = (path) => {
-  switch (path) {
-    case 1:
-      Taro.navigateTo({
-        url: '/subPages/pages/policeManager/index',
+const list = ref([
+  'https://storage.360buyimg.com/jdc-article/NutUItaro34.jpg',
+  'https://storage.360buyimg.com/jdc-article/NutUItaro2.jpg',
+  'https://storage.360buyimg.com/jdc-article/welcomenutui.jpg',
+  'https://storage.360buyimg.com/jdc-article/fristfabu.jpg'
+])
+const swiperRef = ref()
 
-      })
-  }
-
-}
-
-import './index.scss'
 </script>
 
 
-<style scoped lang="scss">
+<!--<template>-->
+<!--  <view>-->
+<!--    <view class="content">-->
+<!--      <div @tap="routerPush(1)" class="grid-item">-->
+<!--        <image class="grid-item-image"></image>-->
+<!--        <view class="grid-item-text">企事业单位</view>-->
+<!--      </div>-->
+<!--      <div class="grid-item">-->
+<!--        <image class="grid-item-image"></image>-->
+<!--        <view class="grid-item-text">监督考核</view>-->
+<!--      </div>-->
+<!--      <div class="grid-item">-->
+<!--        <image class="grid-item-image"></image>-->
+<!--        <view class="grid-item-text">警保风采</view>-->
+<!--      </div>-->
+<!--      <div class="grid-item">-->
+<!--        <image class="grid-item-image"></image>-->
+<!--        <view class="grid-item-text">三色预警</view>-->
+<!--      </div>-->
+<!--    </view>-->
 
-</style>
+<!--  </view>-->
+<!--</template>-->
+<!--<script setup lang="ts">-->
+<!--import Taro from "@tarojs/taro";-->
+
+<!--const routerPush = (path) => {-->
+<!--  switch (path) {-->
+<!--    case 1:-->
+<!--      Taro.navigateTo({-->
+<!--        url: '/subPages/pages/policeManager/index',-->
+
+<!--      })-->
+<!--  }-->
+
+<!--}-->
+
+<!--import './index.scss'-->
+<!--</script>-->
+
+
+<!--<style scoped lang="scss">-->
+
+<!--</style>-->
diff --git a/collect_information/src/subPages/pages/policeManager/index.vue b/collect_information/src/subPages/pages/policeManager/index.vue
index 8c19c7a..bfec2d3 100644
--- a/collect_information/src/subPages/pages/policeManager/index.vue
+++ b/collect_information/src/subPages/pages/policeManager/index.vue
@@ -1,20 +1,52 @@
 <template>
-  <view>
-    <view class="content">
+  <view class="myProject">
+    <view>
 
     </view>
-
   </view>
 </template>
+
 <script setup lang="ts">
+import api from "@/request/index";
+import {onMounted} from "vue";
+import Taro from "@tarojs/taro";
 
-import Taro, {useLoad} from "@tarojs/taro";
+const getMyServiceProject = async () => {
+  const token = Taro.getStorageSync('token')
+  const resp = await api.get(`/projectManageIndex/getMyServiceProject`, {
+    token: token.value
+  })
+  console.log(resp.data)
+}
 
-useLoad(() => {
-  console.log('onLoad')
+
+
+onMounted(async () => {
+  await getMyServiceProject()
 })
-
-import './index.scss'
 </script>
 
+<style scoped lang="scss">
+
+</style>
+
+<!--<template>-->
+<!--  <view>-->
+<!--    <view class="content">-->
+
+<!--    </view>-->
+
+<!--  </view>-->
+<!--</template>-->
+<!--<script setup lang="ts">-->
+
+<!--import Taro, {useLoad} from "@tarojs/taro";-->
+
+<!--useLoad(() => {-->
+<!--  console.log('onLoad')-->
+<!--})-->
+
+<!--import './index.scss'-->
+<!--</script>-->
+
 

From 33220820430b70b18be1ab37ec67c2962cce1247 Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Fri, 13 Sep 2024 09:38:35 +0800
Subject: [PATCH 2/2] ..

---
 .../subPages/pages/policeManager/index.scss   | 31 ++++++++
 .../subPages/pages/policeManager/index.vue    | 53 ++++++-------
 .../src/components/layout/layout.vue          | 78 ++++++++++---------
 policeManagement/src/router/staticRouters.ts  |  1 +
 4 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/collect_information/src/subPages/pages/policeManager/index.scss b/collect_information/src/subPages/pages/policeManager/index.scss
index 2416329..b1dd448 100644
--- a/collect_information/src/subPages/pages/policeManager/index.scss
+++ b/collect_information/src/subPages/pages/policeManager/index.scss
@@ -2,3 +2,34 @@ page {
   background-color: #f0f0f0;
 }
 
+.myProject {
+  .myProjectItem {
+    margin: 20px;
+    border-radius: 10px;
+    background: #ffffff;
+    padding: 15px;
+    font-size: 28px;
+    line-height: 50px;
+    color: #333333;
+
+    .myProjectIndex {
+      color: #9b9b9f;
+    }
+
+    .project {
+      display: flex;
+      justify-content: space-between;
+      flex-flow: wrap;
+      text-align: center;
+
+      view {
+        width: 45%;
+        height: 100rpx;
+        border: 1px solid #cccccc;
+        line-height: 100rpx;
+        margin: 8px 0 8px 0;
+      }
+    }
+  }
+}
+
diff --git a/collect_information/src/subPages/pages/policeManager/index.vue b/collect_information/src/subPages/pages/policeManager/index.vue
index bfec2d3..f299bd0 100644
--- a/collect_information/src/subPages/pages/policeManager/index.vue
+++ b/collect_information/src/subPages/pages/policeManager/index.vue
@@ -1,52 +1,47 @@
 <template>
   <view class="myProject">
-    <view>
-
+    <view class="myProjectItem" v-for="(item,index) in myProjectList" :key="index">
+      <view style="display: flex;justify-content: space-between">
+        <text>{{ item?.name }}</text>
+        <!--<text>进行中</text>-->
+      </view>
+      <view class="myProjectIndex">地址：
+        <text>{{ item?.provinceName }}{{ item.cityName }}{{ item.districtsName }}{{ item.streetName }}</text>
+      </view>
+      <view style="display: flex;justify-content: space-between">
+        <text>项目负责人：{{ item?.contactPersonInfo.name }}</text>
+        <text>电话：{{ item?.contactPersonInfo.telephone }}</text>
+      </view>
+      <view class="project">
+        <view v-for="(items,index) in item.serviceProjectList" :key="index">{{ items.name }}</view>
+      </view>
     </view>
   </view>
 </template>
 
 <script setup lang="ts">
 import api from "@/request/index";
-import {onMounted} from "vue";
+import {onMounted, ref} from "vue";
 import Taro from "@tarojs/taro";
+import './index.scss'
 
+const myProjectList = ref<myProjectList[]>()
 const getMyServiceProject = async () => {
   const token = Taro.getStorageSync('token')
-  const resp = await api.get(`/projectManageIndex/getMyServiceProject`, {
+  const resp = await api.get<myProjectList[]>(`/policeIndex/getUnitServiceProjectList`, {
     token: token.value
   })
+
+  myProjectList.value = resp.data
   console.log(resp.data)
 }
-
-
-
 onMounted(async () => {
   await getMyServiceProject()
 })
 </script>
 
-<style scoped lang="scss">
-
-</style>
-
-<!--<template>-->
-<!--  <view>-->
-<!--    <view class="content">-->
-
-<!--    </view>-->
-
-<!--  </view>-->
-<!--</template>-->
-<!--<script setup lang="ts">-->
-
-<!--import Taro, {useLoad} from "@tarojs/taro";-->
-
-<!--useLoad(() => {-->
-<!--  console.log('onLoad')-->
-<!--})-->
-
-<!--import './index.scss'-->
-<!--</script>-->
+
+
+
 
 
diff --git a/policeManagement/src/components/layout/layout.vue b/policeManagement/src/components/layout/layout.vue
index 60aad97..d8e7cdf 100644
--- a/policeManagement/src/components/layout/layout.vue
+++ b/policeManagement/src/components/layout/layout.vue
@@ -5,42 +5,31 @@
         <div>公安后台</div>
       </div>
       <div v-else class="logo flex-center">
-        <img src="@/assets/vue.svg" title="超级后台" alt="xx" />
+        <img src="@/assets/vue.svg" title="超级后台" alt="xx"/>
       </div>
-      <!--  -->
-      <!-- <a-menu v-model:selectedKeys="selectedKeys" theme="light" mode="inline">
-        <a-menu-item key="1">
-          <router-link to="/index">
-            <pie-chart-outlined />
-            <span>首页</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="2">
-          <router-link to="/register/index">
-            <pie-chart-outlined />
-            <span>注册</span>
-          </router-link>
-        </a-menu-item>
-      </a-menu> -->
+
       <!-- 动态生成菜单项 -->
       <a-menu v-model:selectedKeys="selectedKeys" v-model:openKeys="openKeys" theme="light" mode="inline">
         <template v-for="route in staticRouter">
-          <a-menu-item v-if="route.meta?.title === undefined && route.children" :key="route.path" @click="handleMenuClick(route.children[0].path)">
-            <router-link :to="`${route.children[0].path}`">
-              <HomeOutlined v-if="route.name === 'dashboard'" />
-              <InsuranceOutlined v-if="route.name === 'police'" />
-              <SoundOutlined v-if="route.name === 'law'" />
-              <ApartmentOutlined v-if="route.name === 'warning'" />
+          <a-menu-item v-if="route.meta?.title === undefined && route.children" :key="route.path"
+                       @click="handleMenuClick(route.children[0].path)">
+            <router-link :to="`${route.children[0].path}`" class="flex_">
+              <!--              <icon-font :font-class="route.icon"/>-->
+              <HomeOutlined v-if="route.name === 'dashboard'"/>
+              <InsuranceOutlined v-if="route.name === 'police'"/>
+              <SoundOutlined v-if="route.name === 'law'"/>
+              <ApartmentOutlined v-if="route.name === 'warning'"/>
               <span>{{ route?.children[0]?.meta?.title }}</span>
             </router-link>
           </a-menu-item>
           <a-sub-menu v-if="route.children && route.children.length && route?.meta?.title" :key="route.path">
             <template #title>
-              <MailOutlined v-if="route.name === 'query-'" />
-              <UserOutlined v-if="route.name === 'user'" />
+              <MailOutlined v-if="route.name === 'query-'"/>
+              <UserOutlined v-if="route.name === 'user'"/>
               <span>{{ route.meta?.title }}</span>
             </template>
-            <a-menu-item v-for="child in route.children" :key="child.path" @click="handleMenuClick(`${route.path}/${child.path}`)">
+            <a-menu-item v-for="child in route.children" :key="child.path"
+                         @click="handleMenuClick(`${route.path}/${child.path}`)">
               <router-link :to="`${route.path}/${child.path}`">{{ child.meta?.title }}</router-link>
             </a-menu-item>
           </a-sub-menu>
@@ -49,7 +38,7 @@
     </a-layout-sider>
     <a-layout>
       <a-layout-header class="layout-header">
-        <layout-header v-model:collapsed="collapsed" />
+        <layout-header v-model:collapsed="collapsed"/>
       </a-layout-header>
       <a-layout-content class="layout-content">
         <!-- <keep-alive> 会缓存已经访问过的组件，当你再次访问同一个页面时，它会直接从缓存中加载，而不会触发重新渲染 -->
@@ -59,7 +48,7 @@
           <!-- <router-view v-slot="{ Component, route }"> -->
           <transition appear name="fade-transform" mode="out-in">
             <keep-alive :include="keepAliveNames">
-              <component :is="Component" :key="route.path" />
+              <component :is="Component" :key="route.path"/>
             </keep-alive>
           </transition>
         </router-view>
@@ -69,11 +58,21 @@
 </template>
 
 <script setup lang="ts">
-import { InsuranceOutlined, HomeOutlined, SoundOutlined, MailOutlined, ApartmentOutlined, UserOutlined, AppstoreOutlined } from '@ant-design/icons-vue'
+import IconFont from "@/components/iconfont/IconFont.vue";
+import {
+  InsuranceOutlined,
+  HomeOutlined,
+  SoundOutlined,
+  MailOutlined,
+  ApartmentOutlined,
+  UserOutlined,
+  AppstoreOutlined
+} from '@ant-design/icons-vue'
 import LayoutHeader from '@/components/layout/header/LayoutHeader.vue'
-import { computed, watch, onMounted } from 'vue'
-import { staticRouter } from '@/router/staticRouters'
-import { useRoute } from 'vue-router'
+import {computed, watch, onMounted} from 'vue'
+import {staticRouter} from '@/router/staticRouters'
+import {useRoute} from 'vue-router'
+
 const route = useRoute()
 const selectedKeys = ref([route.path])
 /**
@@ -86,10 +85,10 @@ const handleMenuClick = (path: any) => {
   localStorage.setItem('selectedKeys', JSON.stringify([path]))
 }
 watch(
-  () => route.path,
-  (newPath) => {
-    selectedKeys.value = [newPath]
-  }
+    () => route.path,
+    (newPath) => {
+      selectedKeys.value = [newPath]
+    }
 )
 const openKeys = ref([])
 // 页面加载时，读取 localStorage 中的菜单状态
@@ -132,7 +131,7 @@ watch(openKeys, (newOpenKeys) => {
 // 示例：动态控制缓存页面的名称
 // const keepAliveNames = ref(['index'])
 
-import { ref } from 'vue'
+import {ref} from 'vue'
 // 控制菜单折叠
 const collapsed = ref<boolean>(false)
 
@@ -141,6 +140,13 @@ const keepAliveNames = ref<string[]>(['index', 'rindex'])
 </script>
 
 <style scoped lang="scss">
+.flex_ {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+
+}
+
 .main-content {
   width: 100vw;
   height: 100vh;
diff --git a/policeManagement/src/router/staticRouters.ts b/policeManagement/src/router/staticRouters.ts
index 6319e39..45b703d 100644
--- a/policeManagement/src/router/staticRouters.ts
+++ b/policeManagement/src/router/staticRouters.ts
@@ -9,6 +9,7 @@ export const staticRouter: RouteRecordRaw[] =
             path: '/',
             name: 'dashboard',
             redirect: '/index',
+            icon: 'icon-policeman-full',
             meta: {
                 keepalive: true
             },