From ba67947aa98a7883f85db79855d1c4582125fda4 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Thu, 19 Sep 2024 14:39:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=94=BB=E5=83=8F=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E6=97=A0=E6=95=B0=E6=8D=AE=20=E5=85=B6=E5=AE=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=85=B6=E4=BB=96=20=E4=B8=8D?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E8=AE=B0=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util/util.js | 22 ++++++++++++++++++++- src/views/enforce/enterpriseBaseInfo.vue | 22 ++++++++++----------- src/views/enforce/enterpriseScanPreview.vue | 6 +++++- src/views/enforce/enterpriseWarningInfo.vue | 1 - src/views/enforce/noScanFilter.vue | 2 +- src/views/login.vue | 4 ++-- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/util/util.js b/src/util/util.js index fcda374..a121416 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -78,6 +78,9 @@ const formattedTimeYYYYmmdd = (dateTime) =>{ const hour = ("0" + date.getHours()).slice(-2); const minute = ("0" + date.getMinutes()).slice(-2); const second = ("0" + date.getSeconds()).slice(-2); + const type = getDeviceType(); + console.log("机型格式",type) + return `${year}-${month}-${day}`; } const formattedTime = (dateTime) =>{ @@ -91,6 +94,11 @@ const formattedTime = (dateTime) =>{ return `${year}-${month}-${day} ${hour}:${minute}:${second}`; } +/** + * 格式化用户名称为两个字的姓名 + * @param {*} name + * @returns + */ const alignNames = (name) =>{ if(name.length == 2){ name = name.substring(0,1) + " " + name.substring(1,2); @@ -98,4 +106,16 @@ const alignNames = (name) =>{ return name; } -export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime}; +const getDeviceType = () =>{ + var userAgent = navigator.userAgent || navigator.vendor || window.opera; + + if (userAgent.match(/iPad/i) || userAgent.match(/iPhone/i) || userAgent.match(/iPod/i)) { + return 'iOS'; + } else if (userAgent.match(/Android/i)) { + return 'Android'; + } else { + return 'unknown'; + } +} + +export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime,getDeviceType}; diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index a181d73..b1ee13e 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -431,22 +431,22 @@ // data.punishDataList = res.data; res.rows.forEach(res => { var obj = {} - var textArr = ""; + var textArr = []; obj = res; var arr = res.c206011.split(","); for (const key in arr) { - if (arr[key] == "01") textArr += "警告,"; - if (arr[key] == "02") textArr += "通报批评,"; - if (arr[key] == "03") textArr += "罚款,"; - if (arr[key] == "04") textArr += "没收违法所得,"; - if (arr[key] == "05") textArr += "没收违法财产,"; - if (arr[key] == "06") textArr += "责令停业整改,"; - if (arr[key] == "07") textArr += "暂扣许可证件,"; - if (arr[key] == "08") textArr += "行政拘留,"; - if (arr[key] == "09") textArr += "吊销许可证件,"; + if (arr[key] == "01") textArr.push("警告"); + if (arr[key] == "02") textArr.push("通报批评"); + if (arr[key] == "03") textArr.push("罚款"); + if (arr[key] == "04") textArr.push("没收违法所得"); + if (arr[key] == "05") textArr.push("没收违法财产"); + if (arr[key] == "06") textArr.push("责令停业整改"); + if (arr[key] == "07") textArr.push("暂扣许可证件"); + if (arr[key] == "08") textArr.push("行政拘留"); + if (arr[key] == "09") textArr.push("吊销许可证件"); } - obj.cfzl = textArr; + obj.cfzl = textArr.join(","); data.forceDataList.push(obj); }) diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue index e1a2573..267b279 100644 --- a/src/views/enforce/enterpriseScanPreview.vue +++ b/src/views/enforce/enterpriseScanPreview.vue @@ -32,7 +32,7 @@
+ :enterpriseNumber="data.enterpriseNum">
@@ -62,6 +62,7 @@ const data = reactive({ enterpriseNumber: "", warningInfo: {}, + enterpriseNum:"", searchParam: { enterpriseNumber:"", warnType: 0, @@ -155,7 +156,10 @@ console.log(success.data); data.searchParam.enterpriseNumber = success.data.enterpriseNumber; data.searchParam.warnType = 1; + //加密统一信用代码数据 data.enterpriseNumber = success.data.salt; + //未加密 + data.enterpriseNum = success.data.enterpriseNumber; console.log(data.searchParam.enterpriseNumber); //查询企业历史检查案件 queryEarlyWarning(data.searchParam, success => { diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue index f56744a..04256c3 100644 --- a/src/views/enforce/enterpriseWarningInfo.vue +++ b/src/views/enforce/enterpriseWarningInfo.vue @@ -149,7 +149,6 @@ const warnListInfoList = ref([]) // getCard(); // searchParam.enterpriseNumber = useCommon.enterpriseNumber; searchParam.enterpriseNumber = props.enterpriseNumber; - debugger queryList(); data.dateSearch = nowDate(new Date()); }); diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue index 7dbd606..1cefa65 100644 --- a/src/views/enforce/noScanFilter.vue +++ b/src/views/enforce/noScanFilter.vue @@ -85,7 +85,7 @@ const props = defineProps( { const refreshing = ref(false); const curPage = ref(false); const dicts = ref([]); - const reason = ref("其它无法出示情况"); + const reason = ref(""); const checkCss = ref(0); // watch: { // 'searchParam.enterpriseName': { diff --git a/src/views/login.vue b/src/views/login.vue index be4d237..7c5f52e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -45,9 +45,9 @@ testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, success => { if (success.success) { //企业端 - // router.push({ name: "Home" }); + router.push({ name: "Home" }); //执法端 - router.push({name: "enforceHome"}); + // router.push({name: "enforceHome"}); //设置全局变量 useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); useCommon.SET_USER_ID(success.data.userId);