diff --git a/src/router/index.js b/src/router/index.js
index 907354e..86452a9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -383,6 +383,19 @@ export const expertRoutes=[
name: 'Results',
meta: { title: '匹配结果', icon: 'dashboard' }
},
+ {
+ path: 'patent',
+ component: () => import('@/views/admin/expert/technology/patent'),
+ name: 'patent',
+ meta: { title: '专利列表', icon: 'list' }
+ },
+ {
+ path: 'claimPatent',
+ component: () => import('@/views/admin/expert/technology/claimPatent'),
+ hidden: true,
+ name: 'claimPatent',
+ meta: { title: '认领专利', icon: 'list' }
+ },
{
path: 'paper',
component: () => import('@/views/admin/expert/technology/paper'),
@@ -397,6 +410,40 @@ export const expertRoutes=[
}
]
},
+ {
+ path: '/demand',
+ component: Layout,
+ meta: { title: '需求管理', icon: 'dashboard' },
+ alwaysShow:true,
+ redirect: '/demand/serviceDemand',
+ children: [
+ {
+ path: 'serviceDemand',
+ component: () => import('@/views/admin/expert/demand/serviceDemand'),
+ name: 'serviceDemand',
+ meta: { title: '服务需求', icon: 'list' }
+ },
+ {
+ path: 'release',
+ component: () => import('@/views/admin/expert/demand/release'),
+ hidden: true,
+ name: 'release',
+ meta: { title: '发布需求', icon: 'list' }
+ },
+ {
+ path: 'already',
+ component: () => import('@/views/admin/expert/demand/already'),
+ name: 'already',
+ meta: { title: '已合作企业', icon: 'list' }
+ },
+ {
+ path: 'think',
+ component: () => import('@/views/admin/expert/demand/think'),
+ name: 'think',
+ meta: { title: '想合作企业', icon: 'list' }
+ },
+ ]
+ },
]
export const researchRoutes=[
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 9b4f2b8..25ba571 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -41,20 +41,21 @@ const permission = {
return new Promise(resolve => {
let data = []
// localStorage.setItem('select_identity',role) // 测试
- if (role == 1) {
- // 企业
- data = enterpriseRoutes
- } else if (role == 2) {
- // 专家
- data = expertRoutes
- } else if (role == 4) {
- // 研究机构
- data = researchRoutes
- } else if (role == 8) {
- // 实验室
- } else if (role == 16) {
- // 科技经纪人
- }
+ // if (role == 1) {
+ // // 企业
+ // data = enterpriseRoutes
+ // } else if (role == 2) {
+ // // 专家
+ // data = expertRoutes
+ // } else if (role == 4) {
+ // // 研究机构
+ // data = researchRoutes
+ // } else if (role == 8) {
+ // // 实验室
+ // } else if (role == 16) {
+ // // 科技经纪人
+ // }
+ data = expertRoutes
data.map(item=>{
router.addRoute(item)
})
diff --git a/src/views/admin/expert/demand/already.vue b/src/views/admin/expert/demand/already.vue
new file mode 100644
index 0000000..39c3b98
--- /dev/null
+++ b/src/views/admin/expert/demand/already.vue
@@ -0,0 +1,296 @@
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/expert/demand/release.vue b/src/views/admin/expert/demand/release.vue
new file mode 100644
index 0000000..c4805c1
--- /dev/null
+++ b/src/views/admin/expert/demand/release.vue
@@ -0,0 +1,191 @@
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
diff --git a/src/views/admin/expert/demand/serviceDemand.vue b/src/views/admin/expert/demand/serviceDemand.vue
new file mode 100644
index 0000000..ee1f562
--- /dev/null
+++ b/src/views/admin/expert/demand/serviceDemand.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+ 发布需求
+
+
+
+
+
+
+ 待受理
+ 已受理
+ 已结束
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 删除
+ 取消发布
+ 查看
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/expert/demand/think.vue b/src/views/admin/expert/demand/think.vue
new file mode 100644
index 0000000..0ff7df8
--- /dev/null
+++ b/src/views/admin/expert/demand/think.vue
@@ -0,0 +1,297 @@
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/expert/technology/claimPatent.vue b/src/views/admin/expert/technology/claimPatent.vue
new file mode 100644
index 0000000..419f4d7
--- /dev/null
+++ b/src/views/admin/expert/technology/claimPatent.vue
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.apply_at) }}
+
+
+
+
+ 已认领
+ 未认领
+
+
+
+
+ 认领机构
+ 取消认领
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/expert/technology/paper.vue b/src/views/admin/expert/technology/paper.vue
index cbd4c8c..9658493 100644
--- a/src/views/admin/expert/technology/paper.vue
+++ b/src/views/admin/expert/technology/paper.vue
@@ -71,7 +71,6 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
-
+
{
// dataList.value = response.rows;
// total.value = response.total;
@@ -224,7 +217,6 @@ function handleQuery() {
}
/** 重置按钮操作 */
function resetQuery() {
- dateRange.value = [];
proxy.resetForm("queryRef");
handleQuery();
}
@@ -241,59 +233,16 @@ function handleDelete(row) {
})
.catch(() => {});
}
-/** 导出按钮操作 */
-function handleExport() {
- proxy.download(
- "system/role/export",
- {
- ...queryParams.value,
- },
- `role_${new Date().getTime()}.xlsx`
- );
-}
-/** 数据状态修改 */
-function handleStatusChange(row) {
- let text = row.status === "0" ? "启用" : "停用";
- proxy.$modal
- .confirm('确认要"' + text + '""' + row.roleName + '"数据吗?')
- .then(function () {
- return changeRoleStatus(row.roleId, row.status);
- })
- .then(() => {
- proxy.$modal.msgSuccess(text + "成功");
- })
- .catch(function () {
- row.status = row.status === "0" ? "1" : "0";
- });
-}
-/** 查询菜单树结构 */
-function getMenuTreeselect() {
- menuTreeselect().then((response) => {
- menuOptions.value = response.data;
- });
-}
-/** 所有部门节点数据 */
-function getDeptAllCheckedKeys() {
- // 目前被选中的部门节点
- let checkedKeys = deptRef.value.getCheckedKeys();
- // 半选中的部门节点
- let halfCheckedKeys = deptRef.value.getHalfCheckedKeys();
- checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
- return checkedKeys;
-}
+
/** 重置新增的表单以及其他数据 */
function reset() {
form.value = {
roleId: undefined,
roleName: undefined,
roleKey: undefined,
- roleSort: 0,
- status: "0",
+ author: undefined,
+ time: undefined,
keywords: [],
- menuIds: [],
- deptIds: [],
- menuCheckStrictly: true,
- deptCheckStrictly: true,
remark: undefined,
};
proxy.resetForm("roleRef");
@@ -307,97 +256,28 @@ function handleAdd() {
/** 修改数据 */
function handleUpdate(row) {
reset();
- const roleId = row.roleId || ids.value;
- const roleMenu = getRoleMenuTreeselect(roleId);
- getRole(roleId).then((response) => {
- form.value = response.data;
- form.value.roleSort = Number(form.value.roleSort);
- open.value = true;
- nextTick(() => {
- roleMenu.then((res) => {
- let checkedKeys = res.checkedKeys;
- checkedKeys.forEach((v) => {
- nextTick(() => {
- menuRef.value.setChecked(v, true, false);
- });
- });
- });
- });
- title.value = "修改数据";
- });
-}
-/** 根据数据ID查询菜单树结构 */
-function getRoleMenuTreeselect(roleId) {
- return roleMenuTreeselect(roleId).then((response) => {
- menuOptions.value = response.menus;
- return response;
- });
-}
-/** 根据数据ID查询部门树结构 */
-function getRoleDeptTreeselect(roleId) {
- return roleDeptTreeselect(roleId).then((response) => {
- deptOptions.value = response.depts;
- return response;
- });
-}
-/** 树权限(展开/折叠)*/
-function handleCheckedTreeExpand(value, type) {
- if (type == "menu") {
- let treeList = menuOptions.value;
- for (let i = 0; i < treeList.length; i++) {
- menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
- }
- } else if (type == "dept") {
- let treeList = deptOptions.value;
- for (let i = 0; i < treeList.length; i++) {
- deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
- }
- }
-}
-/** 树权限(全选/全不选) */
-function handleCheckedTreeNodeAll(value, type) {
- if (type == "menu") {
- menuRef.value.setCheckedNodes(value ? menuOptions.value : []);
- } else if (type == "dept") {
- deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
- }
-}
-/** 树权限(父子联动) */
-function handleCheckedTreeConnect(value, type) {
- if (type == "menu") {
- form.value.menuCheckStrictly = value ? true : false;
- } else if (type == "dept") {
- form.value.deptCheckStrictly = value ? true : false;
- }
-}
-/** 所有菜单节点数据 */
-function getMenuAllCheckedKeys() {
- // 目前被选中的菜单节点
- let checkedKeys = menuRef.value.getCheckedKeys();
- // 半选中的菜单节点
- let halfCheckedKeys = menuRef.value.getHalfCheckedKeys();
- checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
- return checkedKeys;
+ form.value = Object.assign({}, row);
+ open.value = true;
+ title.value = "修改数据";
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["roleRef"].validate((valid) => {
if (valid) {
- if (form.value.roleId != undefined) {
- form.value.menuIds = getMenuAllCheckedKeys();
- updateRole(form.value).then((response) => {
- proxy.$modal.msgSuccess("修改成功");
- open.value = false;
- getList();
- });
- } else {
- form.value.menuIds = getMenuAllCheckedKeys();
- addRole(form.value).then((response) => {
- proxy.$modal.msgSuccess("新增成功");
- open.value = false;
- getList();
- });
- }
+ console.log(form.value);
+ // if (form.value.roleId != undefined) {
+ // updateRole(form.value).then((response) => {
+ // proxy.$modal.msgSuccess("修改成功");
+ // open.value = false;
+ // getList();
+ // });
+ // } else {
+ // addRole(form.value).then((response) => {
+ // proxy.$modal.msgSuccess("新增成功");
+ // open.value = false;
+ // getList();
+ // });
+ // }
}
});
}
@@ -406,28 +286,6 @@ function cancel() {
open.value = false;
reset();
}
-/** 选择数据权限范围触发 */
-function dataScopeSelectChange(value) {
- if (value !== "2") {
- deptRef.value.setCheckedKeys([]);
- }
-}
-/** 提交按钮(数据权限) */
-function submitDataScope() {
- if (form.value.roleId != undefined) {
- form.value.deptIds = getDeptAllCheckedKeys();
- dataScope(form.value).then((response) => {
- proxy.$modal.msgSuccess("修改成功");
- openDataScope.value = false;
- getList();
- });
- }
-}
-/** 取消按钮(数据权限)*/
-function cancelDataScope() {
- openDataScope.value = false;
- reset();
-}
getList();
diff --git a/src/views/admin/expert/technology/patent.vue b/src/views/admin/expert/technology/patent.vue
new file mode 100644
index 0000000..e7b63a4
--- /dev/null
+++ b/src/views/admin/expert/technology/patent.vue
@@ -0,0 +1,400 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 新增
+
+
+
+ 认领
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.apply_at) }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/expert/technology/research.vue b/src/views/admin/expert/technology/research.vue
index 78552da..26bf678 100644
--- a/src/views/admin/expert/technology/research.vue
+++ b/src/views/admin/expert/technology/research.vue
@@ -1,3 +1,342 @@
- research
-
\ No newline at end of file
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 下架
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 承担单位
+ 参与单位
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/identity/components/CityOptions/index.vue b/src/views/identity/components/CityOptions/index.vue
index e1b7cc5..7b4e60c 100644
--- a/src/views/identity/components/CityOptions/index.vue
+++ b/src/views/identity/components/CityOptions/index.vue
@@ -7,10 +7,10 @@
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+