Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.4

src/views/menu/cockpit/components/overviewCom.vue

@@ -15,7 +15,7 @@
         <template #title>
           <span class="custom-title">大堂式设备数量</span>
         </template>
-        <span class="itemNum" v-for="(item, index) in allData['onlineATMCount']" :key="index">{{ item }}</span>
+        <span class="itemNum" v-for="(item, index) in allData['lobbyDeviceCount']" :key="index">{{ item }}</span>
       </van-cell>
       <van-cell>
         <template #title>
@@ -117,11 +117,11 @@ export default {
       list: [
         {
           name: '行社',
-          key: 'bankingCount'
+          key: 'hangsheCount'
         },
         {
           name: '营业网点',
-          key: 'bankingStoreCount'
+          key: 'bankingCount'
         },
         {
           name: '中心业务库',
@@ -129,11 +129,11 @@ export default {
         },
         {
           name: '网点业务库',
-          key: 'hangsheCount'
+          key: 'bankingStoreCount'
         },
         {
           name: '在行式自助银行',
-          key: 'lobbyDeviceCount'
+          key: 'onlineATMCount'
         },
         {
           name: '离行式自助银行',

src/views/menu/securityCheckRegister/index.vue

@@ -9,7 +9,7 @@
           <org-tree clearable v-model="query.beCheckedOrgId" placeholder="选择受检机构" @change="changeOrgId"></org-tree>
         </div>
         <div >
-           <date-cell title="日期" is-row v-model="query.taskTime" date-type="date" @change="refreshData"/>
+           <date-cell title="日期" is-row v-model="query.taskTime" date-type="year-month" @change="refreshData"/>
 <!--           <search-select-cell-->
 <!--            class="van-hairline&#45;&#45;right"-->
 <!--            title="检查角色"-->

src/views/menu/visitRecord/add.vue

@@ -18,10 +18,6 @@
 <!--            </van-cell>-->
 <!--          </template>-->
           <div class="panel-box">
-            <van-cell title="介绍信类型" :value="getDictLabel(selectedUser.type,'out_in_type')"></van-cell>
-            <van-cell title="来访事由" :value="selectedUser.reasons"></van-cell>
-            <van-cell title="来访单位" :value="selectedUser.companyName"></van-cell>
-
             <select-cell
               title="来访人员"
               :prop="prop"
@@ -31,6 +27,9 @@
               :data-list="userList"
               required>
             </select-cell>
+            <van-cell title="介绍信类型" :value="getDictLabel(selectedUser.type,'out_in_type')"></van-cell>
+            <van-cell title="来访事由" :value="selectedUser.reasons"></van-cell>
+            <van-cell title="来访单位" :value="selectedUser.companyName"></van-cell>
             <van-cell title="证件类型" :value="selectedUser.idType"></van-cell>
             <van-cell title="证件号码" :value="selectedUser.idCard"></van-cell>
             <div class="upload-box"  v-if="selectedUser.imgFile && selectedUser.imgFile.length > 0">

src/views/menu/visitRecord/detail.vue

@@ -9,10 +9,10 @@
               <span></span>
             </template>
           <div class="panel-box">
+            <van-cell title="来访人员" :value="selectedUser.userName"></van-cell>
             <van-cell title="介绍信类型" :value="getDictLabel(selectedUser.type,'out_in_type')"></van-cell>
             <van-cell title="来访事由" :value="selectedUser.reasons"></van-cell>
             <van-cell title="来访单位" :value="selectedUser.companyName"></van-cell>
-            <van-cell title="来访人员" :value="selectedUser.userName"></van-cell>
             <van-cell title="证件类型" :value="getDictLabel(selectedUser.idType,'letter_id_type')"></van-cell>
             <van-cell title="证件号码" :value="selectedUser.idCard"></van-cell>
             <div class="upload-box" v-if="selectedUser.imgFile && selectedUser.imgFile.length > 0">

vue.config.js

@@ -102,7 +102,7 @@ module.exports = defineConfig({
         }
       },
       '/jwx': {
-        target: "http://10.87.10.42:8080",
+        target: "http://10.87.23.50:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{
@@ -118,7 +118,7 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://10.87.21.107:8080",
+        target: "http://10.87.21.103:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{