From 468d5d4e0798d2fc7b7d71e3be509ad858a37de6 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Sun, 31 Mar 2024 17:23:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?flat:=20=E6=8E=A8=E9=80=81=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/{mian => main}/policy.vue | 17 ++++++++++-------
 vue.config.js                              |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename src/views/report/{mian => main}/policy.vue (90%)

diff --git a/src/views/report/mian/policy.vue b/src/views/report/main/policy.vue
similarity index 90%
rename from src/views/report/mian/policy.vue
rename to src/views/report/main/policy.vue
index a018519..5890220 100644
--- a/src/views/report/mian/policy.vue
+++ b/src/views/report/main/policy.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import {reviewCount} from '@/api/report/report'
+import {policyCount} from '@/api/report/report'
 import CustomLoading from "@/components/Custom-Loading/index.vue";
 import { dateFormat } from "@/util/date";
 const pages = { total: 0, size: 10, currentPage: 1 }
@@ -56,25 +56,28 @@ export default {
           label: '机构名称',
           prop: 'name',
           search: true,
+          searchSpan: 6,
         },{
           label: '政策名称',
-          prop: 'companyCount',
+          prop: 'policyName',
+          search: true,
+          searchSpan: 6,
         },{
           label: '推送数',
-          prop: 'missionCount',
+          prop: 'serveCount',
         },{
           label: '跟踪服务次数 ',
-          prop: 'roleCount'
+          prop: 'traceCount'
         },{
           label: '服务成功次数 ',
-          prop: 'roleCount'
+          prop: 'successCount'
         },{
           label: '日期',
           prop: 'date',
           hide: true,
           display: false,
           type:'date',
-          searchSpan: 8,
+          searchSpan: 6,
           searchRange:true,
           search:true,
         }]
@@ -113,7 +116,7 @@ export default {
           delete params.date
         }
         console.log(123123, params)
-        let resData = await reviewCount(params)
+        let resData = await policyCount(params)
         if(resData.data.code === 200) {
           const { records, current, total, size } = resData.data.data
           this.infoData = records
diff --git a/vue.config.js b/vue.config.js
index 90ff354..d02b6dc 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://localhost:8000',
+        target: 'http://192.168.1.106:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {

From 4974cf2a9762836818ab89fc4b968ccca998c255 Mon Sep 17 00:00:00 2001
From: 18500206848 <liyanspace@163.com>
Date: Sun, 31 Mar 2024 18:53:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E6=88=90=E6=9C=BA=E6=9E=84=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/index/logo.vue                       |  8 ++---
 src/views/manage/company/companyList.vue      | 10 +++---
 src/views/manage/mission/count/index.vue      |  8 ++---
 .../manage/mission/count/table/detail.vue     |  2 +-
 .../manage/mission/count/table/gather.vue     |  2 +-
 src/views/manage/mission/index.vue            |  6 ++--
 src/views/manage/recruit/count/index.vue      |  4 +--
 .../manage/recruit/count/table/detail.vue     |  2 +-
 .../manage/recruit/count/table/gather.vue     |  2 +-
 src/views/manage/recruit/index.vue            |  6 ++--
 src/views/manage/station/inviteCode.vue       | 31 ++++++++++++-------
 src/views/manage/station/mainList.vue         |  6 ++++
 src/views/manage/works/count/index.vue        |  4 +--
 src/views/manage/works/count/table/detail.vue |  2 +-
 src/views/manage/works/count/table/gather.vue |  2 +-
 src/views/manage/works/index.vue              |  6 ++--
 src/views/tenant/main/serve/index.vue         |  6 ++--
 .../tenant/main/talents/certain/index.vue     |  2 +-
 .../tenant/main/talents/latent/index.vue      |  2 +-
 .../tenant/mission/Table/WaitingMission.vue   |  2 +-
 .../tenant/works/Table/WaitingMission.vue     |  2 +-
 src/views/tenant/works/index.vue              |  4 +--
 22 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 578cabf..a2a15ab 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -5,12 +5,8 @@
     </transition>
     <transition-group name="fade">
       <template v-if="!keyCollapse">
-        <span v-if="loginType !== 'Type-S'" class="avue-logo_title" style=" display: flex !important;
-  align-items: center !important;" key="1">
-          <img height="30px" width="180px" src="/manage/svg/logo_dark2.png" alt />
-        </span>
-        <span v-if="loginType === 'Type-S'" class="avue-logo_title" key="1">
-          <img height="30px" width="180px" src="/manage/svg/logo_dark2.png" alt />
+        <span class="avue-logo_title" style=" display: flex !important; align-items: center !important;" key="1">
+          <img height="42px" width="200px" src="/manage/svg/logo_dark2.png" alt />
         </span>
       </template>
     </transition-group>
diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue
index 66dccc2..07d38cf 100644
--- a/src/views/manage/company/companyList.vue
+++ b/src/views/manage/company/companyList.vue
@@ -237,7 +237,7 @@ export default {
         addBtn: true,
         editBtn: true,
         addBtnText: "社区街道登记",
-        addTitle: "新增所属机构",
+        addTitle: "新增机构名称",
         delBtn: false,
         menuWidth: 300,
         labelWidth: 151,
@@ -246,7 +246,7 @@ export default {
         dialogFullscreen: true,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             search: true,
             searchSpan: 6,
@@ -273,7 +273,7 @@ export default {
             column: [
               {
                 type: "input",
-                label: "所属机构",
+                label: "机构名称",
                 span: 20,
                 display: true,
                 size: "small",
@@ -284,7 +284,7 @@ export default {
                   {
                     required: true,
                     whitespace: true,
-                    message: "请输入所属机构",
+                    message: "请输入机构名称",
                   },
                 ],
               },
@@ -382,7 +382,7 @@ export default {
       });
       if (!flags) {
         this.$message.closeAll(); //只显示一个提示
-        this.$message.error("该所属机构已经审核，不用重复操作");
+        this.$message.error("该机构名称已经审核，不用重复操作");
         return;
       }
       this.$refs.check.open(this.ids[0]);
diff --git a/src/views/manage/mission/count/index.vue b/src/views/manage/mission/count/index.vue
index e5bf215..321c69b 100644
--- a/src/views/manage/mission/count/index.vue
+++ b/src/views/manage/mission/count/index.vue
@@ -47,8 +47,8 @@
       >
         <el-row :span="24" v-if="search.status === 1">
 
-          <el-form-item label="所属机构:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+          <el-form-item label="机构名称:">
+            <el-input v-model="search.companyName" placeholder="机构名称"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">
@@ -72,8 +72,8 @@
         </el-row>
         <el-row :span="24" v-if="search.status === 2">
 
-          <el-form-item label="所属机构:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+          <el-form-item label="机构名称:">
+            <el-input v-model="search.companyName" placeholder="机构名称"></el-input>
           </el-form-item>
 
           <el-form-item label="任务编号:">
diff --git a/src/views/manage/mission/count/table/detail.vue b/src/views/manage/mission/count/table/detail.vue
index 21287e6..2ed796f 100644
--- a/src/views/manage/mission/count/table/detail.vue
+++ b/src/views/manage/mission/count/table/detail.vue
@@ -110,7 +110,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {
diff --git a/src/views/manage/mission/count/table/gather.vue b/src/views/manage/mission/count/table/gather.vue
index fafc5a0..c065f06 100644
--- a/src/views/manage/mission/count/table/gather.vue
+++ b/src/views/manage/mission/count/table/gather.vue
@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {
diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue
index f5c77cf..a873e48 100644
--- a/src/views/manage/mission/index.vue
+++ b/src/views/manage/mission/index.vue
@@ -8,10 +8,10 @@
       :inline="true"
     >
       <el-row :span="24">
-        <el-form-item label="所属机构:">
+        <el-form-item label="机构名称:">
           <el-input
             v-model="query.companyName"
-            placeholder="所属机构"
+            placeholder="机构名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -229,7 +229,7 @@ export default {
         mStatusList: missionState,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             display: false,
           },
diff --git a/src/views/manage/recruit/count/index.vue b/src/views/manage/recruit/count/index.vue
index 27c613a..7a40172 100644
--- a/src/views/manage/recruit/count/index.vue
+++ b/src/views/manage/recruit/count/index.vue
@@ -39,8 +39,8 @@
       <el-form size="small" label-position="right" :inline="true">
         <el-row :span="24" v-if="search.status === 1">
 
-          <el-form-item label="所属机构:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+          <el-form-item label="机构名称:">
+            <el-input v-model="search.companyName" placeholder="机构名称"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">
diff --git a/src/views/manage/recruit/count/table/detail.vue b/src/views/manage/recruit/count/table/detail.vue
index bb84cff..bdc217b 100644
--- a/src/views/manage/recruit/count/table/detail.vue
+++ b/src/views/manage/recruit/count/table/detail.vue
@@ -119,7 +119,7 @@ export default {
             display: false,
           },
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {
diff --git a/src/views/manage/recruit/count/table/gather.vue b/src/views/manage/recruit/count/table/gather.vue
index f0cfc49..9b37fc2 100644
--- a/src/views/manage/recruit/count/table/gather.vue
+++ b/src/views/manage/recruit/count/table/gather.vue
@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {
diff --git a/src/views/manage/recruit/index.vue b/src/views/manage/recruit/index.vue
index 1b28e42..f58a77b 100644
--- a/src/views/manage/recruit/index.vue
+++ b/src/views/manage/recruit/index.vue
@@ -8,10 +8,10 @@
       :inline="true"
     >
       <el-row :span="24">
-        <el-form-item label="所属机构:">
+        <el-form-item label="机构名称:">
           <el-input
             v-model="query.companyName"
-            placeholder="所属机构"
+            placeholder="机构名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -218,7 +218,7 @@ export default {
         mStatusList: recruitStatus,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             display: false,
           },
diff --git a/src/views/manage/station/inviteCode.vue b/src/views/manage/station/inviteCode.vue
index e8c5872..dab114f 100644
--- a/src/views/manage/station/inviteCode.vue
+++ b/src/views/manage/station/inviteCode.vue
@@ -110,18 +110,25 @@ const curdOptions = {
   index: true,
   indexLabel: "序号",
   column: [{
-    label: '企业名称',
+    label: '机构名称',
     prop: 'companyName',
     search: true,
-  }, {
-    label: '用户名',
-    prop: 'realName',
-    // search: true,
   },{
-    label: '邀请码',
-    prop: 'inviteCode',
+    label: '企业名称',
+    prop: 'comname',
     search: true,
   },{
+    label: '绑定用户',
+    prop: 'realName',
+    // search: true,
+  },
+  // {
+  //   label: '邀请码',
+  //   prop: 'inviteCode',
+  //   search: true,
+  // },
+
+  {
     label: '手机号',
     prop: 'phone',
     search: true,
@@ -130,10 +137,12 @@ const curdOptions = {
     prop: 'idNumber',
     search: true,
     formatter:(_,value,label) => value
-  },{
-    label: '备注',
-    prop: 'remarks',
-  },{
+  },
+  // {
+  //   label: '备注',
+  //   prop: 'remarks',
+  // },
+  {
     label: '启用状态',
     prop: 'isEnabled',
     slot: true,
diff --git a/src/views/manage/station/mainList.vue b/src/views/manage/station/mainList.vue
index 1dff921..ccad13f 100644
--- a/src/views/manage/station/mainList.vue
+++ b/src/views/manage/station/mainList.vue
@@ -86,6 +86,12 @@ export default {
         dialogType: "drawer",
         dialogFullscreen: true,
         column: [
+          {
+            label: "机构名称",
+            prop: "companyName",
+            search: true,
+            display: false,
+          },
           {
             label: "公司名称",
             prop: "comname",
diff --git a/src/views/manage/works/count/index.vue b/src/views/manage/works/count/index.vue
index 7403289..17392d0 100644
--- a/src/views/manage/works/count/index.vue
+++ b/src/views/manage/works/count/index.vue
@@ -39,8 +39,8 @@
       <el-form size="small" label-position="right" :inline="true">
         <el-row :span="24" v-if="search.status === 1">
 
-          <el-form-item label="所属机构:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+          <el-form-item label="机构名称:">
+            <el-input v-model="search.companyName" placeholder="机构名称"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">
diff --git a/src/views/manage/works/count/table/detail.vue b/src/views/manage/works/count/table/detail.vue
index 2fcacdd..f84c095 100644
--- a/src/views/manage/works/count/table/detail.vue
+++ b/src/views/manage/works/count/table/detail.vue
@@ -119,7 +119,7 @@ export default {
             display: false,
           },
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {
diff --git a/src/views/manage/works/count/table/gather.vue b/src/views/manage/works/count/table/gather.vue
index a563bcf..8f36956 100644
--- a/src/views/manage/works/count/table/gather.vue
+++ b/src/views/manage/works/count/table/gather.vue
@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {
diff --git a/src/views/manage/works/index.vue b/src/views/manage/works/index.vue
index be74682..0067a8e 100644
--- a/src/views/manage/works/index.vue
+++ b/src/views/manage/works/index.vue
@@ -8,10 +8,10 @@
       :inline="true"
     >
       <el-row :span="24">
-        <el-form-item label="所属机构:">
+        <el-form-item label="机构名称:">
           <el-input
             v-model="query.companyName"
-            placeholder="所属机构"
+            placeholder="机构名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -230,7 +230,7 @@ export default {
         mStatusList: companyPostState,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             display: false,
           },
diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index d51b513..4be3b1a 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -45,8 +45,8 @@
         <!--搜索栏-->
         <el-form size="small" label-position="right" :inline="true" style="padding-left: 10px; padding-right: 10px">
           <el-row :span="24">
-            <el-form-item label="所属机构:">
-              <el-input v-model="query.companyName" placeholder="所属机构" clearable></el-input>
+            <el-form-item label="机构名称:">
+              <el-input v-model="query.companyName" placeholder="机构名称" clearable></el-input>
             </el-form-item>
             <el-form-item label="服务名称:">
               <el-input v-model="query.name" placeholder="服务名称" clearable></el-input>
@@ -541,7 +541,7 @@ export default {
         labelWidth: 120,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             addDisplay: false,
           },
diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue
index 451e7fa..6705dec 100644
--- a/src/views/tenant/main/talents/certain/index.vue
+++ b/src/views/tenant/main/talents/certain/index.vue
@@ -268,7 +268,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             // search: true,
             // span: 24,
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index 5c6295f..171cef5 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -269,7 +269,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             // search: true,
             // span: 24,
diff --git a/src/views/tenant/mission/Table/WaitingMission.vue b/src/views/tenant/mission/Table/WaitingMission.vue
index efabfad..b87dee2 100644
--- a/src/views/tenant/mission/Table/WaitingMission.vue
+++ b/src/views/tenant/mission/Table/WaitingMission.vue
@@ -214,7 +214,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             display: false,
           },
diff --git a/src/views/tenant/works/Table/WaitingMission.vue b/src/views/tenant/works/Table/WaitingMission.vue
index b52cf69..e6b56fd 100644
--- a/src/views/tenant/works/Table/WaitingMission.vue
+++ b/src/views/tenant/works/Table/WaitingMission.vue
@@ -216,7 +216,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             display: false,
           },
diff --git a/src/views/tenant/works/index.vue b/src/views/tenant/works/index.vue
index 3faaf61..9786179 100644
--- a/src/views/tenant/works/index.vue
+++ b/src/views/tenant/works/index.vue
@@ -61,10 +61,10 @@
     </el-form> -->
     <el-form size="small" label-position="right" :inline="true" >
       <el-row :span="24">
-        <el-form-item label="所属机构">
+        <el-form-item label="机构名称">
         <el-input
           v-model="search.companyName"
-          placeholder="所属机构"
+          placeholder="机构名称"
           style="width: 130px"
           clearable
         ></el-input>