Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bigDataSystem
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张伯涛
bigDataSystem
Commits
3a66f5de
Commit
3a66f5de
authored
Nov 15, 2024
by
liwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了对比颜色变化
parent
e2a6256b
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
109 additions
and
46 deletions
+109
-46
indicatorStandards.data.ts
...taStandards/IndicatorStandards/indicatorStandards.data.ts
+1
-0
indicatorStandardsContrast.vue
...andards/IndicatorStandards/indicatorStandardsContrast.vue
+17
-9
indicatorStandardsData.ts
...ataStandards/IndicatorStandards/indicatorStandardsData.ts
+1
-1
basicStandards.data.ts
...views/dataStandards/basicStandards/basicStandards.data.ts
+1
-0
basicStandardsContrast.vue
...s/dataStandards/basicStandards/basicStandardsContrast.vue
+17
-9
basicStandardsData.ts
src/views/dataStandards/basicStandards/basicStandardsData.ts
+1
-1
publicCode.data.ts
src/views/dataStandards/publicCode/publicCode.data.ts
+35
-0
publicCodeContrast.vue
src/views/dataStandards/publicCode/publicCodeContrast.vue
+34
-24
publicCodeData.ts
src/views/dataStandards/publicCode/publicCodeData.ts
+2
-2
No files found.
src/views/dataStandards/IndicatorStandards/indicatorStandards.data.ts
View file @
3a66f5de
...
...
@@ -1573,6 +1573,7 @@ export const contrastSchema: FormSchema[] = [
readonly
:
true
,
placeholder
:
'请输入业务规则'
,
},
slot
:
'businessRule'
},
{
field
:
'dataType'
,
...
...
src/views/dataStandards/IndicatorStandards/indicatorStandardsContrast.vue
View file @
3a66f5de
...
...
@@ -26,7 +26,12 @@
</div>
</div>
<div>
<BasicForm
@
register=
"registerLeftForm"
/>
<BasicForm
@
register=
"registerLeftForm"
>
<
template
#
businessRule=
"{ model, field }"
>
<span
style=
"color: red"
v-if=
"startContrastFlag"
>
{{
model
.
businessRule
}}
</span>
<span
style=
"color: black"
v-else
>
{{
model
.
businessRule
}}
</span>
</
template
>
</BasicForm>
</div>
</div>
<div
class=
"w-1/2 xl:w-1/2"
>
...
...
@@ -49,7 +54,12 @@
</div>
</div>
<div>
<BasicForm
@
register=
"registerRightForm"
/>
<BasicForm
@
register=
"registerRightForm"
>
<
template
#
businessRule=
"{ model, field }"
>
<span
style=
"color: red"
v-if=
"startContrastFlag"
>
{{
model
.
businessRule
}}
</span>
<span
style=
"color: black"
v-else
>
{{
model
.
businessRule
}}
</span>
</
template
>
</BasicForm>
</div>
</div>
</PageWrapper>
...
...
@@ -69,6 +79,7 @@
defineOptions
({
name
:
'Metadata'
});
const
route
=
useRoute
();
const
title
=
ref
(
'对外投资出资方式'
)
const
startContrastFlag
=
ref
(
false
)
const
options
=
ref
<
any
>
([
{
value
:
'V1'
,
label
:
'V1'
},
{
value
:
'V2'
,
label
:
'V2'
},
...
...
@@ -88,17 +99,14 @@
/**开始对比*/
function
startContrast
()
{
createMessage
.
success
(
'开始对比'
);
createMessage
.
info
(
'开始对比'
);
startContrastFlag
.
value
=
true
}
/**结束对比*/
function
endContrast
()
{
router
.
push
({
path
:
'/dataStandards/IndicatorStandards/detailStandard'
,
query
:
{
businessId
:
route
.
query
.
businessId
,
},
});
createMessage
.
info
(
'结束对比'
);
startContrastFlag
.
value
=
false
}
onMounted
(()
=>
{
...
...
src/views/dataStandards/IndicatorStandards/indicatorStandardsData.ts
View file @
3a66f5de
...
...
@@ -581,7 +581,7 @@ export const leftContrastData: any[] = [
"standardAlias"
:
"Investment Contribution Method"
,
"standardSource"
:
"国家标准化管理委员会"
,
"definitionBasis"
:
"相关法律法规"
,
"businessRule"
:
"
对外投资的出资方式必须
明确记录。"
,
"businessRule"
:
"明确记录。"
,
"dataType"
:
"1"
,
"tecDataType"
:
"varchar"
,
"valueRange"
:
"非空字符串"
,
...
...
src/views/dataStandards/basicStandards/basicStandards.data.ts
View file @
3a66f5de
...
...
@@ -1832,6 +1832,7 @@ export const contrastSchema: FormSchema[] = [
readonly
:
true
,
placeholder
:
'请输入业务规则'
,
},
slot
:
'businessRule'
},
{
field
:
'dataType'
,
...
...
src/views/dataStandards/basicStandards/basicStandardsContrast.vue
View file @
3a66f5de
...
...
@@ -26,7 +26,12 @@
</div>
</div>
<div>
<BasicForm
@
register=
"registerLeftForm"
/>
<BasicForm
@
register=
"registerLeftForm"
>
<
template
#
businessRule=
"{ model, field }"
>
<span
style=
"color: red"
v-if=
"startContrastFlag"
>
{{
model
.
businessRule
}}
</span>
<span
style=
"color: black"
v-else
>
{{
model
.
businessRule
}}
</span>
</
template
>
</BasicForm>
</div>
</div>
<div
class=
"w-1/2 xl:w-1/2"
>
...
...
@@ -49,7 +54,12 @@
</div>
</div>
<div>
<BasicForm
@
register=
"registerRightForm"
/>
<BasicForm
@
register=
"registerRightForm"
>
<
template
#
businessRule=
"{ model, field }"
>
<span
style=
"color: red"
v-if=
"startContrastFlag"
>
{{
model
.
businessRule
}}
</span>
<span
style=
"color: black"
v-else
>
{{
model
.
businessRule
}}
</span>
</
template
>
</BasicForm>
</div>
</div>
</PageWrapper>
...
...
@@ -69,6 +79,7 @@
defineOptions
({
name
:
'Metadata'
});
const
route
=
useRoute
();
const
title
=
ref
(
'对外投资出资方式'
)
const
startContrastFlag
=
ref
(
false
)
const
options
=
ref
<
any
>
([
{
value
:
'V1'
,
label
:
'V1'
},
{
value
:
'V2'
,
label
:
'V2'
},
...
...
@@ -88,17 +99,14 @@
/**开始对比*/
function
startContrast
()
{
createMessage
.
success
(
'开始对比'
);
createMessage
.
info
(
'开始对比'
);
startContrastFlag
.
value
=
true
}
/**结束对比*/
function
endContrast
()
{
router
.
push
({
path
:
'/dataStandards/basicStandards/detailStandard'
,
query
:
{
businessId
:
route
.
query
.
businessId
,
},
});
createMessage
.
info
(
'结束对比'
);
startContrastFlag
.
value
=
false
}
onMounted
(()
=>
{
...
...
src/views/dataStandards/basicStandards/basicStandardsData.ts
View file @
3a66f5de
...
...
@@ -553,7 +553,7 @@ export const leftContrastData: any[] = [
"standardAlias"
:
"Investment Contribution Method"
,
"standardSource"
:
"国家标准化管理委员会"
,
"definitionBasis"
:
"相关法律法规"
,
"businessRule"
:
"
对外投资的出资方式必须明确记录
。"
,
"businessRule"
:
"
记录对外投资
。"
,
"dataType"
:
"1"
,
"tecDataType"
:
"varchar"
,
"valueRange"
:
"非空字符串"
,
...
...
src/views/dataStandards/publicCode/publicCode.data.ts
View file @
3a66f5de
...
...
@@ -1016,6 +1016,7 @@ export const contrastSchema: FormSchema[] = [
readonly
:
true
,
placeholder
:
'请输入标准来源'
,
},
slot
:
'standardSource'
,
},
{
field
:
'businessDefinition'
,
...
...
@@ -1058,6 +1059,40 @@ export const contrastSchema: FormSchema[] = [
},
},
];
/**版本对比 表单2*/
export
const
contrastSchema2
:
FormSchema
[]
=
[
{
field
:
'checked'
,
component
:
'Checkbox'
,
label
:
'只看差异代码'
,
colProps
:
{
lg
:
24
,
md
:
24
},
renderComponentContent
:
''
,
},
{
field
:
'order'
,
label
:
'排序'
,
component
:
'Select'
,
colProps
:
{
lg
:
24
,
md
:
24
},
componentProps
:
{
options
:[
{
label
:
'代码值升序'
,
value
:
'1'
,
},
{
label
:
'代码值降序'
,
value
:
'2'
,
},
]
},
rules
:
[
{
required
:
true
,
message
:
'请选择排序'
,
},
],
},
];
/**版本对比 列表*/
export
const
contrastTableColumns
:
BasicColumn
[]
=
[
{
...
...
src/views/dataStandards/publicCode/publicCodeContrast.vue
View file @
3a66f5de
...
...
@@ -27,10 +27,15 @@
</div>
<Divider
/>
<div
style=
"display: flex; justify-content: center;"
>
<a-button
style=
"margin-right: 5px"
type=
"primary"
@
click=
""
>
回滚到此版本
</a-button>
<a-button
style=
"margin-right: 5px"
type=
"primary"
@
click=
"
returnButton
"
>
回滚到此版本
</a-button>
</div>
<Divider
/>
<BasicForm
@
register=
"registerLeftForm"
/>
<BasicForm
@
register=
"registerLeftForm"
>
<
template
#
standardSource=
"{ model, field }"
>
<span
style=
"color: red"
v-if=
"startContrastFlag"
>
{{
model
.
standardSource
}}
</span>
<span
style=
"color: black"
v-else
>
{{
model
.
standardSource
}}
</span>
</
template
>
</BasicForm>
<BasicTable
@
register=
"registerTable1"
/>
</div>
<div
class=
"w-1/2 xl:w-1/2"
>
...
...
@@ -54,21 +59,17 @@
</div>
<Divider
/>
<div
style=
"display: flex; justify-content: center;"
>
<a-button
style=
"margin-right: 5px"
type=
"primary"
@
click=
""
>
回滚到此版本
</a-button>
<a-button
style=
"margin-right: 5px"
type=
"primary"
@
click=
"
returnButton
"
>
回滚到此版本
</a-button>
</div>
<Divider
/>
<BasicForm
@
register=
"registerRightForm"
/>
<div
style=
"display: flex;justify-content:flex-end;margin-top:3%;margin-bottom: 10%"
>
<div>
版本
<Select
v-model:value=
"optionValue"
show-search
placeholder=
"请选择升降序"
style=
"width: 200px;margin-left: 10px"
:options=
"orderOptions"
@
change=
"handleChange"
></Select>
</div>
<BasicForm
@
register=
"registerRightForm"
>
<
template
#
standardSource=
"{ model, field }"
>
<span
style=
"color: red"
v-if=
"startContrastFlag"
>
{{
model
.
standardSource
}}
</span>
<span
style=
"color: black"
v-else
>
{{
model
.
standardSource
}}
</span>
</
template
>
</BasicForm>
<div
style=
"display: flex;justify-content: flex-end;margin-top:3%"
>
<BasicForm
@
register=
"registerRightForm2"
/>
</div>
<BasicTable
@
register=
"registerTable2"
/>
<Divider
/>
...
...
@@ -77,7 +78,7 @@
</template>
<
script
lang=
"ts"
setup
>
import
{
PageWrapper
}
from
'@/components/Page'
;
import
{
addValueSearchSchema
,
contrastSchema
,
contrastTableColumns
}
from
'./publicCode.data'
;
import
{
addValueSearchSchema
,
contrastSchema
,
contrastSchema2
,
contrastTableColumns
}
from
'./publicCode.data'
;
import
{
leftContrastData
,
rightContrastData
,
leftContrastTableData
,
rightContrastTableData
}
from
'./publicCodeData'
;
import
{
useMessage
}
from
'@/hooks/web/useMessage'
;
import
{
BasicForm
,
useForm
}
from
'@/components/Form'
;
...
...
@@ -91,6 +92,7 @@
defineOptions
({
name
:
'Metadata'
});
const
route
=
useRoute
();
const
startContrastFlag
=
ref
(
false
)
const
title
=
ref
(
'对外投资出资方式'
)
const
options
=
ref
<
any
>
([
{
value
:
'V1'
,
label
:
'V1'
},
...
...
@@ -114,6 +116,12 @@
showActionButtonGroup
:
false
,
});
const
[
registerRightForm2
,{
setFieldsValue
:
setRightFieldsValue2
}]
=
useForm
({
labelWidth
:
100
,
schemas
:
contrastSchema2
,
showActionButtonGroup
:
false
,
});
const
[
registerTable1
]
=
useTable
({
title
:
'公共代码'
,
api
:
async
(
params
)
=>
{
...
...
@@ -165,17 +173,19 @@
});
/**开始对比*/
function
startContrast
()
{
createMessage
.
success
(
'开始对比'
);
createMessage
.
info
(
'开始对比'
);
startContrastFlag
.
value
=
true
}
/**结束对比*/
function
endContrast
()
{
router
.
push
({
path
:
'/dataStandards/publicCode/detailPublicCode'
,
query
:
{
businessId
:
route
.
query
.
businessId
,
},
});
createMessage
.
info
(
'结束对比'
);
startContrastFlag
.
value
=
false
}
/**回滚*/
function
returnButton
()
{
createMessage
.
success
(
'回滚成功'
);
}
onMounted
(()
=>
{
...
...
src/views/dataStandards/publicCode/publicCodeData.ts
View file @
3a66f5de
...
...
@@ -580,7 +580,7 @@ export const leftContrastData: any[] = [
"standardNumber"
:
"BAS-004"
,
"standardEnglishName"
:
"Investment Contribution Method"
,
"standardAlias"
:
"Investment Contribution Method"
,
"standardSource"
:
"国家标准化管理委员会"
,
"standardSource"
:
"国家标准化管理委员会
1
"
,
"definitionBasis"
:
"相关法律法规"
,
"businessRule"
:
"对外投资的出资方式必须明确记录。"
,
"dataType"
:
"1"
,
...
...
@@ -629,7 +629,7 @@ export const rightContrastData = [
"standardNumber"
:
"BAS-004"
,
"standardEnglishName"
:
"Investment Contribution Method"
,
"standardAlias"
:
"Investment Contribution Method"
,
"standardSource"
:
"国家标准化管理委员会"
,
"standardSource"
:
"国家标准化管理委员会
2
"
,
"definitionBasis"
:
"相关法律法规"
,
"businessRule"
:
"对外投资的出资方式必须明确记录。"
,
"dataType"
:
"1"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment