Merge branch 'develop' into dev_kdl (fd5f5198) · Commits · 融通安全管理系统 / rongtong-app · GitLab

src/components/selectList.vue

+190 −191

Original line number	Original line	Diff line number	Diff line
	@@ -16,12 +16,17 @@
	finished-text="没有更多了"		finished-text="没有更多了"
	@load="getInsideUser()"		@load="getInsideUser()"
	> -->		> -->
	<van-checkbox style="margin: 0px 10px;" v-for="(item,index) in listdata" :name="item.dictLabel" :key="index" @click="selData(item)">		<van-checkbox
			style="margin: 0px 10px;"
			v-for="(item, index) in listdata"
			:name="item.dictLabel"
			:key="index"
			@click="selData(item)"
			>
	<van-cell :title="item.dictValue" />		<van-cell :title="item.dictValue" />
	</van-checkbox>		</van-checkbox>
	<!-- </van-list> -->		<!-- </van-list> -->
	</van-checkbox-group>		</van-checkbox-group>

	</div>		</div>
	<!-- 底部信息 -->		<!-- 底部信息 -->
	<footer class="footer">		<footer class="footer">
	@@ -35,8 +40,7 @@
	style="border-radius: 5px; background-color: #f0f1f5;"		style="border-radius: 5px; background-color: #f0f1f5;"
	@click.native="cancel"		@click.native="cancel"
	>取消		>取消
	</van-button		</van-button>
	>
	<van-button		<van-button
	size="small"		size="small"
	type="info"		type="info"
	@@ -44,8 +48,7 @@
	style="margin:0 10px 0 20px;border-radius: 5px;"		style="margin:0 10px 0 20px;border-radius: 5px;"
	@click.native="save"		@click.native="save"
	>保存		>保存
	</van-button		</van-button>
	>
	</div>		</div>
	</van-cell-group>		</van-cell-group>
	</footer>		</footer>
	@@ -53,21 +56,19 @@
	</template>		</template>

	<script>		<script>

	import { debounce } from "@/utils/common.js";		import { debounce } from "@/utils/common.js";

	export default {		export default {
	props: {		props: {
	listdata: {		listdata: {
	type: Array,		type: Array,
	default:()=>[],		default: () => []
	}		}
	},		},
	components: {		components: {
	// LHeader		// LHeader
	},		},
	created() {		created() {},
	},
	data() {		data() {
	return {		return {
	text: "选择人员",		text: "选择人员",
	@@ -79,29 +80,28 @@
	loading: false,		loading: false,
	finished: false,		finished: false,
	projectList: [],		projectList: [],
	itemSel:{		itemSel: {}

	}
	};		};
	},		},
	methods: {		methods: {
	// 待搜索框内容发生变化		// 待搜索框内容发生变化
	onInput: debounce(function() {		onInput: debounce(function() {
	this.projectList=[]		this.projectList = [];
	this.pageNum=1		this.pageNum = 1;
	this.finished = false		this.finished = false;
	this.loading = true		this.loading = true;
	this.getInsideUser();		this.getInsideUser();
	}, 800),		}, 800),

	selData(e) {		selData(e) {
	this.itemSel=e		this.itemSel = e;
	},		},
	save() {		save() {
	this.$emit('saveSlect', this.checkbox)		this.$emit("saveSlect", this.checkbox);
			this.checkbox = [];
	},		},
	cancel() {		cancel() {
	this.$emit('closeSlect')		this.$emit("closeSlect");
	}		}
	}		}
	};		};
	@@ -220,4 +220,3 @@
	}		}
	}		}
	</style>		</style>

	No newline at end of file

src/main.js

+11 −8

Original line number	Original line	Diff line number	Diff line
	@@ -8,8 +8,10 @@ import qs from 'qs';
	import './permission'		import './permission'
	import Cookies from 'js-cookie'		import Cookies from 'js-cookie'
	import util from './api/util.js'		import util from './api/util.js'
	import {DropdownMenu, DropdownItem, Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row, Image as VanImage, Badge,NoticeBar,DatetimePicker,		import {
	Step, Steps,Lazyload,Popover,Collapse, CollapseItem,TreeSelect } from 'vant'		DropdownMenu, DropdownItem, Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast, Search, Picker, Uploader, Notify, ContactList, Calendar, Radio, RadioGroup, Tag, Tabbar, TabbarItem, Sticky, Grid, GridItem, Skeleton, Col, Row, Image as VanImage, Badge, NoticeBar, DatetimePicker,
			Step, Steps, Lazyload, Popover, Collapse, CollapseItem, TreeSelect, Switch
			} from 'vant'
	import 'lib-flexible/flexible'		import 'lib-flexible/flexible'
	import vueEsign from 'vue-esign'		import vueEsign from 'vue-esign'
	Vue.use(vueEsign)		Vue.use(vueEsign)
	@@ -18,6 +20,7 @@ Vue.use(Divider).use(Popup).use(Overlay).use(Loading).use(Dialog).use(Toast).use
	.use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky)		.use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky)
	.use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage).use(Badge).use(NoticeBar).use(DatetimePicker).use(Step).use(Steps).use(Popover).use(Lazyload).use(Collapse).use(CollapseItem).use(TreeSelect)		.use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage).use(Badge).use(NoticeBar).use(DatetimePicker).use(Step).use(Steps).use(Popover).use(Lazyload).use(Collapse).use(CollapseItem).use(TreeSelect)
	Vue.use(DropdownMenu);		Vue.use(DropdownMenu);
			Vue.use(Switch);
	Vue.use(DropdownItem);		Vue.use(DropdownItem);
	// 引用高德地图组件 main.js		// 引用高德地图组件 main.js
	import VueAMap from 'vue-amap'		import VueAMap from 'vue-amap'

src/views/riskProject/add/addInherent.vue

+571 −206

File changed.

Preview size limit exceeded, changes collapsed.

src/views/riskProject/add/index.vue

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -389,13 +389,6 @@ export default {
	this.currentDate = new Date();		this.currentDate = new Date();
	},		},
	getLeaderUserList(e) {		getLeaderUserList(e) {
	if (!this.form.projectId) {
	this.$toast({
	title: "提示",
	message: "请选择关联项目!"
	});
	return false;
	}
	this.userPrefix = e;		this.userPrefix = e;
	this.$toast.loading({		this.$toast.loading({
	message: "加载中...",		message: "加载中...",
	@@ -439,14 +432,6 @@ export default {
	this.projectDept = false;		this.projectDept = false;
	},		},
	getExecuteUser() {		getExecuteUser() {
	if (!this.form.projectId) {
	this.$toast({
	title: "提示",
	message: "请选择关联项目!"
	});
	return false;
	}

	this.filedName = "nickName";		this.filedName = "nickName";
	this.$toast.loading({		this.$toast.loading({
	message: "加载中...",		message: "加载中...",

vue.config.js

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,11 +8,11 @@ module.exports = {
	//以上的ip和端口是我们本机的;下面为需要跨域的		//以上的ip和端口是我们本机的;下面为需要跨域的
	proxy: { //配置跨域		proxy: { //配置跨域
	'/app-api': {		'/app-api': {
	target: 'http://192.168.4.232:8080/', //这里是后台的地址		// target: 'http://192.168.4.232:8080/', //这里是后台的地址
	// target: 'http://192.168.15.124:8080/', //这里是杨帆的地址		// target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
	// target: 'http://192.168.10.137:8080/', //这里是昊哥的地址		// target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
	// target: 'http://192.168.10.36:8080/', //这里是昊哥的地址		// target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
	// target: 'http://localhost:8080/', //这里是后台的地址		target: 'http://localhost:8081/', //这里是后台的地址
	ws: true,		ws: true,
	changOrigin: true, //允许跨域		changOrigin: true, //允许跨域
	// logLevel: 'debug', // 显示代理调试信息		// logLevel: 'debug', // 显示代理调试信息