diff --git a/.beagle.yml b/.beagle.yml index 7bff5d353a53352795d3e256695916d78f730c2e..698ac695f3c3047835870148d10046bd1a62caee 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -41,19 +41,19 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 - export NODE_ENV=production - yarn build - # - name: s3-cache-build - # image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 - # network_mode: host - # settings: - # rebuild: true - # hash: package.json - # mount: - # - node_modules - # endpoint: http://cache.wodcloud.com - # access_key: - # from_secret: ACCESS_KEY_MINIO - # secret_key: - # from_secret: SECRET_KEY_MINIO + - name: s3-cache-build + image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 + network_mode: host + settings: + rebuild: true + hash: package.json + mount: + - node_modules + endpoint: http://cache.wodcloud.com + access_key: + from_secret: ACCESS_KEY_MINIO + secret_key: + from_secret: SECRET_KEY_MINIO - name: docker image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 diff --git a/src/bg-ui/bg-upload-image.vue b/src/bg-ui/bg-upload-image.vue index 1ed93f55d79b99015d811863c388ef8260e8a7ed..51eb59efd2158160c4bef7826be6662384cfa57d 100644 --- a/src/bg-ui/bg-upload-image.vue +++ b/src/bg-ui/bg-upload-image.vue @@ -44,6 +44,10 @@ + + + Preview Image + + diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss index ba0a7c9d9f2943e5453d2c2c5e61fd3aa55cb7d8..8196e1371badc869f4e0495e90c84b51b2a8047d 100644 --- a/src/bg-ui/index.scss +++ b/src/bg-ui/index.scss @@ -2559,6 +2559,7 @@ a { width: 100%; .el-checkbox { + width: 100%; .el-checkbox__label { overflow: hidden; text-overflow: ellipsis; @@ -2620,7 +2621,7 @@ a { } .bg-permission-option--self { - width: 168px; + width: 128px; &.full-option { width: 100%; @@ -2628,7 +2629,7 @@ a { } .bg-permission-option--list { - width: calc(100% - 168px); + width: calc(100% - 128px); &.flex-wrap { display: flex; @@ -2640,10 +2641,13 @@ a { >.bg-permission-option { >.bg-permission-option--self { - width: 168px; + width: 128px; border-right: none; border-bottom: none; } } } +} +.bg-upload-image-dialog { + width: 650px; } \ No newline at end of file diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue index 6c8c99811f38eb0624059a82afa0d1b4aa5ffe0a..1bf7128c476f4f193dce9e0923d7853ccd7ddfc1 100644 --- a/src/page/main/develop/account/index.vue +++ b/src/page/main/develop/account/index.vue @@ -217,22 +217,21 @@ import CryptoJS from "crypto-js"; { label: "业务系统编码", prop: "business_code", - width: 180 + minWidth: 160 }, { label: "业务系统名称", prop: "business_name", - minWidth: 180 + minWidth: 160 }, { label: "账号", prop: "system_account", - width: 150 }, { label: "所属机构", prop: "organization_name", - width: 240 + minwidth: 240 }, { label: "创建时间", @@ -242,7 +241,6 @@ import CryptoJS from "crypto-js"; { label: "是否启用", prop: "state", - width: 80 }, { label: "操作", diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue index 41b1b521141f2e468f42ad94a7237b646bc33573..9bfe46f4754b8ae70fa42eb53e190056354b59b5 100644 --- a/src/page/main/system/organization/index.vue +++ b/src/page/main/system/organization/index.vue @@ -969,7 +969,7 @@ import { downloadFileFormatNew } from '@/services/helper' bottom: unset } .dialog_form { - padding: 16px; + padding: 24px 8px 6px; } \ No newline at end of file diff --git a/src/page/main/system/organization/org-form.vue b/src/page/main/system/organization/org-form.vue index 3e3640fc988d14cb045bfb223c637dfd0fe6d3a3..4b3e2df2e8c9d9033a410a64ba9c94ffa9049283 100644 --- a/src/page/main/system/organization/org-form.vue +++ b/src/page/main/system/organization/org-form.vue @@ -5,7 +5,6 @@ :model="orgForm" :rules="formRules" ref="orgRef" - style="max-width: 80%" > - + 将文件拖到此处,或 点击上传