zhangshi_app_web.git

			@@ -205,7 +205,7 @@
			></div>
			</template>
			</el-table-column>
			<el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
			<el-table-column fixed="right" label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
			<template slot-scope="scope" v-if="scope.row.roleId !== 1">
			<div class="button-container">
			<el-button
			@@ -723,6 +723,7 @@
			};
			},
			created() {
			// alert(1233)
			this.getList();
			// this.getCateInfor()
			this.getInfo()
			@@ -862,6 +863,8 @@
			getList1() {
			this.loading1 = true;
			let userId = this.$store.state.user.userId

			this.userOptions = []
			showShareUser(userId, 2017).then(response=>{
			console.log("===========ddddddddddddd")
			console.log(response.data)
			@@ -897,12 +900,18 @@
			const shareList = {}
			shareList.shareContents = this.id1 \|\| this.ids;
			shareList.shareIds = this.ids1
			if(shareList.shareIds.length==0)
			{
			this.$modal.msgSuccess("请选择分享对象");
			return;
			}
			console.log(shareList,'sharelistsharelist')
			this.$modal.confirm('是否确认分享？').then(function() {
			return share(shareList);
			}).then(() => {

			this.getList();
			this.getList1();
			this.$modal.msgSuccess("分享成功");
			this.id1 = undefined
			this.open1 = false;
			@@ -948,9 +957,20 @@

			getList() {
			this.loading = true;
			this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
			this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
			console.log(this.queryParams)
			console.log(this.dateRange)
			if(this.dateRange!=null)
			{
			this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
			this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
			console.log(this.queryParams)
			}
			else
			{
			this.queryParams.happenStartTime = null
			this.queryParams.happenEndTime = null
			}

			console.log(this.queryParams)
			//alert(this.queryParams.name)
			// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
			let _this = this
			@@ -1034,6 +1054,7 @@
			/** 查看详细信息 */
			handleCheck(row){
			const id = row.id;
			this.open2 = false;
			// alert(988)
			this.$router.push("/familymodel/Device/equipmentInfo/" + id);
			},