Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
yn-science-front
Project
Project
Details
Activity
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
徐俊
yn-science-front
Commits
946b9bf6
Commit
946b9bf6
authored
Dec 11, 2024
by
wangxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4444
parent
d6137954
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
11 deletions
+45
-11
register.js
src/register.js
+2
-0
cascaderSelect.vue
src/views/components/common/cascaderSelect.vue
+37
-5
config.js
src/views/components/common/config.js
+0
-0
Index.vue
src/views/query/project/Index.vue
+2
-4
projectEdit.vue
src/views/report/project/components/projectEdit.vue
+4
-2
No files found.
src/register.js
View file @
946b9bf6
...
@@ -27,6 +27,7 @@ import upLoad from '@/views/components/common/upLoad'
...
@@ -27,6 +27,7 @@ import upLoad from '@/views/components/common/upLoad'
import
paraMultiSelect
from
'@/views/components/common/paraMultiSelect'
import
paraMultiSelect
from
'@/views/components/common/paraMultiSelect'
import
paraSelect
from
'@/views/components/common/paraSelect'
import
paraSelect
from
'@/views/components/common/paraSelect'
import
baseSelect
from
'@/views/components/common/baseSelect'
import
baseSelect
from
'@/views/components/common/baseSelect'
import
cascaderSelect
from
'@/views/components/common/cascaderSelect'
import
Viewer
from
"v-viewer"
import
Viewer
from
"v-viewer"
import
'viewerjs/dist/viewer.css'
import
'viewerjs/dist/viewer.css'
...
@@ -39,6 +40,7 @@ Vue.component('fModal', fModal)
...
@@ -39,6 +40,7 @@ Vue.component('fModal', fModal)
Vue
.
component
(
'paraMultiSelect'
,
paraMultiSelect
)
Vue
.
component
(
'paraMultiSelect'
,
paraMultiSelect
)
Vue
.
component
(
'paraSelect'
,
paraSelect
)
Vue
.
component
(
'paraSelect'
,
paraSelect
)
Vue
.
component
(
'baseSelect'
,
baseSelect
)
Vue
.
component
(
'baseSelect'
,
baseSelect
)
Vue
.
component
(
'cascaderSelect'
,
cascaderSelect
)
// 设置ant日期选择框为中文样式
// 设置ant日期选择框为中文样式
import
moment
from
'moment'
import
moment
from
'moment'
...
...
src/views/components/common/cascaderSelect.vue
View file @
946b9bf6
<
template
>
<
template
>
<a-cascader
:options=
"options"
change-on-select
:show-search=
"
{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="Please select" @change="onChange" />
<a-cascader
v-model=
"selected"
:style=
"
{width:'80%'}" :options="options"
:show-search="{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="Please select" @change="onChange" />
</
template
>
</
template
>
<
script
>
<
script
>
import
{
specList
}
from
"@/views/components/common/config"
import
{
specList
,
getSpecArray
}
from
"@/views/components/common/config"
export
default
{
export
default
{
name
:
"cascaderSelect"
,
name
:
"cascaderSelect"
,
data
()
{
data
()
{
return
{
return
{
options
:
specList
options
:
specList
,
selected
:
null
,
};
};
},
},
props
:
{
value
:
{
type
:
String
,
default
()
{
return
null
}
},
},
created
()
{
created
()
{
console
.
log
(
this
.
options
)
if
(
!!
this
.
value
)
{
this
.
selected
=
getSpecArray
(
this
.
value
)
// this.$emit("change");
// this.$emit("input", this.selected)
}
console
.
log
(
this
.
selected
)
},
},
methods
:
{
methods
:
{
onChange
(
value
,
selectedOptions
)
{
onChange
(
value
,
selectedOptions
)
{
console
.
log
(
value
,
selectedOptions
);
console
.
log
(
value
,
selectedOptions
);
this
.
selected
=
value
if
(
!!
this
.
selected
&&
this
.
selected
.
length
==
3
)
{
this
.
$emit
(
"input"
,
this
.
selected
[
2
])
this
.
$emit
(
"change"
);
}
},
},
displayRender
({
labels
})
{
displayRender
({
labels
})
{
return
labels
[
labels
.
length
-
1
];
return
labels
[
labels
.
length
-
1
];
},
},
filter
(
inputValue
,
path
)
{
filter
(
inputValue
,
path
)
{
return
path
.
some
(
option
=>
option
.
label
.
toLowerCase
().
indexOf
(
inputValue
.
toLowerCase
())
>
-
1
);
return
path
.
some
(
option
=>
option
.
label
.
toLowerCase
().
indexOf
(
inputValue
.
toLowerCase
())
>
-
1
);
},
},
},
},
watch
:
{
value
:
{
handler
(
value
)
{
if
(
!!
value
)
{
this
.
selected
=
getSpecArray
(
this
.
value
)
if
(
!!
this
.
selected
&&
this
.
selected
.
length
==
3
)
{
this
.
$emit
(
"input"
,
this
.
selected
[
2
])
this
.
$emit
(
"change"
);
}
}
},
},
}
};
};
</
script
>
</
script
>
src/views/components/common/config.js
View file @
946b9bf6
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/views/query/project/Index.vue
View file @
946b9bf6
...
@@ -15,8 +15,7 @@
...
@@ -15,8 +15,7 @@
</a-form-item>
</a-form-item>
<a-form-item>
<a-form-item>
<a-button
type=
"primary"
icon=
"search"
@
click=
"search"
>
搜索
</a-button>
<a-button
type=
"primary"
icon=
"search"
@
click=
"search"
>
搜索
</a-button>
<a-button
icon=
"reload"
style=
"margin-left: 10px"
@
click=
"reset"
class=
"bt-normal"
>
重置
</a-button>
<a-button
icon=
"reload"
style=
"margin-left: 10px"
@
click=
"reset"
class=
"bt-normal"
>
重置
</a-button>
<cascader-select/>
</a-form-item>
</a-form-item>
</a-form>
</a-form>
<a-divider
style=
"height: 1px; background-color: #e8e8e8;"
/>
<a-divider
style=
"height: 1px; background-color: #e8e8e8;"
/>
...
@@ -54,11 +53,10 @@ import moment from 'moment'
...
@@ -54,11 +53,10 @@ import moment from 'moment'
import
{
isEmptyParams
,
filterExportExcelData
,
tableColumnsName
}
from
"@/views/utils/common"
;
import
{
isEmptyParams
,
filterExportExcelData
,
tableColumnsName
}
from
"@/views/utils/common"
;
import
projectView
from
'@/views/report/project/components/projectView'
import
projectView
from
'@/views/report/project/components/projectView'
import
scoreEdit
from
'@/views/evaluation/components/scoreEdit'
import
scoreEdit
from
'@/views/evaluation/components/scoreEdit'
import
cascaderSelect
from
'@/views/components/common/cascaderSelect'
export
default
{
export
default
{
name
:
'queryProject'
,
name
:
'queryProject'
,
components
:
{
components
:
{
projectView
,
scoreEdit
,
cascaderSelect
projectView
,
scoreEdit
},
},
data
()
{
data
()
{
return
{
return
{
...
...
src/views/report/project/components/projectEdit.vue
View file @
946b9bf6
...
@@ -311,7 +311,8 @@
...
@@ -311,7 +311,8 @@
</a-col>
</a-col>
<a-col
:span=
"20"
>
<a-col
:span=
"20"
>
<a-form-model-item
prop=
"knowledgeId"
>
<a-form-model-item
prop=
"knowledgeId"
>
<para-multi-select
v-model=
"formData.knowledgeId"
:typeId=
"57"
/>
<cascader-select
v-model=
"formData.knowledgeId"
/>
<!--
<para-multi-select
v-model=
"formData.knowledgeId"
:typeId=
"57"
/>
-->
</a-form-model-item>
</a-form-model-item>
</a-col>
</a-col>
</a-row>
</a-row>
...
@@ -603,7 +604,7 @@ export default {
...
@@ -603,7 +604,7 @@ export default {
unitLinkEmail
:
[{
required
:
true
,
message
:
'请填写电子邮箱'
,
trigger
:
'blur'
},],
unitLinkEmail
:
[{
required
:
true
,
message
:
'请填写电子邮箱'
,
trigger
:
'blur'
},],
unitLinkFax
:
[{
required
:
true
,
message
:
'请填写传真'
,
trigger
:
'blur'
},],
unitLinkFax
:
[{
required
:
true
,
message
:
'请填写传真'
,
trigger
:
'blur'
},],
projName
:
[{
required
:
true
,
message
:
'请填写项目名称'
,
trigger
:
'blur'
},],
projName
:
[{
required
:
true
,
message
:
'请填写项目名称'
,
trigger
:
'blur'
},],
knowledgeId
:
{
required
:
true
,
message
:
'请选择
>项目所属学科类别
'
,
trigger
:
'change'
},
knowledgeId
:
{
required
:
true
,
message
:
'请选择
学科代码
'
,
trigger
:
'change'
},
subjectScope
:
[{
required
:
true
,
message
:
'请填写选题范围'
,
trigger
:
'blur'
},],
subjectScope
:
[{
required
:
true
,
message
:
'请填写选题范围'
,
trigger
:
'blur'
},],
projClass
:
[{
required
:
true
,
message
:
'请填写项目类别'
,
trigger
:
'blur'
},],
projClass
:
[{
required
:
true
,
message
:
'请填写项目类别'
,
trigger
:
'blur'
},],
remark
:
[{
required
:
true
,
message
:
'请填写附注说明'
,
trigger
:
'blur'
},],
remark
:
[{
required
:
true
,
message
:
'请填写附注说明'
,
trigger
:
'blur'
},],
...
@@ -691,6 +692,7 @@ export default {
...
@@ -691,6 +692,7 @@ export default {
}
}
},
},
submit
()
{
submit
()
{
console
.
log
(
this
.
formData
)
this
.
processProjectYearTarget
()
this
.
processProjectYearTarget
()
this
.
$refs
.
form
.
validate
(
valid
=>
{
this
.
$refs
.
form
.
validate
(
valid
=>
{
if
(
valid
)
{
if
(
valid
)
{
...
...
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