0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev 

# Conflicts:
#	components.d.ts
#	vite.config.ts
This commit is contained in:
blp 2023-01-10 11:38:46 +08:00
parent 8de9512364 5c9e024b62
commit 81c27df227
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components.d.ts vendored
View File

@ -13,8 +13,13 @@ declare module '@vue/runtime-core' {
AForm: typeof import('ant-design-vue/es')['Form'] AForm: typeof import('ant-design-vue/es')['Form']
AFormItem: typeof import('ant-design-vue/es')['FormItem'] AFormItem: typeof import('ant-design-vue/es')['FormItem']
AInput: typeof import('ant-design-vue/es')['Input'] AInput: typeof import('ant-design-vue/es')['Input']
AInputGroup: typeof import('ant-design-vue/es')['InputGroup']
AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
AInputPassword: typeof import('ant-design-vue/es')['InputPassword'] AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
AModal: typeof import('ant-design-vue/es')['Modal']
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm'] APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
ARow: typeof import('ant-design-vue/es')['Row']
ASelect: typeof import('ant-design-vue/es')['Select']
ASpin: typeof import('ant-design-vue/es')['Spin'] ASpin: typeof import('ant-design-vue/es')['Spin']
ATooltip: typeof import('ant-design-vue/es')['Tooltip'] ATooltip: typeof import('ant-design-vue/es')['Tooltip']
BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default'] BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']

20
src/views/account/Center/bind/index.vue
View File

@ -162,16 +162,16 @@ const handleSubmit = () => {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.page-container:deep { :deep(
.ant-form-item-label .ant-form-item-label
> label.ant-form-item-required:not( > label.ant-form-item-required:not(
.ant-form-item-required-mark-optional .ant-form-item-required-mark-optional
)::before { )::before
display: none; ) {
} display: none;
.ant-form-item-label > label { }
font-weight: bold; :deep(.ant-form-item-label > label) {
} font-weight: bold;
} }
.page-container { .page-container {
width: 100%; width: 100%;

3
vite.config.ts
View File

@ -76,7 +76,8 @@ export default defineConfig(({ mode}) => {
[env.VITE_APP_BASE_API]: { [env.VITE_APP_BASE_API]: {
// target: 'http://192.168.33.22:8800', // target: 'http://192.168.33.22:8800',
// target: 'http://192.168.32.244:8881', // target: 'http://192.168.32.244:8881',
target: 'http://47.108.63.174:8845', // opcua // target: 'http://47.112.135.104:5096', // opcua
target: 'http://47.108.63.174:8845', // 测试
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '') rewrite: (path) => path.replace(/^\/api/, '')
} }