From 99ac6ffbad994e3fa0207062252d475221740fe6 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 7 Mar 2022 11:59:19 +0800 Subject: [PATCH 001/136] =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{AppThematicConfig.vue.vue => AppThematicConfig.vue} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/3.0.0/AppThematicConfig/{AppThematicConfig.vue.vue => AppThematicConfig.vue} (100%) diff --git a/packages/3.0.0/AppThematicConfig/AppThematicConfig.vue.vue b/packages/3.0.0/AppThematicConfig/AppThematicConfig.vue similarity index 100% rename from packages/3.0.0/AppThematicConfig/AppThematicConfig.vue.vue rename to packages/3.0.0/AppThematicConfig/AppThematicConfig.vue From 52744994684d1100f0122aef8ce7c30d96e22ca9 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 7 Mar 2022 13:59:05 +0800 Subject: [PATCH 002/136] 28085 --- examples/entries.js | 2 +- packages/bigscreen/designer/components/Layout.vue | 6 +++++- packages/bigscreen/designer/config.js | 2 +- .../apps/shandong/AppVillageCode/components/List.vue | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/entries.js b/examples/entries.js index 52683155..3d7290b4 100644 --- a/examples/entries.js +++ b/examples/entries.js @@ -2,7 +2,7 @@ const install = function(Vue) { if (install.installed) return Promise.resolve(); else { - let contexts = require.context('../project/shandong10086/apps', true, /(\/.+)\/App[^\/]+\.vue$/); + let contexts = require.context('../packages', true, /(\/.+)\/App[^\/]+\.vue$/); if (contexts) { contexts.keys().map((e) => { if (contexts(e).default) { diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue index d9afd889..72409299 100644 --- a/packages/bigscreen/designer/components/Layout.vue +++ b/packages/bigscreen/designer/components/Layout.vue @@ -461,7 +461,11 @@ return this.$message.error('请上传图片') } - this.images.push(this.form.images) + this.images = [ + ...this.images, + ...this.form.images + ] + this.form.images = [] this.isShowAddImg = false }, diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js index c152dbf6..14e6add3 100644 --- a/packages/bigscreen/designer/config.js +++ b/packages/bigscreen/designer/config.js @@ -620,7 +620,7 @@ const components = [ title: '', moniterId: '', monitorType: 'cmcc', - api: '/app/appzyvideoequipment/list', + api: '/app/appzyvideoequipment/list2', border: 'border2', sourceDataId: '', dataType: 'staticData', diff --git a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue index 45e80022..31ff5d6b 100644 --- a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue +++ b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue @@ -1,7 +1,7 @@ diff --git a/project/oms/apps/AppFeedback/components/List.vue b/project/oms/apps/AppFeedback/components/List.vue index d264b1ea..22d048ed 100644 --- a/project/oms/apps/AppFeedback/components/List.vue +++ b/project/oms/apps/AppFeedback/components/List.vue @@ -10,7 +10,7 @@ v-model="search.opinion" class="search-input" size="small" - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" placeholder="内容描述/上报人" clearable @change="getList" diff --git a/project/sass/apps/AppAddressBook/components/List.vue b/project/sass/apps/AppAddressBook/components/List.vue index 0b0b0db9..1a0867da 100644 --- a/project/sass/apps/AppAddressBook/components/List.vue +++ b/project/sass/apps/AppAddressBook/components/List.vue @@ -106,7 +106,7 @@ diff --git a/project/sass/apps/AppAskForm/components/Statistics.vue b/project/sass/apps/AppAskForm/components/Statistics.vue index 5de65aa5..36042c0b 100644 --- a/project/sass/apps/AppAskForm/components/Statistics.vue +++ b/project/sass/apps/AppAskForm/components/Statistics.vue @@ -68,7 +68,7 @@ size="small" placeholder="请输入居民名称" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/sass/apps/AppAskForm/components/Template.vue b/project/sass/apps/AppAskForm/components/Template.vue index ce72f773..a63ee951 100644 --- a/project/sass/apps/AppAskForm/components/Template.vue +++ b/project/sass/apps/AppAskForm/components/Template.vue @@ -16,7 +16,7 @@ size="small" placeholder="请输入模板名称" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.title = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/sass/apps/AppBuildManage/components/BuildMsg.vue b/project/sass/apps/AppBuildManage/components/BuildMsg.vue index 3f9d71f4..1bf7a318 100644 --- a/project/sass/apps/AppBuildManage/components/BuildMsg.vue +++ b/project/sass/apps/AppBuildManage/components/BuildMsg.vue @@ -18,7 +18,7 @@ diff --git a/project/sass/apps/AppBuildManage/components/List.vue b/project/sass/apps/AppBuildManage/components/List.vue index bce00f89..e23efbff 100644 --- a/project/sass/apps/AppBuildManage/components/List.vue +++ b/project/sass/apps/AppBuildManage/components/List.vue @@ -16,7 +16,7 @@ diff --git a/project/sass/apps/AppCarousel/AppCarousel.vue b/project/sass/apps/AppCarousel/AppCarousel.vue index c18aa9f6..67679cef 100644 --- a/project/sass/apps/AppCarousel/AppCarousel.vue +++ b/project/sass/apps/AppCarousel/AppCarousel.vue @@ -11,7 +11,7 @@ diff --git a/project/sass/apps/AppConvenienceAddressBook/components/List.vue b/project/sass/apps/AppConvenienceAddressBook/components/List.vue index 3e144cb0..135d3038 100644 --- a/project/sass/apps/AppConvenienceAddressBook/components/List.vue +++ b/project/sass/apps/AppConvenienceAddressBook/components/List.vue @@ -19,7 +19,7 @@ v-model="search.name" class="search-input" size="small" - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" placeholder="请输入名称/电话" clearable @change="getList" diff --git a/project/sass/apps/AppGridMember/components/Family.vue b/project/sass/apps/AppGridMember/components/Family.vue index 9af0f4ed..99c69374 100644 --- a/project/sass/apps/AppGridMember/components/Family.vue +++ b/project/sass/apps/AppGridMember/components/Family.vue @@ -23,7 +23,7 @@ v-model="search.name" class="search-input" size="small" - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" placeholder="姓名/身份证/联系方式" clearable @clear="search.current = 1, search.name = '', getList()" diff --git a/project/sass/apps/AppHealthReport/components/List.vue b/project/sass/apps/AppHealthReport/components/List.vue index 5ab6dc24..83ba0154 100644 --- a/project/sass/apps/AppHealthReport/components/List.vue +++ b/project/sass/apps/AppHealthReport/components/List.vue @@ -10,7 +10,7 @@ size="small" placeholder="请输入姓名" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/sass/apps/AppHomesteadManagement/components/List.vue b/project/sass/apps/AppHomesteadManagement/components/List.vue index 43fb30c7..dbb07d69 100644 --- a/project/sass/apps/AppHomesteadManagement/components/List.vue +++ b/project/sass/apps/AppHomesteadManagement/components/List.vue @@ -12,7 +12,7 @@ diff --git a/project/sass/apps/AppInterview/AppInterview.vue b/project/sass/apps/AppInterview/AppInterview.vue index 2c69d238..eef5528e 100644 --- a/project/sass/apps/AppInterview/AppInterview.vue +++ b/project/sass/apps/AppInterview/AppInterview.vue @@ -28,7 +28,7 @@ v-model="search.title" placeholder="标题" clearable - @keyup.enter.native="page.current = 1, getTableData()" + v-throttle="() => {page.current = 1, getTableData()}" @clear="page.current = 1, search.title = '', getTableData()" size="small"/> diff --git a/project/sass/apps/AppNotification/components/noticeManage.vue b/project/sass/apps/AppNotification/components/noticeManage.vue index 665d3394..f3ef3750 100644 --- a/project/sass/apps/AppNotification/components/noticeManage.vue +++ b/project/sass/apps/AppNotification/components/noticeManage.vue @@ -21,7 +21,7 @@ diff --git a/project/sass/apps/AppRiskArea/components/List.vue b/project/sass/apps/AppRiskArea/components/List.vue index 6033e6c1..4835fcac 100644 --- a/project/sass/apps/AppRiskArea/components/List.vue +++ b/project/sass/apps/AppRiskArea/components/List.vue @@ -20,7 +20,7 @@ v-model="search.province" class="search-input" size="small" - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" placeholder="省级名称/市级名称/区级名称" clearable @clear="search.current = 1, search.province = '', getList()" diff --git a/project/sass/apps/AppSpecialAdjustment/components/List.vue b/project/sass/apps/AppSpecialAdjustment/components/List.vue index 5ce9dac1..621dab5d 100644 --- a/project/sass/apps/AppSpecialAdjustment/components/List.vue +++ b/project/sass/apps/AppSpecialAdjustment/components/List.vue @@ -14,7 +14,7 @@ size="small" placeholder="请输入姓名" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/sass/apps/AppSpecialDisabled/components/List.vue b/project/sass/apps/AppSpecialDisabled/components/List.vue index 644c0655..b367accc 100644 --- a/project/sass/apps/AppSpecialDisabled/components/List.vue +++ b/project/sass/apps/AppSpecialDisabled/components/List.vue @@ -14,7 +14,7 @@ size="small" placeholder="请输入姓名" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/sass/apps/AppSpecialDrug/components/List.vue b/project/sass/apps/AppSpecialDrug/components/List.vue index 4894de01..2b6e7623 100644 --- a/project/sass/apps/AppSpecialDrug/components/List.vue +++ b/project/sass/apps/AppSpecialDrug/components/List.vue @@ -14,7 +14,7 @@ size="small" placeholder="请输入姓名" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/sass/apps/AppSpecialMental/components/List.vue b/project/sass/apps/AppSpecialMental/components/List.vue index ca2d4f05..044c85d9 100644 --- a/project/sass/apps/AppSpecialMental/components/List.vue +++ b/project/sass/apps/AppSpecialMental/components/List.vue @@ -14,7 +14,7 @@ size="small" placeholder="请输入姓名" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/sass/apps/AppSpecialPrison/components/List.vue b/project/sass/apps/AppSpecialPrison/components/List.vue index 09f1c63b..630d8f7b 100644 --- a/project/sass/apps/AppSpecialPrison/components/List.vue +++ b/project/sass/apps/AppSpecialPrison/components/List.vue @@ -14,7 +14,7 @@ size="small" placeholder="请输入姓名" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.name = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue b/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue index 46600d57..c20e9e4e 100644 --- a/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue +++ b/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue @@ -52,7 +52,7 @@ size="small" placeholder="请输入姓名" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, search.residentName = '', getList()" suffix-icon="iconfont iconSearch"> diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue index c9a27fa8..ad4875a6 100644 --- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue +++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue @@ -23,7 +23,7 @@ v-model="search.title" class="search-input" size="small" - @keyup.enter.native="search.current = 1, search.title, getList()" + v-throttle="() => {search.current=1,getList()}" placeholder="请输入发布人姓名" clearable @clear="search.current = 1, search.title = '', getList()" diff --git a/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue b/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue index 4fbcf1f1..742b7ede 100644 --- a/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue +++ b/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue @@ -39,7 +39,7 @@ size="mini" placeholder="申诉人/申诉对象/..." clearable - @keyup.enter.native="page.current = 1, getList()" + v-throttle="() => {page.current = 1, getList()}" @clear="page.current = 1, getList()" suffix-icon="iconfont iconSearch" /> diff --git a/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue b/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue index 7d0a2bf3..42562458 100644 --- a/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue +++ b/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue @@ -39,7 +39,7 @@ size="mini" placeholder="申诉人/申诉对象/..." clearable - @keyup.enter.native="page.current = 1, getList()" + v-throttle="() => {page.current = 1, getList()}" @clear="page.current = 1, getList()" suffix-icon="iconfont iconSearch" /> diff --git a/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue b/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue index 2dc45dee..c6d5e97d 100644 --- a/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue +++ b/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue @@ -14,7 +14,7 @@ size="small" placeholder="对象、户主、事件类型" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, getList()" suffix-icon="iconfont iconSearch" /> diff --git a/project/xiushan/apps/creditScore/scoreFamily/AppScoreFamily.vue b/project/xiushan/apps/creditScore/scoreFamily/AppScoreFamily.vue index a05b20ab..ca1d2fa2 100644 --- a/project/xiushan/apps/creditScore/scoreFamily/AppScoreFamily.vue +++ b/project/xiushan/apps/creditScore/scoreFamily/AppScoreFamily.vue @@ -21,7 +21,7 @@ v-model="searchObj.con" size="small" placeholder="户主姓名" - @keyup.enter.native="page.current = 1, getList()" + v-throttle="() => {page.current = 1, getList()}" @clear="search.current = 1, search.con = '', getList()" clearable suffix-icon="iconfont iconSearch" /> diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue b/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue index 1409e030..3457f1eb 100644 --- a/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue +++ b/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue @@ -43,7 +43,7 @@ size="mini" placeholder="申诉人/申诉对象/..." clearable - @keyup.enter.native="page.current = 1, getList()" + v-throttle="() => {page.current = 1, getList()}" @clear="page.current = 1, getList()" suffix-icon="iconfont iconSearch"/> diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue b/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue index 3b01c40b..d97cc066 100644 --- a/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue +++ b/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue @@ -43,7 +43,7 @@ size="mini" placeholder="申诉人/申诉对象/..." clearable - @keyup.enter.native="page.current = 1, getList()" + v-throttle="() => {page.current = 1, getList()}" @clear="page.current = 1, getList()" suffix-icon="iconfont iconSearch"/> diff --git a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue index 2dc45dee..c6d5e97d 100644 --- a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue +++ b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue @@ -14,7 +14,7 @@ size="small" placeholder="对象、户主、事件类型" clearable - @keyup.enter.native="search.current = 1, getList()" + v-throttle="() => {search.current = 1, getList()}" @clear="search.current = 1, getList()" suffix-icon="iconfont iconSearch" /> diff --git a/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue b/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue index 7ebe4cbe..7534cf2a 100644 --- a/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue +++ b/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue @@ -29,7 +29,7 @@ v-model="searchObj.con" size="small" placeholder="个人姓名" - @keyup.enter.native="page.current = 1, getList()" + v-throttle="() => {page.current = 1, getList()}" @clear="page.current = 1, searchObj.con = '', getList()" clearable suffix-icon="iconfont iconSearch" /> diff --git a/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue b/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue index a2c13327..796bbb8e 100644 --- a/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue +++ b/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue @@ -56,7 +56,7 @@ v-model="searchObj.name" size="small" placeholder="订单号/商品名/兑换家庭" - @keyup.enter.native="page.current = 1, getList()" + v-throttle="() => {page.current = 1, getList()}" @clear="page.current = 1, searchObj.name = '', getList()" clearable suffix-icon="iconfont iconSearch" From 59d1e952d5484b4eb0551c1fe5d7b44748150435 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 22 Mar 2022 15:06:52 +0800 Subject: [PATCH 082/136] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/xiushan/apps.import.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 project/xiushan/apps.import.json diff --git a/project/xiushan/apps.import.json b/project/xiushan/apps.import.json new file mode 100644 index 00000000..c89141eb --- /dev/null +++ b/project/xiushan/apps.import.json @@ -0,0 +1,3 @@ +{ + "AppCodeGeneration": "动态表单" +} From 30ecf5b1540872dd45ce8e8fb8a4b6aea2e75478 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 22 Mar 2022 15:24:33 +0800 Subject: [PATCH 083/136] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AppMassMessage/AppMassMessage.vue | 2 +- .../xiushan/apps/AppMassMessage/mmDetail.vue | 51 +++++++++++++++++-- .../xiushan/apps/AppMassMessage/mmList.vue | 22 ++++---- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/project/xiushan/apps/AppMassMessage/AppMassMessage.vue b/project/xiushan/apps/AppMassMessage/AppMassMessage.vue index 4d041fd1..92a831fe 100644 --- a/project/xiushan/apps/AppMassMessage/AppMassMessage.vue +++ b/project/xiushan/apps/AppMassMessage/AppMassMessage.vue @@ -24,7 +24,7 @@ export default { } }, created() { - this.dict.load("leaveMessageType","yesOrNo") + this.dict.load("leaveMessageType", "yesOrNo", "msgStatus") } } diff --git a/project/xiushan/apps/AppMassMessage/mmDetail.vue b/project/xiushan/apps/AppMassMessage/mmDetail.vue index 0fcef18d..f190a7ec 100644 --- a/project/xiushan/apps/AppMassMessage/mmDetail.vue +++ b/project/xiushan/apps/AppMassMessage/mmDetail.vue @@ -1,10 +1,10 @@ Date: Tue, 22 Mar 2022 22:05:45 +0800 Subject: [PATCH 108/136] BUG 28470 --- project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue b/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue index 16cfd9a4..d870055f 100644 --- a/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue +++ b/project/xiushan/apps/finance/AppFinanceOrg/AppFinanceOrg.vue @@ -63,7 +63,7 @@ export default { organizationName: [{required: true, message: "请输入机构名称"}], organizationType: [{required: true, message: "请选择机构类型"}], logoUrl: [{required: true, message: "请上传logo"}], - maxOrderNumber: [{required: true, message: "请输入抢单数量"}], + maxOrderNumber: [{required: true, message: "请输入抢单数量"},{pattern:/^\d+$/,message: '请输入正整数'}], } }, }, From 97ab7c12048f8f36a4749f77853ef69ca8889a72 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 22 Mar 2022 22:09:34 +0800 Subject: [PATCH 109/136] BUG 28481 --- project/xiushan/apps/creditScore/scorePersonal/spList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/xiushan/apps/creditScore/scorePersonal/spList.vue b/project/xiushan/apps/creditScore/scorePersonal/spList.vue index 22c59123..8eae750c 100644 --- a/project/xiushan/apps/creditScore/scorePersonal/spList.vue +++ b/project/xiushan/apps/creditScore/scorePersonal/spList.vue @@ -16,7 +16,7 @@ From e6869140237abd8e0eab16505238d2c08c60a902 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 22 Mar 2022 22:11:33 +0800 Subject: [PATCH 110/136] BUG 28469 --- project/xiushan/apps/finance/AppLoanAudit/loanList.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue index cb72758a..220d8e20 100644 --- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue +++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue @@ -111,13 +111,15 @@ export default { From 54f71407ad07301dd8c41c65936597cf9962f983 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 22 Mar 2022 22:52:01 +0800 Subject: [PATCH 115/136] =?UTF-8?q?=E5=8F=AF=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue b/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue index 1dcf84d0..d7675617 100644 --- a/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue +++ b/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue @@ -61,7 +61,9 @@ export default { return this.user.info.areaList?.length - 1 }, currentPage() { - return this.$route.hash?.substring(1) || newsList + return this.$route.hash == "#video" ? videoDetail : + this.$route.hash == "#news" ? newsDetail : + this.$route.hash?.substring(1) || newsList } }, methods: { From 5c339ccdfad315e5bc643ecf3dcc2b5a813f6135 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 23 Mar 2022 09:42:45 +0800 Subject: [PATCH 116/136] BUG 28493 --- .../xiushan/apps/finance/AppFinanceProduct/productRecommend.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productRecommend.vue b/project/xiushan/apps/finance/AppFinanceProduct/productRecommend.vue index 4a35804c..b0e87321 100644 --- a/project/xiushan/apps/finance/AppFinanceProduct/productRecommend.vue +++ b/project/xiushan/apps/finance/AppFinanceProduct/productRecommend.vue @@ -129,7 +129,7 @@ export default { getProducts() { let {organizationType} = this.form this.instance.post("/appfinancialproduct/list", null, { - params: {organizationType, size: 999, status: 0} + params: {organizationType, size: 999, status: 1} }).then(res => { if (res?.data) { this.productList = res.data?.records From c50141a41181a7fda1e5c80067d8e05b273f4d5c Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 23 Mar 2022 09:47:04 +0800 Subject: [PATCH 117/136] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiushan/apps/finance/AppFinanceProduct/productList.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue index 2ff9b21d..f9832185 100644 --- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue +++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue @@ -3,7 +3,9 @@ - - - From cbdc4a8b65d77c96ea668a4e99c168f1021f7656 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 23 Mar 2022 13:52:14 +0800 Subject: [PATCH 127/136] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMonitorManage/AppMonitorManage.vue | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue index 79d86af1..580fd4b5 100644 --- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue +++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue @@ -3,19 +3,23 @@
-
+
-
+ +
@@ -71,6 +75,7 @@ selected: { areaId: '' }, + videoUrl: '', latlng: null, disabledLevel: 0, rules: { @@ -110,14 +115,15 @@ params: {deviceId} }).then(res => { if (res?.data) { - let data = JSON.parse(res.data) - if (refresh) { - monitor.url = data.url - } else if (this.splitScreen == 1) { - this.monitors = [{...monitor, ...data}] - } else { - this.monitors.push({...monitor, ...data}) - } + this.videoUrl = res.data + // let data = JSON.parse(res.data) + // if (refresh) { + // monitor.url = data.url + // } else if (this.splitScreen == 1) { + // this.monitors = [{...monitor, ...data}] + // } else { + // this.monitors.push({...monitor, ...data}) + // } } }) }, From 76986d78034616b4363002a784aed7ca42ecb903 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 23 Mar 2022 14:19:06 +0800 Subject: [PATCH 128/136] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bigscreen/viewer/AppGigscreenViewer.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue index 974967dd..425d8a60 100644 --- a/packages/bigscreen/viewer/AppGigscreenViewer.vue +++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue @@ -100,13 +100,20 @@ if (item.dataType !== 'staticData' && ((item.type.indexOf('Chart') > -1) || item.type === 'display' || item.type === 'table' || item.type === 'summary')) { this.getSourceData(item, index) } - if (item.type === 'monitor' && item.monitorType !== 'hik' && item.monitorType !== 'dahua') { + if (item.type === 'monitor' && item.monitorType === 'cmcc') { this.instance.post(`${this.urlPrefix}/appzyvideoequipment/getWebSdkUrl?deviceId=${item.moniterId}`).then(res => { if (res.code == 0) { this.$set(this.componentList[index], 'src', JSON.parse(res.data).url) } }) } + if (item.type === 'monitor' && item.monitorType === 'slw') { + this.instance.post(`${this.urlPrefix}/appzyvideoequipment/getWebSdkUrl?deviceId=${item.moniterId}`).then(res => { + if (res.code == 0) { + this.$set(this.componentList[index], 'src', res.data) + } + }) + } }) } } From ea63a41b4743186e503439ded3fdd4741adb58c6 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 23 Mar 2022 16:21:39 +0800 Subject: [PATCH 129/136] 28508 --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 4c62f6b4..e4ebd77c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -64,7 +64,7 @@ module.exports = { proxy: { //设置代理,可解决跨5 '/lan': { - target: 'http://192.168.1.87:9000/', + target: 'https://sdtestweb.sdvillage.cn', changeOrigin: true, pathRewrite: { //地址重写 From 8589cbe29a094f8ac69b8ddeb61404f57f0594d9 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 23 Mar 2022 16:37:47 +0800 Subject: [PATCH 130/136] 28497 --- packages/party/AppPartyOrg/AppPartyOrganization.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/party/AppPartyOrg/AppPartyOrganization.vue b/packages/party/AppPartyOrg/AppPartyOrganization.vue index d5ad1921..9d8205c4 100644 --- a/packages/party/AppPartyOrg/AppPartyOrganization.vue +++ b/packages/party/AppPartyOrg/AppPartyOrganization.vue @@ -583,10 +583,19 @@ export default { margin-left: 1px; .ai-list__content--right-wrapper { - height: 100%; + position: relative; + // height: 100%; .ai-empty { - height: 100%; + position: absolute; + top: 50%; + left: 50%; + z-index: 1; + transform: translate(-50%, -50%); + + .ai-empty__bg { + margin-top: 0; + } } } } From 195dca851c3a6b3a9d9dc63084c4b7a36aa0b4c2 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 23 Mar 2022 16:41:25 +0800 Subject: [PATCH 131/136] 28412 --- packages/wechat/AppAddressBook/components/List.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wechat/AppAddressBook/components/List.vue b/packages/wechat/AppAddressBook/components/List.vue index c8dc8f0d..bd8d77c0 100644 --- a/packages/wechat/AppAddressBook/components/List.vue +++ b/packages/wechat/AppAddressBook/components/List.vue @@ -162,7 +162,7 @@ @onConfirm="onFormConfirm"> - + From ed9ac12226b0a85fa92e0e505f188881b627239b Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 23 Mar 2022 16:47:10 +0800 Subject: [PATCH 132/136] 28421 --- project/shandong10086/apps/shandong/scoreManage/scoreChange.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/shandong10086/apps/shandong/scoreManage/scoreChange.vue b/project/shandong10086/apps/shandong/scoreManage/scoreChange.vue index abfc0dc2..6140059d 100644 --- a/project/shandong10086/apps/shandong/scoreManage/scoreChange.vue +++ b/project/shandong10086/apps/shandong/scoreManage/scoreChange.vue @@ -31,7 +31,7 @@