hy

dsk-operate-ui/src/api/enterpriseData/enterpriseData.js

@@ -51,7 +51,17 @@ let claim= function claim(param) {
 	data: param
   })
 }
+// 查建筑企业
+
+let enterprisePage= function enterprisePage(param) {
+  return request({
+    url: '/enterprise/page',
+    method: 'post',
+	data: param
+  })
+}
+
 
 
 
-export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim}
\ No newline at end of file
+export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,enterprisePage}
\ No newline at end of file

dsk-operate-ui/src/assets/styles/public.css

@@ -463,21 +463,6 @@ select {
 	display: inline-block;
 }
 
-.viewlist-el-popover .pup_list li .VIP {
-	width: 24px;
-	height: 12px;
-	top: 0px;
-	right: -8px;
-	position: absolute;
-}
-
-.viewlist-el-popover .pup_list li .SVIP {
-	width: 24px;
-	height: 12px;
-	top: 0px;
-	right: -10px;
-	position: absolute;
-}
 
 .viewlist-el-popover .pup_list li:hover {
 	color: #0081FF;
@@ -725,3 +710,365 @@ select {
 .checkbox  .checkbox-content .checkbox-content-qx{
 	margin-right: 30px;
 }
+ .toolbar-right-search {
+	margin-left: 16px;
+}
+
+
+.bottomlist-title-left{
+	display: inline-flex;
+	align-items: center;
+}
+.toolbar-right-search .toolbar-right_input {
+	width: 228px;
+	display: inline-flex;
+	align-items: center;
+}
+
+.toolbar-right-search .el-input__inner {
+	width: 228px;
+	height: 32px;
+	line-height: 32px;
+
+}
+.toolbar-right-search .el-input .el-input__inner {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	border-right: none;
+	height: 32px;
+	line-height: 32px;
+}
+.toolbar-right-search  .el-input-group__append{
+	padding: 0;
+}
+.toolbar-right-search .result-search {
+	height: 32px;
+	line-height: 32px;
+}
+
+.toolbar-right-search .toolbar-right-search .el-input .el-input__inner {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	border-right: none;
+	height: 32px;
+	line-height: 32px;
+}
+
+.toolbar-right-search .result-search {
+	width: 80px;
+	height: 32px;
+	background: #0081FF;
+	border-top-right-radius: 2px;
+	border-bottom-right-radius: 2px;
+	text-align: center;
+	line-height: 32px;
+	padding: 0;
+	cursor: pointer;
+	color: #fff;
+}
+
+.toolbar-right-search .result-search:hover {
+	background: #0074E5;
+}
+.info-list {
+	display: flex;
+	/* width: 1200px; */
+	margin: auto;
+	background: #fff;
+	padding: 24px 0px;
+	border-bottom: 1px solid #EFEFEF;
+	/* cursor: pointer; */
+}
+
+.info-list:hover {
+	background: #F5FAFF;
+}
+
+.info-list .info-list-left {
+	width: 128px;
+	display: flex;
+	justify-content: center;
+	align-items: flex-start;
+}
+
+.info-list .info-list-right {
+	width: auto;
+}
+
+.info-list-left img {
+	width: 96px;
+	height: 96px;
+}
+
+.info-list-left .list-left-titel {
+	width: 78px;
+	height: 78px;
+	line-height: 78px;
+	border-radius: 4px 4px 4px 4px;
+	text-align: center;
+	color: #fff;
+	font-size: 32px;
+}
+
+
+.info-list-right .card-right-title {
+	display: flex;
+	align-items: center;
+	line-height: 18px;
+	/* cursor: pointer; */
+}
+
+.info-list-right .card-right-title .card-right-img {
+	width: 14px;
+	height: 14px;
+	margin-right: 2px;
+	margin-top: 2px;
+}
+
+.info-list-right .card-right-title .right-title-black {
+	display: inline-block;
+	font-weight: 400;
+	color: #333333;
+	margin-right: 24px;
+}
+
+.info-list-right .card-right-title .right-title-black-640 {
+	max-width: 640px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.info-list-right .card-right-title .right-title-blue {
+	font-weight: 400;
+	color: #0081FF;
+	margin-right: 24px;
+	cursor: pointer;
+}
+
+.info-list-right .card-right-title .right-title-grey {
+	font-weight: 400;
+	color: #999999;
+}
+
+.info-list-right .card-right-title .right-title-blue .blue {
+	color: #0081FF;
+	margin-right: 12px;
+}
+
+.info-list-right .card-right-title .right-title-blue .black {
+	color: #333333;
+	margin-right: 12px;
+}
+
+.info-list-right .card-right-title .right-title-blue .grey {
+	color: #999999;
+	margin-right: 12px;
+}
+
+/* 标题 */
+.info-list-right .card-right-title .title {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+	margin-right: 12px;
+	line-height: 24px;
+	cursor: pointer;
+	padding: 0;
+}
+
+.info-list-right .card-right-title .right-title-caption {
+	font-size: 18px;
+	font-weight: bold;
+	color: #333333;
+	margin-right: 12px;
+	line-height: 24px;
+	cursor: pointer;
+	/* height: 24px; */
+}
+
+/* 地区标签 */
+.info-list-right .card-right-title .region {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	border: 1px solid #099D4B;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #F3F3FF;
+	color: #8491E8;
+	margin-right: 8px;
+}
+
+/* 曾用名 */
+.info-list-right .card-right-title .formername {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #EEEEEE;
+	color: #838383;
+	margin-right: 8px;
+
+}
+
+/* 正向标签 */
+.info-list-right .card-right-title .positive {
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	height: 22px;
+	padding: 0 16px;
+	color: #54BC7E;
+	background-color: #ECF6E7;
+	margin-right: 8px;
+
+}
+
+/* 中性标签 */
+.info-list-right .card-right-title .neutral {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #E4F3FD;
+	color: #41A1FD;
+	margin-right: 8px;
+}
+
+.info-list-right .card-right-title .neutral1 {
+	margin-bottom: 8px;
+}
+
+/* 警示标签 */
+.info-list-right .card-right-title .warning {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #FFF3F3;
+	color: #FD5757;
+	margin-right: 8px;
+}
+
+/* 其它紫色 */
+.info-list-right .card-right-title .purple {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #FCF3FF;
+	color: #B589DB;
+	margin-right: 8px;
+}
+
+/*地区淡蓝色 */
+.info-list-right .card-right-title .cityblue {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #F3F3FF;
+	color: #8491E8;
+	margin-right: 8px;
+}
+
+/* 工程用途 */
+.info-list-right .card-right-title .purposeStr {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #E3F6F8;
+	color: #44BCC4;
+	margin-right: 8px;
+}
+
+
+/* 荣誉奖项 */
+.info-list-right .card-right-title .honoraryaward {
+	display: inline-block;
+	border-radius: 2px 2px 2px 2px;
+	display: inline-block;
+	text-align: center;
+	font-size: 12px;
+	line-height: 22px;
+	padding: 0 16px;
+	background: #FFF1DC;
+	color: #BFA061;
+	margin-right: 8px;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-0 {
+	background: #E4F3FD;
+	color: #41A1FD;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-1 {
+	background: #FFF1DC;
+	color: #BFA061;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-2 {
+	background: #E3F6F8;
+	color: #44BCC4;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-3 {
+	background: #F3F3FF;
+	color: #8491E8;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-4 {
+	background: #FCF3FF;
+	color: #B589DB;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-5 {
+	background: #E4F3FD;
+	color: #41A1FD;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-6 {
+	background: #FFF1DC;
+	color: #BFA061;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-7 {
+	background: #E3F6F8;
+	color: #44BCC4;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-8 {
+	background: #F3F3FF;
+	color: #8491E8;
+}
+
+.info-list-right .card-right-title .honoraryaward .color-9 {
+	background: #FCF3FF;
+	color: #B589DB;
+}
+
+

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

@@ -228,6 +228,7 @@
 		created() {
 			this.addressListfn();
 			this.searchDic();
+			this.search();
 		},
 		methods: {
 		     searchDic(){
@@ -319,16 +320,16 @@
 				let arr = (this.$refs.address.getCheckedNodes())
 				let provinceCode = [],
 					cityCode = [],
-					countyCode = [];
+					areaCode = [];
 				let province = [],
 					city = [],
-					county = [];
+					area = [];
 			
 				for (var i in arr) {
 					if (arr[i].parent) {
 						if (!arr[i].parent.checked) {
 							arr[i].hasChildren && cityCode.push(arr[i].value);
-							!arr[i].hasChildren && countyCode.push(arr[i].value);
+							!arr[i].hasChildren && areaCode.push(arr[i].value);
 						}
 					} else {
 						provinceCode.push(arr[i].value)
@@ -360,12 +361,12 @@
 			
 						}
 					}
-					if (countyCode.length > 0) {
-						for (let i = 0; i < countyCode.length; i++) {
-							if (countyCode[i] == jsk_data[j].id) {
-								county.push({
+					if (areaCode.length > 0) {
+						for (let i = 0; i < areaCode.length; i++) {
+							if (areaCode[i] == jsk_data[j].id) {
+								area.push({
 									value: jsk_data[j].regionName,
-									key: countyCode[i]
+									key: areaCode[i]
 								})
 							}
 			
@@ -373,7 +374,7 @@
 					}
 			
 				}
-				if (province.length > 0 || city.length > 0 || county.length > 0) {
+				if (province.length > 0 || city.length > 0 || area.length > 0) {
 					let arrlist = [];
 					if (province.length > 0) {
 						for (let i in province) {
@@ -385,9 +386,9 @@
 							arrlist.push(city[i].value)
 						}
 					}
-					if (county.length > 0) {
-						for (let i in county) {
-							arrlist.push(county[i].value)
+					if (area.length > 0) {
+						for (let i in area) {
+							arrlist.push(area[i].value)
 						}
 					}
 					console.log(this.addressType);
@@ -396,7 +397,7 @@
 						keyid: 'address',
 						provinceCode: provinceCode,
 						cityCode: cityCode,
-						countyCode: countyCode,
+						areaCode: areaCode,
 						title: '项目属地：',
 						key: '',
 						addressType:this.addressType
@@ -464,17 +465,14 @@
 				    if (this.arrList[i].keyid == "address") {
 				      params.specialBondProjectDto['province'] = this.arrList[i].provinceCode.join(',');
 				      params.specialBondProjectDto['city'] = this.arrList[i].cityCode.join(',');
-				      params.specialBondProjectDto['county'] = this.arrList[i].countyCode.join(',');
+				      params.specialBondProjectDto['area'] = this.arrList[i].areaCode.join(',');
 				    }
 				}
 			  }
 			  if(this.projectType.length>0&&this.projectType[0]!='不限'){
 				  params.specialBondProjectDto['projectType'] = this.projectType.join(',');
 			  }
-			  if(!this.ckhasValue(params.specialBondProjectDto)){
-			  	this.$message.warning("请选择筛选条件后添加多组业绩!");
-			  	return
-			  }
+			  
 			  api.bondProjectPage(params).then(res=>{
 				  if (res.code==200) {
 				  	this.tableData=res.data.list;