Merge branch 'develop' into dev-lv (18b6124e) · Commits · 融通安全管理系统 / rongtong-app · GitLab

src/components/TabBar.vue

+3 −3

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ export default {

		data() {
		return {
		active: "0",
		active: localStorage.getItem('active')?localStorage.getItem('active'):1,
		tabBarList: [
		{
		key: "1",
		@@ -53,11 +53,11 @@ export default {
		};
		},
		mounted() {
		this.active = this.index
		// this.active = this.index
		},
		methods: {
		onChange(index) {
		this.active = index;
		localStorage.setItem('active',index);
		if(this.active==index){
		this.tabBarList.forEach((item)=>{
		if(item.name==this.active){

src/views/riskProject/add/index.vue

+4 −14

Original line number	Diff line number	Diff line
		@@ -208,10 +208,10 @@
		>{{ item[filedName] }}</van-checkbox
		>
		</van-checkbox-group>
		<div>
		<van-button type="primary" @click="checkAll">全选</van-button>
		<van-button type="info" @click="toggleAll">反选</van-button>
		</div>
		<div style="display: flex;justify-content: space-around;">
		<van-button native-type="button" type="primary" v-on:click="checkAll">全选</van-button>
		<van-button native-type="button" type="info" @click="toggleAll">反选</van-button>
		</div>
		</van-popup>

		@@ -416,19 +416,9 @@ export default {
		});
		},
		onRiskList(value) {
		console.log(
		"%c [ value ]-331",
		"font-size:13px; background:pink; color:#bf2c9f;",
		value
		);
		if (this.filedName == "nickName") {
		this.form.workUserIds = this.filterField("userId", value).join();
		this.form.workUserNames = this.filterField("nickName", value).join();
		console.log(
		"%c [ this.form.workUserNames ]-334",
		"font-size:13px; background:pink; color:#bf2c9f;",
		this.form.workUserNames
		);
		} else {
		this.form.buildingIds = this.filterField("id", value).join();
		this.form.buildingNames = this.filterField("name", value).join();

src/views/riskProject/add/projectList.vue

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		finished-text="没有更多了"
		@load="getInsideUser()"
		>
		<van-radio v-for="item in projectList" :name="item.id" :key="item.id" @click="selData(item)">
		<van-radio style="margin: 0px 10px;" v-for="item in projectList" :name="item.id" :key="item.id" @click="selData(item)">
		<van-cell :title="item.name" />
		</van-radio>
		</van-list>

src/views/riskProject/add/taskList.vue

+53 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@
		v-model="active"
		color="#2980f7"
		animated
		:sticky="true"
		offset-top="2.93rem"
		>
		<van-tab title="任务详情">
		@@ -177,6 +176,11 @@
		>
		<van-col span="22" @click="toRiskDetail(item)">
		<van-col span="5">
		<van-image
		width="46"
		height="46"
		src="https://img01.yzcdn.cn/vant/cat.jpeg"
		/>
		<van-image width="46" height="46" :src="item.avatar" />
		</van-col>
		<van-col span="17">
		@@ -187,7 +191,11 @@
		</van-col>
		</van-col>
		<van-col span="2">
		<van-row>
		<van-row
		:style="{
		color: '#03b615'
		}"
		>
		<van-icon name="arrow" size="26px" @click="goColorDetail" />
		</van-row>
		</van-col>
		@@ -338,6 +346,35 @@
		<div>删除任务</div>
		</div>
		</div>
		<div
		v-show="pathAuth == 'riskApprove' && status == 2"
		style="display: flex;
		justify-content: space-around;
		background-color: #fff;
		border-top: 1px solid #e3e3e3;
		height: 1.5rem;
		width: 100%;
		text-align: center;
		position: fixed;
		bottom: 0;"
		>
		<div
		@click="approveTask"
		style="color: #4bced0;font-size: 14px;font-weight: 600;"
		>
		<div style="font-size: 22px;">
		<van-icon name="success" />
		</div>
		<div>审批通过</div>
		</div>
		<div
		@click="unApproveTask"
		style="color: #ec808d;font-size: 14px;font-weight: 600;"
		>
		<div style="font-size: 22px;"><van-icon name="cross" /></div>
		<div>审批否决</div>
		</div>
		</div>
		</div>
		</template>

		@@ -386,7 +423,7 @@ export default {
		var planId = this.$route.params.id \|\| sessionStorage.getItem("planId");
		var buildingId =
		this.$route.params.buildingId \|\| sessionStorage.getItem("buildingId");

		this.pathAuth = sessionStorage.getItem("pathAuth");
		this.postList(planId, buildingId);
		this.getRiskTaskList(planId, buildingId);
		},
		@@ -394,6 +431,7 @@ export default {
		timestampToTimes(time) {
		return timestampToTime(new Date(time), "DT2", true);
		},
		//执行任务
		performTasks() {
		sessionStorage.setItem(
		"buildingId",
		@@ -416,10 +454,22 @@ export default {
		//修改任务
		editTask() {
		//TODO 修改任务
		console.log("修改任务");
		},
		//删除任务
		delTask() {
		//TODO 删除任务
		console.log("删除任务");
		},
		//审批通过
		approveTask() {
		//TODO 审批通过
		console.log("审批通过");
		},
		//审批否决
		unApproveTask() {
		//TODO 审批否决
		console.log("审批否决");
		},
		handadd() {
		this.$router.push({

src/views/riskProject/approve/index.vue

+1 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@ export default {
		// buildingId: item.buildingId
		}
		});
		sessionStorage.setItem("pathAuth", "riskApprove");
		sessionStorage.setItem("planId", item.id);
		sessionStorage.setItem("buildingId", "");
		}