hy

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

@@ -37,17 +37,18 @@ input {
 	background: none;
 	outline: none;
 }
+
 html {
-  height: 100%;
-  box-sizing: border-box;
+	height: 100%;
+	box-sizing: border-box;
 }
 
 body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+	height: 100%;
+	-moz-osx-font-smoothing: grayscale;
+	-webkit-font-smoothing: antialiased;
+	text-rendering: optimizeLegibility;
+	font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
 
 ul,
@@ -112,6 +113,7 @@ select {
 .float_right {
 	float: right;
 }
+
 .el-input {
 	width: 100%;
 }
@@ -129,7 +131,10 @@ select {
 .el-input__icon {
 	line-height: 34px;
 }
-
+.el-dropdown-link{
+	cursor: pointer;
+	color: #333333;
+}
 .el-dropdown-link .el-input {
 	width: 100%;
 }
@@ -141,6 +146,7 @@ select {
 .el-input--suffix .el-input__inner {
 	padding-right: 15px;
 }
+
 .el-select .el-input.is-focus .el-input__inner,
 .el-input.is-active .el-input__inner,
 .el-input__inner:focus,
@@ -148,8 +154,12 @@ select {
 .el-range-editor.is-active:focus-within {
 	border-color: #3181fa;
 }
+
 .el-popper[x-placement^=top] {
-    margin-bottom: 12px;
+	margin-bottom: 12px;
+}
+.el-popper[x-placement^=bottom]{
+	margin-top: 12px;
 }
 .el-select-dropdown .popper__arrow {
 	display: none;
@@ -158,6 +168,7 @@ select {
 .el-popper .popper__arrow {
 	display: none;
 }
+
 .select-popper {
 	text-align: center;
 	display: inline-block;
@@ -217,6 +228,7 @@ select {
 .select-popper::-webkit-scrollbar-corner {
 	background: #fff;
 }
+
 .select-popper .el-select {
 	width: 100%;
 }
@@ -255,11 +267,100 @@ select {
 .content_item .select-popper:hover .select-caret {
 	color: #0074E5;
 }
+
 .content_item .select-caret:focus {
 	border: none;
 	outline: none;
 }
-.content_item  .geduan{
+
+.select-multiple {
+	position: absolute;
+	left: 0;
+	top: 0px;
+	opacity: 0;
+	line-height: 16px;
+}
+
+.select-multiple .el-input {
+	width: 100%;
+	line-height: 16px;
+}
+
+
+.select-multiple .el-input .el-input__inner {
+	width: 100%;
+	height: 16px !important;
+}
+
+.select-multiple .el-tag__close.el-icon-close {
+	display: none;
+}
+.el-dropdown-land{
+	margin-right: 24px;
+}
+.el-dropdown-land .el-icon-caret-bottom{
+	color: #333333;
+	margin-left: 4px;
+}
+ .land_date_picker{
+     position: absolute!important;
+    visibility: hidden;
+     left: 100px;
+     top: 206px;
+}
+
+.jabph_popper_box {
+	position: absolute;
+	left: 146px;
+	bottom: -1px;
+	background: #ffffff;
+	width: 186px;
+	color: #606266;
+	text-indent: 0;
+	padding: 16px;
+	padding-top: 0px;
+	border: 1px solid #e0e0e0;
+
+
+}
+
+.jabph_popper_box .jabph_popper_wrap {
+	margin-top: 16px;
+	display: inline-block;
+
+
+}
+
+.jabph_popper_box .jabph_popper_wrap .jabph_popper_input {
+	width: 100px;
+	display: inline-block;
+	margin: 0px 8px;
+
+	.el-input__inner {
+		width: 100px;
+	}
+}
+
+.jabph_popper_box div:last-child {
+	display: flex;
+	justify-content: center;
+	margin-top: 16px;
+}
+
+.jabph_popper_box1 {
+	left: 0;
+	border: none;
+}
+
+.jabph_popper_box2 {
+	left: 101px;
+}
+
+.jabph_popper_box3 {
+	left: 115px;
+}
+
+.content_item .geduan {
 	width: 100%;
 	height: 0px;
 	opacity: 1;
@@ -305,4 +406,4 @@ select {
 	background: #f5faff;
 	color: #0081FF;
 	border-color: #0081FF;
-}
+}
\ No newline at end of file

dsk-operate-ui/src/directive/index.js

@@ -4,6 +4,8 @@ import dialogDrag from './dialog/drag'
 import dialogDragWidth from './dialog/dragWidth'
 import dialogDragHeight from './dialog/dragHeight'
 import clipboard from './module/clipboard'
+import limitNum from './limitNum/limitNum'
+
 
 const install = function(Vue) {
   Vue.directive('hasRole', hasRole)
@@ -12,6 +14,7 @@ const install = function(Vue) {
   Vue.directive('dialogDrag', dialogDrag)
   Vue.directive('dialogDragWidth', dialogDragWidth)
   Vue.directive('dialogDragHeight', dialogDragHeight)
+  Vue.directive('limitNum', limitNum)
 }
 
 if (window.Vue) {

dsk-operate-ui/src/directive/limitNum/limitNum.js

+export default {
+    bind(el) {
+        el.oninput = () => {
+          el.children[0].value = el.children[0].value.replace(/[^\d.]/g,"");  //清除“数字”和“.”以外的字符  
+          el.children[0].value = el.children[0].value.replace(/\.{2,}/g,"."); //只保留第一个. 清除多余的  
+          el.children[0].value = el.children[0].value.replace(/^\./g,""); //必须保证第一个为数字而不是. 
+          el.children[0].value = el.children[0].value.replace(".","$#$").replace(/\./g,"").replace("$#$","."); 
+          if(el.children[0].value.indexOf(".")< 0 && el.children[0].value !=""){//以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额 
+              el.children[0].value= parseFloat(el.children[0].value); 
+          } 
+        };
+       },
+}
\ No newline at end of file

dsk-operate-ui/src/main.js

@@ -14,6 +14,7 @@ import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 
+
 import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";

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

@@ -455,7 +455,6 @@
 <style lang="scss" scoped>
 	.content{
 	  padding: 0px 16px;
-	  
       border-radius: 4px 4px 4px 4px;
 	   background: #FFFFFF;
 	   .content_item{
@@ -563,10 +562,11 @@
 			}
 		}
 		.bottomlist-content{
-			padding: 14px;
+			
 			padding-bottom: 0px;
 		}
 		.bottomlist-list{
+			padding: 14px;
 			font-size: 14px;
 			border-bottom: 1px solid #EFEFEF;
 			padding-bottom: 14px;

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

@@ -14,28 +14,30 @@
 			</div>
 		</div>
 		<debtProject v-if="personnelHerf=='debtProject'" />
+		<Land v-if="personnelHerf=='Land'" />
 		
 
 	</div>
 </template>
 <script>
 	import debtProject from "./components/debtProject/index.vue";
+	import Land from "./components/Land/index.vue";
 	import "@/assets/styles/public.css";
 	export default {
 		name: 'radar',
-		components: { debtProject },
+		components: { debtProject,Land },
 		data() {
 			return {
 				// tablist
 				personnelList: [{
 						key: 'debtProject',
-						status: true,
+						status: false,
 						value: '企业专项债项目',
 
 					},
 					{
-						key: 'Builder',
-						status: false,
+						key: 'Land',
+						status: true,
 						value: '土地交易',
 
 					},
@@ -71,7 +73,7 @@
 					},
 
 				],
-				personnelHerf:'debtProject'
+				personnelHerf:'Land'
 			}
 		},
 		created() {},
@@ -81,7 +83,7 @@
 					this.personnelList[i].status = false;
 				}
 				this.personnelList[index].status = true;
-
+                this.personnelHerf=this.personnelList[index].key;
 			},
 		}
 	}