Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java

@@ -36,7 +36,6 @@ public class AppEnfCaseInfoController  {
     /**
      * 查询【历史检查信息】列表
      */
-    @SaIgnore
     @GetMapping("/queryXzjcList")
     public TableDataInfo queryXzjcList(SxtJcdzb107522Bo bo, PageQuery pageQuery)
     {
@@ -46,7 +45,6 @@ public class AppEnfCaseInfoController  {
     /**
      * 查询【历史强制案件】列表
      */
-    @SaIgnore
     @GetMapping("/queryXzqzList")
     public TableDataInfo queryXzqzList(SxtXzqzjbxx173774Bo bo, PageQuery pageQuery)
     {
@@ -57,7 +55,6 @@ public class AppEnfCaseInfoController  {
     /**
      * 查询【历史处罚案件】列表
      */
-    @SaIgnore
     @GetMapping("/queryXzcfList")
     public TableDataInfo queryXzcfList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery)
     {

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -299,4 +298,5 @@ public class AppEnfLoginController extends LoginController {
         }
         return null;
     }
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java

@@ -252,6 +252,11 @@ public class SxtJcdzb107522Bo extends BaseEntity {
      */
     private Long updatestatus;
 
+    /**
+     * 当事人证件号码（用于关联查询条件）
+     */
+    private String c601034;
+
     /**
      * 非业务主键
      */

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml

@@ -81,7 +81,7 @@
     <select id="huanSectionA" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select r.check_category, e.company_org_type,r.enterprise_address
         from enforcement_registration r
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on r.enterprise_number = e.enterprise_number
         <where>
             and r.enterprise_number is not null
@@ -119,7 +119,7 @@
     <select id="tongSectionA" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select r.check_category, e.company_org_type,r.enterprise_address
         from enforcement_registration r
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on r.enterprise_number = e.enterprise_number
         <where>
             and r.enterprise_number is not null
@@ -263,7 +263,7 @@
     </select>
     <select id="primaryNotice" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from enterprise_law_enforcement n
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on n.enterprise_number=e.enterprise_number
         <where>
             and n.enterprise_number is not null
@@ -294,7 +294,7 @@
     </select>
     <select id="huanNotice" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from enterprise_law_enforcement n
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on n.enterprise_number=e.enterprise_number
         <where>
             and n.enterprise_number is not null
@@ -325,7 +325,7 @@
     </select>
     <select id="tongNotice" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from enterprise_law_enforcement n
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on n.enterprise_number=e.enterprise_number
         <where>
             and n.enterprise_number is not null
@@ -356,7 +356,7 @@
     </select>
     <select id="primaryComplaint" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address,c.enforce_type from complaint_statistics c
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)
@@ -389,7 +389,7 @@
     </select>
     <select id="huanComplaint" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address,c.enforce_type from complaint_statistics c
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)
@@ -422,7 +422,7 @@
     </select>
     <select id="tongComplaint" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address,c.enforce_type from complaint_statistics c
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)
@@ -455,7 +455,7 @@
     </select>
     <select id="primaryWarning" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from law_enforcement_warning_list w
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on w.enterprise_number=e.enterprise_number
         <where>
             and w.enterprise_number is not null
@@ -487,7 +487,7 @@
     </select>
     <select id="huanWarning" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from law_enforcement_warning_list w
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on w.enterprise_number=e.enterprise_number
         <where>
             and w.enterprise_number is not null
@@ -519,7 +519,7 @@
     </select>
     <select id="tongWarning" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
         select e.enterprise_address from law_enforcement_warning_list w
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on w.enterprise_number=e.enterprise_number
         <where>
             and w.enterprise_number is not null
@@ -653,7 +653,7 @@
         left join (select id,bureau_dept_id,bureau_dept_name from enforcement_registration where
         enterprise_number is not null and check_category is not null) r
         on c.rid=r.id
-        left join (select * from enterprise_information group by enterprise_number) e
+        left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e
         on c.enterprise_number=e.enterprise_number
         <where>
             and (c.rid is not null or c.complaint_department_id is not null)

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml

@@ -72,18 +72,16 @@
             enterprise_information ei
         LEFT JOIN (
             SELECT
-                enterprise_number,
-                qr_code_url
+                t.enterprise_number,
+                ANY_VALUE(t.qr_code_url) AS qr_code_url
             FROM
                 ( SELECT enterprise_number,
                         qr_code_url,
                         generate_time
                         FROM qr_code_generate_history
-                    WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1000000000 ) t
+                    WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1 ) t
          GROUP BY
-            t.enterprise_number
-        ORDER BY
-            t.generate_time DESC
+            t.enterprise_number,t.qr_code_url,t.generate_time
             ) gh ON ei.enterprise_number = gh.enterprise_number
         <where>
             and ei.is_delete = 0

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue

@@ -216,6 +216,7 @@ onMounted(() => {
         // isLoading.value = false;
         //设置已经初始化
         useCommon.SET_IS_FIRST_LOAD(false);
+        console.log(useCommon)
 
         fetchNoticeList();
         fetchBannerList();

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue

@@ -114,9 +114,12 @@ let html5QrCode = null;
  * 点击扫码入口
  */
 const toScanPageView = () => {
+        console.log("appEnv: ", appEnv);
     if (appEnv === 'dev') {
+        console.log("dev----------------------<")
         openHtml5QrcodeScanner();
     } else {
+        console.log("pro----------------------<")
         openWxScan();
     }
 };
@@ -247,24 +250,18 @@ const ClickScan = () => {
         needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
         scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
         success: (res) => {
-            // 页面跳转
-            console.log("=========== 扫码返回 ===========")
-            console.log(res)
-            if(isHttpLink(res.resultStr)){
-                handleScanResult(res.resultStr);
-            }else{
-                showFailToast("该二维码不正确");
-            }
-        },
-        error: function(res) {
-            console.log("错误回调",res)
-            if (res.errMsg.indexOf('function_not_exist') > 0) {
-            showFailToast('版本过低请升级')
-            }
-        },
-        cancel: (res) => {
-            console.log('err', res);
-        },
+                // 页面跳转
+                console.log("=========== 扫码返回 ===========", res)
+            },
+            error: function(res) {
+                console.log("错误回调",res)
+                if (res.errMsg.indexOf('function_not_exist') > 0) {
+                    showFailToast('版本过低请升级')
+                }
+            },
+            cancel: (res) => {
+                console.log('err', res);
+            },
     });
 };
 
@@ -325,6 +322,7 @@ const isHttpLink = (url) => {
     return url.indexOf('http://') === 0 || url.indexOf('https://') === 0;
 };
 
+
 // ========== 手动搜索企业弹窗 ==========
 const showSearchModal = ref(false);
 const selectedReason = ref(-1); // 默认未选中，字典加载后设置

zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue

@@ -231,7 +231,7 @@ const hasUserInfo = () => {
 };
 
 onMounted(() => {
-    new Vconsolefrom();
+    // new Vconsolefrom();
     console.log("企业端 Home onMounted");
     // new Vconsolefrom();
     //debugger;