Skip to content

K
knowledgeServiceAdmin
提交 a95778f3 authored 作者: 王腾飞's avatar 王腾飞
浏览文件
操作

Merge branch 'dev' of http://192.168.2.120/quanlili/knowledgeServiceAdmin into wtf

上级 212d7ed5 f585fd1a
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 72 行增加 和 33 行删除
src/api/metadata/index.js
浏览文件 @ a95778f3
......@@ -77,6 +77,20 @@ export function importOrganizationAPI(data) { //导入机构实体
data
})
}
export function importTimerAPI(data) { //导入时间实体
return request({
url: `${requestPath.resource}/participle/save/time`,
method: 'post',
data
})
}
export function addEntityAPI(data) { //新增实体
return request({
url: `${requestPath.resource}/participle/save/entity`,
method: 'post',
data
})
}
export function backDetialAPI(params) { //回显实体
return request({
url: `${requestPath.resource}/participle/entity`,
......
src/router/index.js
浏览文件 @ a95778f3
......@@ -158,7 +158,8 @@ export const asyncRouterMap = [{
name: 'mycommit',
meta: {
title: '我提交的',
routerIds: ['090301']
routerIds: ['090301'],
search:true
},
},{
path: 'myedit',
......@@ -166,7 +167,8 @@ export const asyncRouterMap = [{
name: 'myedit',
meta: {
title: '我编辑的',
routerIds: ['090302']
routerIds: ['090302'],
search:true
},
},{
path: 'allresource',
......@@ -174,7 +176,8 @@ export const asyncRouterMap = [{
name: 'allresource',
meta: {
title: '全部资源',
routerIds: ['090303']
routerIds: ['090303'],
search:true
},
},{
path: 'browsebycategory',
......
src/views/storagemodule/namedentity/character.vue
浏览文件 @ a95778f3
......@@ -308,7 +308,10 @@ let relateOptaion={
}
},
tooltip: {
//formatter: '{b}'
// formatter: function(params,a,b,c){
// //return params.data.target+">"+params.data.source+":"+params.data.value
// console.log(params.data,'777777')
// }
},
toolbox: {
show: true,
......@@ -392,11 +395,12 @@ let relateOptaion={
],
roam: true,
nodeScaleRatio: 0, //鼠标漫游缩放时节点的相应缩放比例，当设为0时节点不随着鼠标的缩放而缩放
focusNodeAdjacency: false, //是否在鼠标移到节点上的时候突出显示节点以及节点的边和邻接节点。
focusNodeAdjacency: true, //是否在鼠标移到节点上的时候突出显示节点以及节点的边和邻接节点。
lineStyle: {
normal: {
// text: relarr[i],
color: 'source'
//color: 'source'
color:'#DCDFE6'
}
},
label: {
......@@ -409,10 +413,10 @@ let relateOptaion={
fontSize: "12" //字体大小
},
formatter: function(params) {
return params.data.showName //此处为label转换 并转换颜色
return params.data.showName //此处为label转换 并转换颜色
},
fontSize: 18,
fontStyle: '600',
//fontStyle: '600',
}
},
edgeLabel: {
......@@ -691,13 +695,19 @@ export default {
name: '',
type: 'wordCloud',
shape: 'circle',
size: ['80%', '80%'],
textRotation: [0, 45, 90, -45],
textPadding: 0,
autoSize: {
enable: true,
minSize: 14
},
// size: ['80%', '80%'],
// sizeRange:[12,50],
// rotationRange:[0,0],
// gridSize:[12,50],
// textRotation: [0, 45, 90, -45],
// textPadding: 0,
// autoSize: {
// enable: true,
// minSize: 14
// },
rotationRange: [0,0],
sizeRange: [12, 50],
gridSize: 20,
textStyle: {
normal: {
fontFamily: 'sans-serif',
......
src/views/submission/infoview/allresource.vue
浏览文件 @ a95778f3
......@@ -11,6 +11,10 @@
<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
<span @click="sizeSort" class="btn" :class="[size?'active':'']">资源大小<i :class="[size=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
</div>
<div class="screeningConditionsRight">
<!-- <label for="">检索：</label>
<input type="text"> -->
<el-select v-model="searchForm.resourceType" placeholder="请选择" @change="changeResourceType" style="width:160px">
<el-option
v-for="item in options"
......@@ -27,10 +31,6 @@
:value="item.value">
</el-option>
</el-select>
</div>
<div class="screeningConditionsRight">
<label for="">检索：</label>
<input type="text">
<span>共找到{{totalCount}}条数据</span>
</div>
</div>
......@@ -81,7 +81,7 @@ import pagination from '@/components/pagination/pagination'
import { operationMsg, confirm } from '@/utils/publicFunctions'
import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js";
export default {
name: 'metadata',
name: 'allresource',
components:{pagination},
data () {
return {
......@@ -154,6 +154,10 @@ export default {
//asc //desc
mounted() {
this.getList();
this.bus.$off('searchList').$on('searchList', content => {
this.searchForm.content=content;
this.getList();
});
},
watch: {
},
......
src/views/submission/infoview/mycommit.vue
浏览文件 @ a95778f3
......@@ -11,6 +11,10 @@
<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
<span @click="sizeSort" class="btn" :class="[size?'active':'']">资源大小<i :class="[size=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
</div>
<div class="screeningConditionsRight">
<!-- <label for="">检索：</label> -->
<!-- <input type="text"> -->
<el-select v-model="searchForm.resourceType" placeholder="请选择" @change="changeResourceType" style="width:160px">
<el-option
v-for="item in options"
......@@ -27,10 +31,6 @@
:value="item.value">
</el-option>
</el-select>
</div>
<div class="screeningConditionsRight">
<label for="">检索：</label>
<input type="text">
<span>共找到{{totalCount}}条数据</span>
</div>
</div>
......@@ -81,7 +81,7 @@ import { operationMsg, confirm } from '@/utils/publicFunctions'
import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js";
import Cookies from 'js-cookie'
export default {
name: 'metadata',
name: 'mycommit',
components:{pagination},
data () {
return {
......@@ -145,7 +145,8 @@ export default {
createTime: null,
createrId: Cookies.get('userId'),
pageNum: 1,
pageSize: 30
pageSize: 30,
content:''
},
searchUserForm:{},
dateTime:'',
......@@ -159,7 +160,10 @@ export default {
//asc //desc
mounted() {
this.getList();
console.log(this.searchForm.createrId, '99999999')
this.bus.$off('searchList').$on('searchList', content => {
this.searchForm.content=content;
this.getList();
});
},
watch: {
},
......
src/views/submission/infoview/myedit.vue
浏览文件 @ a95778f3
......@@ -11,6 +11,11 @@
<span @click="formationSort" class="btn" :class="[formation?'active':'']">形成时间<i :class="[formation=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
<span @click="sizeSort" class="btn" :class="[size?'active':'']">资源大小<i :class="[size=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
</div>
<div class="screeningConditionsRight">
<!-- <label for="">检索：</label>
<input type="text"> -->
<el-select v-model="searchForm.resourceType" placeholder="请选择" @change="changeResourceType" style="width:160px">
<el-option
v-for="item in options"
......@@ -27,10 +32,6 @@
:value="item.value">
</el-option>
</el-select>
</div>
<div class="screeningConditionsRight">
<label for="">检索：</label>
<input type="text">
<span>共找到{{totalCount}}条数据</span>
</div>
</div>
......@@ -81,7 +82,7 @@ import { operationMsg, confirm } from '@/utils/publicFunctions'
import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js";
import Cookies from 'js-cookie'
export default {
name: 'metadata',
name: 'myedit',
components:{pagination},
data () {
return {
......@@ -157,7 +158,10 @@ export default {
//asc //desc
mounted() {
this.getList();
console.log(Cookies.get('userId'),"()()()00")
this.bus.$off('searchList').$on('searchList', content => {
this.searchForm.content=content;
this.getList();
});
},
watch: {
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论