diff --git a/routers/routes/routes.go b/routers/routes/routes.go index c5fe938a8..efa2df216 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -903,7 +903,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/tech_view", tech.TechView) m.Get("/repo_view", tech.RepoView) m.Get("/admin_view", tech.AdminView) - m.Get("/my_view", tech.AdminView) + m.Get("/my_view", tech.MyView) }, reqSignIn) diff --git a/templates/tech/my_view.tmpl b/templates/tech/my_view.tmpl new file mode 100644 index 000000000..c5074a955 --- /dev/null +++ b/templates/tech/my_view.tmpl @@ -0,0 +1,5 @@ +{{template "base/head_home" .}} + +
+ +{{template "base/footer" .}} diff --git a/web_src/vuepages/apis/modules/tech.js b/web_src/vuepages/apis/modules/tech.js index 679d4f9b6..cd6e830b4 100644 --- a/web_src/vuepages/apis/modules/tech.js +++ b/web_src/vuepages/apis/modules/tech.js @@ -79,6 +79,19 @@ export const getTechOpenISearch = (params) => { }); } +// 我申请的项目列表 +// 输入 page,pageSize +// 返回 {"total":10,"data":[{}]} +// data: {id:记录的id,name:启智项目名称,owner_name:启智项目拥有者名称,tech_name:科技项目名称,tech_number:科技项目编号,institution:项目承担单位, +// execute_period:执行周期,contact:联系人,contact_phone:联系电话,contact_email:联系邮件,apply_user:申请账号,status:状态} +export const getTechMyList = (params) => { + return service({ + url: '/api/v1/tech/my', + method: 'get', + params: params, + }); +} + // 后台管理项目列表 // 输入 page,pageSize // 返回 {"total":10,"data":[{}]} @@ -97,9 +110,11 @@ export const getTechAdminList = (params) => { // 返回 { code:0, message:"" } export const setTechAdminOperation = (data) => { return service({ - url: `/api/v1/tech/admin/action/${data.type}`, + url: `/api/v1/tech/admin/${data.type}`, method: 'post', - data: data.id, + data: { + id: data.id + }, params: {}, }); } diff --git a/web_src/vuepages/pages/tech/adminview/index.vue b/web_src/vuepages/pages/tech/adminview/index.vue index 5bd1f7664..0ce594269 100644 --- a/web_src/vuepages/pages/tech/adminview/index.vue +++ b/web_src/vuepages/pages/tech/adminview/index.vue @@ -1,10 +1,11 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 提示：批量操作只会对【展示状态】为 “未展示” 或 “已展示” 的数据生效。 +
@@ -133,7 +262,7 @@ export default { .top-container { display: flex; align-items: center; - margin: 15px 0; + margin: 30px 0 15px 0; .check-toggle { margin-right: 20px; @@ -185,7 +314,6 @@ export default { } .table-wrap { - margin-bottom: 12px; overflow-x: auto; /deep/ .el-table__header { @@ -208,4 +336,26 @@ export default { } } } + +.op-tips { + margin: 10px 0 10px 0; + color: #606266; + font-size: 12px; + + i { + margin-right: 4px; + } +} + +.op-btn { + cursor: pointer; + + &.agree { + color: rgb(56, 158, 13); + } + + &.cancel { + color: rgb(50, 145, 248); + } +} diff --git a/web_src/vuepages/pages/tech/components/SciAndTechPrjItem.vue b/web_src/vuepages/pages/tech/components/SciAndTechPrjItem.vue index d238688ab..a95db04f1 100644 --- a/web_src/vuepages/pages/tech/components/SciAndTechPrjItem.vue +++ b/web_src/vuepages/pages/tech/components/SciAndTechPrjItem.vue @@ -76,9 +76,7 @@ export default { }, components: {}, data() { - return { - - }; + return {}; }, methods: { calcFromNow(unix) { diff --git a/web_src/vuepages/pages/tech/components/SearchBar.vue b/web_src/vuepages/pages/tech/components/SearchBar.vue index 74025e1b8..15d99e01a 100644 --- a/web_src/vuepages/pages/tech/components/SearchBar.vue +++ b/web_src/vuepages/pages/tech/components/SearchBar.vue @@ -5,11 +5,9 @@
-
搜索
+
{{ $t('repos.search') }}
申请展示项目 - 管理展示项目
OpenI启智社区开源指南
@@ -23,7 +21,6 @@ + + diff --git a/web_src/vuepages/pages/tech/myview/vp-tech-myview.js b/web_src/vuepages/pages/tech/myview/vp-tech-myview.js new file mode 100644 index 000000000..48e542500 --- /dev/null +++ b/web_src/vuepages/pages/tech/myview/vp-tech-myview.js @@ -0,0 +1,17 @@ +import Vue from 'vue'; +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +import localeEn from 'element-ui/lib/locale/lang/en'; +import localeZh from 'element-ui/lib/locale/lang/zh-CN'; +import { i18n, lang } from '~/langs'; +import App from './index.vue'; + +Vue.use(ElementUI, { + locale: lang === 'zh-CN' ? localeZh : localeEn, + size: 'small', +}); + +new Vue({ + i18n, + render: (h) => h(App), +}).$mount('#__vue-root'); diff --git a/web_src/vuepages/pages/tech/repoview/index.vue b/web_src/vuepages/pages/tech/repoview/index.vue index 891d13fc6..8af16effc 100644 --- a/web_src/vuepages/pages/tech/repoview/index.vue +++ b/web_src/vuepages/pages/tech/repoview/index.vue @@ -1,6 +1,6 @@