Skip to content

Z
zhichan
Commit 754a8762 by 刘泽奇
Options

Merge branch 'embed_applications' of gitlab.gongsibao.com:jiangyong/zhichan into embed_applications

parents 4afce868 2ab33264
Showing with 84 additions and 36 deletions
embed_applications/app/front/entry/index.ejs
......@@ -22,8 +22,8 @@
<div id="app" style="visibility: hidden;">
<div>
<el-scrollbar class="page-component__scroll" style="marginTop:0; height: 100%;">
<div id="embedwarpper">
<div style="width:100%;min-height: 850px;"><keep-alive>
<div id="embedwarpper" style="minHeight:940px;">
<div style="width:100%;min-height: 900px;"><keep-alive>
<router-view name="default" v-loading.fullscreen.lock="loading" element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
</router-view></keep-alive>
......
embed_applications/app/front/vues/pages/brandfind/brandfind.css
......@@ -81,7 +81,7 @@
}
.brandfind-search-box>div:nth-child(2) {
width: 11.3%;
max-width: 11.3%;
}
.brandfind-search-box>div:nth-child(1) .el-icon-camera {
......@@ -225,6 +225,7 @@
.brandfind .el-checkbox-button.is-checked .el-checkbox-button__inner {
background: #118EE9;
box-shadow: none;
}
.brandfind-main-filter-item .el-checkbox-button:last-child .el-checkbox-button__inner {
......@@ -363,7 +364,7 @@
min-height: 400px;
}
.brandfind-list-warpper>.brandfind-list-box{
height:330px !important;
min-height:330px !important;
}
.brandfind-list-title {
......@@ -605,7 +606,9 @@
min-width: 69px;
}
.btn{
margin-top: 15px !important;
margin-top: 0 !important;
margin-right: 0 !important;
border: 1px solid rgb(17,142,233) !important;
}
.brandfind .el-pagination.is-background .btn-next,
.brandfind .el-pagination.is-background .btn-prev {
......@@ -636,7 +639,7 @@
}
.brandfind-list-page .el-pagination {
margin-top: 145px;
margin-top: 15px;
float: right;
}
.loading-brandfind{
......
embed_applications/app/front/vues/pages/brandfind/brandfind.html
......@@ -630,7 +630,7 @@
</div>
<!-- 列表标题over -->
<!-- 相同商标列表 -->
<div class="brandfind-list-box" style="height:390px !important;">
<div class="brandfind-list-box" style="min-height:445px !important;">
<div class="brandfind-main-equal-form-box-null" v-if="!total">
<!-- 没数据 -->
<div>
......@@ -724,7 +724,7 @@
</div>
<!-- 列表标题over -->
<!-- 相同商标列表 -->
<div class="brandfind-list-box" style="height:390px !important;">
<div class="brandfind-list-box" style="min-height:445px !important;">
<div class="brandfind-main-equal-form-box-null" v-if="!total">
<!-- 没数据 -->
<div>
......@@ -821,7 +821,7 @@
</div>
<!-- 列表标题over -->
<!-- 相同商标列表 -->
<div class="brandfind-list-box" style="height:390px !important;">
<div class="brandfind-list-box" style="min-height:445px !important;">
<div class="brandfind-main-equal-form-box-null" v-if="!total">
<!-- 没数据 -->
<div>
......@@ -934,13 +934,18 @@
:auto-crop-height="option.autoCropHeight" :center-box="option.centerBox"
@real-time="realTime" :high="option.high" @img-load="imgLoad"></vue-cropper>
<slot></slot>
<div style="background:#fff;height: 63px;font-size: 14px;">
<div style="background:#fff;height: 63px;font-size: 14px;
display: flex;
padding: 15px 60px;
box-sizing: border-box;
justify-content: center;">
<label class="btn" style="background: #118EE9;color: #fff;width: 100px; "
for="uploads">重新选择</label>
<input type="file" id="uploads" style="position:absolute; clip:rect(0 0 0 0);"
accept="image/png, image/jpeg, image/gif, image/jpg"
@change="uploadImg($event, 1)">
<!-- <a @click="down(1)" class="btn">下载图片</a> -->
<div class="midBtn" style="width:40px;"></div>
<a class="btn"
style="color: rgb(255, 255, 255);background-color: #118EE9;width: 100px;"
@click="submit">提交图片</a>
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.css
......@@ -75,10 +75,10 @@
.brandfinddetails-steps {
width: 100%;
box-sizing: border-box;
border: 1px solid #E6E8E9;
height: 163px;
padding-top: 100px;
padding-bottom: 40px;
border-bottom: none;
}
.brandfinddetails-steps .el-step__icon-inner {
......@@ -132,7 +132,7 @@
width: 100%;
box-sizing: border-box;
padding: 30px;
border: 1px solid #eee;
border-top: 1px solid #eee;
}
.brandfinddetails-details-box {
......@@ -197,16 +197,31 @@
display: flex;
align-items: center;
min-height: 120px;
height: 100%;
overflow: auto;
}
.brandfinddetails-details-box-reg>div:nth-of-type(2) {
box-sizing: border-box;
min-height: 120px;
height: 100%;
padding: 28px 20px 0 26px;
overflow: auto;
}
.brandfinddetails-details-box-reg>div:nth-of-type(2)::-webkit-scrollbar {/*滚动条整体样式*/
width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
height: 4px;
}
.brandfinddetails-details-box-reg>div:nth-of-type(2)::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
border-radius: 5px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.brandfinddetails-details-box-reg>div:nth-of-type(2)::-webkit-scrollbar-track {/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.brandfinddetails-details-box-reg>div>span {
......@@ -262,7 +277,7 @@
.brandfinddetails-details-box>.brandfinddetails-details-box-notice>div:nth-child(2) {
min-height: 100px;
height: 100%;
overflow: auto;
box-sizing: border-box;
padding: 25px 0 0 26px;
}
......@@ -271,9 +286,22 @@
line-height: 1;
height: 14px;
margin-bottom: 13px;
}
.brandfinddetails-details-box>.brandfinddetails-details-box-notice>div:nth-child(2)::-webkit-scrollbar {/*滚动条整体样式*/
width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
height: 4px;
}
.brandfinddetails-details-box>.brandfinddetails-details-box-notice>div:nth-child(2)::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
border-radius: 5px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: rgba(0,0,0,0.2);
}
.brandfinddetails-details-box>.brandfinddetails-details-box-notice>div:nth-child(2)::-webkit-scrollbar-track {/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
.brandfinddetails .el-icon-search {
vertical-align: middle;
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.js
......@@ -73,7 +73,6 @@
this.regNum = this.$router.history.current.query.regNum || "";
this.nclNum = this.$router.history.current.query.nclNum || "";
this.getTmDetail();
this.$nextTick(() => {
var box = document.getElementsByClassName('brandfinddetails-details-box-reg');
setTimeout(() => {
......@@ -88,6 +87,8 @@
});
},
activated:function(){
var brandfinddetails = document.getElementsByClassName('brandfinddetails')[0];
brandfinddetails.parentNode.style.padding = "0px";
var embedwarpper = document.getElementsByClassName("el-scrollbar__wrap")[0];
embedwarpper.scrollTop=0;
this.regNum = this.$router.history.current.query.regNum || "";
......@@ -99,5 +100,9 @@
this.regNum2 = this.$router.history.current.query.regNum || "";
this.nclNum2 = this.$router.history.current.query.nclNum || "";
},
deactivated(){
var brandfinddetails = document.getElementById('embedwarpper');
brandfinddetails.children[0].style.padding = "20px";
},
vname: "gsb-brandfinddetails"
}
embed_applications/app/front/vues/pages/ncldetail/ncldetail.css
......@@ -22,8 +22,9 @@
font-size: 16px;
color: #797979;
letter-spacing: 0;
font-weight: 600;
line-height: 70px;
font-weight: 600;
line-height: 25px;
margin-bottom: 20px;
}
.ncldetail-main-title {
......@@ -106,7 +107,7 @@
font-size: 16px;
text-align: center;
font-family: Roboto;
border: 1px solid rgba(187, 187, 187, 1);
border: 1px solid #D1D1D1;
margin: 10px .6%;
cursor: pointer;
border-radius:2px;
......
embed_applications/app/front/vues/pages/ncldetail/ncldetail.js
......@@ -165,5 +165,10 @@
item.imgUrl = `/imgs/recommoned/${index + 1}.png`;
});
},
activated(){
console.log("_________----------");
this.brandKey = 1;
this.recommendType = false;
},
vname: "gsb-ncldetail"
}
embed_applications/app/front/vues/pages/noticetm/noticetm.css
......@@ -18,7 +18,8 @@
color: #797979;
letter-spacing: 0;
font-weight: 600;
line-height: 70px;
line-height: 25px;
margin-bottom: 20px;
}
.noticetm-main-title {
......@@ -122,6 +123,7 @@
}
.brandfind-main-filter-item .el-radio-button__orig-radio:checked+.el-radio-button__inner{
background: #118EE9;
box-shadow: none;
}
.brandfind-main-filter-item .el-radio-button:first-child .el-radio-button__inner {
border-left: none;
......@@ -160,7 +162,7 @@
border: 1px solid #D1D1D1;
border-radius: 2px;
color: rgba(72,72,72,1);
transform: translateY(40px);
transform: translateY(12px);
padding: 7px 3px;
font-size: 12px;
text-align: center;
......@@ -171,7 +173,7 @@
padding: 7px 3px;
background: #FFFFFF;
border-radius: 2px;
transform: translateY(60px);
transform: translateY(38px);
background: #118EE9;
font-size: 12px;
text-align: center;
......
embed_applications/app/front/vues/pages/noticetm/noticetm.html
......@@ -2,7 +2,7 @@
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="noticetm-main-name">商标公告</div>
<div class="noticetm-main-title">
<div :class="brandKey == 1 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 1">最新12期公告</div>
<div :class="brandKey == 1 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 1">最新{{issue_list.length}}期公告</div>
<div :class="brandKey == 2 ? \'title-item1\' : \'title-item2\'" @click="brandKey = 2">公告商标查询</div>
</div>
<div class="noticetm-notice" v-if="brandKey==1">
......@@ -98,9 +98,9 @@
</el-checkbox-group> -->
<el-radio-group v-model="selected_issue" size="mini" :border="true"
@change="noticetmquery" style="dispaly:flex">
<el-radio-button label="不限">
<!-- <el-radio-button label="不限">
不限
</el-radio-button>
</el-radio-button> -->
<div>
<el-radio-button v-for="(item, index) in issue_list" :label="item.value"
v-model="item.value">
......@@ -126,7 +126,7 @@
</div>
<div v-if="brandKey==2">
<div class="brandfind-list-box" style="border:1px solid rgba(247,247,248,1);">
<div class="brandfind-list-box" style="border:1px solid rgba(247,247,248,1);min-height: 477px;">
<div class="brandfind-main-equal-form-box-null" v-if="tms.length == 0">
<!-- 没数据 -->
<div>
......
embed_applications/app/front/vues/pages/noticetm/noticetm.js
......@@ -91,8 +91,8 @@
this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) {
that.loading = false;
that.issue_list = d.data.selectdata;
that.issue_data = d.data.rows;
that.issue_list = d.data.selectdata.slice(1,12);
that.issue_data = d.data.rows.slice(1,12);
that.maxdata = d.data.selectdata[0].value;
console.log(d, "//////////////////////////");
}).catch(function (e) {
......@@ -141,7 +141,6 @@
this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => {
that.loading = false;
console.log(d,"zheshishuju");
if (d.status == 0 && d.data) {
var rows = d.data.rows;
for (var i = 0; i < rows.length; i++) {
......
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.js
......@@ -17,7 +17,7 @@
}, {
value: '2015',
label: '2015'
}, {
}, {
value: '2014',
label: '2014'
}, {
......@@ -666,7 +666,7 @@
methods: {
brandEve(val) {
console.log(val);
console.log(val,"zxcvbnm");
this.tmindexdetailPost()
},
tmindexdetailPost() {
......@@ -861,8 +861,7 @@
},
showProvince(pName, Chinese_){
;
console.log(pName, Chinese_);
console.log(pName, Chinese_,"213231333333333333333333");
this.provinceNameOne = Chinese_ || this.provinceNameOne;
this.cityEchartdata.series[0].mapType = '';
this.provinceName = Chinese_;
......@@ -879,6 +878,7 @@
var script = document.createElement("script");
script.type = "text/javascript";
console.log(script.readyState,"script.readyState");
if (script.readyState) {
console.log(1);
script.onreadystatechange = function () {
......@@ -908,7 +908,7 @@
this.myChart = echarts.init(document.getElementById('container'));
this.myChart.setOption(this.regionEchartdata, true);
this.myChart.on('click', function (params) {
console.log(params);
console.log(params,"213321");
that.city = params.name;
for (var i = 0; i < that.provincesText.length; i++) {
if (params.name == that.provincesText[i]) {
......
embed_applications/app/front/vues/pages/tmbigdatadetail/tmbigdatadetail.js
......@@ -164,7 +164,7 @@
this.$root.postReq(url, obj).then((d) => {
this.loading = false;
console.log(d, '#######################################');
this.tableData = d.data.datalist;
this.tableData = d.data.datalist.slice(0,d.data.datalist.length-1);
var echarts = this.$refs.theTotalLogoRef.getEchartObj();
if (this.activeName == 'first') {
this.theTotalLogoData.series[0].name = "商标总量";
......
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