Skip to content

Z
zhichan
Commit ddceb884 by 任建
Options

rj

parent e2b47af9
Showing with 229 additions and 82 deletions
embed_applications/app/front/vues/pages/brandfind/brandfind.css
......@@ -5,6 +5,12 @@
/* margin: 0 auto; */
background: #ffffff;
}
.el-table--scrollable-x .el-table__body-wrapper{
overflow: hidden !important;
}
.brandfind:hover .el-input--suffix:hover .el-input__inner:hover{
border: 1px solid #118EE9;
}
.brandfind-title {
font-family: MicrosoftYaHei;
......@@ -175,6 +181,7 @@
.brandfind-main-filter-item .el-checkbox-button__inner,
.brandfind-main-filter-item .el-checkbox-group {
vertical-align: top;
display: flex;
}
......@@ -183,7 +190,6 @@
border: none;
/* width: 100px; */
margin-bottom: 10px;
width: 100px;
margin-right: 20px;
box-sizing: border-box;
}
......@@ -195,17 +201,12 @@
.brandfind-main-filter-item .el-checkbox-button:first-child .el-checkbox-button__inner {
border-left: none;
width: 54px !important;
border-radius: 0;
margin-left: 20px;
margin-right: 45px;
}
.brandfind .el-checkbox-button.is-checked:first-child .el-checkbox-button__inner {
width: -webkit-fill-available;
background: #118EE9;
margin-left: 20px;
margin-right: 45px;
}
.brandfind .el-checkbox-button.is-checked .el-checkbox-button__inner {
......@@ -347,6 +348,9 @@
margin-top: 20px;
min-height: 400px;
}
.brandfind-list-warpper>.brandfind-list-box{
height:330px !important;
}
.brandfind-list-title {
width: 100%;
......
embed_applications/app/front/vues/pages/brandfind/brandfind.html
......@@ -12,8 +12,8 @@
:disabled="searchDisabled" type="text" :placeholder="placeholder" v-model="text"
maxlength="50">
<div style="padding:12px 0;width: 20px;height:20px;" slot="suffix">
<label for="uploads">
<i class="el-icon-camera"></i>
<label for="uploads" style="width:24px;height:20px">
<i class=""><img src="/imgs/photo.png" style="width:24px;height:100%" alt=""></i>
</label>
<input type="file" id="uploads"
style="height:0;width:0;position: absolute;top: 0px;left: -41px;"
......@@ -47,11 +47,13 @@
<el-checkbox-button label="不限">
不限
</el-checkbox-button>
<div>
<el-checkbox-button v-for="(item, index) in ncl_list"
:key="item.key" :label="item.key"
v-model="item.key">
{{item.keyvalue}}
</el-checkbox-button>
</div>
</el-checkbox-group>
</div>
<div v-if="ncl_list.length" class="brandfind-main-filter-more">
......@@ -103,10 +105,12 @@
<el-checkbox-button label="不限">
不限
</el-checkbox-button>
<div>
<el-checkbox-button
v-for="(item, index) in apply_year_list"
:key="item.key" :label="item.key">
</el-checkbox-button>
</div>
</el-checkbox-group>
</div>
<div v-if="ncl_list.length" class="brandfind-main-filter-more">
......@@ -126,11 +130,12 @@
<el-checkbox-button label="不限">
不限
</el-checkbox-button>
<div>
<el-checkbox-button
v-for="(item, index) in checkboxLabelHigh"
:key="item" :label="item">
</el-checkbox-button>
</div>
</el-checkbox-group>
</div>
<!-- <div class="brandfind-main-filter-more">
......@@ -628,7 +633,7 @@
</div>
<!-- 列表标题over -->
<!-- 相同商标列表 -->
<div class="brandfind-list-box">
<div class="brandfind-list-box" style="height:390px !important;">
<div class="brandfind-main-equal-form-box-null" v-if="!total">
<!-- 没数据 -->
<div>
......@@ -722,7 +727,7 @@
</div>
<!-- 列表标题over -->
<!-- 相同商标列表 -->
<div class="brandfind-list-box">
<div class="brandfind-list-box" style="height:390px !important;">
<div class="brandfind-main-equal-form-box-null" v-if="!total">
<!-- 没数据 -->
<div>
......@@ -819,7 +824,7 @@
</div>
<!-- 列表标题over -->
<!-- 相同商标列表 -->
<div class="brandfind-list-box">
<div class="brandfind-list-box" style="height:390px !important;">
<div class="brandfind-main-equal-form-box-null" v-if="!total">
<!-- 没数据 -->
<div>
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.css
......@@ -5,7 +5,9 @@
/* margin: 0 auto; */
background: #ffffff;
}
.brandfinddetails-details-box-logo > div:nth-child(2) > div{
background: #eee !important;
}
.brandfinddetails-title {
box-sizing: border-box;
padding: 30px;
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.js
......@@ -9,7 +9,7 @@
serviceitems_wzc: [],
loading:false,
regNum2:null,
nclNum2:null
nclNum2:null,
}
},
......@@ -96,6 +96,7 @@
this.nclNum = this.$router.history.current.query.nclNum || "";
if(this.regNum!=this.regNum2&&this.nclNum!=this.nclNum2){
this.getTmDetail();
this.tmdetail.logo="";
}
this.regNum2 = this.$router.history.current.query.regNum || "";
this.nclNum2 = this.$router.history.current.query.nclNum || "";
......
embed_applications/app/front/vues/pages/ncldetail/ncldetail.css
......@@ -122,7 +122,7 @@
float: left;
min-width: 178px;
min-height: 171px;
width: 12.5%;
width: 14.05%;
height: 10.4%;
padding-bottom: 14px;
background-color: rgba(255, 255, 255, 1);
......
embed_applications/app/front/vues/pages/noticetm/noticetm.css
......@@ -101,6 +101,7 @@
.brandfind-main-filter-item .el-radio-button__inner,
.brandfind-main-filter-item .el-radio-group {
vertical-align: top;
display: flex;
}
.brandfind-main-filter-item .el-radio-button--mini .el-radio-button__inner {
......@@ -144,7 +145,9 @@
border: 1px solid #eee;
margin-right: 30px;
}
.noticetm-input input:hover{
border: 1px solid #118EE9;
}
.details-entry {
background: #FFFFFF;
border: 1px solid #D1D1D1;
......
embed_applications/app/front/vues/pages/noticetm/noticetm.html
......@@ -63,14 +63,16 @@
{{item.code}} {{item.name}}
</el-checkbox-button>
</el-checkbox-group> -->
<el-radio-group v-model="selected_nclNum" size="mini" @change="noticetmquery">
<el-radio-group v-model="selected_nclNum" size="mini" @change="noticetmquery" style="dispaly:flex">
<el-radio-button label="不限">
不限
</el-radio-button>
<div>
<el-radio-button v-for="(item, index) in ncldata" :label="item.code"
v-model="item.code">
{{item.code}} {{item.name}}
</el-radio-button>
</div>
</el-radio-group>
</div>
......@@ -95,14 +97,16 @@
</el-checkbox-button>
</el-checkbox-group> -->
<el-radio-group v-model="selected_issue" size="mini" :border="true"
@change="noticetmquery">
@change="noticetmquery" style="dispaly:flex">
<el-radio-button label="不限">
不限
</el-radio-button>
<div>
<el-radio-button v-for="(item, index) in issue_list" :label="item.value"
v-model="item.value">
{{item.label}}
</el-radio-button>
</div>
</el-radio-group>
</div>
<div class="brandfind-main-filter-more">
......
embed_applications/app/front/vues/pages/policylist/policylist.html
......@@ -89,7 +89,7 @@
<div class="policylist-portrayal">
<div class="portrayal-left">政策画像</div>
<div class="portrayal-right">
<div class="portrayal-right-list" v-for="(item,key) in portrayalArr" :key="key" :style="rgb()">{{item}}</div>
<div class="portrayal-right-list" v-for="(item,key) in portrayalArr" :key="key" :style="rgba()">{{item}}</div>
</div>
</div>
<div class="policylist-essay">
......@@ -100,9 +100,9 @@
<div class="essay-content" v-html="recommendationsObj.policytext"></div>
</div>
<div class="policylist-buttons">
<div style="border:1px solid rgba(88,184,72,1);color: #2AA515"><img src="/imgs/wx.png" alt="">分享到微信</div>
<!-- <div style="border:1px solid rgba(88,184,72,1);color: #2AA515"><img src="/imgs/wx.png" alt="">分享到微信</div>
<div style="border:1px solid rgba(228,109,108,1);color: #E46D6C"><img src="/imgs/wb.png" alt="">分享到微博</div>
<div style="border:1px solid rgba(255,189,29,1);color: #FFBD1D"><img src="/imgs/sc.png" alt="">收藏</div>
<div style="border:1px solid rgba(255,189,29,1);color: #FFBD1D"><img src="/imgs/sc.png" alt="">收藏</div> -->
<div style="border:1px solid rgba(78,140,238,1);color:#4E8CEE" @click="consulting"><img src="/imgs/zx.png" alt="">政策咨询</div>
</div>
<!-- <div class="policylist-navigation">
......
embed_applications/app/front/vues/pages/policylist/policylist.js
......@@ -1390,13 +1390,32 @@
recommendationsObjAfter: {},
companyObj: {},
rKey: null,
zcoName: ''
zcoName: '',
colorList:[{
bgColor:"#EDEEFA",
fontColor:"#5B65D3"
},{
bgColor:"#FDF2EC",
fontColor:"#FC835A"
},{
bgColor:"#FFEBF5",
fontColor:"#FF75B3"
},{
bgColor:"#E1EDFB",
fontColor:"#3CACFF"
},{
bgColor:"#E0F4E8",
fontColor:"#54D02F"
},{
bgColor:"#E8F7F9",
fontColor:"#30BBCE"
}]
}
},
methods: {
search() {
this.zcPost()
this.zcPost();
},
handleCurrentChange(val) {
this.zcPost(val)
......@@ -1471,6 +1490,10 @@
var rgb = 'color:' + 'rgba('+r+','+g+','+b+', 1)' + ';' + 'background-color:' + 'rgba('+r+','+g+','+b+', 0.3)';
return rgb;
},
rgba() {
var color = this.colorList[Math.floor(Math.random()*this.colorList.length)];
return `color:${color.fontColor};background-color:${color.bgColor}`;
},
leftswiperList () {
console.log(this.$refs.swiperList.offsetWidth);
if (this.transformNumber < 0) {
......@@ -1495,6 +1518,7 @@
})
},
zcPost(size) {
console.log(123);
/*http://43.247.184.92:8018/gsb/api/zc*/
axios.post('http://43.247.184.92:8018/gsb/api/zc',{
"zctext": this.zctext,
......
embed_applications/app/front/vues/pages/policyquery/policyquery.css
......@@ -2,6 +2,36 @@
width: 100%;
height: 100%;
}
.el-input--mini .el-input__inner{
border:1px solid rgba(238,238,238,1);
border-radius: 0px;
}
.policylist-headerbut{
background: #fff;
position: relative;
top: -1px;
color:rgba(121,121,121,1) !important;
}
.policyquery-items > .items_item > div{
padding-right: 30px !important;
}
.policyquery-items > .items_item > div:hover{
color: #118EE9;
}
.policyquery-items > .items_right:hover{
color: #118EE9;
}
.policyquery-items:nth-child(1){
border-top: 1px solid #F0F3F0;
}
.policyquery-items{
border: none !important;
box-sizing: border-box;
border-bottom: 1px solid #F0F3F0 !important;
}
.policyquery-items:last-child{
border:none !important;
}
.policylist-warpper > .policylist {
width: 100%;
height: 100%;
......@@ -9,6 +39,7 @@
.policylist-header {
width: 100%;
overflow: hidden;
border: 1px solid #F0F3F0;
}
.header-left {
float: left;
......
embed_applications/app/front/vues/pages/policyquery/policyquery.js
......@@ -96,14 +96,12 @@
'郑州'
],
tableData2:[
'不限',
'部委',
'省级',
'市级',
'区级'
],
tableData3:[
'不限',
'发改部门',
'教育部门',
'科学技术部门',
......@@ -123,7 +121,6 @@
'其他部门'
],
tableData4:[
'不限',
'资质荣誉',
'事前补助',
'研发费补助',
......@@ -136,13 +133,11 @@
'人才补贴'
],
tableData5:[
'不限',
'事业单位',
'企业单位',
'社会组织'
],
tableData6:[
'不限',
'工业',
'建筑业',
'金融业',
......@@ -162,7 +157,6 @@
'其他'
],
tableData7:[
'不限',
'普惠(创新券/社保补贴/创业补贴等)',
'科技创新',
'人才类',
......@@ -189,7 +183,6 @@
'其他'
],
tableData8:[
'不限',
'基础与应用基础研究',
'社会民生',
'现代服务业',
......@@ -201,7 +194,6 @@
'人才补贴'
],
tableData9:[
'不限',
'2019',
'2018',
'2017',
......@@ -209,11 +201,34 @@
'2015',
'2014',
'2013'
]
],
colorList:[{
bgColor:"#EDEEFA",
fontColor:"#5B65D3"
},{
bgColor:"#FDF2EC",
fontColor:"#FC835A"
},{
bgColor:"#FFEBF5",
fontColor:"#FF75B3"
},{
bgColor:"#E1EDFB",
fontColor:"#3CACFF"
},{
bgColor:"#E0F4E8",
fontColor:"#54D02F"
},{
bgColor:"#E8F7F9",
fontColor:"#30BBCE"
}]
}
},
methods: {
rgba() {
var color = this.colorList[Math.floor(Math.random()*this.colorList.length)];
return `color:${color.fontColor};background-color:${color.bgColor}`;
},
inputDel(input) {
console.log(input);
this[input] = '';
......@@ -221,16 +236,16 @@
},
tableDataClick1(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
console.log(123123123123);
val = ''
};
if (val)
this.input1 = val;
this.zcPost()
},
tableDataClick2(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input2 = val;
......@@ -238,7 +253,7 @@
},
tableDataClick3(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input3 = val;
......@@ -246,7 +261,7 @@
},
tableDataClick4(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input4 = val;
......@@ -254,7 +269,7 @@
},
tableDataClick5(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input5 = val;
......@@ -262,7 +277,7 @@
},
tableDataClick6(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input6 = val;
......@@ -270,7 +285,7 @@
},
tableDataClick7(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input7 = val;
......@@ -278,7 +293,7 @@
},
tableDataClick8(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input8 = val;
......@@ -286,7 +301,7 @@
},
tableDataClick9(val) {
console.log(val);
if (val == '不限') {
if (val == undefined) {
val = ''
};
this.input9 = val;
......@@ -408,7 +423,8 @@
console.log(d,'---------------------------------');
var data = d.data.data;
this.recommendationsArr = data;
this.total = d.data.total
this.total = d.data.total;
console.log(this.recommendationsArr,12312312321);
})
},
zccompanyPost() {
......@@ -445,7 +461,6 @@
}
},
mounted: function() {
this.recommendationsArr = this.recommendationsArr1;
/*for (let i = 0; i < this.portrayalArr.length; i++) {
this.portrayalArr[i].col = this.rgb();
};*/
......
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.css
.tmbigdata {
/* margin: 0 auto; */
}
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 99000;
}
.tmbigdata-header {
min-width: 1000px;
......
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.html
<div class="tmbigdata">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="tmbigdata-header">
<div class="name">商标大数据</div>
<div class="select">
......
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.js
......@@ -623,7 +623,8 @@
]
}]
}
},
loading:false
}
},
......@@ -645,9 +646,9 @@
this.tmnclstatisticsrank(obj);
/** var that = this;
this.$root.loading = true;
this.loading = true;
this.$root.postReq("/web/tmquery/bigtmCtl/tmindexdetail", obj).then(d=>{
this.$root.loading = false;
this.loading = false;
console.log(d,'********************************');
that.brandArr[0].amount = d.data.tmtotal;
that.brandArr[1].amount = d.data.tmzctotal;
......@@ -676,47 +677,47 @@
that.$forceUpdate();
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});*/
},
/**商标统计接口总量、有效、申请 */
tmstatistics(obj){
var that = this;
this.$root.loading = true;
this.loading = true;
this.$root.postReq("/web/tmquery/bigtmCtl/tmstatistics", obj).then(d => {
this.$root.loading = false;
this.loading = false;
if (d && d.status == 0 && d.data) {
that.brandArr[0].amount = d.data.tmtotal;
that.brandArr[1].amount = d.data.tmzctotal;
that.brandArr[2].amount = d.data.tmsqtotal;
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
/**商标统计接口公司总量 */
tmcompanystatistics(obj){
var that = this;
this.$root.loading = true;
this.loading = true;
this.$root.postReq("/web/tmquery/bigtmCtl/tmcompanystatistics", obj).then(d => {
this.$root.loading = false;
this.loading = false;
if (d && d.status == 0 && d.data) {
that.brandArr[3].amount = d.data.tmgstotal;
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
/**商标地区分布统计排名 */
tmaddrstatisticsrank(obj){
var that = this;
this.$root.loading = true;
this.loading = true;
this.$root.postReq("/web/tmquery/bigtmCtl/tmaddrstatisticsrank", obj).then(d => {
this.$root.loading = false;
this.loading = false;
if (d && d.status == 0 && d.data) {
that.brandDistrict = d.data.tmaddrrank;
if (that.provinceName == '') {
......@@ -738,37 +739,37 @@
}
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
/**商标企业分布统计排名 */
tmcompanystatisticsrank(obj){
var that = this;
this.$root.loading = true;
this.loading = true;
this.$root.postReq("/web/tmquery/bigtmCtl/tmcompanystatisticsrank", obj).then(d => {
this.$root.loading = false;
this.loading = false;
if (d && d.status == 0 && d.data) {
that.brandEnterprise = d.data.tmcompanyrank;
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
/**商标类别申请排名 */
tmnclstatisticsrank(obj){
var that = this;
this.$root.loading = true;
this.loading = true;
this.$root.postReq("/web/tmquery/bigtmCtl/tmnclstatisticsrank", obj).then(d => {
this.$root.loading = false;
this.loading = false;
if (d && d.status == 0 && d.data) {
that.brandSortrow = d.data.tmnclrank;
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
......@@ -792,7 +793,7 @@
});
that.$forceUpdate();
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
......
embed_applications/app/front/vues/pages/wins/wins.css
......@@ -3,7 +3,24 @@
width: 100%;
padding: 4px 10px;
}
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.el-button.is-disabled, .el-button.is-disabled:focus, .el-button.is-disabled:hover{
background: rgba(183,221,248) !important;
color: #fff !important;
}
.wins-main-form-box .el-input .el-input__inner{
background: #fff;
}
.wins .el-button:focus, .wins .el-button:hover{
background: #fff;
}
.wins-main-title {
width: 100%;
height: 21px;
......@@ -37,7 +54,6 @@
text-align: left;
width: 400px;
height: 34px;
background: rgba(250, 250, 250, 1);
border-radius: 2px;
border: 1px solid rgba(238, 238, 238, 1);
}
......@@ -61,10 +77,8 @@
width: 400px;
height: 34px;
color: rgba(170, 170, 171, 1);
background: rgba(250, 250, 250, 1);
border-radius: 2px;
border: 1px solid rgba(238, 238, 238, 1);
background: rgba(250, 250, 250, 1);
}
......
embed_applications/app/front/vues/pages/wins/wins.html
<div class="wins">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="wins-main" v-if="1">
<h3 class="wins-main-title">
商标起名
......
embed_applications/app/front/vues/pages/wins/wins.js
......@@ -108,6 +108,26 @@
],
hotCharat: [],
ncl_list: [],
loading:false,
colorList:[{
bgColor:"#EDEEFA",
fontColor:"#5B65D3"
},{
bgColor:"#FDF2EC",
fontColor:"#FC835A"
},{
bgColor:"#FFEBF5",
fontColor:"#FF75B3"
},{
bgColor:"#E1EDFB",
fontColor:"#3CACFF"
},{
bgColor:"#E0F4E8",
fontColor:"#54D02F"
},{
bgColor:"#E8F7F9",
fontColor:"#30BBCE"
}]
}
},
......@@ -159,10 +179,14 @@
var getRandomColor1 = function () {
return `rgba(${Math.floor(Math.random() * 256)},${Math.floor(Math.random() * 256)},${Math.floor(Math.random() * 256)},1)`
};
var color = () => {
return this.colorList[Math.floor(Math.random()*this.colorList.length)];
};
var hotList = document.querySelectorAll('.wins-randColor');
for (let i = 0; i < hotList.length; i++) {
hotList[i].style.background = getRandomColor();
hotList[i].style.color = getRandomColor1();
var colorItem=color();
hotList[i].style.background = colorItem.bgColor;
hotList[i].style.color = colorItem.fontColor;
}
console.log(111);
},
......@@ -172,9 +196,9 @@
"seltype": this.checkIndustry
};
this.checkList = [];
this.$root.loading = true;
this.loading = true;
this.$root.getReq('/web/tmquery/toolCtl/aiadive', obj).then((d) => {
this.$root.loading = false;
this.loading = false;
console.log(d, "ccccccccccccccccccccccccccccccc");
let checkList = JSON.parse(d.data);
console.log(checkList);
......@@ -250,9 +274,9 @@
var obj = {
"ncl_list": this.ncl_list.length ? this.ncl_list : "1,2,3"
};
this.$root.loading = true;
this.loading = true;
this.$root.postReq('/web/tmquery/toolCtl/getHotWords', obj).then((d) => {
this.$root.loading = false;
this.loading = false;
console.log(d);
this.hotCharat = d.data;
this.$nextTick(() => {
......
embed_applications/app/front/vues/pages/winsresult/winsresult.css
......@@ -5,7 +5,14 @@
padding: 4px 10px;
}
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.winsresult-title {
display: flex;
justify-content: space-between;
......
embed_applications/app/front/vues/pages/winsresult/winsresult.html
<div class="winsresult">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="winsresult-title">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="routerHistory">商标起名</el-breadcrumb-item>
......
embed_applications/app/front/vues/pages/winsresult/winsresult.js
......@@ -15,7 +15,7 @@
industry: '',
bigType: null,
ncl_list: null,
loading:false
}
},
created() {
......@@ -51,12 +51,12 @@
try {
/* 初始化页面参数 */
if (this.requestObj) {
this.$root.loading = true;
this.loading = true;
let data = Object.assign(this.requestObj, {});
this.type = this.requestObj.bigType.join();
this.industry = this.requestObj.industry.join();
this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => {
this.$root.loading = false;
this.loading = false;
if (d.status == 0) {
if (!d.data || d.data.length == 0) {
this.$message('暂无数据');
......@@ -100,9 +100,9 @@
let successRateObj = {};
successRateObj.ncl_list = this.ncl_list;
successRateObj.tmName = this.name;
this.$root.loading = true;
this.loading = true;
this.$root.postReq(`/web/tmquery/toolCtl/tmPassRate`, successRateObj).then((d) => {
this.$root.loading = false;
this.loading = false;
console.log(d);
if (d.status == 0) {
this.bigType = d.data;
......@@ -120,12 +120,12 @@
/* 初始化页面参数 */
if (this.requestObj) {
console.log(this.requestObj, "!!!!!!!!!!!!!!!!!!!!!!!!1");
this.$root.loading = true;
this.loading = true;
let data = Object.assign(this.requestObj, {});
this.type = this.requestObj.bigType.join();
this.industry = this.requestObj.industry[1];
this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => {
this.$root.loading = false;
this.loading = false;
if (d.status == 0) {
if (!d.data || d.data.length == 0) {
this.$message('暂无数据');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment