Merge remote-tracking branch 'origin/master'

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;
+        <span class="avue-logo_title" style=" display: flex !important; align-items: center !important;" key="1">
-  align-items: center !important;" key="1">
+          <img height="42px" width="200px" src="/manage/svg/logo_dark2.png" alt />
-          <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>
       </template>
     </transition-group>

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]);

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-form-item label="机构名称:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+            <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-form-item label="机构名称:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+            <el-input v-model="search.companyName" placeholder="机构名称"></el-input>
           </el-form-item>
 
           <el-form-item label="任务编号:">

src/views/manage/mission/count/table/detail.vue

@@ -110,7 +110,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {

src/views/manage/mission/count/table/gather.vue

@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {

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,
           },

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-form-item label="机构名称:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+            <el-input v-model="search.companyName" placeholder="机构名称"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">

src/views/manage/recruit/count/table/detail.vue

@@ -119,7 +119,7 @@ export default {
             display: false,
           },
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {

src/views/manage/recruit/count/table/gather.vue

@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {

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,
           },

src/views/manage/station/inviteCode.vue

@@ -110,18 +110,25 @@ const curdOptions = {
   index: true,
   indexLabel: "序号",
   column: [{
-    label: '企业名称',
+    label: '机构名称',
     prop: 'companyName',
     search: true,
   },{
-    label: '用户名',
+    label: '企业名称',
-    prop: 'realName',
+    prop: 'comname',
-    // search: true,
-  },{
-    label: '邀请码',
-    prop: 'inviteCode',
     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,

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",

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-form-item label="机构名称:">
-            <el-input v-model="search.companyName" placeholder="所属机构"></el-input>
+            <el-input v-model="search.companyName" placeholder="机构名称"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">

src/views/manage/works/count/table/detail.vue

@@ -119,7 +119,7 @@ export default {
             display: false,
           },
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {

src/views/manage/works/count/table/gather.vue

@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
           },
           {

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,
           },

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

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-form-item label="机构名称:">
-              <el-input v-model="query.companyName" placeholder="所属机构" clearable></el-input>
+              <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,
           },

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,

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,

src/views/tenant/mission/Table/WaitingMission.vue

@@ -214,7 +214,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             display: false,
           },

src/views/tenant/works/Table/WaitingMission.vue

@@ -216,7 +216,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "所属机构",
+            label: "机构名称",
             prop: "companyName",
             display: false,
           },

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>

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: {