diff --git a/src/assets/images/index/i-code.png b/src/assets/images/index/i-code.png new file mode 100644 index 000000000..e539a6870 Binary files /dev/null and b/src/assets/images/index/i-code.png differ diff --git a/src/assets/images/index/i-lock.png b/src/assets/images/index/i-lock.png new file mode 100644 index 000000000..5628c725e Binary files /dev/null and b/src/assets/images/index/i-lock.png differ diff --git a/src/assets/images/index/i-people.png b/src/assets/images/index/i-people.png new file mode 100644 index 000000000..0fcf50e07 Binary files /dev/null and b/src/assets/images/index/i-people.png differ diff --git a/src/assets/img/login/loginLeft.png b/src/assets/img/login/loginLeft.png new file mode 100644 index 000000000..e5f17b490 Binary files /dev/null and b/src/assets/img/login/loginLeft.png differ diff --git a/src/assets/imgs/login/i-code.png b/src/assets/imgs/login/i-code.png deleted file mode 100644 index d5ca9ea20..000000000 Binary files a/src/assets/imgs/login/i-code.png and /dev/null differ diff --git a/src/assets/imgs/login/i-lock.png b/src/assets/imgs/login/i-lock.png deleted file mode 100644 index 59dcce65d..000000000 Binary files a/src/assets/imgs/login/i-lock.png and /dev/null differ diff --git a/src/assets/imgs/login/i-people.png b/src/assets/imgs/login/i-people.png deleted file mode 100644 index 57c0a6491..000000000 Binary files a/src/assets/imgs/login/i-people.png and /dev/null differ diff --git a/src/assets/scss/pages/login.scss b/src/assets/scss/pages/login.scss index 143d91da9..74d6f4255 100644 --- a/src/assets/scss/pages/login.scss +++ b/src/assets/scss/pages/login.scss @@ -13,7 +13,8 @@ content: ""; } &::before { - background-image: url(~@/assets/imgs/login/bg.png); + // background-image: url(~@/assets/imgs/login/bg.png); + background-color:#f5f7fa ; background-size: cover; } &::after { @@ -28,8 +29,13 @@ right: 0; left: 0; margin: auto; - width: 650px; - height: 500px; + width: 1200px; + height: 586px; + display: flex; + justify-content: space-around; + box-shadow: 0px 9px 28px 8px rgba(0,86,214,0.05), 0px 6px 16px 0px rgba(0,86,214,0.08), 0px 3px 6px -4px rgba(0,86,214,0.12); + border-radius: 4px; + animation: fm-f6957b98 0.33s ease-out; @keyframes title { 0% { @@ -52,16 +58,15 @@ } .title { - margin: 0 auto; - text-align: center; + margin: 0 0 64px 80px; + text-align: left; line-height: 80px; - font-size: 41px; - font-family: "思源宋体"; - font-weight: bold; - color: #ffffff; - background: linear-gradient(0deg, #0385ff 0%, #ffffff 50%, #ffffff 100%); + font-size: 24px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 600; + // background: linear-gradient(0deg, #0385ff 0%, #ffffff 50%, #ffffff 100%); -webkit-background-clip: text; - -webkit-text-fill-color: transparent; + // -webkit-text-fill-color: transparent; animation: title 0.33s * 1.5 ease-out; } @@ -91,7 +96,6 @@ top: 70px; width: 54px; height: 377px; - animation: decorationLeft 0.33s ease-out; } .i-right { position: absolute; @@ -117,46 +121,37 @@ .fm { box-sizing: border-box; - margin: -30px auto 0; - padding: 110px 150px 50px; - width: 555px; - height: 368px; - background-image: url(~@/assets/imgs/login/card-bg.png); + // margin: -30px auto 0; + // padding: 110px 150px 50px; + height: 100%; + flex:1; + display: flex; + flex-direction: column; + justify-content: center; + // background-image: url(~@/assets/imgs/login/card-bg.png); + background-color: #fff; background-size: cover; - animation: fm 0.33s ease-out; - .fm-item { box-sizing: border-box; margin: 0 auto; margin-bottom: 16px; - width: 255px; + width: 320px; height: 38px; line-height: 38px; - background: #102163; display: flex; align-items: center; .input { - width: 85%; + width: 100%; margin-bottom: 0; - + background-color: #fff; input { + background-color: #fff; display: block; padding-left: 0; line-height: 38px; height: 38px; width: 100%; - border: none; - background-color: transparent; - color: #fff; - font-size: 14px; - - &::placeholder { - color: #d7d7d7; - } - &:active { - background-color: transparent; - } } } @@ -181,22 +176,27 @@ box-sizing: border-box; margin: 0 auto; margin-bottom: 16px; - width: 255px; + position: relative; + width: 320px; display: flex; align-items: center; - + justify-content: space-around; .fm-item { margin: 0; - width: 140px; + width: 50%; + margin-right: 8px; .input { - width: 70%; + width: 100%; + } + .suffix{ + position: absolute; + left: -139px; } } .captcha { position: relative; - margin-left: auto; - width: 105px; + width: 50%; height: 38px; img { @@ -213,12 +213,12 @@ box-sizing: border-box; margin: 0 auto; margin-top: 30px; - width: 255px; + width: 320px; height: 38px; - background: linear-gradient(0deg, #0061ff 0%, #0096ff 100%); + background: #0056d6; border-radius: 2px; line-height: 38px; - font-size: 20px; + font-size: 16px; font-weight: 500; color: #ffffff; text-align: center; @@ -275,3 +275,15 @@ } } } +::v-deep .el-input--medium .el-input__inner { + padding-left: 30px !important; + } +.suffix{ + float: left; + position: absolute; + left: -303px; + top: -1px; +} +.loginLeftBox{ + +} \ No newline at end of file diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue index 4ab3789ae..7ffe1fb16 100644 --- a/src/views/modules/base/smartImport.vue +++ b/src/views/modules/base/smartImport.vue @@ -23,6 +23,7 @@ 下载模板 @@ -43,35 +44,43 @@ - - - +
+
+ + 保 存 +
+ @@ -103,14 +121,6 @@ - @@ -153,18 +163,6 @@ export default { pageSize: 20, pageNo: 0, - casOptions: [], - iscascaderShow: 0, - orgIdArray: [], - selCateObj: {}, - optionProps: { - multiple: true, - value: 'agencyId', - label: 'agencyName', - orgType: 'orgType', - children: 'subAgencyList', - checkStrictly: true - }, formShow: false, formData: {}, @@ -172,13 +170,16 @@ export default { scopeList: [], dataSyncConfigId: '', importLoading: false, + + groupList: [], + sHeight: 0, } }, computed: { tableHeight () { - const h = this.clientHeight - 220 + this.iframeHeigh - const _h = this.clientHeight - 220 + const h = this.clientHeight - this.sHeight + this.iframeHeigh + const _h = this.clientHeight - this.sHeight return this.$store.state.inIframe ? h : _h }, @@ -192,7 +193,9 @@ export default { }, async mounted () { await this.loadData() - await this.getOrgList() + await this.loadPersonGroup() + + this.sHeight = this.$refs.divEditBtn.offsetHeight + 300 }, methods: { @@ -201,27 +204,43 @@ export default { this.formShow = false }, - async getOrgList () { - - const url = '/gov/org/customeragency/my-subagency-list' + async loadPersonGroup () { + const url = '/oper/customize/icformitemgroup/list' + // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree' + let params = { + formCode: 'resi_base_info', + policyFlag: '1' + } - let params = {}; + const { data, code, msg } = await requestPost(url, params) - const { data, code, msg } = await requestPost(url, params); if (code === 0) { + this.groupList = data + } else { + this.$message.error(msg) + } - //组织级联数据 - ++this.iscascaderShow - this.casOptions = [] - this.orgIdArray.length = [] + }, - if (data) { - this.casOptions.push(data) + //选择人员信息第一列下拉框 + async handleSelGroup (index, item, isSet) { + const url = '/oper/customize/icformitem/getItemListV2' + // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree' + let params = { + policyFlag: '1', + groupId: item.id, - } + } + + const { data, code, msg } = await requestPost(url, params) + if (code === 0) { + + let oneData = this.dataList[index] + oneData.itemList = data + this.$set(this.dataList, index, oneData) } else { - this.$message.error(msg); + this.$message.error(msg) } }, @@ -275,53 +294,8 @@ export default { }, - // 开启/启用 - disableCategory (row, index) { - row.switchStatusShow = row.switchStatus === 'open' ? '关闭' : '开启' - this.$confirm('确认' + row.switchStatusShow, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - const url = '/epmetuser/dataSyncConfig/configSwitch' - // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/configSwitch' - const param = { - deptCode: row.deptCode, - dataSyncConfigId: row.id, - - } - window.app.ajax.post(url, param, - (data, rspMsg) => { - // row.switchStatus = 'open' - // row.switchStatus = true - // this.$set(this.dataList, index, row) - - this.$message.success('操作成功') - this.loadData() - }, - (rspMsg, data) => { - this.$message.error(rspMsg) - }) - }).catch(() => { - - }) - }, - - - // 编辑 customerId,parentCategoryId,dateform - editShow (row) { - this.dataSyncConfigId = row.id - - this.orgIdArray = [] - row.scopeList.forEach(element => { - if (element.orgIdPath) { - this.orgIdArray.push(element.orgIdPath.split(':')) - } - - }); - - this.formShow = true - + handleComfirm () { + console.log(this.dataList) }, async editDiaOK () { @@ -485,4 +459,16 @@ export default { diff --git a/src/views/modules/shequ/cpts/peopleDetail.vue b/src/views/modules/shequ/cpts/peopleDetail.vue index 9a36e8e4f..17eb8a065 100644 --- a/src/views/modules/shequ/cpts/peopleDetail.vue +++ b/src/views/modules/shequ/cpts/peopleDetail.vue @@ -16,7 +16,7 @@
基本信息
-
+
所属网格： @@ -38,16 +38,23 @@ {{ homeName }}
- {{field.label}}： + v-for="field in fieldSubList" + v-if="info[field.columnName]!=0" + > + {{field.label}} ： {{ info[field.columnName]||'--'}} {{ + "> + + {{ info[field.columnName] == null ? "--" : getOptionLabel( @@ -55,7 +62,9 @@ info[field.columnName], field.itemType ) - }} + }} + + {{ info[field.columnName] == null ? "--" : info[field.columnName] @@ -63,7 +72,9 @@
-
{{index==0? '分类信息':'其他信息'}}
+
{{index==0? '分类信息':'其他信息'}} +
居民分类:
+
@@ -538,6 +549,7 @@ export default { } }); }); + console.log(this.fieldList,4435345) } else { this.$message.error(msg); } @@ -728,5 +740,26 @@ export default { right: 35px; top: 5px; } - +.m-pop .wrap{ + width: 820px; +height: 848px; +} +.m-pop .wrap .wrap2 { + width: 820px; +height: 848px; +} +.m-pop .wrap .list .item{ + width: 48% !important; + font-size: 14px; + + } + .m-pop .wrap .list .width-40{ + width: 17% !important; + } +.listTransform{ + transform: translateX(55px); +} + .div-mult-table section { + color: #ccc; + } diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index a07fb2296..c19c11797 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -2,54 +2,60 @@
-

{{ $t("brand.work") }}

-
- - -
+
+ +
+

{{ $t("brand.work") }}

-
- -
- + > + +
-
- -
- + > + +
-
- -
- + > + +
@@ -64,13 +70,13 @@
-
+