Skip to content

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

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

上级 e4687ddb 48b0dfe9
显示空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 70 行删除
src/router/index.js
浏览文件 @ df444173
......@@ -296,7 +296,7 @@ export const asyncRouterMap = [{
redirect: '/draw/sip',
alwaysShow: true,
meta: {
title: '提取模块',
title: '数据提取',
icon: 'icon-projectshequmokuai',
routerIds: ['22']
},
......
src/styles/index.scss
浏览文件 @ df444173
......@@ -575,3 +575,33 @@ p.divider {
}
}
}
// 修改资源状态按钮
.status_btn{
display: inline-block;
line-height: 1;
white-space: nowrap;
cursor: pointer;
background: #FFF;
color: #62738D;
border: 1px solid #62738D;
-webkit-appearance: none;
text-align: center;
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin: 0;
-webkit-transition: .1s;
transition: .1s;
font-weight: 500;
padding: 7px 15px;
font-size: 12px;
border-radius: 3px;
margin-left: 10px;
}
.status_btn.statusActive{
background-color: #00B5B8 !important;
border-color: #00B5B8 !important;
color: #fff !important;
}
.totalCount{
white-space: nowrap;
}
\ No newline at end of file
src/views/dataManagement/chart.vue
浏览文件 @ df444173
......@@ -751,6 +751,7 @@ export default {
let params={
day:90
}
this.surveyChart.showLoading();
getSurveyAPI(params).then(res=>{
if(res.data.code==0){
let resData=res.data.data;
......@@ -774,6 +775,7 @@ export default {
surveyOption.series[1]['data']=archiveNum||[];
surveyOption.series[2]['data']=handoverRatio||[];
surveyOption.series[3]['data']=hookRatio||[];
this.surveyChart.hideLoading();
this.surveyChart.setOption(surveyOption)
}else{
this.$message.error('获取资源概况失败')
......
src/views/dataManagement/index.scss
浏览文件 @ df444173
......@@ -41,12 +41,14 @@
}
.screeningConditions {
width:100%;
height:50px;
min-height:50px;
line-height:50px;
color:#62738D;
font-size:14px;
background:#F9FAFC;
border-bottom:1px solid #DCE1E9;
display: flex;
justify-content: space-between;
.screeningConditionsLeft {
float:left;
padding-left: 26px;
......
src/views/dataManagement/search.vue
浏览文件 @ df444173
......@@ -52,9 +52,12 @@
<!-- <em @click="searchTimerVisible=true">通过时间筛选</em> -->
<em @click="searchUserVisible=true" v-if="!searchForm.createrId">筛选用户提交</em>
<em class="clear_active" v-else @click="clearUaer">清空用户筛选</em>
<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
{{item.label}}
</span>
</div>
<div class="screeningConditionsRight">
<el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceType" style="width:120px" size="mini">
<!-- <el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceType" style="width:120px" size="mini">
<el-option
v-for="item in statusOptions"
:key="item.value"
......@@ -62,7 +65,7 @@
:value="item.value">
<span>{{ item.text }}</span>
</el-option>
</el-select>
</el-select> -->
<el-select v-model="searchForm.resourceType" placeholder="请选择" @change="changeResourceType" style="width:80px" size="mini">
<el-option
v-for="item in options"
......@@ -71,7 +74,7 @@
:value="item.value">
</el-option>
</el-select>
<span>共找到{{totalCount}}条数据</span>
<span class="totalCount">共找到{{totalCount}}条数据</span>
</div>
</div>
<div class="list_wrap clearfix">
......@@ -204,10 +207,6 @@ export default {
inputVal:'',
inputType:1,
statusOptions:[{
value: '',
label: '资源状态',
text:"全部"
}, {
value: 5,
label: '已入库',
text:"已入库",
......@@ -407,6 +406,11 @@ export default {
}
this.getList();
},
changeStatus(item){
let {value }=item;
this.searchForm.status=value;
this.getList();
},
changeResourceType(){
this.getList();
},
......
src/views/draw/resources/index.scss
浏览文件 @ df444173
......@@ -59,7 +59,7 @@
}
.sipConditions {
width:100%;
height:52px;
min-height:52px;
line-height:50px;
color:#62738D;
font-size:14px;
......@@ -67,6 +67,8 @@
border-bottom:1px solid #DCE1E9;
border-top:1px solid #DCE1E9;
padding: 0 20px;
display: flex;
justify-content: space-between;
.screeningConditionsLeft {
.el-button--success.is-plain{
color: #62738D !important;
......
src/views/draw/resources/index.vue
浏览文件 @ df444173
......@@ -37,9 +37,12 @@
<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>
<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
{{item.label}}
</span>
</div>
<div class="screeningConditionsRight">
<el-select v-model="searchForm.status" placeholder="资源状态" size="mini" @change="changeResourceType" style="width:140px">
<!-- <el-select v-model="searchForm.status" placeholder="资源状态" size="mini" @change="changeResourceType" style="width:140px">
<el-option
v-for="item in statusOptions"
:key="item.value"
......@@ -47,7 +50,7 @@
:value="item.value">
<span>{{item.text}}</span>
</el-option>
</el-select>
</el-select> -->
<el-select v-model="searchForm.resourceType" size="mini" placeholder="请选择" @change="changeResourceType" style="width:140px">
<el-option
v-for="item in options"
......@@ -56,7 +59,7 @@
:value="item.value">
</el-option>
</el-select>
<span>共找到{{totalCount}}条数据</span>
<span class="totalCount">共找到{{totalCount}}条数据</span>
</div>
</div>
<div class="list_wrap clearfix">
......@@ -168,11 +171,7 @@ export default {
value: 5,
label: '三维文件'
}],
statusOptions:[{
value: '',
label: '资源状态',
text: '全部'
}, {
statusOptions:[ {
value: 5,
label: '已入库',
text: '已入库'
......@@ -398,6 +397,11 @@ export default {
this.searchForm.orderBy='createTime '+ this.createTime;
this.getList()
},
changeStatus(item){
let {value }=item;
this.searchForm.status=value;
this.getList();
},
changeResourceType(){
this.getList();
},
......
src/views/storagemodule/storageinfomanger/resourcelook.vue
浏览文件 @ df444173
......@@ -38,6 +38,9 @@
<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>
<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
{{item.label}}
</span>
</div>
<div class="screeningConditionsRight">
<el-select v-model="searchForm.resourceType" placeholder="请选择" @change="changeResourceType" style="width:140px">
......@@ -48,7 +51,7 @@
:value="item.value">
</el-option>
</el-select>
<el-select v-model="searchForm.status" placeholder="资源状态" @change="changeResourceType" style="width:140px">
<!-- <el-select v-model="searchForm.status" placeholder="资源状态" @change="changeResourceType" style="width:140px">
<el-option
v-for="item in statusOptions"
:key="item.value"
......@@ -56,8 +59,8 @@
:value="item.value">
<span>{{item.text}}</span>
</el-option>
</el-select>
<span>共找到{{totalCount}}条数据</span>
</el-select> -->
<span class="totalCount">共找到{{totalCount}}条数据</span>
</div>
</div>
<div class="list_wrap clearfix">
......@@ -163,11 +166,7 @@ export default {
value: 5,
label: '三维文件'
}],
statusOptions:[{
value: '',
label: '资源状态',
text: '全部'
}, {
statusOptions:[ {
value: '0',
label: '待录入',
text: '待录入'
......@@ -405,6 +404,11 @@ export default {
this.searchForm.orderBy='createTime '+ this.createTime;
this.getList()
},
changeStatus(item){
let {value }=item;
this.searchForm.status=value;
this.getList();
},
changeResourceType(){
this.getList();
},
......
src/views/submission/infoview/allresource.vue
浏览文件 @ df444173
......@@ -13,6 +13,9 @@
<span @click="createTimeSort" class="btn" :class="[createTime?'active':'']">提交时间<i :class="[createTime=='desc'?'icon-projectjiantouxia':'icon-projectjiantoushang']"></i></span>
<em @click="searchUserVisible=true" v-if="!searchForm.createrId">筛选用户提交</em>
<em class="empty" v-else @click="clearUaer">清空用户筛选</em>
<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
{{item.label}}
</span>
</div>
<div class="screeningConditionsRight">
<!-- <label for="">检索：</label>
......@@ -25,15 +28,15 @@
:value="item.value">
</el-option>
</el-select>
<el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceStatus" style="width:160px">
<!-- <el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceStatus" style="width:160px">
<el-option
v-for="item in optionsStatus"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<span>共找到{{totalCount}}条数据</span>
</el-select> -->
<span class="totalCount">共找到{{totalCount}}条数据</span>
</div>
</div>
<div class="list_wrap clearfix">
......@@ -152,9 +155,6 @@ export default {
label: '三维文件'
}],
optionsStatus: [{
value: '',
label: '全部'
},{
value: '0',
label: '待录入'
}, {
......@@ -304,6 +304,11 @@ export default {
this.getList();
this.searchUserVisible=false;
},
changeStatus(item){
let {value }=item;
this.searchForm.status=value;
this.getList();
},
changeResourceType(){//根据资源类型搜索
this.getList();
},
......@@ -425,12 +430,14 @@ export default {
}
.screeningConditions {
width:100%;
height:50px;
min-height:50px;
line-height:50px;
color:#62738D;
font-size:14px;
background:#F9FAFC;
border-bottom:1px solid #DCE1E9;
display: flex;
justify-content: space-between;
.screeningConditionsLeft {
float:left;
padding-left: 26px;
......
src/views/submission/infoview/browsebycategory.vue
浏览文件 @ df444173
......@@ -38,12 +38,14 @@
<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>
<el-button type="success" plain size="mini" @click="alertBatchBack">待录入</el-button>
<el-button type="success" plain size="mini" @click="alertBatchBack">待交接</el-button>
<el-button type="success" plain size="mini" @click="alertBatchBack">待挂接</el-button>
<el-button type="success" plain size="mini" @click="alertBatchBack">通过交接</el-button>
<el-button type="success" plain size="mini" @click="alertBatchBack">拒绝交接</el-button>
<el-button type="success" plain size="mini" @click="alertBatchBack">已入库</el-button>
<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in statusOptions" :key="item.value" @click="changeStatus(item)">
{{item.label}}
</span>
<!-- <el-button type="success" plain size="mini">待交接</el-button>
<el-button type="success" plain size="mini">待挂接</el-button>
<el-button type="success" plain size="mini">通过交接</el-button>
<el-button type="success" plain size="mini">拒绝交接</el-button>
<el-button type="success" plain size="mini">已入库</el-button> -->
</div>
<div class="screeningConditionsRight">
<el-select v-model="searchForm.resourceType" placeholder="请选择" @change="changeResourceType" style="width:140px">
......@@ -54,7 +56,7 @@
:value="item.value">
</el-option>
</el-select>
<el-select v-model="searchForm.status" placeholder="资源状态" @change="changeResourceType" style="width:140px">
<!-- <el-select v-model="searchForm.status" placeholder="资源状态" @change="changeResourceType" style="width:140px">
<el-option
v-for="item in statusOptions"
:key="item.value"
......@@ -62,8 +64,8 @@
:value="item.value">
<span>{{item.text}}</span>
</el-option>
</el-select>
<span>共找到{{totalCount}}条数据</span>
</el-select> -->
<span class="totalCount">共找到{{totalCount}}条数据</span>
</div>
</div>
<div class="list_wrap clearfix">
......@@ -174,11 +176,13 @@ export default {
value: 5,
label: '三维文件'
}],
statusOptions:[{
value: '',
label: '资源状态',
text: '全部'
}, {
statusOptions:[
// {
// value: '',
// label: '资源状态',
// text: '全部'
// },
{
value: '0',
label: '待录入',
text: '待录入'
......@@ -188,8 +192,8 @@ export default {
text: '待交接'
}, {
value: '2',
label: '待挂接文件',
text: '待挂接文件'
label: '待挂接',
text: '待挂接'
}, {
value: '3',
label: '通过交接',
......@@ -457,6 +461,11 @@ export default {
this.searchForm.orderBy='createTime '+ this.createTime;
this.getList()
},
changeStatus(item){
let {value }=item;
this.searchForm.status=value;
this.getList();
},
changeResourceType(){
this.getList();
},
......
src/views/submission/infoview/editphotoresource.vue
浏览文件 @ df444173
......@@ -94,7 +94,7 @@
</div>
<div class="threeBtn">
<button @click="$router.back(-1)">取消</button>
<button @click="saveEdit">保存变更</button>
<button @click="saveEdit">再次提交</button>
</div>
</div>
<mapmark :isShowMark="isShowMark" @changeIsShowMark="changeVal" @locationChange="locationChange"></mapmark>
......
src/views/submission/infoview/index.scss
浏览文件 @ df444173
.resource_wrap{
.totalCount{
white-space: nowrap;
}
.title{
color: #2E3E6C;
font-size: 16px;
......@@ -55,8 +58,10 @@
}
.sipConditions {
width:100%;
height:52px;
min-height:52px;
line-height:50px;
display: flex;
justify-content: space-between;
color:#62738D;
font-size:14px;
background:#F9FAFC;
......
src/views/submission/infoview/mycommit.vue
浏览文件 @ df444173
......@@ -11,6 +11,9 @@
<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>
<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
{{item.label}}
</span>
</div>
<div class="screeningConditionsRight">
<!-- <label for="">检索：</label> -->
......@@ -23,15 +26,15 @@
:value="item.value">
</el-option>
</el-select>
<el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceStatus" style="width:160px">
<!-- <el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceStatus" style="width:160px">
<el-option
v-for="item in optionsStatus"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<span>共找到{{totalCount}}条数据</span>
</el-select> -->
<span class="totalCount">共找到{{totalCount}}条数据</span>
</div>
</div>
<div class="list_wrap clearfix">
......@@ -115,9 +118,6 @@ export default {
label: '三维文件'
}],
optionsStatus: [{
value: '',
label: '全部'
},{
value: '0',
label: '待录入',
}, {
......@@ -266,6 +266,11 @@ export default {
this.getList();
this.searchUserVisible=false;
},
changeStatus(item){
let {value }=item;
this.searchForm.status=value;
this.getList();
},
changeResourceType(){//根据资源类型搜索
this.getList();
},
......@@ -350,14 +355,15 @@ export default {
}
.screeningConditions {
width:100%;
height:50px;
line-height:50px;
color:#62738D;
font-size:14px;
background:#F9FAFC;
border-bottom:1px solid #DCE1E9;
min-height: 50px;
line-height: 50px;
display: flex;
justify-content: space-between;
.screeningConditionsLeft {
float:left;
padding-left: 26px;
.iconfont{
font-size: 14px;
......@@ -402,7 +408,6 @@ export default {
}
}
.screeningConditionsRight {
float:right;
margin-right:26px;
label {
font-weight:400;
......
src/views/submission/infoview/myedit.vue
浏览文件 @ df444173
......@@ -11,7 +11,9 @@
<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>
<span class="status_btn" :class="[searchForm.status==item.value?'statusActive':'']" v-for="item in optionsStatus" :key="item.value" @click="changeStatus(item)">
{{item.label}}
</span>
</div>
<div class="screeningConditionsRight">
<!-- <label for="">检索：</label>
......@@ -24,15 +26,15 @@
:value="item.value">
</el-option>
</el-select>
<el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceStatus" style="width:160px">
<!-- <el-select v-model="searchForm.status" placeholder="请选择" @change="changeResourceStatus" style="width:160px">
<el-option
v-for="item in optionsStatus"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<span>共找到{{totalCount}}条数据</span>
</el-select> -->
<span class="totalCount">共找到{{totalCount}}条数据</span>
</div>
</div>
<div class="list_wrap clearfix">
......@@ -116,9 +118,6 @@ export default {
label: '三维文件'
}],
optionsStatus: [{
value: '',
label: '全部'
},{
value: '0',
label: '待录入'
}, {
......@@ -266,6 +265,11 @@ export default {
this.getList();
this.searchUserVisible=false;
},
changeStatus(item){
let {value }=item;
this.searchForm.status=value;
this.getList();
},
changeResourceType(){//根据资源类型搜索
this.getList();
},
......@@ -350,12 +354,14 @@ export default {
}
.screeningConditions {
width:100%;
height:50px;
min-height:50px;
line-height:50px;
color:#62738D;
font-size:14px;
background:#F9FAFC;
border-bottom:1px solid #DCE1E9;
display: flex;
justify-content: space-between;
.screeningConditionsLeft {
float:left;
padding-left: 26px;
......
src/views/submission/resourcecommit/index.vue
浏览文件 @ df444173
......@@ -174,7 +174,7 @@
<button @click="$router.back(-1)">取消</button>
<!-- <button v-if="isShowSavaBtn">提交并转录目录</button> -->
<button @click="commitResource" v-if="isShowSavaBtn">提交入库</button>
<button @click="saveEdit" v-if="isShowSavaBtn1">保存变更</button>
<button @click="saveEdit" v-if="isShowSavaBtn1">再次提交</button>
</div>
</div>
<el-dialog title="标签资源" :visible.sync="dialogTableVisible" class="lableDia">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论