Skip to content

Z
zhichan
Commit 4afce868 by 刘泽奇
Options

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

parents 5b87ac9e a2dcf33b
Showing with 1102 additions and 244 deletions
.vscode/launch.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"name": "Launch Program", "name": "Launch Program",
"program": "${workspaceFolder}/projectmanage/main.js" "program": "${workspaceFolder}/embed_applications/main.js"
} }
] ]
} }
\ No newline at end of file
embed_applications/app/base/db/metadata/apps/platform.js
...@@ -163,6 +163,14 @@ module.exports = { ...@@ -163,6 +163,14 @@ module.exports = {
"isctl": "no" "isctl": "no"
}, },
{ {
"code": "policyquery",
"icon": "fa fa-power-off",
"path": "policyquery",
"isMenu": false,
"label": "申请人详情",
"isctl": "no"
},
{
"code": "policylist", "code": "policylist",
"icon": "fa fa-power-off", "icon": "fa fa-power-off",
"path": "policylist", "path": "policylist",
...@@ -193,6 +201,7 @@ module.exports = { ...@@ -193,6 +201,7 @@ module.exports = {
"winsresult": { "title": "商标查询详情", "config": null, "path": "/winsresult", "comname": "winsresult" }, "winsresult": { "title": "商标查询详情", "config": null, "path": "/winsresult", "comname": "winsresult" },
"wins": { "title": "商标查询详情", "config": null, "path": "/wins", "comname": "wins" }, "wins": { "title": "商标查询详情", "config": null, "path": "/wins", "comname": "wins" },
"policylist": { "title": "商标查询详情", "config": null, "path": "/policylist", "comname": "policylist" }, "policylist": { "title": "商标查询详情", "config": null, "path": "/policylist", "comname": "policylist" },
"policyquery": { "title": "政策查询", "config": null, "path": "/policyquery", "comname": "policyquery" },
"brandfinddetails": { "title": "商标查询详情", "config": null, "path": "/brandfinddetails", "comname": "brandfinddetails" }, "brandfinddetails": { "title": "商标查询详情", "config": null, "path": "/brandfinddetails", "comname": "brandfinddetails" },
"proposer": { "title": "申请人详情", "config": null, "path": "/proposer", "comname": "proposer" }, "proposer": { "title": "申请人详情", "config": null, "path": "/proposer", "comname": "proposer" },
"brandfind": { "title": "商标检索", "config": null, "path": "/", "comname": "brandfind" }, "brandfind": { "title": "商标检索", "config": null, "path": "/", "comname": "brandfind" },
......
embed_applications/app/front/entry/admin.ejs
...@@ -91,8 +91,9 @@ ...@@ -91,8 +91,9 @@
</div> </div>
<div class="rightcontent"> <div class="rightcontent">
<transition name="slide-fade"> <transition name="slide-fade">
<keep-alive>
<router-view> <router-view>
</router-view> </router-view></keep-alive>
</transition> </transition>
</div> </div>
</div> </div>
......
embed_applications/app/front/entry/index.ejs
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<body> <body>
<div id="app" style="visibility: hidden;"> <div id="app" style="visibility: hidden;">
<div> <div>
<el-scrollbar class="page-component__scroll" > <el-scrollbar class="page-component__scroll" style="marginTop:0; height: 100%;">
<div id="embedwarpper"> <div id="embedwarpper">
<div><keep-alive> <div style="width:100%;min-height: 850px;"><keep-alive>
<router-view name="default" v-loading.fullscreen.lock="loading" element-loading-text="拼命加载中" <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)"> element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
</router-view></keep-alive> </router-view></keep-alive>
......
embed_applications/app/front/entry/public/css/index.css
...@@ -33,4 +33,124 @@ ...@@ -33,4 +33,124 @@
border-radius: 2px; border-radius: 2px;
border: 1px solid rgba(230, 232, 233, 1); border: 1px solid rgba(230, 232, 233, 1);
}
.policylist-title {
width: 100%;
height: 51px;
line-height: 35px;
font-size:16px;
font-family:MicrosoftYaHei-Bold,MicrosoftYaHei;
font-weight:bold;
color:rgba(72,72,72,1);
}
.policyquery-items {
border: 1px solid #F0F3F0;
/* height: 100px; */
width: 100%;
display：flex;display:-webkit-flex;align-items:stretch;
}
.policyquery-items > .items_left {
width: 97px;
height:inherit;
float: left;
background-color: #FAFAFA;
padding: 13px 20px;
box-sizing: border-box;
font-size:14px;
font-family:MicrosoftYaHei;
color:rgba(121,121,121,1);
}
.policyquery-items > .items_item {
width: calc(100% - 167px);
float: left;
padding: 5px 20px;
box-sizing: border-box;
font-size:14px;
font-family:MicrosoftYaHei;
color:rgba(72,72,72,1);
overflow: hidden;
}
.policyquery-items > .items_item > div{
float: left;
padding: 8px 0px;
padding-right: 20px;
box-sizing: border-box;
cursor: pointer;
}
.policyquery-items > .items_item > .pitch {
color: #118EE9;
}
.policyquery-items > .items_right {
width: 70px;
float: right;
padding-right: 20px;
padding-top: 13px;
box-sizing: border-box;
font-size:14px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(72,72,72,1);
cursor: pointer;
}
.policyquery-items > .items_right > i {
margin-left: 2px;
}
.policylist-headerbut {
margin: 0 auto;
font-size:14px;
text-align: center;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(72,72,72,1);
line-height:14px;
width:81px;
height:22px;
line-height: 22px;
border-radius:0px 0px 15px 15px;
border:1px solid rgba(240,243,240,1);
border-top: 0px;
margin-bottom: 10px;
cursor: pointer;
}
.policylist-selected {
width: 100%;
min-height: 40px;
overflow: hidden;
}
.policylist-selected > .leftName {
width: 97px;
float: left;
font-size:14px;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(121,121,121,1);
}
.policylist-selected > .itemsName {
width: calc(100% - 97px);
float: left;
overflow: hidden;
}
.policylist-selected > .itemsName > .itemName {
float: left;
margin-right: 6px;
margin-bottom: 16px;
padding: 0px 6px;
padding-right: 20px;
box-sizing: border-box;
height:26px;
background:rgba(255,255,255,1);
border-radius:1px;
border:1px solid rgba(17,142,233,1);
text-align: center;
line-height: 26px;
color: #118EE9;
position: relative;
}
.policylist-selected > .itemsName > .itemName > i{
position: absolute;
right: 6px;
top: 7px;
cursor: pointer;
} }
\ No newline at end of file
embed_applications/app/front/vues/pages/brandfind/brandfind.css
...@@ -5,7 +5,19 @@ ...@@ -5,7 +5,19 @@
/* margin: 0 auto; */ /* margin: 0 auto; */
background: #ffffff; 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;
}
.el-button--primary:focus, .el-button--primary:hover {
background: #0F84DB !important;
color: #FFF;
}
.is-active:hover{
background: #0F84DB !important;
}
.brandfind-title { .brandfind-title {
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-size: 16px; font-size: 16px;
...@@ -19,6 +31,7 @@ ...@@ -19,6 +31,7 @@
/* padding: 24px 30px 30px 30px; */ /* padding: 24px 30px 30px 30px; */
/* width: 1126px; */ /* width: 1126px; */
width: 100%; width: 100%;
padding: 0 10px;
} }
.brandfind-search-box { .brandfind-search-box {
...@@ -32,22 +45,28 @@ ...@@ -32,22 +45,28 @@
position: absolute; position: absolute;
padding: 0 5px; padding: 0 5px;
left: 5px; left: 5px;
top: 3px; top: 6px;
background: #118EE9; background: #eeeeee;
display: flex; display: flex;
min-width: 60px; min-width: 60px;
height: 35px; height: 30px;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
z-index: 1128; z-index: 991;
border-radius: 3px; border-radius: 3px;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
opacity: 1; opacity: 1;
} }
.brandfind-search-box .upload-input-img>div{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.brandfind-search-box .upload-input-img i { .brandfind-search-box .upload-input-img i {
color: #ffffff; color: #797979;
cursor: pointer; cursor: pointer;
margin-left: 15px; margin-left: 15px;
} }
...@@ -104,12 +123,17 @@ ...@@ -104,12 +123,17 @@
font-size: 24px; font-size: 24px;
} }
.brandfind-main .el-tabs--border-card>.el-tabs__header .el-tabs__item{
padding: 0 30px !important;
}
.brandfind-main .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active { .brandfind-main .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
background: #118EE9; background: #118EE9;
color: #ffffff; color: #ffffff;
border-right-color: #118EE9 ;
border-left-color: #118EE9;
} }
.brandfind-main .el-tabs__nav-scroll { .brandfind-main .el-tabs__nav-scroll {
background: #F9F9F9; background: #F9F9F9;
} }
...@@ -117,19 +141,17 @@ ...@@ -117,19 +141,17 @@
.brandfind-main .el-tabs--border-card { .brandfind-main .el-tabs--border-card {
border: none; border: none;
box-shadow: none; box-shadow: none;
} }
.brandfind-main .el-tabs--border-card>.el-tabs__content { .brandfind-main .el-tabs--border-card>.el-tabs__content {
padding: 0; padding: 0;
} }
.brandfind-main-filter { .brandfind-main-filter {
/* width: 1066px; */ /* width: 1066px; */
width: 100%; width: 100%;
min-height: 172px; min-height: 172px;
box-sizing: border-box; box-sizing: border-box;
padding: 32px 18px 0; padding: 32px 30px 0;
border: 1px solid #f7f7f8; border: 1px solid #f7f7f8;
} }
...@@ -139,6 +161,7 @@ ...@@ -139,6 +161,7 @@
min-height: 24px; min-height: 24px;
line-height: 24px; line-height: 24px;
margin-bottom: 20px; margin-bottom: 20px;
position: relative;
} }
.brandfind-main-filter-item::after { .brandfind-main-filter-item::after {
...@@ -172,14 +195,15 @@ ...@@ -172,14 +195,15 @@
.brandfind-main-filter-item .el-checkbox-button__inner, .brandfind-main-filter-item .el-checkbox-button__inner,
.brandfind-main-filter-item .el-checkbox-group { .brandfind-main-filter-item .el-checkbox-group {
vertical-align: top; vertical-align: top;
display: flex;
} }
.brandfind-main-filter-item .el-checkbox-button--mini .el-checkbox-button__inner { .brandfind-main-filter-item .el-checkbox-button--mini .el-checkbox-button__inner {
text-align: left;
border: none; border: none;
/* width: 100px; */ /* width: 100px; */
margin-bottom: 10px; margin-bottom: 10px;
width: 100px;
margin-right: 20px; margin-right: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -191,17 +215,12 @@ ...@@ -191,17 +215,12 @@
.brandfind-main-filter-item .el-checkbox-button:first-child .el-checkbox-button__inner { .brandfind-main-filter-item .el-checkbox-button:first-child .el-checkbox-button__inner {
border-left: none; border-left: none;
width: 54px !important;
border-radius: 0; border-radius: 0;
margin-left: 20px;
margin-right: 45px;
} }
.brandfind .el-checkbox-button.is-checked:first-child .el-checkbox-button__inner { .brandfind .el-checkbox-button.is-checked:first-child .el-checkbox-button__inner {
width: -webkit-fill-available; width: -webkit-fill-available;
background: #118EE9; background: #118EE9;
margin-left: 20px;
margin-right: 45px;
} }
.brandfind .el-checkbox-button.is-checked .el-checkbox-button__inner { .brandfind .el-checkbox-button.is-checked .el-checkbox-button__inner {
...@@ -213,7 +232,7 @@ ...@@ -213,7 +232,7 @@
} }
.brandfind-main-filter-item>.brandfind-main-filter-more { .brandfind-main-filter-item>.brandfind-main-filter-more {
float: right; /* float: right; */
box-sizing: border-box; box-sizing: border-box;
width: 70px; width: 70px;
height: 24px; height: 24px;
...@@ -224,6 +243,10 @@ ...@@ -224,6 +243,10 @@
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #D1D1D1; border: 1px solid #D1D1D1;
border-radius: 2px; border-radius: 2px;
position: absolute;
top: 0;
right: 0;
} }
.brandfind-main-filter-more>button { .brandfind-main-filter-more>button {
...@@ -339,6 +362,9 @@ ...@@ -339,6 +362,9 @@
margin-top: 20px; margin-top: 20px;
min-height: 400px; min-height: 400px;
} }
.brandfind-list-warpper>.brandfind-list-box{
height:330px !important;
}
.brandfind-list-title { .brandfind-list-title {
width: 100%; width: 100%;
...@@ -373,6 +399,7 @@ ...@@ -373,6 +399,7 @@
height: 180px; height: 180px;
box-sizing: border-box; box-sizing: border-box;
padding: 30px; padding: 30px;
border-bottom:1px solid rgba(247,247,248,1);
} }
...@@ -382,7 +409,7 @@ ...@@ -382,7 +409,7 @@
box-sizing: border-box; box-sizing: border-box;
width: 200px; width: 200px;
height: 120px; height: 120px;
border: 5px solid #f7f7f8; border: 1px solid #f7f7f8;
float: left; float: left;
} }
...@@ -423,7 +450,6 @@ ...@@ -423,7 +450,6 @@
border-radius: 2px; border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
padding: 4px 13px; padding: 4px 13px;
width: 126px;
height: 24px; height: 24px;
margin-right: 10px; margin-right: 10px;
text-align: center; text-align: center;
...@@ -450,6 +476,7 @@ ...@@ -450,6 +476,7 @@
font-size: 14px; font-size: 14px;
color: #FFFFFF; color: #FFFFFF;
letter-spacing: 0; letter-spacing: 0;
border-radius: 1px;
} }
...@@ -464,7 +491,9 @@ ...@@ -464,7 +491,9 @@
.brandfind-list-box-text-info>div { .brandfind-list-box-text-info>div {
margin-top: 11px; margin-top: 11px;
overflow: auto; overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
float: left; float: left;
} }
...@@ -565,7 +594,9 @@ ...@@ -565,7 +594,9 @@
} }
.brandfind .el-input--suffix .el-input__inner { .brandfind .el-input--suffix .el-input__inner {
background: #fafafa; background:#fff;
border-radius:2px;
border:1px solid #CFDAE5;
} }
...@@ -573,7 +604,9 @@ ...@@ -573,7 +604,9 @@
.brandfind .el-pagination span:not([class*=suffix]) { .brandfind .el-pagination span:not([class*=suffix]) {
min-width: 69px; min-width: 69px;
} }
.btn{
margin-top: 15px !important;
}
.brandfind .el-pagination.is-background .btn-next, .brandfind .el-pagination.is-background .btn-next,
.brandfind .el-pagination.is-background .btn-prev { .brandfind .el-pagination.is-background .btn-prev {
border-radius: 2px !important; border-radius: 2px !important;
...@@ -603,7 +636,27 @@ ...@@ -603,7 +636,27 @@
} }
.brandfind-list-page .el-pagination { .brandfind-list-page .el-pagination {
margin-top: 18px; margin-top: 145px;
float: right; float: right;
margin-bottom: 18px; }
} .loading-brandfind{
\ No newline at end of file width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.el-icon-warning{
font-size: 20px;
}
.el-message{
background: #fff !important;
}
.el-table__row>td:nth-child(2)>div{
padding-left: 20px !important;
}
.brandfind .is-active:hover{
color: #fff !important;
}
\ No newline at end of file
embed_applications/app/front/vues/pages/brandfind/brandfind.js
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/*搜索框禁用 */ /*搜索框禁用 */
searchDisabled: false, searchDisabled: false,
placeholder: '请输入商标名称、申请号、申请人等', placeholder: '请输入商标名称、申请号、申请人等',
loading:false,
tmList: [], tmList: [],
tmRegistNumsAll: [], tmRegistNumsAll: [],
pagesize: "10", pagesize: "10",
...@@ -129,7 +129,12 @@ ...@@ -129,7 +129,12 @@
/** 智能查询按钮点击事件 */ /** 智能查询按钮点击事件 */
tmSearchButtonClick(){ tmSearchButtonClick(){
if (!this.text) { if (!this.text) {
this.$message.warning("请输入目标"); this.$message({
dangerouslyUseHTMLString: true,
iconClass: "el-icon-warning",
type: 'warning',
message: '<strong>&nbsp;&nbsp;&nbsp;请输入搜索内容</strong>'
});
} else { } else {
this.ncl_list = []; this.ncl_list = [];
this.selected_ncl_list = ["不限"]; this.selected_ncl_list = ["不限"];
...@@ -150,6 +155,7 @@ ...@@ -150,6 +155,7 @@
this.$message.warning("请输入目标"); this.$message.warning("请输入目标");
} else { } else {
/* 0:相同商标,1：相似商标,2：申请号,3：申请人,4：图像*/ /* 0:相同商标,1：相似商标,2：申请号,3：申请人,4：图像*/
console.log(this.tabsName,"12312312");
if (this.tabsName == "0") { if (this.tabsName == "0") {
this.accurateTmSearch(); this.accurateTmSearch();
} else if (this.tabsName == "1") { } else if (this.tabsName == "1") {
...@@ -209,11 +215,11 @@ ...@@ -209,11 +215,11 @@
} }
obj["flzttabkey"] = selected_legal_status_list; obj["flzttabkey"] = selected_legal_status_list;
} }
this.$root.loading = true; this.loading = true;
clearTimeout(this.timer); clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000); this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkNameAccurate", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkNameAccurate", obj).then(d => {
this.$root.loading = false; this.loading = false;
console.log("精确商标查询+++++++++++++++++++"); console.log("精确商标查询+++++++++++++++++++");
console.log(d); console.log(d);
if (d && d.status == 0 && d.data) { if (d && d.status == 0 && d.data) {
...@@ -233,7 +239,7 @@ ...@@ -233,7 +239,7 @@
} }
} }
}).catch(function (e) { }).catch(function (e) {
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
...@@ -302,11 +308,11 @@ ...@@ -302,11 +308,11 @@
} else { } else {
obj["sbtjdata"] = ["近似", "变字", "拼音", "同义词", "形近字", "换序", "包含该商标"]; obj["sbtjdata"] = ["近似", "变字", "拼音", "同义词", "形近字", "换序", "包含该商标"];
} }
this.$root.loading = true; this.loading = true;
clearTimeout(this.timer); clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000); this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkName", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkName", obj).then(d => {
this.$root.loading = false; this.loading = false;
console.log("模糊商标查询+++++++++++++++++++"); console.log("模糊商标查询+++++++++++++++++++");
console.log(d); console.log(d);
if (d && d.status == 0 && d.data) { if (d && d.status == 0 && d.data) {
...@@ -325,7 +331,7 @@ ...@@ -325,7 +331,7 @@
this.checkboxLabelHigh = ["近似", "变字", "拼音", "同义词", "形近字", "换序", "包含该商标"]; this.checkboxLabelHigh = ["近似", "变字", "拼音", "同义词", "形近字", "换序", "包含该商标"];
} }
}).catch(function (e) { }).catch(function (e) {
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
...@@ -377,12 +383,12 @@ ...@@ -377,12 +383,12 @@
} }
obj["flzttabkey"] = selected_legal_status_list; obj["flzttabkey"] = selected_legal_status_list;
} }
this.$root.loading = true; this.loading = true;
clearTimeout(this.timer); clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000); this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkzchAccurate", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkzchAccurate", obj).then(d => {
this.$root.loading = false; this.loading = false;
console.log("注册号商标查询+++++++++++++++++++"); console.log("注册号商标查询+++++++++++++++++++");
console.log(d); console.log(d);
if (d && d.status == 0 && d.data) { if (d && d.status == 0 && d.data) {
...@@ -399,7 +405,7 @@ ...@@ -399,7 +405,7 @@
} }
} }
}).catch(function (e) { }).catch(function (e) {
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
...@@ -452,11 +458,11 @@ ...@@ -452,11 +458,11 @@
} }
obj["flzttabkey"] = selected_legal_status_list; obj["flzttabkey"] = selected_legal_status_list;
} }
this.$root.loading = true; this.loading = true;
clearTimeout(this.timer); clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000); this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkzcr", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkzcr", obj).then(d => {
this.$root.loading = false; this.loading = false;
console.log("申请人商标查询+++++++++++++++++++"); console.log("申请人商标查询+++++++++++++++++++");
console.log(d); console.log(d);
if (d && d.status == 0 && d.data) { if (d && d.status == 0 && d.data) {
...@@ -473,7 +479,7 @@ ...@@ -473,7 +479,7 @@
} }
} }
}).catch(function (e) { }).catch(function (e) {
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
...@@ -536,7 +542,6 @@ ...@@ -536,7 +542,6 @@
} }
var num2 = this.province_counts_t.length; var num2 = this.province_counts_t.length;
for(var j = 0; j < 5 - num2; j++){ for(var j = 0; j < 5 - num2; j++){
console.log(j);
this.province_counts_t.push({ this.province_counts_t.push({
count: "-", count: "-",
index: "-", index: "-",
...@@ -553,6 +558,26 @@ ...@@ -553,6 +558,26 @@
item.index = index + 6; item.index = index + 6;
return item; return item;
}); });
if(d.data.ncl_counts.length){
var num1 = this.ncl_counts_o.length;
for(var i = 0; i < 5 - num1; i++){
this.ncl_counts_o.push({
code: "-",
count: "-",
index: "-",
percent: "-"
})
}
var num2 = this.ncl_counts_t.length;
for(var j = 0; j < 5 - num2; j++){
this.ncl_counts_t.push({
code: "-",
count: "-",
index: "-",
percent: "-"
})
}
}
} }
}); });
}, },
...@@ -603,32 +628,30 @@ ...@@ -603,32 +628,30 @@
} }
var that = this; var that = this;
console.log(obj); console.log(obj);
const loadingbyc = this.$loading({ this.loading = true;
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(255, 255, 255, 0.7)'
});
this.$root.postReq("/web/tmquery/tmqueryCtl/findImageSearch", obj).then(function (d) { this.$root.postReq("/web/tmquery/tmqueryCtl/findImageSearch", obj).then(function (d) {
console.log("findImageSearch"); console.log("findImageSearch");
console.log(d); console.log(d);
if (d.status == 0) { if (d.status == 0) {
that.total = d.data.count; that.total = d.data.count;
that.tmList = d.data.rows; that.tmList = d.data.rows;
loadingbyc.close(); that.loading = false;
} }
}).catch(function (e) { }).catch(function (e) {
console.log(e); console.log(e);
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
loadingbyc.close(); that.loading = false;
}); });
}, },
tabClick(){ tabClick(){
console.log("12345"); this.currentpage="1";
console.log(this.tabsName); console.log(this.tabsName=="4");
console.log(typeof (this.tabsName));
if (this.tabsName == "4") { if (this.tabsName == "4") {
console.log(123); if(this.imageText){
this.imageTmsearch();
}
console.log("qweqwweq");
console.log(1234);
} }
if (this.text && this.tabsName != "4") { if (this.text && this.tabsName != "4") {
this.tmSearchButtonClick(); this.tmSearchButtonClick();
...@@ -642,6 +665,11 @@ ...@@ -642,6 +665,11 @@
this.selected_apply_year_list = ["不限"]; this.selected_apply_year_list = ["不限"];
this.checkboxLabelHigh = []; this.checkboxLabelHigh = [];
this.selected_checkboxLabelHigh = ["不限"]; this.selected_checkboxLabelHigh = ["不限"];
this.total = 0;
this.province_counts_o= [];
this.province_counts_t= [];
this.ncl_counts_o= [];
this.ncl_counts_t= [];
} }
}, },
nclchange(v){ nclchange(v){
...@@ -825,6 +853,17 @@ ...@@ -825,6 +853,17 @@
}, },
imageTextDelete(){ imageTextDelete(){
this.imageText = ""; this.imageText = "";
this.imageUrl = "";
this.tmList = [];
this.ncl_list = [];
this.selected_ncl_list = ["不限"];
this.legal_status_list = [];
this.selected_legal_status_list = ["不限"];
this.apply_year_list = [];
this.selected_apply_year_list = ["不限"];
this.checkboxLabelHigh = [];
this.selected_checkboxLabelHigh = ["不限"];
this.imageTmsearch();
}, },
currentChange(v){ currentChange(v){
console.log(v); console.log(v);
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.css
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
/* margin: 0 auto; */ /* margin: 0 auto; */
background: #ffffff; background: #ffffff;
} }
.brandfinddetails-details-box-logo > div:nth-child(2) > div{
background: #eee !important;
}
.brandfinddetails-title { .brandfinddetails-title {
box-sizing: border-box; box-sizing: border-box;
padding: 30px; padding: 30px;
...@@ -75,7 +77,7 @@ ...@@ -75,7 +77,7 @@
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #E6E8E9; border: 1px solid #E6E8E9;
height: 163px; height: 163px;
padding-top: 110px; padding-top: 100px;
padding-bottom: 40px; padding-bottom: 40px;
} }
...@@ -130,7 +132,7 @@ ...@@ -130,7 +132,7 @@
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 30px; padding: 30px;
border: 1px solid #eee;
} }
.brandfinddetails-details-box { .brandfinddetails-details-box {
...@@ -281,13 +283,23 @@ ...@@ -281,13 +283,23 @@
} }
.brandfinddetails .is-finish .is-text{ .brandfinddetails .is-finish .is-text{
background: #f68367; background: #f68367 !important;
} }
.brandfinddetails .is-finish .el-step__line { .brandfinddetails .is-finish .el-step__line {
background: #F68367; background: #F68367;
} }
.loading-brandfind{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.el-step__icon.is-text{
background: #ccc;
}
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.html
<div class="brandfinddetails"> <div ref="brandfinddetails" class="brandfinddetails">
<div class="loading-brandfind" v-if="loading" v-loading="true"></div>
<div class="brandfinddetails-title"> <div class="brandfinddetails-title">
<div> <div>
<img v-if="tmdetail.logo" :src="tmdetail.logo" alt=""> <img v-if="tmdetail.logo" :src="tmdetail.logo" alt="">
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.js
...@@ -7,11 +7,14 @@ ...@@ -7,11 +7,14 @@
tmdetail: {}, tmdetail: {},
serviceitems: [], serviceitems: [],
serviceitems_wzc: [], serviceitems_wzc: [],
loading:false,
regNum2:null,
nclNum2:null,
} }
}, },
methods: { methods: {
getTmDetail(){ getTmDetail(){
if (!this.regNum) { if (!this.regNum) {
this.$message.warning("参数错误"); this.$message.warning("参数错误");
return; return;
...@@ -24,14 +27,12 @@ ...@@ -24,14 +27,12 @@
"sbzch": this.regNum, "sbzch": this.regNum,
"gjfl": this.nclNum "gjfl": this.nclNum
}; };
this.$root.loading = true; this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/tradeMarkDetail", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/tradeMarkDetail", obj).then(d => {
console.log("商标详情+++++++++++++++++++"); this.loading = false;
console.log(d);
this.$root.loading = false;
if (d && d.status == 0 && d.data) { if (d && d.status == 0 && d.data) {
if (d.data.detaildata && d.data.detaildata.length > 0) { if (d.data.detaildata && d.data.detaildata.length > 0) {
this.tmdetail = d.data.detaildata[0]; this.tmdetail = JSON.parse(JSON.stringify(d.data.detaildata[0]));
if (this.tmdetail && this.tmdetail.sbzt) { if (this.tmdetail && this.tmdetail.sbzt) {
if (this.tmdetail.sbzt == "申请中") { if (this.tmdetail.sbzt == "申请中") {
this.tmdetail["active"] = 1; this.tmdetail["active"] = 1;
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
} }
}).catch(function (e) { }).catch(function (e) {
this.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
...@@ -71,7 +72,6 @@ ...@@ -71,7 +72,6 @@
mounted: function() { mounted: function() {
this.regNum = this.$router.history.current.query.regNum || ""; this.regNum = this.$router.history.current.query.regNum || "";
this.nclNum = this.$router.history.current.query.nclNum || ""; this.nclNum = this.$router.history.current.query.nclNum || "";
console.log(this.$router.history);
this.getTmDetail(); this.getTmDetail();
this.$nextTick(() => { this.$nextTick(() => {
...@@ -86,7 +86,18 @@ ...@@ -86,7 +86,18 @@
}, 600); }, 600);
}); });
},
activated:function(){
var embedwarpper = document.getElementsByClassName("el-scrollbar__wrap")[0];
embedwarpper.scrollTop=0;
this.regNum = this.$router.history.current.query.regNum || "";
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 || "";
}, },
vname: "gsb-brandfinddetails" vname: "gsb-brandfinddetails"
} }
embed_applications/app/front/vues/pages/ncldetail/ncldetail.css
...@@ -4,11 +4,19 @@ ...@@ -4,11 +4,19 @@
/* margin: 0 auto; */ /* margin: 0 auto; */
background-color: #fff; background-color: #fff;
padding-bottom: 25px; padding-bottom: 25px;
padding: 0 10px;
}
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 99000;
} }
.ncldetail-main-name { .ncldetail-main-name {
width: 100%; width: 100%;
padding-left: 30px;
box-sizing: border-box; box-sizing: border-box;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
font-size: 16px; font-size: 16px;
...@@ -26,7 +34,6 @@ ...@@ -26,7 +34,6 @@
text-align: center; text-align: center;
box-shadow: 0px 0px 0px 0px rgba(82, 86, 106, 0.2); box-shadow: 0px 0px 0px 0px rgba(82, 86, 106, 0.2);
font-family: Roboto; font-family: Roboto;
padding: 0px 25px;
padding-top: 10px; padding-top: 10px;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -34,8 +41,8 @@ ...@@ -34,8 +41,8 @@
.ncldetail-main-title>.title-item1 { .ncldetail-main-title>.title-item1 {
float: left; float: left;
width: 96px; width: 96px;
height: 33px; height: 30px;
line-height: 33px; line-height: 30px;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 14px; font-size: 14px;
color: #FFFFFF; color: #FFFFFF;
...@@ -48,8 +55,8 @@ ...@@ -48,8 +55,8 @@
.ncldetail-main-title>.title-item2 { .ncldetail-main-title>.title-item2 {
float: left; float: left;
width: 96px; width: 96px;
height: 33px; height: 30px;
line-height: 33px; line-height: 30px;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 14px; font-size: 14px;
color: #118EE9; color: #118EE9;
...@@ -64,43 +71,58 @@ ...@@ -64,43 +71,58 @@
height: auto; height: auto;
overflow: hidden; overflow: hidden;
margin-top: 15px; margin-top: 15px;
border-left: 1px solid rgba(247,247,248,1);
} }
/* 隐藏 */ /* 隐藏 */
.ncldetail-main-content-particular { .ncldetail-main-content-particular {
width: 100%; width: 100%;
max-height: 160px; max-height: 120px;
padding: 0px 15px; padding: 0px 30px 0 0;
box-sizing: border-box;
overflow: hidden;
margin-bottom: 20px;
}
.ncldetail-main-content-particular>div{
width: 100%;
height: 118px;
border-radius:1px;
border:1px solid rgba(230,232,233,1);
box-sizing: border-box; box-sizing: border-box;
padding: 0 5px 0 13px;
overflow: auto; overflow: auto;
} }
.ncldetail-main-content-particular>div::-webkit-scrollbar {
.ncldetail-main-content-particular>div { width: 4px;
/*height: 4px;*/
}
.ncldetail-main-content-particular>div>div {
float: left; float: left;
width: 45px; max-width: 33px;
height: 45px; width: 2.9%;
line-height: 45px; height: 33px;
line-height: 32px;
color: rgba(16, 16, 16, 1); color: rgba(16, 16, 16, 1);
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
font-family: Roboto; font-family: Roboto;
border: 1px solid rgba(187, 187, 187, 1); border: 1px solid rgba(187, 187, 187, 1);
margin: 15px; margin: 10px .6%;
cursor: pointer; cursor: pointer;
border-radius:2px;
} }
.ncldetail-main-content-particular>.special { .ncldetail-main-content-particular>div>.special {
background-color: #118EE9; background:rgba(235,242,255,1);
color: #fff; border-radius:2px;
border: #118EE9; border:1px solid rgba(202,220,255,1);
} }
/* */ /* */
.ncldetail-main-item { .ncldetail-main-item {
float: left; float: left;
min-width: 178px;
min-height: 171px; min-height: 171px;
width: 13%; width: 14.05%;
height: 10.4%; height: 10.4%;
padding-bottom: 14px; padding-bottom: 14px;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
...@@ -112,7 +134,8 @@ ...@@ -112,7 +134,8 @@
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
border: 1px solid #F7F7F8; border-right: 1px solid #F7F7F8;
border-top: 1px solid #F7F7F8;
border-radius: 1px; border-radius: 1px;
} }
...@@ -175,43 +198,46 @@ ...@@ -175,43 +198,46 @@
.ncldetail-main-item>.maskLayer>.text { .ncldetail-main-item>.maskLayer>.text {
width: 100%; width: 100%;
height: 90px; height: 92px;
font-family: PingFangSC-Semibold; font-family: PingFangSC-Semibold;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
letter-spacing: 0; letter-spacing: 0;
line-height: 19px; line-height: 18px;
text-align: left; text-align: left;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 5; -webkit-line-clamp: 5;
overflow: hidden; overflow: hidden;
} }
.ncldetail-main-item>.maskLayer>.text::-webkit-scrollbar {
width: 4px;
}
/* 2 */ /* 2 */
.ncldetail-main-content2 { .ncldetail-main-content2 {
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
padding: 15px 30px; padding: 15px 0px 0 0;
padding-right: 30px;
box-sizing: border-box; box-sizing: border-box;
} }
.ncldetail-main-item2 { .ncldetail-main-item2 {
width: 100%; width: 100%;
height: 120px; height: 120px;
border: 1px solid #F7F7F8; border: 1px solid rgba(230,232,233,1);
border-bottom: none; border-bottom: none;
} }
.ncldetail-main-item2:last-child { .ncldetail-main-item2:last-child {
border-bottom: 1px solid #F7F7F8; border-bottom: 1px solid rgba(230,232,233,1);
} }
.item2-left { .item2-left {
float: left; float: left;
border-right: 1px solid #f7f7f8; border-right: 1px solid rgba(230,232,233,1);
width: 13.2%; width: 180px;
height: 100%; height: 100%;
} }
...@@ -294,14 +320,15 @@ ...@@ -294,14 +320,15 @@
width: 100%; width: 100%;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
padding: 0px 30px; padding-right: 30px;
box-sizing: border-box; box-sizing: border-box;
} }
.RecommendedDetails { .RecommendedDetails {
width: 100%; width: 100%;
min-height: 400px; min-height: 400px;
border: 1px solid #E6E8E9; border: 1px solid rgba(230,232,233,1);
border-top: none;
} }
.RecommendedDetails>.Rtop { .RecommendedDetails>.Rtop {
...@@ -309,7 +336,7 @@ ...@@ -309,7 +336,7 @@
height: 177px; height: 177px;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #E6E8E9; border-bottom: 1px solid rgba(230,232,233,1);
position: relative; position: relative;
} }
...@@ -365,18 +392,17 @@ ...@@ -365,18 +392,17 @@
.RecommendedDetails>.Rbottom>.Rleft { .RecommendedDetails>.Rbottom>.Rleft {
float: left; float: left;
width: 44%; width: 46%;
padding: 30px; padding: 30px;
border-right: 1px solid #E6E8E9;
box-sizing: border-box; box-sizing: border-box;
border-right: 1px solid rgba(230,232,233,1);
} }
.RecommendedDetails>.Rbottom>.Rright { .RecommendedDetails>.Rbottom>.Rright {
float: right; float: right;
width: 54%; width: 54%;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
border-left: 1px solid rgba(230,232,233,1);
} }
.RecommendedDetails>.Rbottom>.Rleft>div { .RecommendedDetails>.Rbottom>.Rleft>div {
......
embed_applications/app/front/vues/pages/ncldetail/ncldetail.html
<div class="ncldetail"> <div class="ncldetail">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="ncldetail-main"> <div class="ncldetail-main">
<div class="ncldetail-main-name">商标分类</div> <div class="ncldetail-main-name">商标分类</div>
<div class="ncldetail-main-title"> <div class="ncldetail-main-title">
...@@ -11,7 +12,7 @@ ...@@ -11,7 +12,7 @@
<div class="name">{{item.code}}类</div> <div class="name">{{item.code}}类</div>
<div class="text">{{item.name}}</div> <div class="text">{{item.name}}</div>
<div class="maskLayer" v-if="nclKey == key"> <div class="maskLayer" v-if="nclKey == key">
<div class="name">第{{item.code}}类 {{item.name}}</div> <div class="name" style="overflow: hidden;textOverflow: ellipsis;whiteSpace: nowrap;">第{{item.code}}类 {{item.name}}</div>
<div class="text">{{item.description}}</div> <div class="text">{{item.description}}</div>
</div> </div>
</div> </div>
...@@ -29,7 +30,10 @@ ...@@ -29,7 +30,10 @@
</div> </div>
</div> </div>
<div class="ncldetail-main-content-particular" v-if="recommendType && brandKey == 1"> <div class="ncldetail-main-content-particular" v-if="recommendType && brandKey == 1">
<div :class="NmcpKey == i ? \'special\' : \' \'" v-for="i in 45" @click="ncldataParEve(i)">{{i}}</div> <div>
<div :class="NmcpKey == i ? \'special\' : \' \'" v-for="i in 45" @click="ncldataParEve(i)">{{i}}</div>
</div>
</div> </div>
<div class="ncldetail-main-content2-particular" v-if="recommendType"> <div class="ncldetail-main-content2-particular" v-if="recommendType">
<div class="RecommendedDetails"> <div class="RecommendedDetails">
......
embed_applications/app/front/vues/pages/ncldetail/ncldetail.js
...@@ -87,7 +87,8 @@ ...@@ -87,7 +87,8 @@
RecommendedDetailsData: [], RecommendedDetailsData: [],
RecommendedDetailsObj: {}, RecommendedDetailsObj: {},
RdeKey: 0, RdeKey: 0,
NmcpKey: null NmcpKey: null,
loading: false
} }
}, },
methods: { methods: {
...@@ -127,14 +128,9 @@ ...@@ -127,14 +128,9 @@
number: this.number number: this.number
}; };
var that = this; var that = this;
const loadingbyc = this.$loading({ this.loading=true;
lock: true,
text: '拼命加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.$root.postReq("/web/tmquery/tmqueryCtl/getNclDetail", objdata).then(function (d) { this.$root.postReq("/web/tmquery/tmqueryCtl/getNclDetail", objdata).then(function (d) {
loadingbyc.close(); that.loading=false;
that.RecommendedDetailsData = d.data; that.RecommendedDetailsData = d.data;
that.RecommendedDetailsObj = d.data.data[0]; that.RecommendedDetailsObj = d.data.data[0];
var str = that.RecommendedDetailsData.classification.replace(/-/,` -`); var str = that.RecommendedDetailsData.classification.replace(/-/,` -`);
...@@ -142,7 +138,7 @@ ...@@ -142,7 +138,7 @@
}).catch(function (e) { }).catch(function (e) {
console.log(e); console.log(e);
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
} }
......
embed_applications/app/front/vues/pages/noticetm/noticetm.css
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
/* border: 1px solid #118EE9; */ /* border: 1px solid #118EE9; */
/* padding: 30px; */ /* padding: 30px; */
background: #ffffff; background: #ffffff;
padding: 0 10px;
}
.brandfind-list-page{
margin-bottom: 60px;
} }
.noticetm-main-name { .noticetm-main-name {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
...@@ -34,8 +37,8 @@ ...@@ -34,8 +37,8 @@
.noticetm-main-title>.title-item1 { .noticetm-main-title>.title-item1 {
float: left; float: left;
width: 120px; width: 120px;
height: 33px; height: 30px;
line-height: 33px; line-height: 30px;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 14px; font-size: 14px;
color: #FFFFFF; color: #FFFFFF;
...@@ -48,8 +51,8 @@ ...@@ -48,8 +51,8 @@
.noticetm-main-title>.title-item2 { .noticetm-main-title>.title-item2 {
float: left; float: left;
width: 120px; width: 120px;
height: 33px; height: 30px;
line-height: 33px; line-height: 30px;
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 14px; font-size: 14px;
color: #118EE9; color: #118EE9;
...@@ -66,8 +69,8 @@ ...@@ -66,8 +69,8 @@
.noticetm-find { .noticetm-find {
padding: 30px; padding: 30px;
border: 1px solid #eee; border:1px solid rgba(247,247,248,1);
margin-bottom: 20px;
} }
.noticetm-notice .el-table--fit { .noticetm-notice .el-table--fit {
...@@ -96,17 +99,26 @@ ...@@ -96,17 +99,26 @@
.noticetm .el-table td, .el-table th.is-leaf{ .noticetm .el-table td, .el-table th.is-leaf{
text-align: center; text-align: center;
} }
.el-radio-group>.is-active:hover{
background:#fff !important;
}
.el-radio-group>div>.is-active:hover{
background:#fff !important;
}
.brandfind-main-filter-item .el-radio-button__inner, .brandfind-main-filter-item .el-radio-button__inner,
.brandfind-main-filter-item .el-radio-group { .brandfind-main-filter-item .el-radio-group {
vertical-align: top; vertical-align: top;
display: flex;
} }
.brandfind-main-filter-item .el-radio-button--mini .el-radio-button__inner { .brandfind-main-filter-item .el-radio-button--mini .el-radio-button__inner {
border: none; border: none;
margin-bottom: 10px; margin-bottom: 10px;
width: 120px;
margin-right: 20px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 14px;
color:rgba(151,166,173,1);
text-align: left;
padding: 7px 13px;
} }
.brandfind-main-filter-item .el-radio-button__orig-radio:checked+.el-radio-button__inner{ .brandfind-main-filter-item .el-radio-button__orig-radio:checked+.el-radio-button__inner{
background: #118EE9; background: #118EE9;
...@@ -115,34 +127,18 @@ ...@@ -115,34 +127,18 @@
border-left: none; border-left: none;
border-radius: 0; border-radius: 0;
width: -webkit-fill-available; width: -webkit-fill-available;
margin-left: 39px; margin-right: 16px;
margin-right: 47px;
} }
.brandfind-main-filter-item .el-radio-button:last-child .el-radio-button__inner { .brandfind-main-filter-item .el-radio-button:last-child .el-radio-button__inner {
border-radius: 0; border-radius: 0;
} }
.noticetm-input { .noticetm-input {
color: #797979; color: #797979;
letter-spacing: 0; letter-spacing: 0;
text-align: center; text-align: center;
height: 28px; height: 28px;
min-width: 1126px;
font-size: 14px;
} }
.noticetm-input>button { .noticetm-input>button {
...@@ -156,21 +152,23 @@ ...@@ -156,21 +152,23 @@
border: 1px solid #eee; border: 1px solid #eee;
margin-right: 30px; margin-right: 30px;
} }
.noticetm-input input:hover{
border: 1px solid #118EE9;
}
.details-entry { .details-entry {
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #D1D1D1; border: 1px solid #D1D1D1;
border-radius: 2px; border-radius: 2px;
color: black; color: rgba(72,72,72,1);
transform: translateY(40px); transform: translateY(40px);
padding: 5px 3px; padding: 7px 3px;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
} }
.details-entry2 { .details-entry2 {
padding: 5px 3px; padding: 7px 3px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 2px; border-radius: 2px;
transform: translateY(60px); transform: translateY(60px);
...@@ -180,11 +178,6 @@ ...@@ -180,11 +178,6 @@
cursor: pointer; cursor: pointer;
} }
.noticetm .el-pagination button, .noticetm .el-pagination button,
.noticetm .el-pagination span:not([class*=suffix]) { .noticetm .el-pagination span:not([class*=suffix]) {
min-width: 69px; min-width: 69px;
...@@ -206,4 +199,15 @@ ...@@ -206,4 +199,15 @@
.noticetm .el-pagination.is-background .el-pager li:not(.disabled).active { .noticetm .el-pagination.is-background .el-pager li:not(.disabled).active {
background: #1C2B36; background: #1C2B36;
}
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 99000;
}
.el-table td, .el-table th.is-leaf{
border-bottom:1px solid rgba(247,247,248,1) !important;
} }
\ No newline at end of file
embed_applications/app/front/vues/pages/noticetm/noticetm.js
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
typeList: '' typeList: '',
loading: false
} }
}, },
...@@ -87,15 +88,15 @@ ...@@ -87,15 +88,15 @@
noticetype: "TMZCSQ" noticetype: "TMZCSQ"
}; };
var that = this; var that = this;
this.$root.loading = true; this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) { this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) {
that.$root.loading = false; that.loading = false;
that.issue_list = d.data.selectdata; that.issue_list = d.data.selectdata;
that.issue_data = d.data.rows; that.issue_data = d.data.rows;
that.maxdata = d.data.selectdata[0].value; that.maxdata = d.data.selectdata[0].value;
console.log(d, "//////////////////////////"); console.log(d, "//////////////////////////");
}).catch(function (e) { }).catch(function (e) {
this.$root.loading = false; this.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
...@@ -137,9 +138,10 @@ ...@@ -137,9 +138,10 @@
}; };
console.log(obj); console.log(obj);
var that = this; var that = this;
this.$root.loading = true; this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => {
that.$root.loading = false; that.loading = false;
console.log(d,"zheshishuju");
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
var rows = d.data.rows; var rows = d.data.rows;
for (var i = 0; i < rows.length; i++) { for (var i = 0; i < rows.length; i++) {
...@@ -148,6 +150,7 @@ ...@@ -148,6 +150,7 @@
var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, ""); var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, "");
var nclnum = sblb.split(" ")[0]; var nclnum = sblb.split(" ")[0];
nclnum = Number(nclnum); nclnum = Number(nclnum);
console.log(nclnum);
nclnum = this.ncldata[nclnum - 1].code + " " + this.ncldata[nclnum - 1].name; nclnum = this.ncldata[nclnum - 1].code + " " + this.ncldata[nclnum - 1].name;
rows[i]["nclnum"] = nclnum; rows[i]["nclnum"] = nclnum;
} }
...@@ -155,11 +158,9 @@ ...@@ -155,11 +158,9 @@
that.tms = rows; that.tms = rows;
that.total = d.data.count; that.total = d.data.count;
} }
}).catch(function (e) { }).catch(function (e) {
console.log(e); console.log(e,"lslslslls");
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
......
embed_applications/app/front/vues/pages/policylist/policylist.css
...@@ -2,6 +2,14 @@ ...@@ -2,6 +2,14 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.policy-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.policylist-warpper > .policylist { .policylist-warpper > .policylist {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
embed_applications/app/front/vues/pages/policylist/policylist.html
<div class="policylist-warpper"> <div class="policylist-warpper">
<div class="policy-loading" v-if="loading" v-loading="true"></div>
<div class="policylist" v-if="detailPageType"> <div class="policylist" v-if="detailPageType">
<div class="policylist-header"> <div class="policylist-header" style="border:none;">
<div class="header-left" @click="LookHome">区域政策<span v-if="!listPageType" > > <span style="color: #484848">全部企业</span></span></div> <div class="header-left" @click="LookHome">区域政策<span v-if="!listPageType" > > <span style="color: #484848">全部企业</span></span></div>
<div class="header-right"> <div class="header-right">
<el-select v-model="policyValue" placeholder="全部企业" size="mini"> <el-select v-model="policyValue" placeholder="全部企业" size="mini">
...@@ -42,8 +43,8 @@ ...@@ -42,8 +43,8 @@
</div> </div>
<div class="policylist-portrayal"> <div class="policylist-portrayal">
<div class="portrayal-left">企业画像</div> <div class="portrayal-left">企业画像</div>
<div class="portrayal-right"> <div class="portrayal-right" ref="qyhx">
<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">{{item}}</div>
</div> </div>
</div> </div>
<div class="policylist-recommend"> <div class="policylist-recommend">
...@@ -63,9 +64,9 @@ ...@@ -63,9 +64,9 @@
</div> </div>
</div> </div>
<div class="policylist-content"> <div class="policylist-content" ref="item">
<div class="policylist-content-list" v-for="(i,k) in recommendationsArr"> <div class="policylist-content-list" v-for="(i,k) in recommendationsArr">
<div class="policylist-conten-title" @click="articleDetails(i)">{{i.name}} <span :style="color16()">{{i.label}}</span></div> <div class="policylist-conten-title" @click="articleDetails(i)">{{i.name}} <span>{{i.label}}</span></div>
<div class="policylist-conten-text">{{i.text}}</div> <div class="policylist-conten-text">{{i.text}}</div>
<div class="policylist-conten-items"><span>来源：{{i.source}}</span><span>日期：{{i.date}}</span><span> <i class="el-icon-view"></i> {{i.count}}</span></div> <div class="policylist-conten-items"><span>来源：{{i.source}}</span><span>日期：{{i.date}}</span><span> <i class="el-icon-view"></i> {{i.count}}</span></div>
</div> </div>
...@@ -82,14 +83,14 @@ ...@@ -82,14 +83,14 @@
</div> </div>
<div class="policylist" v-if="!detailPageType"> <div class="policylist" v-if="!detailPageType">
<div class="policylist-header"> <div class="policylist-header" style="border:none;">
<div class="header-left" @click="next">区域政策 > 全部企业 > <span style="color: #484848">政策详情</span></div> <div class="header-left" @click="next">区域政策 > 全部企业 > <span style="color: #484848">政策详情</span></div>
</div> </div>
<div style="width: 100%;height: 25px;"></div> <div style="width: 100%;height: 25px;"></div>
<div class="policylist-portrayal"> <div class="policylist-portrayal">
<div class="portrayal-left">政策画像</div> <div class="portrayal-left">政策画像</div>
<div class="portrayal-right"> <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> </div>
<div class="policylist-essay"> <div class="policylist-essay">
...@@ -100,9 +101,9 @@ ...@@ -100,9 +101,9 @@
<div class="essay-content" v-html="recommendationsObj.policytext"></div> <div class="essay-content" v-html="recommendationsObj.policytext"></div>
</div> </div>
<div class="policylist-buttons"> <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(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 style="border:1px solid rgba(78,140,238,1);color:#4E8CEE" @click="consulting"><img src="/imgs/zx.png" alt="">政策咨询</div>
</div> </div>
<!-- <div class="policylist-navigation"> <!-- <div class="policylist-navigation">
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
<div @click="after(rKey)" v-if="recommendationsObjAfter">下一篇：{{recommendationsObjAfter.name}}</div> <div @click="after(rKey)" v-if="recommendationsObjAfter">下一篇：{{recommendationsObjAfter.name}}</div>
</div> --> </div> -->
<div class="policylist-qr"> <div class="policylist-qr">
<img src="/imgs/gsb.png" alt=""> 扫一扫，关注iBOSS微信服务号，随时随地了解行业政策最新资讯 <img style="border:1px dashed #666;" src="/imgs/gsb.png" alt=""> 扫一扫，关注iBOSS微信服务号，随时随地了解行业政策最新资讯
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
embed_applications/app/front/vues/pages/policylist/policylist.js
...@@ -1390,13 +1390,45 @@ ...@@ -1390,13 +1390,45 @@
recommendationsObjAfter: {}, recommendationsObjAfter: {},
companyObj: {}, companyObj: {},
rKey: null, 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"
}],
loading: false
} }
}, },
methods: { methods: {
search() { search() {
this.zcPost() if(this.zctext){
this.zcPost();
};
},
colorChild1(){
for (let i = 0; i < this.$refs.qyhx.children.length; i++) {
this.$refs.qyhx.children[i].style = this.rgb();
};
},
colorChild2(){
for (let i = 0; i < this.$refs.item.children.length; i++) {
this.$refs.item.children[i].children[0].children[0].style = this.color16();
};
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.zcPost(val) this.zcPost(val)
...@@ -1423,15 +1455,18 @@ ...@@ -1423,15 +1455,18 @@
scrollTo(0,0); scrollTo(0,0);
this.recommendationsObj = obj; this.recommendationsObj = obj;
this.zccompanyPost(); this.zccompanyPost();
this.loading=true;
axios.post('http://43.247.184.92:8018/gsb/api/zcdetailcount',{ axios.post('http://43.247.184.92:8018/gsb/api/zcdetailcount',{
"ID": obj.ID, "ID": obj.ID,
"count":0 "count":0
}).then( d => { }).then( d => {
console.log(d,'================================='); console.log(d,'=================================');
this.loading=false;
var data = d.data.data; var data = d.data.data;
this.portrayalArr = d.data.company_keys; this.portrayalArr = d.data.company_keys;
this.recommendationsArr = data this.arrList = this.recommendationsArr;
}) this.recommendationsArr = data;
});
}, },
/*before(i) { /*before(i) {
this.rKey = i-1; this.rKey = i-1;
...@@ -1442,7 +1477,7 @@ ...@@ -1442,7 +1477,7 @@
next () { next () {
this.detailPageType = true; this.detailPageType = true;
this.zccompanyPost(); this.zccompanyPost();
this.zcPost() this.zcPost();
}, },
LookHome() { LookHome() {
this.listPageType = true; this.listPageType = true;
...@@ -1467,10 +1502,14 @@ ...@@ -1467,10 +1502,14 @@
rgb(){ rgb(){
var r = Math.floor(Math.random()*256); var r = Math.floor(Math.random()*256);
var g = Math.floor(Math.random()*256); var g = Math.floor(Math.random()*256);
var b = Math.floor(Math.random()*256); var b = Math.floor(Math.random()*256);
var rgb = 'color:' + 'rgba('+r+','+g+','+b+', 1)' + ';' + 'background-color:' + 'rgba('+r+','+g+','+b+', 0.3)'; var rgb = 'color:' + 'rgba('+r+','+g+','+b+', 1)' + ';' + 'background-color:' + 'rgba('+r+','+g+','+b+', 0.3)';
return rgb; return rgb;
}, },
rgba() {
var color = this.colorList[Math.floor(Math.random()*this.colorList.length)];
return `color:${color.fontColor};background-color:${color.bgColor}`;
},
leftswiperList () { leftswiperList () {
console.log(this.$refs.swiperList.offsetWidth); console.log(this.$refs.swiperList.offsetWidth);
if (this.transformNumber < 0) { if (this.transformNumber < 0) {
...@@ -1485,33 +1524,47 @@ ...@@ -1485,33 +1524,47 @@
} }
}, },
zccompanyNamePost() { zccompanyNamePost() {
this.loading=true;
axios.post('http://43.247.184.92:8018/gsb/api/zccompany_name',{ axios.post('http://43.247.184.92:8018/gsb/api/zccompany_name',{
"company_name": this.zcoName "company_name": this.zcoName
}).then( d => { }).then( d => {
console.log(d,'================================='); console.log(d,'=================================');
this.loading=false;
var data = d.data.data; var data = d.data.data;
this.portrayalArr = d.data.company_keys; this.portrayalArr = d.data.company_keys;
this.recommendationsArr = data this.arrList = this.recommendationsArr;
this.recommendationsArr = data;
}) })
}, },
zcPost(size) { zcPost(size) {
console.log(123);
/*http://43.247.184.92:8018/gsb/api/zc*/ /*http://43.247.184.92:8018/gsb/api/zc*/
this.loading=true;
axios.post('http://43.247.184.92:8018/gsb/api/zc',{ axios.post('http://43.247.184.92:8018/gsb/api/zc',{
"zctext": this.zctext, "zctext": this.zctext,
"currentpage": size || 1, "currentpage": size || 1,
"pagesize":10 "pagesize":10
}).then( d => { }).then( d => {
console.log(d,'---------------------------------'); console.log(d,'---------------------------------');
this.loading=false;
var data = d.data.data; var data = d.data.data;
this.arrList = this.recommendationsArr;
this.recommendationsArr = data; this.recommendationsArr = data;
this.total = d.data.total this.total = d.data.total;
this.colorChild2();
}) })
}, },
zccompanyPost() { zccompanyPost() {
this.loading=true;
axios.post('http://43.247.184.92:8018/gsb/api/zccompany',{}).then( d => { axios.post('http://43.247.184.92:8018/gsb/api/zccompany',{}).then( d => {
console.log(d); console.log(d,'123452345678');
var data = d.data.data; var data = d.data.data;
this.portrayalArr = data this.portrayalArr = data;
this.loading=false;
setTimeout(()=>{
this.colorChild1();
this.colorChild2();
},100)
}) })
}, },
getCompanyListPost() { getCompanyListPost() {
...@@ -1534,20 +1587,18 @@ ...@@ -1534,20 +1587,18 @@
data[i]['logo'] = data[i].name.substr(0, 4); data[i]['logo'] = data[i].name.substr(0, 4);
that.policyArr.push(data[i]); that.policyArr.push(data[i]);
}; };
console.log(that.policyArr) console.log(that.policyArr,"809767899")
}).catch(function (e) { }).catch(function (e) {
console.log(`操作失败，请刷新页面后重新操作`); console.log(`操作失败，请刷新页面后重新操作`);
}); });
} }
}, },
mounted: function() { mounted: function() {
this.arrList = this.recommendationsArr;
this.recommendationsArr = this.recommendationsArr1; this.recommendationsArr = this.recommendationsArr1;
/*for (let i = 0; i < this.portrayalArr.length; i++) {
this.portrayalArr[i].col = this.rgb();
};*/
this.zcPost(); this.zcPost();
this.zccompanyPost(); this.zccompanyPost();
this.getCompanyListPost() this.getCompanyListPost();
}, },
vname: "gsb-policylist" vname: "gsb-policylist"
} }
embed_applications/app/front/vues/pages/policyquery/policyquery.css 0 → 100644
.policylist-warpper {
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%;
}
.policylist-header {
width: 100%;
overflow: hidden;
border: 1px solid #F0F3F0;
}
.header-left {
float: left;
font-size:16px;
font-family:MicrosoftYaHei;
color:rgba(121,121,121,1);
cursor: pointer;
}
.header-right {
float: right;
width: 110px;
height: 28px;
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(121,121,121,1);
}
.policylist-swiper {
width: 100%;
margin-top: 30px;
height: 150px;
padding: 20px;
box-sizing: border-box;
position: relative;
background-color: #FAFAFA;
/* background-color: #ccc; */
}
.swiper-main {
width: 96%;
height: 100%;
margin: 0 auto;
white-space:nowrap;
overflow: hidden;
}
.swiper-leftButton {
position: absolute;
top: 33%;
left: 20px;
width:16px;
height:54px;
line-height: 54px;
text-align: center;
background:rgba(240,240,240,1);
border-radius:2px;
cursor: pointer;
}
.swiper-rightButton {
position: absolute;
top: 33%;
right: 20px;
width:16px;
height:54px;
line-height: 54px;
text-align: center;
background:rgba(240,240,240,1);
border-radius:2px;
cursor: pointer;
}
.swiper-rightButton:hover {
background-color:rgba(235,242,255,1);
color: #97A6AD;
}
.swiper-leftButton:hover {
background-color:rgba(235,242,255,1);
color: #97A6AD;
}
.main-lists {
height: 100%;
overflow: hidden;
white-space: nowrap;
display: inline-block;
-webkit-transition: transform 0.3s linear;
}
.mian-list {
display: inline-block;
width: 360px;
height: 100%;
margin-right: 10px;
background:rgba(255,255,255,1);
box-shadow:2px 2px 5px 0px rgba(226,226,226,0.5);
border-radius:2px;
border:1px solid rgba(230,232,233,1);
padding: 20px;
box-sizing: border-box;
overflow: hidden;
cursor: pointer;
}
.mian-list:hover {
background:rgba(255,255,255,1);
box-shadow:2px 2px 5px 0px rgba(226,226,226,0.5);
border-radius:2px;
border:1px solid rgba(17,142,233,1);
}
.list-img {
float: left;
width:70px;
height:70px;
margin-right: 20px;
font-size: 20px;
color: #5D9ADD;
background:rgba(235,242,255,1);
white-space: normal !important;
text-align: center;
display:table;
padding: 0px 10px;
box-sizing: border-box;
}
.list-img > span {
display:table-cell;
vertical-align:middle
}
.list-text {
float: left;
line-height: 24px;
letter-spacing: 2px;
}
.list-text-title {
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(72,72,72,1);
}
.list-text-name {
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(121,121,121,1);
}
.policylist-portrayal {
width:100%;
height:118px;
background:rgba(255,255,255,1);
border-radius:1px;
border:1px solid rgba(247,247,248,1);
overflow: hidden;
padding: 20px;
box-sizing: border-box;
}
.portrayal-left {
float: left;
font-weight: 600;
color: #118EE9;
font-size: 1.6vw;
margin-right: 22px;
}
.portrayal-right {
float: left;
width: 85%;
height: 100%;
overflow: hidden;
padding: 0.5% 0px;
box-sizing: border-box;
}
.portrayal-right-list {
float: left;
margin-right: 16px;
margin-bottom: 10px;
padding: 5px 10px;
font-size:12px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
cursor: default;
}
.policylist-recommend {
width:100%;
height:60px;
background:rgba(255,255,255,1);
border-radius:1px;
border:1px solid rgba(247,247,248,1);
padding: 0px 20px;
line-height: 60px;
box-sizing: border-box;
overflow: hidden;
}
.recommend-title {
float: left;
font-weight: 600;
font-size: 1.6vw;
color: #F2784B;
margin-right: 22px;
}
.recommend-name {
float: left;
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(121,121,121,1);
margin-right: 30px;
font-weight: 600;
}
.recommend-name > span {
margin-left: 10px;
color: #118EE9;
}
.recommend-input {
float: right;
width:220px;
height:32px;
}
.policylist-content {
width: 100%;
}
.policylist-content-list {
width: 100%;
padding: 20px 30px;
box-sizing: border-box;
}
.policylist-conten-title {
font-size:18px;
font-family:PingFangSC-Semibold,PingFangSC;
font-weight:600;
color:rgba(72,72,72,1);
margin-bottom: 15px;
cursor: pointer;
}
.policylist-conten-title a {
text-decoration:none !important;
color:#333 !important;
}
.policylist-conten-title span {
margin-left: 10px;
padding: 5px 10px;
font-size:12px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(255,255,255,1);
background-color: #597EF7;
}
.policylist-conten-text {
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(121,121,121,1);
margin-bottom: 13px;
}
.policylist-conten-items {
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(153,153,153,1);
}
.policylist-conten-items > span {
margin-right: 40px;
}
.policylist-pagination {
text-align: right;
}
.policylist-details {
width: 100%;
height:130px;
background:rgba(250,250,250,1);
padding: 30px;
box-sizing: border-box;
overflow: hidden;
}
.details-leftimg {
float: left;
width:70px;
height:70px;
background:rgba(234,244,255,1);
margin-right: 22px;
}
.details-righttext {
float: left;
width: 80%;
}
.righttext-name {
width: 100%;
line-height: 24px;
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(72,72,72,1);
}
.righttext-span {
line-height: 24px;
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(121,121,121,1);
}
.righttext-span > span {
display: inline-block;
}
.policylist-essay {
width: 100%;
}
.essay-title {
width: 100%;
height: 175px;
padding-top: 30px;
box-sizing: border-box;
}
.essay-title-name {
width:100%;
height:75px;
font-size:24px;
font-weight: 600;
font-family:MicrosoftYaHei;
color:rgba(72,72,72,1);
line-height:40px;
text-align: center;
}
.essay-title-list {
width: 100%;
margin-top: 20px;
text-align: center;
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(170,170,170,1);
}
.essay-title-list > span {
margin-right: 38px;
}
.essay-content {
width: 100%;
font-size:14px;
font-family:PingFangSC-Regular,PingFangSC;
font-weight:400;
color:rgba(85,85,85,1);
line-height: 42px;
}
.policylist-buttons {
width: 100%;
padding-bottom: 30px;
border-bottom:1px solid rgba(239,239,239,1);
overflow: hidden;
}
.policylist-buttons > div {
float: right;
width:120px;
height:32px;
line-height: 32px;
margin-right: 13px;
border-radius:20px;
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
text-align: center;
cursor: pointer;
}
.policylist-buttons > div > img {
vertical-align: middle;
}
.policylist-navigation {
width: 100%;
height: 107px;
font-size:14px;
font-family:PingFangSC-Regular,PingFangSC;
font-weight:400;
color:rgba(70,70,70,1);
padding: 30px 0px;
box-sizing: border-box;
}
.policylist-navigation > div {
line-height: 24px;
cursor: pointer;
}
.policylist-qr {
width:100%;
height:134px;
line-height: 134px;
background:rgba(248,248,248,1);
font-size:14px;
font-family:PingFangSC-Medium,PingFangSC;
font-weight:500;
color:rgba(72,72,72,1);
text-align: center;
}
.policylist-qr > img {
vertical-align:middle;
}
\ No newline at end of file
embed_applications/app/front/vues/pages/proposer/proposer.css
...@@ -121,4 +121,12 @@ ...@@ -121,4 +121,12 @@
height: auto; height: auto;
min-height: 114px; min-height: 114px;
}
.loading-brandfind{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
} }
\ No newline at end of file
embed_applications/app/front/vues/pages/proposer/proposer.html
<div class="proposer"> <div class="proposer">
<div class="loading-brandfind" v-if="loading" v-loading="true"></div>
<h1> <h1>
<el-row> <el-row>
<el-col :span="10">{{companyInfo.name}}</el-col> <el-col :span="10">{{companyInfo.name}}</el-col>
...@@ -16,9 +17,9 @@ ...@@ -16,9 +17,9 @@
</div> </div>
<ul> <ul>
<li>{{companyInfo.name}}</li> <li>{{companyInfo.name}}</li>
<li><span>网址：</span><span>暂无数据</span></li> <li><span>网址：</span><span>-</span></li>
<li><span>电话：</span><span>{{companyInfo.tel_info}}</span></li> <li><span>电话：</span><span v-if="companyInfo.tel_info">{{companyInfo.tel_info}}</span><span v-else>-</span></li>
<li><span>地址：</span><span>{{companyInfo.businessAddress}}</span></li> <li><span>地址：</span><span v-if="companyInfo.businessAddress">{{companyInfo.businessAddress}}</span><span v-else>-</span></li>
</ul> </ul>
<!-- <div> <!-- <div>
<el-row> <el-row>
...@@ -31,43 +32,55 @@ ...@@ -31,43 +32,55 @@
<div class="proposer-details"> <div class="proposer-details">
<el-row> <el-row>
<el-col :span="4"> 统一社会信用代码</el-col> <el-col :span="4"> 统一社会信用代码</el-col>
<el-col :span="8"> {{companyInfo.creditCode}}</el-col> <el-col v-if="companyInfo.creditCode" :span="8"> {{companyInfo.creditCode}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 组织机构代码</el-col> <el-col :span="4"> 组织机构代码</el-col>
<el-col :span="8">{{companyInfo.organizationCode}} </el-col> <el-col v-if="companyInfo.organizationCode" :span="8"> {{companyInfo.organizationCode}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> 注册号</el-col> <el-col :span="4"> 注册号</el-col>
<el-col :span="8"> {{companyInfo.registrID}}</el-col> <el-col v-if="companyInfo.registrID" :span="8"> {{companyInfo.registrID}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 经营状态</el-col> <el-col :span="4"> 经营状态</el-col>
<el-col :span="8"> {{companyInfo.managementState}}</el-col> <el-col v-if="companyInfo.managementState" :span="8"> {{companyInfo.managementState}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> 公司类型</el-col> <el-col :span="4"> 公司类型</el-col>
<el-col :span="8"> {{companyInfo.companyType}}</el-col> <el-col v-if="companyInfo.companyType" :span="8"> {{companyInfo.companyType}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 成立日期</el-col> <el-col :span="4"> 成立日期</el-col>
<el-col :span="8">{{companyInfo.foundedTime}} </el-col> <el-col v-if="companyInfo.foundedTime" :span="8"> {{companyInfo.foundedTime}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> 法定代表人</el-col> <el-col :span="4"> 法定代表人</el-col>
<el-col :span="8"> {{companyInfo.legalRepresentative}}</el-col> <el-col v-if="companyInfo.legalRepresentative" :span="8"> {{companyInfo.legalRepresentative}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 营业期限</el-col> <el-col :span="4"> 营业期限</el-col>
<el-col :span="8"> {{companyInfo.businessTerm}}</el-col> <el-col v-if="companyInfo.businessTerm" :span="8"> {{companyInfo.businessTerm}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> 注册资本</el-col> <el-col :span="4"> 注册资本</el-col>
<el-col :span="8"> {{companyInfo.registeredCapital}}</el-col> <el-col v-if="companyInfo.registeredCapital" :span="8"> {{companyInfo.registeredCapital}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 发照日期</el-col> <el-col :span="4"> 发照日期</el-col>
<el-col :span="8"> {{companyInfo.dateIssue}}</el-col> <el-col v-if="companyInfo.dateIssue" :span="8"> {{companyInfo.dateIssue}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4">登记机关 </el-col> <el-col :span="4">登记机关 </el-col>
<el-col :span="20"> {{companyInfo.registerOffice}}</el-col> <el-col v-if="companyInfo.registerOffice" :span="20"> {{companyInfo.registerOffice}}</el-col>
<el-col v-else :span="20"> -</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> 经营范围 </el-col> <el-col :span="4"> 经营范围 </el-col>
<el-col :span="20"> {{companyInfo.scope}}</el-col> <el-col v-if="companyInfo.scope" :span="20"> {{companyInfo.scope}}</el-col>
<el-col v-else :span="20"> -</el-col>
</el-row> </el-row>
</div> </div>
......
embed_applications/app/front/vues/pages/proposer/proposer.js
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
return { return {
company_name:"", company_name:"",
companyInfo:{}, companyInfo:{},
loading:false,
company_name2:null
} }
}, },
...@@ -17,22 +19,17 @@ ...@@ -17,22 +19,17 @@
company_name:this.company_name company_name:this.company_name
}; };
var that=this; var that=this;
const loading = this.$loading({ this.loading=true;
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
that.$root.postReq("/web/tmquery/bytmmonitCtl/getCompanyInfoNoUser", obj).then(d=> { that.$root.postReq("/web/tmquery/bytmmonitCtl/getCompanyInfoNoUser", obj).then(d=> {
console.log(d); console.log(d);
loading.close(); that.loading=false;
if(d.code==1){ if(d.code==1){
if(d.data){ if(d.data){
that.companyInfo=d.data; that.companyInfo=d.data;
} }
} }
}).catch(function (e) { }).catch(function (e) {
loading.close(); that.loading=false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
} }
...@@ -41,6 +38,13 @@ ...@@ -41,6 +38,13 @@
this.company_name = this.$router.history.current.query.company_name || ""; this.company_name = this.$router.history.current.query.company_name || "";
this.getEntDetail(); this.getEntDetail();
}, },
activated:function(){
this.company_name = this.$router.history.current.query.company_name || "";
if(this.company_name!=this.company_name2){
this.getEntDetail();
}
this.company_name2 = this.$router.history.current.query.company_name || "";
},
vname:"gsb-proposer" vname:"gsb-proposer"
} }
\ No newline at end of file
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.css
.tmbigdata { .tmbigdata {
/* margin: 0 auto; */ /* margin: 0 auto; */
} }
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 99000;
}
.tmbigdata-header { .tmbigdata-header {
min-width: 1000px; min-width: 1000px;
......
embed_applications/app/front/vues/pages/tmbigdata/tmbigdata.html
<div class="tmbigdata"> <div class="tmbigdata">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="tmbigdata-header"> <div class="tmbigdata-header">
<div class="name">商标大数据</div> <div class="name">商标大数据</div>
<div class="select"> <div class="select">
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
</div> </div>
<div class="tmbigdata-contentTwo"> <div class="tmbigdata-contentTwo">
<div class="tmbigdata-content-left"> <div class="tmbigdata-content-left">
<gsb-echart2 ref="trademarkApplicationRef" :data="trademarkApplicationdata"></gsb-echart2> <gsb-echart2 style="marginLeft:30px;box-sizing: border-box;" ref="trademarkApplicationRef" :data="trademarkApplicationdata"></gsb-echart2>
</div> </div>
<div class="tmbigdata-content-right"> <div class="tmbigdata-content-right">
<div class="tmbigdata-content-right-tabs"><span>商标类别申请排名</span><div @click="tmbigdatadetail(3)">详情</div></div> <div class="tmbigdata-content-right-tabs"><span>商标类别申请排名</span><div @click="tmbigdatadetail(3)">详情</div></div>
......
embed_applications/app/front/vues/pages/tmbigdatadetail/tmbigdatadetail.css
...@@ -11,6 +11,14 @@ ...@@ -11,6 +11,14 @@
box-sizing: border-box; box-sizing: border-box;
padding: 30px; padding: 30px;
} }
.tmbigdatadetail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.tmbigdatadetail-header-title { .tmbigdatadetail-header-title {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
......
embed_applications/app/front/vues/pages/tmbigdatadetail/tmbigdatadetail.html
<div class="tmbigdatadetail"> <div class="tmbigdatadetail">
<div class="tmbigdatadetail-loading" v-if="loading" v-loading="true"></div>
<div class="tmbigdatadetail-header"> <div class="tmbigdatadetail-header">
<div class="tmbigdatadetail-header-title"> <div class="tmbigdatadetail-header-title">
<div class="name">{{titleName}}</div> <div class="name">{{titleName}}</div>
......
embed_applications/app/front/vues/pages/tmbigdatadetail/tmbigdatadetail.js
...@@ -124,7 +124,8 @@ ...@@ -124,7 +124,8 @@
} }
] ]
}, },
titleName: '' titleName: '',
loading:false
} }
}, },
...@@ -159,9 +160,9 @@ ...@@ -159,9 +160,9 @@
} else { } else {
return return
}; };
this.$root.loading = true; this.loading = true;
this.$root.postReq(url, obj).then((d) => { this.$root.postReq(url, obj).then((d) => {
this.$root.loading = false; this.loading = false;
console.log(d, '#######################################'); console.log(d, '#######################################');
this.tableData = d.data.datalist; this.tableData = d.data.datalist;
var echarts = this.$refs.theTotalLogoRef.getEchartObj(); var echarts = this.$refs.theTotalLogoRef.getEchartObj();
...@@ -188,7 +189,7 @@ ...@@ -188,7 +189,7 @@
}); });
this.$forceUpdate(); this.$forceUpdate();
}).catch(function (e) { }).catch(function (e) {
this.$root.loading = false; this.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
} }
......
embed_applications/app/front/vues/pages/wins/wins.css
...@@ -3,7 +3,24 @@ ...@@ -3,7 +3,24 @@
width: 100%; width: 100%;
padding: 4px 10px; 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 { .wins-main-title {
width: 100%; width: 100%;
height: 21px; height: 21px;
...@@ -37,7 +54,6 @@ ...@@ -37,7 +54,6 @@
text-align: left; text-align: left;
width: 400px; width: 400px;
height: 34px; height: 34px;
background: rgba(250, 250, 250, 1);
border-radius: 2px; border-radius: 2px;
border: 1px solid rgba(238, 238, 238, 1); border: 1px solid rgba(238, 238, 238, 1);
} }
...@@ -61,10 +77,8 @@ ...@@ -61,10 +77,8 @@
width: 400px; width: 400px;
height: 34px; height: 34px;
color: rgba(170, 170, 171, 1); color: rgba(170, 170, 171, 1);
background: rgba(250, 250, 250, 1);
border-radius: 2px; border-radius: 2px;
border: 1px solid rgba(238, 238, 238, 1); 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="wins">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="wins-main" v-if="1"> <div class="wins-main" v-if="1">
<h3 class="wins-main-title"> <h3 class="wins-main-title">
商标起名 商标起名
......
embed_applications/app/front/vues/pages/wins/wins.js
...@@ -108,15 +108,42 @@ ...@@ -108,15 +108,42 @@
], ],
hotCharat: [], hotCharat: [],
ncl_list: [], 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"
}]
} }
}, },
methods: { methods: {
/*字数长度 */ /*字数长度 */
selectedCharatCommand(v) { selectedCharatCommand(v) {
console.log(v,"zishuchangdu");
this.selectedCharat = this.nameLength[v]; this.selectedCharat = this.nameLength[v];
let num = parseInt(this.selectedCharat); let num = parseInt(this.selectedCharat);
/*修改后的值 */ /*修改后的值 */
if(this.selectedStructure.length>num){
this.selectedStructure = "请选择商标包含结构";
};
if(this.inputLength>num){
this.inputValue = "";
};
var newNum = this.inputPlaceholder.replace(/[0-9]/, num); var newNum = this.inputPlaceholder.replace(/[0-9]/, num);
console.log(this.selectedCharat, num, newNum); console.log(this.selectedCharat, num, newNum);
this.StructureLength(num); this.StructureLength(num);
...@@ -144,6 +171,7 @@ ...@@ -144,6 +171,7 @@
}, },
/*包含结构 */ /*包含结构 */
selectedStructureCommand(v){ selectedStructureCommand(v){
console.log(v,"123");
this.selectedStructure = this.brandStructure[v]; this.selectedStructure = this.brandStructure[v];
console.log(this.selectedStructure); console.log(this.selectedStructure);
}, },
...@@ -159,10 +187,14 @@ ...@@ -159,10 +187,14 @@
var getRandomColor1 = function () { var getRandomColor1 = function () {
return `rgba(${Math.floor(Math.random() * 256)},${Math.floor(Math.random() * 256)},${Math.floor(Math.random() * 256)},1)` 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'); var hotList = document.querySelectorAll('.wins-randColor');
for (let i = 0; i < hotList.length; i++) { for (let i = 0; i < hotList.length; i++) {
hotList[i].style.background = getRandomColor(); var colorItem=color();
hotList[i].style.color = getRandomColor1(); hotList[i].style.background = colorItem.bgColor;
hotList[i].style.color = colorItem.fontColor;
} }
console.log(111); console.log(111);
}, },
...@@ -172,9 +204,9 @@ ...@@ -172,9 +204,9 @@
"seltype": this.checkIndustry "seltype": this.checkIndustry
}; };
this.checkList = []; this.checkList = [];
this.$root.loading = true; this.loading = true;
this.$root.getReq('/web/tmquery/toolCtl/aiadive', obj).then((d) => { this.$root.getReq('/web/tmquery/toolCtl/aiadive', obj).then((d) => {
this.$root.loading = false; this.loading = false;
console.log(d, "ccccccccccccccccccccccccccccccc"); console.log(d, "ccccccccccccccccccccccccccccccc");
let checkList = JSON.parse(d.data); let checkList = JSON.parse(d.data);
console.log(checkList); console.log(checkList);
...@@ -248,12 +280,12 @@ ...@@ -248,12 +280,12 @@
}, },
getHotCharat(){ getHotCharat(){
var obj = { var obj = {
"ncl_list": this.ncl_list.length ? this.ncl_list : "1,2,3" "ncl_list": this.ncl_list.length ? this.ncl_list : ''
}; };
this.$root.loading = true; this.loading = true;
this.$root.postReq('/web/tmquery/toolCtl/getHotWords', obj).then((d) => { this.$root.postReq('/web/tmquery/toolCtl/getHotWords', obj).then((d) => {
this.$root.loading = false; this.loading = false;
console.log(d); console.log(d,'123123');
this.hotCharat = d.data; this.hotCharat = d.data;
this.$nextTick(() => { this.$nextTick(() => {
this.randomColor(); this.randomColor();
...@@ -287,7 +319,6 @@ ...@@ -287,7 +319,6 @@
changeIcon(){ changeIcon(){
let icon = document.querySelector('.wins-main-form-box .el-icon-arrow-down'); let icon = document.querySelector('.wins-main-form-box .el-icon-arrow-down');
icon.setAttribute("class", "el-icon-caret-bottom el-icon--right"); icon.setAttribute("class", "el-icon-caret-bottom el-icon--right");
console.log(icon, `xxxxxxxxxzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz`);
}, },
}, },
...@@ -303,7 +334,6 @@ ...@@ -303,7 +334,6 @@
watch: { watch: {
inputValue(o, v){ inputValue(o, v){
this.inputValue = this.inputValue.substr(0, this.inputLength); this.inputValue = this.inputValue.substr(0, this.inputLength);
console.log(this.inputValue);
}, },
}, },
......
embed_applications/app/front/vues/pages/winsresult/winsresult.css
...@@ -5,7 +5,14 @@ ...@@ -5,7 +5,14 @@
padding: 4px 10px; padding: 4px 10px;
} }
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.winsresult-title { .winsresult-title {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
embed_applications/app/front/vues/pages/winsresult/winsresult.html
<div class="winsresult"> <div class="winsresult">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="winsresult-title"> <div class="winsresult-title">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="routerHistory">商标起名</el-breadcrumb-item> <el-breadcrumb-item :to="routerHistory">商标起名</el-breadcrumb-item>
......
embed_applications/app/front/vues/pages/winsresult/winsresult.js
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
industry: '', industry: '',
bigType: null, bigType: null,
ncl_list: null, ncl_list: null,
loading:false
} }
}, },
created() { created() {
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
try { try {
/* 初始化页面参数 */ /* 初始化页面参数 */
if (this.requestObj) { if (this.requestObj) {
this.$root.loading = true; this.loading = true;
let data = Object.assign(this.requestObj, {}); let data = Object.assign(this.requestObj, {});
this.type = this.requestObj.bigType.join(); this.type = this.requestObj.bigType.join();
this.industry = this.requestObj.industry.join(); this.industry = this.requestObj.industry.join();
this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => { this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => {
this.$root.loading = false; this.loading = false;
if (d.status == 0) { if (d.status == 0) {
if (!d.data || d.data.length == 0) { if (!d.data || d.data.length == 0) {
this.$message('暂无数据'); this.$message('暂无数据');
...@@ -100,9 +100,9 @@ ...@@ -100,9 +100,9 @@
let successRateObj = {}; let successRateObj = {};
successRateObj.ncl_list = this.ncl_list; successRateObj.ncl_list = this.ncl_list;
successRateObj.tmName = this.name; successRateObj.tmName = this.name;
this.$root.loading = true; this.loading = true;
this.$root.postReq(`/web/tmquery/toolCtl/tmPassRate`, successRateObj).then((d) => { this.$root.postReq(`/web/tmquery/toolCtl/tmPassRate`, successRateObj).then((d) => {
this.$root.loading = false; this.loading = false;
console.log(d); console.log(d);
if (d.status == 0) { if (d.status == 0) {
this.bigType = d.data; this.bigType = d.data;
...@@ -120,12 +120,12 @@ ...@@ -120,12 +120,12 @@
/* 初始化页面参数 */ /* 初始化页面参数 */
if (this.requestObj) { if (this.requestObj) {
console.log(this.requestObj, "!!!!!!!!!!!!!!!!!!!!!!!!1"); console.log(this.requestObj, "!!!!!!!!!!!!!!!!!!!!!!!!1");
this.$root.loading = true; this.loading = true;
let data = Object.assign(this.requestObj, {}); let data = Object.assign(this.requestObj, {});
this.type = this.requestObj.bigType.join(); this.type = this.requestObj.bigType.join();
this.industry = this.requestObj.industry[1]; this.industry = this.requestObj.industry[1];
this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => { this.$root.postReq(`/web/tmquery/toolCtl/getTmNameList`, data).then((d) => {
this.$root.loading = false; this.loading = false;
if (d.status == 0) { if (d.status == 0) {
if (!d.data || d.data.length == 0) { if (!d.data || d.data.length == 0) {
this.$message('暂无数据'); this.$message('暂无数据');
......
embed_applications/package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
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