Skip to content

9
912project
提交 df850bd1 authored 作者: CRS's avatar CRS
浏览文件
操作

new

上级 18d5f26c f59ec0cf
显示空白字符变更
内嵌 并排
正在显示 包含 488 行增加 和 35 行删除
src/components/UnDependenceDispose/UnDependence.vue
浏览文件 @ df850bd1
...@@ -90,8 +90,8 @@ export default { ...@@ -90,8 +90,8 @@ export default {
} }
this.$server.getConfigPageList(this.myPage, this.pageSize, obj).then(res => { this.$server.getConfigPageList(this.myPage, this.pageSize, obj).then(res => {
console.log(res); console.log(res);
this.tableData = res.data.objects; this.tableData = res.data.rows;
this.tablePageSize = res.data.totalElement; this.tablePageSize = res.data.total;
}) })
}, },
// 数据 // 数据
...@@ -100,8 +100,8 @@ export default { ...@@ -100,8 +100,8 @@ export default {
technologyName:this.technologyId technologyName:this.technologyId
} }
this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => { this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
this.tableData = res.data.objects; this.tableData = res.data.rows;
this.tablePageSize = res.data.totalElement; this.tablePageSize = res.data.total;
}); });
}, },
// 点击分页 // 点击分页
...@@ -122,7 +122,7 @@ export default { ...@@ -122,7 +122,7 @@ export default {
// 支持国产化 // 支持国产化
yesEdit(row, index){ yesEdit(row, index){
let obj = { let obj = {
suffix: ['java'], suffix: 'java',
target: row.target, target: row.target,
technologyId: '967a8bd0-eb27-4fb6-ba1d-1bca21cea5b4', technologyId: '967a8bd0-eb27-4fb6-ba1d-1bca21cea5b4',
technologyName: '内部依赖(支持)', technologyName: '内部依赖(支持)',
......
src/components/assessment/homeDetailcopy.vue
浏览文件 @ df850bd1
...@@ -74,6 +74,42 @@ ...@@ -74,6 +74,42 @@
<el-input v-model="notime"></el-input> <el-input v-model="notime"></el-input>
<span class="input_text">月</span> <span class="input_text">月</span>
</el-form-item> </el-form-item>
<el-form-item label="单位名称：" style="opacity:0;">
<el-input v-model="notime"></el-input>
</el-form-item>
<el-form-item label="单位名称：" style="opacity:0;">
<el-input v-model="notime"></el-input>
</el-form-item>
<el-form-item label="单位名称：">
<el-input v-model="notime"></el-input>
</el-form-item>
<el-form-item label="单位联系人：">
<el-input v-model="notime"></el-input>
</el-form-item>
<el-form-item label="单位电话：">
<el-input v-model="notime"></el-input>
</el-form-item>
<el-form-item label="原单位联系人：">
<el-input v-model="notime"></el-input>
</el-form-item>
<el-form-item label="原单位电话：">
<el-input v-model="notime"></el-input>
</el-form-item>
<div class="form-radio one"> <div class="form-radio one">
<div class="radio-text one">开发单位是否为本地：</div> <div class="radio-text one">开发单位是否为本地：</div>
<el-radio <el-radio
...@@ -100,6 +136,19 @@ ...@@ -100,6 +136,19 @@
@click.native.prevent="clickitem1('form','secret',2)" @click.native.prevent="clickitem1('form','secret',2)"
>否</el-radio> >否</el-radio>
</div> </div>
<div class="form-radio one">
<div class="radio-text one">原应用是否通过等级保护：</div>
<el-radio
v-model="form.secret"
:label="1"
@click.native.prevent="clickitem1('form','secret',1)"
>是</el-radio>
<el-radio
v-model="form.secret"
:label="2"
@click.native.prevent="clickitem1('form','secret',2)"
>否</el-radio>
</div>
<div class="form-radio one"> <div class="form-radio one">
<div class="radio-text one">容灾能力：</div> <div class="radio-text one">容灾能力：</div>
<el-radio <el-radio
...@@ -198,12 +247,12 @@ ...@@ -198,12 +247,12 @@
</el-form> </el-form>
</div> </div>
<!-- <div class="line"></div> --> <!-- <div class="line"></div> -->
<div :class="{'pg-button no':!isLog,'pg-button':isLog}" @click="goPrev">对应评估报告</div> <div :class="{'pg-button no':!isLog,'pg-button':isLog}" @click="goPrev">上次报告</div>
<div <div
:class="{'pg-button':form.cost!=''&& form.projectName!='' ,'pg-button no':form.cost==''|| form.projectName=='' }" :class="{'pg-button':form.cost!=''&& form.projectName!='' ,'pg-button no':form.cost==''|| form.projectName=='' }"
@click="goPg2(1)" @click="goPg2(1)"
>保存并快速评估</div> >快速评估</div>
<div class="pg-button" @click="goBack">关闭</div> <div class="pg-button" @click="goBack">关闭</div>
</div> </div>
</div> </div>
...@@ -246,6 +295,18 @@ ...@@ -246,6 +295,18 @@
src="./img/doform.png" src="./img/doform.png"
alt alt
/></li>
<li :class="{'box-nav-title':true,'active':isOpen7}" @click="open7">原开发语言体系 <img
v-show="systemStructure.application.deploy == '' && systemStructure.application.operateSystem == '' && systemStructure.application.other == '' && systemStructure.application.edition == '' && systemStructure.database.other == '' && systemStructure.database.deploy == '' && systemStructure.database.operateSystem == '' && systemStructure.database.edition == '' && systemStructure.storage.edition == '' && systemStructure.storage.other == '' && systemStructure.storage.deploy == '' && systemStructure.storage.operateSystem == '' && systemStructure.otherEquipment.operateSystem == '' && systemStructure.otherEquipment.edition == '' && systemStructure.otherEquipment.deploy == '' && systemStructure.otherEquipment.other == '' && systemStructure.slb.operateSystem == '' && systemStructure.slb.edition == '' && systemStructure.slb.deploy == '' && systemStructure.slb.other == '' && systemStructure.otherDemand == '' && systemStructure.loadBalance == '' && systemStructure.disaster == '' && systemStructure.distributed == ''"
src="./img/noform.png"
alt
/>
<img
v-show="systemStructure.application.deploy != '' || systemStructure.application.operateSystem != '' || systemStructure.application.other != '' || systemStructure.application.edition != '' || systemStructure.database.other != '' || systemStructure.database.deploy != '' || systemStructure.database.operateSystem != '' || systemStructure.database.edition != '' || systemStructure.storage.edition != '' || systemStructure.storage.other != '' || systemStructure.storage.deploy != '' || systemStructure.storage.operateSystem != '' || systemStructure.otherEquipment.operateSystem != '' || systemStructure.otherEquipment.edition != '' || systemStructure.otherEquipment.deploy != '' || systemStructure.otherEquipment.other != '' || systemStructure.slb.operateSystem != '' || systemStructure.slb.edition != '' || systemStructure.slb.deploy != '' || systemStructure.slb.other != '' || systemStructure.otherDemand != '' || systemStructure.loadBalance != '' || systemStructure.disaster != '' || systemStructure.distributed != ''"
src="./img/doform.png"
alt
/></li> /></li>
<li :class="{'box-nav-title':true,'active':isOpen2}" @click="open2">前端浏览器相关 <img <li :class="{'box-nav-title':true,'active':isOpen2}" @click="open2">前端浏览器相关 <img
v-show="browser.plugInUnit == '' && browser.compatibleBrowsers == '' && browser.otherBrowser=='' && browser.geography == '' && browser.peripheral == '' && browser.media == '' && browser.animation== '' && browser.document == '' && browser.threeD == ''&& browser.flash == '' && browser.otherDemand == ''" v-show="browser.plugInUnit == '' && browser.compatibleBrowsers == '' && browser.otherBrowser=='' && browser.geography == '' && browser.peripheral == '' && browser.media == '' && browser.animation== '' && browser.document == '' && browser.threeD == ''&& browser.flash == '' && browser.otherDemand == ''"
...@@ -679,6 +740,366 @@ ...@@ -679,6 +740,366 @@
>是</el-radio> >是</el-radio>
</div> </div>
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">容灾：</div>
<el-radio
v-model="systemStructure.disaster"
:label="1"
@click.native.prevent="clickitem1('systemStructure','disaster',1)"
>是</el-radio>
<div class="copy-box-main-input more">
<span class="box-input-text">其他：</span>
<el-input v-model="systemStructure.otherDemand" placeholder="请输入"></el-input>
</div>
</div>
</div>
</div>
</div>
<div class="open-box" v-show="isOpen7">
<div class="copy-nav-title-two">
<span class="ball"></span>主要开发架构
</div>
<div class="copy-nav-main noborder">
<div class="copy-nav-main-title">应用服务器：</div>
<div class="copy-nav-main-main">
<div class="form-radio">
<div class="radio-text">部署情况：</div>
<el-radio
v-model="systemStructure.application.deploy"
@click.native.prevent="clickitem('application','deploy',1)"
:label="1"
>本地</el-radio>
<el-radio
v-model="systemStructure.application.deploy"
@click.native.prevent="clickitem('application','deploy',2)"
:label="2"
>政务云</el-radio>
</div>
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">操作系统：</div>
<div class="radios-box">
<el-radio
v-model="systemStructure.application.operateSystem"
@click.native.prevent="clickitem('application','operateSystem','WINSERVER2006')"
label="WINSERVER2006"
>WinServer 2006-2008/X64</el-radio>
<el-radio
v-model="systemStructure.application.operateSystem"
@click.native.prevent="clickitem('application','operateSystem','WINSERVER2012')"
label="WINSERVER2012"
>WinServer 2012-2019/X64</el-radio>
<el-radio
v-model="systemStructure.application.operateSystem"
@click.native.prevent="clickitem('application','operateSystem','UBUNTU')"
label="UBUNTU"
>Ubuntu Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.application.operateSystem"
label="CENTEROSREALES"
@click.native.prevent="clickitem('application','operateSystem','CENTEROSREALES')"
>CentOS Reales X.XX-X.XX</el-radio>
<el-radio
v-model="systemStructure.application.operateSystem"
@click.native.prevent="clickitem('application','operateSystem','REDHATREALES')"
label="REDHATREALES"
>Redhat Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.application.operateSystem"
@click.native.prevent="clickitem('application','operateSystem','AIX')"
label="AIX"
>AIX Version X.X-X.X</el-radio>
</div>
<div class="copy-box-main-input">
<span class="box-input-text">其他：</span>
<el-input v-model="systemStructure.application.other" placeholder="请输入"></el-input>
</div>
<div class="copy-box-main-input bottom">
<span class="box-input-text">版本：</span>
<el-input v-model="systemStructure.application.edition" placeholder="请输入"></el-input>
</div>
</div>
</div>
</div>
<div class="copy-nav-main noborder">
<div class="copy-nav-main-title">数据库服务器：</div>
<div class="copy-nav-main-main">
<div class="form-radio">
<div class="radio-text">部署情况：</div>
<el-radio
v-model="systemStructure.database.deploy"
:label="1"
@click.native.prevent="clickitem('database','deploy',1)"
>本地</el-radio>
<el-radio
v-model="systemStructure.database.deploy"
:label="2"
@click.native.prevent="clickitem('database','deploy',2)"
>政务云</el-radio>
</div>
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">操作系统：</div>
<div class="radios-box">
<el-radio
v-model="systemStructure.database.operateSystem"
@click.native.prevent="clickitem('database','operateSystem','WINSERVER2006')"
label="WINSERVER2006"
>WinServer 2006-2008/X64</el-radio>
<el-radio
v-model="systemStructure.database.operateSystem"
@click.native.prevent="clickitem('database','operateSystem','WINSERVER2012')"
label="WINSERVER2012"
>WinServer 2012-2019/X64</el-radio>
<el-radio
v-model="systemStructure.database.operateSystem"
@click.native.prevent="clickitem('database','operateSystem','UBUNTU')"
label="UBUNTU"
>Ubuntu Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.database.operateSystem"
@click.native.prevent="clickitem('database','operateSystem','CENTEROSREALES')"
label="CENTEROSREALES"
>CentOS Reales X.XX-X.XX</el-radio>
<el-radio
v-model="systemStructure.database.operateSystem"
@click.native.prevent="clickitem('database','operateSystem','REDHATREALES')"
label="REDHATREALES"
>Redhat Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.database.operateSystem"
@click.native.prevent="clickitem('database','operateSystem','AIX')"
label="AIX"
>AIX Version X.X-X.X</el-radio>
</div>
<div class="copy-box-main-input">
<span class="box-input-text">其他：</span>
<el-input v-model="systemStructure.database.other" placeholder="请输入"></el-input>
</div>
<div class="copy-box-main-input bottom">
<span class="box-input-text">版本：</span>
<el-input v-model="systemStructure.database.edition" placeholder="请输入"></el-input>
</div>
</div>
</div>
</div>
<div class="copy-nav-main noborder">
<div class="copy-nav-main-title">slb：</div>
<div class="copy-nav-main-main">
<div class="form-radio">
<div class="radio-text">部署情况：</div>
<el-radio
v-model="systemStructure.slb.deploy"
:label="1"
@click.native.prevent="clickitem('slb','deploy',1)"
>本地</el-radio>
<el-radio
v-model="systemStructure.slb.deploy"
:label="2"
@click.native.prevent="clickitem('slb','deploy',2)"
>政务云</el-radio>
</div>
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">操作系统：</div>
<div class="radios-box">
<el-radio
v-model="systemStructure.slb.operateSystem"
@click.native.prevent="clickitem('slb','operateSystem','WINSERVER2006')"
label="WINSERVER2006"
>WinServer 2006-2008/X64</el-radio>
<el-radio
v-model="systemStructure.slb.operateSystem"
@click.native.prevent="clickitem('slb','operateSystem','WINSERVER2012')"
label="WINSERVER2012"
>WinServer 2012-2019/X64</el-radio>
<el-radio
v-model="systemStructure.slb.operateSystem"
@click.native.prevent="clickitem('slb','operateSystem','UBUNTU')"
label="UBUNTU"
>Ubuntu Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.slb.operateSystem"
@click.native.prevent="clickitem('slb','operateSystem','CENTEROSREALES')"
label="CENTEROSREALES"
>CentOS Reales X.XX-X.XX</el-radio>
<el-radio
v-model="systemStructure.slb.operateSystem"
@click.native.prevent="clickitem('slb','operateSystem','REDHATREALES')"
label="REDHATREALES"
>Redhat Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.slb.operateSystem"
@click.native.prevent="clickitem('slb','operateSystem','AIX')"
label="AIX"
>AIX Version X.X-X.X</el-radio>
</div>
<div class="copy-box-main-input">
<span class="box-input-text">其他：</span>
<el-input v-model="systemStructure.slb.other" placeholder="请输入"></el-input>
</div>
<div class="copy-box-main-input bottom">
<span class="box-input-text">版本：</span>
<el-input v-model="systemStructure.slb.edition" placeholder="请输入"></el-input>
</div>
</div>
</div>
</div>
<div class="copy-nav-main noborder">
<div class="copy-nav-main-title">存储：</div>
<div class="copy-nav-main-main">
<div class="form-radio">
<div class="radio-text">部署情况：</div>
<el-radio
v-model="systemStructure.storage.deploy"
:label="1"
@click.native.prevent="clickitem('storage','deploy',1)"
>本地</el-radio>
<el-radio
v-model="systemStructure.storage.deploy"
:label="2"
@click.native.prevent="clickitem('storage','deploy',2)"
>政务云</el-radio>
</div>
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">操作系统：</div>
<div class="radios-box">
<el-radio
v-model="systemStructure.storage.operateSystem"
@click.native.prevent="clickitem('storage','operateSystem','WINSERVER2006')"
label="WINSERVER2006"
>WinServer 2006-2008/X64</el-radio>
<el-radio
v-model="systemStructure.storage.operateSystem"
@click.native.prevent="clickitem('storage','operateSystem','WINSERVER2012')"
label="WINSERVER2012"
>WinServer 2012-2019/X64</el-radio>
<el-radio
v-model="systemStructure.storage.operateSystem"
@click.native.prevent="clickitem('storage','operateSystem','UBUNTU')"
label="UBUNTU"
>Ubuntu Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.storage.operateSystem"
@click.native.prevent="clickitem('storage','operateSystem','CENTEROSREALES')"
label="CENTEROSREALES"
>CentOS Reales X.XX-X.XX</el-radio>
<el-radio
v-model="systemStructure.storage.operateSystem"
@click.native.prevent="clickitem('storage','operateSystem','REDHATREALES')"
label="REDHATREALES"
>Redhat Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.storage.operateSystem"
@click.native.prevent="clickitem('storage','operateSystem','AIX')"
label="AIX"
>AIX Version X.X-X.X</el-radio>
</div>
<div class="copy-box-main-input">
<span class="box-input-text">其他：</span>
<el-input v-model="systemStructure.storage.other" placeholder="请输入"></el-input>
</div>
<div class="copy-box-main-input bottom">
<span class="box-input-text">版本：</span>
<el-input v-model="systemStructure.storage.edition" placeholder="请输入"></el-input>
</div>
</div>
</div>
</div>
<div class="copy-nav-main noborder">
<div class="copy-nav-main-title">其他服务设备：</div>
<div class="copy-nav-main-main">
<div class="form-radio">
<div class="radio-text">部署情况：</div>
<el-radio
v-model="systemStructure.otherEquipment.deploy"
:label="1"
@click.native.prevent="clickitem('otherEquipment','deploy',1)"
>本地</el-radio>
<el-radio
v-model="systemStructure.otherEquipment.deploy"
:label="2"
@click.native.prevent="clickitem('otherEquipment','deploy',2)"
>政务云</el-radio>
</div>
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">操作系统：</div>
<div class="radios-box">
<el-radio
v-model="systemStructure.otherEquipment.operateSystem"
@click.native.prevent="clickitem('otherEquipment','operateSystem','WINSERVER2006')"
label="WINSERVER2006"
>WinServer 2006-2008/X64</el-radio>
<el-radio
v-model="systemStructure.otherEquipment.operateSystem"
@click.native.prevent="clickitem('otherEquipment','operateSystem','WINSERVER2012')"
label="WINSERVER2012"
>WinServer 2012-2019/X64</el-radio>
<el-radio
v-model="systemStructure.otherEquipment.operateSystem"
@click.native.prevent="clickitem('otherEquipment','operateSystem','UBUNTU')"
label="UBUNTU"
>Ubuntu Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.otherEquipment.operateSystem"
@click.native.prevent="clickitem('otherEquipment','operateSystem','CENTEROSREALES')"
label="CENTEROSREALES"
>CentOS Reales X.XX-X.XX</el-radio>
<el-radio
v-model="systemStructure.otherEquipment.operateSystem"
@click.native.prevent="clickitem('otherEquipment','operateSystem','REDHATREALES')"
label="REDHATREALES"
>Redhat Reales XX.XX-XX.XX</el-radio>
<el-radio
v-model="systemStructure.otherEquipment.operateSystem"
@click.native.prevent="clickitem('otherEquipment','operateSystem','AIX')"
label="AIX"
>AIX Version X.X-X.X</el-radio>
</div>
<div class="copy-box-main-input">
<span class="box-input-text">其他：</span>
<el-input
v-model="systemStructure.otherEquipment.other"
placeholder="请输入"
></el-input>
</div>
<div class="copy-box-main-input bottom">
<span class="box-input-text">版本：</span>
<el-input
v-model="systemStructure.otherEquipment.edition"
placeholder="请输入"
></el-input>
</div>
</div>
</div>
</div>
<div class="copy-nav-title-two">
<span class="ball"></span>更多需求
</div>
<div class="copy-nav-main noborder more seven">
<div class="copy-nav-main-main">
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">分布式：</div>
<el-radio
v-model="systemStructure.distributed"
:label="1"
@click.native.prevent="clickitem1('systemStructure','distributed',1)"
>是</el-radio>
</div>
<div class="form-radio" style="margin-top:5px;">
<div class="radio-text">负载均衡：</div>
<el-radio
v-model="systemStructure.loadBalance"
:label="1"
@click.native.prevent="clickitem1('systemStructure','loadBalance',1)"
>是</el-radio>
</div>
<div class="form-radio" style="margin-top:5px;"> <div class="form-radio" style="margin-top:5px;">
<div class="radio-text">容灾：</div> <div class="radio-text">容灾：</div>
<el-radio <el-radio
...@@ -1387,6 +1808,7 @@ export default { ...@@ -1387,6 +1808,7 @@ export default {
isOpen4: false, isOpen4: false,
isOpen5: false, isOpen5: false,
isOpen6: false, isOpen6: false,
isOpen7: false,
notime:'' notime:''
}; };
}, },
...@@ -1635,6 +2057,15 @@ export default { ...@@ -1635,6 +2057,15 @@ export default {
this.isOpen5 = false this.isOpen5 = false
this.isOpen6 =true this.isOpen6 =true
}, },
open7() {
this.isOpen2 = false;
this.isOpen1 = false
this.isOpen3 =false
this.isOpen4 = false
this.isOpen5 = false
this.isOpen6 =false
this.isOpen7 =true
},
clickitem(objKey, objName, e) { clickitem(objKey, objName, e) {
e === this.systemStructure[objKey][objName] e === this.systemStructure[objKey][objName]
? (this.systemStructure[objKey][objName] = "") ? (this.systemStructure[objKey][objName] = "")
...@@ -1960,7 +2391,7 @@ export default { ...@@ -1960,7 +2391,7 @@ export default {
width: 98%; width: 98%;
margin: 0 auto; margin: 0 auto;
height: 100%; height: 100%;
height: 630px; height:780px;
/* background-color: orange; */ /* background-color: orange; */
} }
.home-detail-copy .copy-form >>> .el-form-item { .home-detail-copy .copy-form >>> .el-form-item {
...@@ -2137,7 +2568,7 @@ export default { ...@@ -2137,7 +2568,7 @@ export default {
font-size: 18px; font-size: 18px;
} }
.form-radio .radio-text.one { .form-radio .radio-text.one {
width: 180px; width: 220px;
float: left; float: left;
text-align: right; text-align: right;
font-size: 18px; font-size: 18px;
......
src/components/roleDispose/addRole.vue
浏览文件 @ df850bd1
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
id: this.detailData.id, id: this.detailData.id,
oldRule: this.form oldRule: this.form
}; };
obj.suffix = obj.suffix.join(",")
console.log(this.detailData.id) console.log(this.detailData.id)
if (this.modalName === '修改规则') { if (this.modalName === '修改规则') {
this.$server.editConfigUpdate(obj).then(res => { this.$server.editConfigUpdate(obj).then(res => {
......
src/components/roleDispose/roleDispose.vue
浏览文件 @ df850bd1
...@@ -5,19 +5,25 @@ ...@@ -5,19 +5,25 @@
<div class="content"> <div class="content">
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>关键字：</span> <!-- <span>关键技术：</span> -->
<el-input v-model="input2" size="medium" @change="search" placeholder="请输入关键字"></el-input> <el-select v-model="input3" size="medium" placeholder="请选择关键技术">
</span>
<span class="searchVal">
<span>关键技术：</span>
<el-select v-model="searchVal" @change="search" placeholder="请选择关键技术" clearable>
<el-option <el-option
v-for="item in allList" v-for="item in keyNameList"
:key="item.id"
:label="item.technologyName" :label="item.technologyName"
:value="item.technologyName"> :value="item.technologyName">
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
<span class="searchVal">
<span>查询：</span>
<el-input v-model="input2" size="medium" placeholder="请输入关键字"></el-input>
</span>
<span class="searchVal" style="margin-left:30px;">
<!-- <span>查询：</span> -->
<el-input v-model="input1" size="medium" placeholder="请输入范围"></el-input>
</span>
<span class="button searchBtn" @click="search">搜索</span> <span class="button searchBtn" @click="search">搜索</span>
<span class="button add" @click="addRole"><img src="../../assets/img/add.png"></span> <span class="button add" @click="addRole"><img src="../../assets/img/add.png"></span>
</p> </p>
...@@ -84,9 +90,12 @@ export default { ...@@ -84,9 +90,12 @@ export default {
name: 'roleDispose', name: 'roleDispose',
data () { data () {
return { return {
input2: '', // 关键字 searchKey:'',
searchVal: '', // 关键技术 input3:'',
allList: [], // 所有关键技术 input2: '',
input1: '',
suffix:'',
target:'',
tableData: [], tableData: [],
tablePageSize: 0, tablePageSize: 0,
pageSize: 9, // 每页个数 pageSize: 9, // 每页个数
...@@ -94,6 +103,7 @@ export default { ...@@ -94,6 +103,7 @@ export default {
components: '', components: '',
myPage: 1, myPage: 1,
detailData: {}, detailData: {},
keyNameList:[],
modalName: '' modalName: ''
} }
}, },
...@@ -105,27 +115,38 @@ export default { ...@@ -105,27 +115,38 @@ export default {
console.log(err); console.log(err);
}) })
this.search(); this.search();
this.keyName()
}, },
methods: { methods: {
// 搜索 // 搜索
search () { keyName(){
let obj; let val = {
if (this.input2 !== '' && this.searchVal !== '') { 'technologyName': '',
obj = {
'technologyName': this.searchVal,
'target': this.input2
}
} else if (this.input2 !== '' && this.searchVal === '') {
obj = {
'target': this.input2
}
} else if (this.input2 === '' && this.searchVal !== '') {
obj = {
'technologyName': this.searchVal
} }
} else { this.$server.getAllPageList(this.myPage,this.pageSize,val).then(res=>{
obj = {} console.log(res.data)
this.keyNameList = res.data.rows;
}).catch(err => {
this.$message.error('数据请求失败！');
})
},
search () {
let obj = {
technologyName:this.input3,
target:this.input2,
suffix:this.input1,
} }
// if(this.searchKey == 'suffix'){
// obj.suffix = this.input2
// }else if (this.searchKey == 'technologyName'){
// obj.technologyName = this.input2
// }else if (this.searchKey == 'target'){
// obj.target = this.input2
// }
this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => { this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
console.log(res) console.log(res)
this.tableData = res.data.rows; this.tableData = res.data.rows;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论