diff --git a/src/assets/css/index.css b/src/assets/css/index.css index bfc9d256b3504f25b907e842e3d68361c66b624c..43df1e4e6cef9e0366cc761979cfe3abe4dad24b 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -1478,23 +1478,25 @@ border-radius:8px; } .flex_left { - background-color: #fff; height: calc(100% - 20px); width: 320px; - box-shadow: 0px 1px 4px 0px - rgba(0, 7, 101, 0.15); - border-radius: 6px; margin-right: 10px; overflow: hidden; } .flex_right { - background-color: #fff; + height: calc(100% - 20px); flex: 1; + + overflow: hidden; +} + +.bgc_white { box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15); border-radius: 6px; - overflow: hidden; + background-color: #fff; + } .tree::-webkit-scrollbar { diff --git a/src/assets/imgs/img_data-complete.png b/src/assets/imgs/img_data-complete.png index dd88a7c9829fdb257b3911209f9f24de026d0a70..d7ea38bcdded7c3dc47312fa29a7a7ac95a6f7ea 100644 Binary files a/src/assets/imgs/img_data-complete.png and b/src/assets/imgs/img_data-complete.png differ diff --git a/src/assets/imgs/img_data-fail.png b/src/assets/imgs/img_data-fail.png new file mode 100644 index 0000000000000000000000000000000000000000..29c2c887e34dfc4fff06208642d82d29d2b35583 Binary files /dev/null and b/src/assets/imgs/img_data-fail.png differ diff --git a/src/page/main/develop/account/add/index.vue b/src/page/main/develop/account/add/index.vue index 8655074357b20ef62830f8789c7f8940ce9532dd..5bcae62dd06d25b9e023707d3e426db32187ca7a 100644 --- a/src/page/main/develop/account/add/index.vue +++ b/src/page/main/develop/account/add/index.vue @@ -47,8 +47,12 @@
+
+
返回列表 继续创建 +
+
@@ -81,7 +85,7 @@ const step = ref(1); const systemFormRef = ref(null); const contactFormRef = ref(null); const tempFormData = ref(null) -const formData = ref({ +const formData = reactive({ org: '', code: '', name: '', @@ -99,37 +103,6 @@ const formData = ref({ remark: '', }); //业务系统表单+联系人表单 - -onBeforeUnmount(()=>{ - -}) -onMounted(() => { - if(route.query.type === "1") { - setTimeout(()=> { - systemFormRef.value.setForm({ - org: 'a', - code: 'b', - name: 'b', - desc: 'b', - logo: ['b'], - role: 'b', - account: 'b', - password: 'b', - confirm_password: 'b', - url: 'b', - firm_name: 'b', - is_use: 'b', - - }) - contactFormRef.value.setForm({ - contact_user: 'c', - phone: 'c', - email: 'c', - remark: 'c', - }) - },500) - } -}) // 下一步 const nextStep = () => { systemFormRef.value.submitForm(); @@ -170,6 +143,37 @@ const cancel = () => { router.go(-1); } +onBeforeUnmount(()=>{ + +}) +onMounted(() => { + if(route.query.type === "1") { + setTimeout(()=> { + systemFormRef.value.setForm({ + org: 'a', + code: 'b', + name: 'b', + desc: 'b', + logo: ['b'], + role: 'b', + account: 'b', + password: 'b', + confirm_password: 'b', + url: 'b', + firm_name: 'b', + is_use: 'b', + + }) + contactFormRef.value.setForm({ + contact_user: 'c', + phone: 'c', + email: 'c', + remark: 'c', + }) + },500) + } +}) + diff --git a/src/page/main/develop/account/add/system-form.vue b/src/page/main/develop/account/add/system-form.vue index 953ecbee7456650d2efbe9164776b2b607960124..6980b6fc81a3b7e1345380defeef3324f7086ea5 100644 --- a/src/page/main/develop/account/add/system-form.vue +++ b/src/page/main/develop/account/add/system-form.vue @@ -115,6 +115,7 @@ const clearForm = () => { if (!systemRef) return systemRef.value.resetFields() } + const setForm = (data) => { systemForm.value = Object.assign(systemForm, data); } diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue index edd8cb1a841cec0a1219afa556dcb8a41c83b368..f6c52af7437a4b05822d9b3094facd6f0b080c73 100644 --- a/src/page/main/develop/account/index.vue +++ b/src/page/main/develop/account/index.vue @@ -7,7 +7,7 @@
-
+
政务机构
@@ -24,7 +24,7 @@
-
+
新建编辑 @@ -274,7 +274,7 @@ import { useRouter } from 'vue-router'; height: calc(100% - 65px); padding: 5px; } -.tree /deep/ .el-tree-node>.el-tree-node__children { +.tree :deep() .el-tree-node>.el-tree-node__children { overflow: unset; } .main_container { @@ -287,6 +287,7 @@ import { useRouter } from 'vue-router'; } .pagination_box { position: sticky; + position: -webkit-sticky; margin-top: 16px; bottom: 0px; background-color: #fff; diff --git a/src/page/main/system/organization/directory-form.vue b/src/page/main/system/organization/directory-form.vue new file mode 100644 index 0000000000000000000000000000000000000000..372e841e2d0d931904d6179f3de09ffe76afe8d3 --- /dev/null +++ b/src/page/main/system/organization/directory-form.vue @@ -0,0 +1,62 @@ + + + \ No newline at end of file diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue index 2d4a69eb6b04991907877ce5591ec76a7025faf4..2f60cd5692810584da2f1edf5315ac3f4e024620 100644 --- a/src/page/main/system/organization/index.vue +++ b/src/page/main/system/organization/index.vue @@ -1,30 +1,532 @@ - - \ 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 new file mode 100644 index 0000000000000000000000000000000000000000..53ea24e64019785e715f3932e287eaa5e8e1c070 --- /dev/null +++ b/src/page/main/system/organization/org-form.vue @@ -0,0 +1,82 @@ + + + \ No newline at end of file diff --git a/src/page/main/system/organization/tree.vue b/src/page/main/system/organization/tree.vue new file mode 100644 index 0000000000000000000000000000000000000000..23ab4acbc7de071249a7e34dd35fd51a57ace317 --- /dev/null +++ b/src/page/main/system/organization/tree.vue @@ -0,0 +1,311 @@ + + + + + \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 7da572b9785df7f8e40a59b26547723be6650f9b..0daefe5eb3ab9965e209b95c01c9a75aa0e31108 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,7 +14,7 @@ export default { vue() ], //本地运行基础路径,如:http://localhost:5173/apaas/ui/ - base: "/apaas/manage/ui", + base: "/apaas/manage/ui/", clearScreen:false, resolve:{ //别名,代码引入时方便引入