Merge remote-tracking branch 'origin/main'

collect_information/src/pages/police/index/index.vue.bak

@@ -1,15 +1,15 @@
 <template>
-  <div class="search" id="search">
+  <view class="search" id="search">
-    <a-input v-model="valueInput" @input="searchInput" placeholder="请进行搜索"></a-input>
+    <nut-input v-model="valueInput" @input="searchInput" placeholder="请进行搜索"></nut-input>
-    <div v-if="valueInput">
+    <view v-if="valueInput">
       <ul>
         <li v-for="item in searchResults" :key="item.id">{{item}}</li>
       </ul>
-    </div>
+    </view>
-    <div v-else >
+    <view v-else >
       没有找到相关结果
-    </div>
+    </view>
-  </div>
+  </view>
 </template>
 <script setup lang="ts">
 import {onMounted, ref,} from "vue";

collect_information/src/subPages/police/myEnterprisesUnit/myEnterprisesUnit.vue

@@ -26,6 +26,7 @@
                <view>责任单位：{{serviceProject.securityUnitName}}</view>
             </view>
         </view>
+
       </view>
     </view>
     <view v-else class="myProject">

collect_information/src/subPages/projectManager/myProject/myProject.scss

@@ -1,10 +1,8 @@
+page {
+  background-color: #f0f0f0;
+}
 .myProject {
-  height: 100vh;
-  overflow: hidden;
-  background: #f1f1f1;
-
   .myProjectItem {
-    //height: 20%;
     margin: 20px;
     border-radius: 10px;
     background: #ffffff;
@@ -18,16 +16,8 @@
     }
 
     .project {
-      display: flex;
-      justify-content: space-between;
-      flex-flow: wrap;
-      text-align: center;
-
       view {
-        width: 45%;
+        width: 100%;
-        height: 100rpx;
-        border: 1px solid #cccccc;
-        line-height: 100rpx;
         margin: 8px 0 8px 0;
       }
     }

collect_information/src/subPages/projectManager/myProject/myProject.vue

@@ -4,6 +4,7 @@
       <view class="myProjectItem" v-for="(item,index) in myProjectList" :key="index">
         <view style="display: flex;justify-content: space-between">
           <text>{{ item?.name }}</text>
+          <text>单位类型：{{ item?.type.label }}</text>
         </view>
         <view class="myProjectIndex">地址：
           <text>{{ item?.provinceName }}{{ item.cityName }}{{ item.districtsName }}{{ item.streetName }}</text>
@@ -13,9 +14,17 @@
           <text>电话：{{ item?.contactPersonInfo.telephone }}</text>
         </view>
         <view class="project">
-          <view @click="projectClick(item.name,serviceProject)"
+          <view @click="projectClick(item?.name, serviceProject)" v-for="(serviceProject, index) in item.serviceProjectList" :key="index">
-                v-for="(serviceProject,index) in item.serviceProjectList" :key="index">
+            <view style="border: 1px solid #cccccc;color: #9b9b9f">
-            {{ serviceProject.name }}
+              <view style="display: flex; justify-content: space-between">
+                <text>项目名称：{{serviceProject.name}}</text>
+                <text>项目类型：{{serviceProject.type.label}}</text>
+              </view>
+              <view style="display: flex; justify-content: space-between">
+                <text>项目负责人：{{serviceProject.projectManagerMiniProgramUserInfo?.name?serviceProject.projectManagerMiniProgramUserInfo?.name:'无分配项目经理'}}</text>
+              </view>
+              <view>责任单位：{{serviceProject.securityUnitName}}</view>
+            </view>
           </view>
         </view>
       </view>
@@ -37,7 +46,6 @@ import './myProject.scss'
 import {MyProjectList, ServiceProjectList} from "@/types/subPages/projectManager/myProject";
 
 const myProjectList = ref<MyProjectList[]>()
-
 const number = ref(0)
 const getMyServiceProject = async () => {
   const resp = await api.get<MyProjectList[]>(`/projectManageIndex/getMyServiceProject`)

policeManagement/src/global.d.ts

@@ -1,3 +1,5 @@
+
+// global.d.ts不能出现 export 关键字否则这个文件会失效
 declare const __APP_ENV: ImportMetaEnv;
 class TreeNodeVo<T, E = Record<string, any>> {
     value: T;
@@ -18,7 +20,7 @@ interface JsonResult<T> {
 }
 
 
-export interface SecurityUnitPagerQueryParams {
+interface SecurityUnitPagerQueryParams {
     /** 名称 **/
     name?: string;
     /** 社会编码 **/
@@ -34,14 +36,7 @@ interface BaseEnum<T> {
     value: T;
     label: string
 }
-class TreeNodeVo<T, E = Record<string, any>> {
+
-    value: T;
-    parentValue: T;
-    label: string;
-    orderIndex?: number;
-    children?: TreeNodeVo<T>[]
-    extData?: E;
-}
 interface Grid {
     //栅格占据的列数
     span?: number;