Skip to content

S
sedu-mobile-v2
Commit 4d5adf1c by liuzhanxin
Options

fix

parent 03e8028f
Showing with 283 additions and 219 deletions
cloudTrain/pages/Rectification-Item/detail.vue
<template> <template>
<view class="top-container" > <view class="top-container">
<view class="detailtext"><text class="titletext">整改项详情</text><text class="contenttext">{{description}}</text></view> <view class="detailtext"><text class="titletext">整改项详情</text><text class="contenttext">{{description}}</text></view>
<view class="detailtext"><text class="titletext">位置</text><text class="contenttext">{{roomName}}</text></view> <view class="detailtext"><text class="titletext">位置</text><text class="contenttext">{{roomName}}</text></view>
<view class="detailtext"><text class="titletext">实验室</text><text class="contenttext">{{roomName}}</text></view> <view class="detailtext"><text class="titletext">实验室</text><text class="contenttext">{{roomName}}</text></view>
...@@ -19,17 +19,17 @@ ...@@ -19,17 +19,17 @@
export default { export default {
data() { data() {
return { return {
imgUrl:[], imgUrl: [],
roomName:"", roomName: "",
description:"", description: "",
detailData:{} detailData: {}
} }
}, },
methods: { methods: {
onLoad() { onLoad() {
var that = this var that = this
uni.$on('rectificationListData',function(data){ uni.$on('rectificationListData', function(data) {
console.log("@@@@@@@@@@@@@@@"+JSON.stringify(data)) console.log("@@@@@@@@@@@@@@@" + JSON.stringify(data))
var detailData = data[0] var detailData = data[0]
that.roomName = JSON.parse(detailData.room).name that.roomName = JSON.parse(detailData.room).name
that.description = detailData.description; that.description = detailData.description;
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
that.$forceUpdate(); that.$forceUpdate();
}) })
}, },
onUnload(){ onUnload() {
uni.$off('rectificationListData',function(data){ uni.$off('rectificationListData', function(data) {
}) })
}, },
...@@ -51,11 +51,11 @@ ...@@ -51,11 +51,11 @@
upCallback(page) { upCallback(page) {
}, },
onNavigationBarButtonTap(){ onNavigationBarButtonTap() {
uni.navigateTo({ uni.navigateTo({
url:"../Security-Check/index?mod=put" url: "../Security-Check/index?mod=put"
}) })
uni.$emit("rectificationEdit",[this.detailData]) uni.$emit("rectificationEdit", [this.detailData])
}, },
} }
} }
...@@ -70,56 +70,66 @@ ...@@ -70,56 +70,66 @@
margin-top: 10rpx; margin-top: 10rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.title { .title {
font-size: 16px; font-size: 16px;
color: #333333; color: #333333;
} }
.containter{
.containter {
display: flex; display: flex;
width: 100%; width: 100%;
background-color: #F5F5F5; background-color: #F5F5F5;
padding: 20rpx; padding: 20rpx;
} }
.statuspic{
width:80rpx; .statuspic {
height:80rpx; width: 80rpx;
height: 80rpx;
} }
.titletext{
font-size:28rpx; .titletext {
font-size: 28rpx;
color: #666666; color: #666666;
margin-right: 78rpx; margin-right: 78rpx;
flex:1 flex: 1
} }
.titletextlong{
font-size:28rpx; .titletextlong {
font-size: 28rpx;
color: #666666; color: #666666;
margin-right: 50rpx; margin-right: 50rpx;
flex:1 flex: 1
} }
.contenttext{
font-size:28rpx; .contenttext {
font-size: 28rpx;
color: #333333; color: #333333;
flex:3 flex: 3
} }
.pic { .pic {
width:80rpx; width: 80rpx;
height:80rpx; height: 80rpx;
} }
.remind { .remind {
font-size:32rpx; font-size: 32rpx;
color: #CDCDCD; color: #CDCDCD;
} }
.detailtext { .detailtext {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-top: 20rpx; margin-top: 20rpx;
} }
.camera-button { .camera-button {
display:flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width:200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
padding: 0; padding: 0;
} }
......
cloudTrain/pages/Security-Check/security-checkitem.vue
<template> <template>
<mescroll-body class="containter" ref="mescrollRef" @init="mescrollInit" :down="downOption" :up="upOption" @down="downCallback" @up="upCallback"> <mescroll-body class="containter" ref="mescrollRef" @init="mescrollInit" :down="downOption" :up="upOption" @down="downCallback"
@up="upCallback">
<view v-if="isShow" class="news-li" v-for="(item,index) in dataList" :key="index"> <view v-if="isShow" class="news-li" v-for="(item,index) in dataList" :key="index">
<view> <view>
<text>{{index}}.{{item.content}}</text> <text>{{index}}.{{item.content}}</text>
...@@ -13,7 +14,9 @@ ...@@ -13,7 +14,9 @@
</view> </view>
</view> </view>
</view> </view>
<view ><image @click="checkItem(item)" class="icon" src="../../static/security-check/safeEdit.png"></view> <view>
<image @click="checkItem(item)" class="icon" src="../../static/security-check/safeEdit.png">
</view>
</view> </view>
</view> </view>
<button hover-class="submithover" @click="showModal" class="submit-button"> <button hover-class="submithover" @click="showModal" class="submit-button">
...@@ -37,28 +40,28 @@ ...@@ -37,28 +40,28 @@
upOption: { upOption: {
use: false, // 是否启用上拉加载; 默认true use: false, // 是否启用上拉加载; 默认true
}, },
isShow:false, isShow: false,
checkitems:[], checkitems: [],
objectData:{}, objectData: {},
taskId:"", taskId: "",
checkResult:[], checkResult: [],
submitShow:false submitShow: false
} }
}, },
methods: { methods: {
cancel:function(){ cancel: function() {
this.submitShow = false; this.submitShow = false;
}, },
showModal:function(){ showModal: function() {
this.submitShow = true; this.submitShow = true;
}, },
onLoad() { onLoad() {
var that = this; var that = this;
uni.$on('sendCheckItem',function(data){ uni.$on('sendCheckItem', function(data) {
that.objectData = data[0] that.objectData = data[0]
that.taskId = data[2]; that.taskId = data[2];
var content = data[1].children var content = data[1].children
content.map((opt)=>{ content.map((opt) => {
opt.status = 0; opt.status = 0;
// opt.checkitems = []; // opt.checkitems = [];
}) })
...@@ -66,8 +69,8 @@ ...@@ -66,8 +69,8 @@
}) })
this.loadData(); this.loadData();
}, },
onUnload(){ onUnload() {
uni.$off('sendCheckItem',function(data){ uni.$off('sendCheckItem', function(data) {
}) })
}, },
...@@ -79,43 +82,44 @@ ...@@ -79,43 +82,44 @@
upCallback(page) { upCallback(page) {
}, },
goDetail(){ goDetail() {
uni.navigateTo({ uni.navigateTo({
url:"./select-checkobject" url: "./select-checkobject"
}) })
}, },
itemClick(index,status){ itemClick(index, status) {
this.dataList[index].status = status; this.dataList[index].status = status;
var res = { var res = {
name:this.checkitems[status].name, name: this.checkitems[status].name,
code:this.checkitems[status].code, code: this.checkitems[status].code,
id:this.checkitems[status].id id: this.checkitems[status].id
} }
this.checkResult[index].result_type = JSON.stringify(res); this.checkResult[index].result_type = JSON.stringify(res);
this.$forceUpdate(); this.$forceUpdate();
console.log(JSON.stringify(this.checkResult)) console.log(JSON.stringify(this.checkResult))
}, },
checkItem(item){ checkItem(item) {
uni.navigateTo({ uni.navigateTo({
url:"./index" url: "./index"
}) })
uni.$emit("safeReportData",[this.objectData,item,this.taskId]); uni.$emit("safeReportData", [this.objectData, item, this.taskId]);
}, },
loadData(){ loadData() {
var user = {}; var user = {};
user.id = this.GLOBALUTIL.user.userid; user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username); user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({ uni.request({
url: this.GLOBALUTIL.url+'/base-data/v1/dict-items?sort_property=ID&sort_direction=ASC&dict_code=JCJG&page_number=1&page_size=10', url: this.GLOBALUTIL.url +
'/base-data/v1/dict-items?sort_property=ID&sort_direction=ASC&dict_code=JCJG&page_number=1&page_size=10',
method: 'GET', method: 'GET',
header: { header: {
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user) 'user': JSON.stringify(user)
}, },
body:null, body: null,
success: (res) => { success: (res) => {
this.dataList.map((opt)=>{ this.dataList.map((opt) => {
opt.checkitems = res.data.data; opt.checkitems = res.data.data;
}) })
this.checkitems = res.data.data; this.checkitems = res.data.data;
...@@ -124,18 +128,18 @@ ...@@ -124,18 +128,18 @@
// console.log(JSON.stringify(this.dataList)) // console.log(JSON.stringify(this.dataList))
// console.log(JSON.stringify(this.checkitems)) // console.log(JSON.stringify(this.checkitems))
this.checkResult = []; this.checkResult = [];
this.dataList.map((opt)=>{ this.dataList.map((opt) => {
var res = { var res = {
name:this.checkitems[0].name, name: this.checkitems[0].name,
id:this.checkitems[0].id, id: this.checkitems[0].id,
code:this.checkitems[0].code code: this.checkitems[0].code
} }
var item = { var item = {
"result_type":JSON.stringify(res), "result_type": JSON.stringify(res),
"check_item_id":opt.id, "check_item_id": opt.id,
"check_list_id":opt.check_list_id, "check_list_id": opt.check_list_id,
"check_task_id":this.taskId, "check_task_id": this.taskId,
"lab_id":this.objectData.id "lab_id": this.objectData.id
} }
this.checkResult.push(item) this.checkResult.push(item)
}) })
...@@ -143,36 +147,36 @@ ...@@ -143,36 +147,36 @@
}) })
}, },
onSubmitClick(){ onSubmitClick() {
this.submitShow = false; this.submitShow = false;
var user = {}; var user = {};
user.id = this.GLOBALUTIL.user.userid; user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username); user.name = encodeURI(this.GLOBALUTIL.user.username);
var body = this.checkResult var body = this.checkResult
uni.request({ uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-result', url: this.GLOBALUTIL.url + '/safety/v1/check-result',
method: 'POST', method: 'POST',
data:JSON.stringify(body), data: JSON.stringify(body),
header: { header: {
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'user' : JSON.stringify(user) 'user': JSON.stringify(user)
}, },
success: (res) => { success: (res) => {
console.log(JSON.stringify(res)) console.log(JSON.stringify(res))
if(res.statusCode == 200){ if (res.statusCode == 200) {
uni.$emit("refreshTaskList") uni.$emit("refreshTaskList")
this.$refs.popup.open({ this.$refs.popup.open({
type:'success', type: 'success',
content:'提交成功!', content: '提交成功!',
timeout:1000, timeout: 1000,
isClick:false isClick: false
}); });
setTimeout(()=>{ setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta:2 delta: 2
}) })
},1000) }, 1000)
} }
} }
}) })
...@@ -183,14 +187,15 @@ ...@@ -183,14 +187,15 @@
<style> <style>
/*说明*/ /*说明*/
.notice{ .notice {
font-size: 30upx; font-size: 30upx;
padding: 40upx 0; padding: 40upx 0;
border-bottom: 1upx solid #eee; border-bottom: 1upx solid #eee;
text-align: center; text-align: center;
} }
/*展示上拉加载的数据列表*/ /*展示上拉加载的数据列表*/
.news-li{ .news-li {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-size: 32upx; font-size: 32upx;
...@@ -198,48 +203,58 @@ ...@@ -198,48 +203,58 @@
border-bottom: 1upx solid #eee; border-bottom: 1upx solid #eee;
width: 100%; width: 100%;
} }
.news-li .new-content{
.news-li .new-content {
font-size: 28upx; font-size: 28upx;
margin-top: 10upx; margin-top: 10upx;
margin-left: 20upx; margin-left: 20upx;
color: #666; color: #666;
} }
.icon { .icon {
width:30rpx; width: 30rpx;
height:30rpx; height: 30rpx;
} }
.top-container { .top-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.hover{
.hover {
opacity: 0.7; opacity: 0.7;
} }
.item-container{
.item-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
margin-right: 30rpx; margin-right: 30rpx;
} }
.selected { .selected {
width:40rpx; width: 40rpx;
height:40rpx; height: 40rpx;
background-color: #00CE47; background-color: #00CE47;
}, }
,
.unselected { .unselected {
width:40rpx; width: 40rpx;
height:40rpx; height: 40rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1rpx solid #00CE47 ; border: 1rpx solid #00CE47;
} }
.containter{
.containter {
display: flex; display: flex;
width: 100%; width: 100%;
} }
.submit-button { .submit-button {
display: flex; display: flex;
width:600rpx; width: 600rpx;
height:60rpx; height: 60rpx;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%); background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%);
...@@ -249,12 +264,14 @@ ...@@ -249,12 +264,14 @@
bottom: 60rpx; bottom: 60rpx;
margin-left: -300rpx; margin-left: -300rpx;
} }
.submittext { .submittext {
font-size: 14px; font-size: 14px;
color: #FFFFFF; color: #FFFFFF;
font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
} }
.submithover{
.submithover {
opacity: 0.7; opacity: 0.7;
} }
</style> </style>
cloudTrain/pages/Security-Check/security-task-list.vue
<template> <template>
<mescroll-body class="containter" ref="mescrollRef" @init="mescrollInit" :down="downOption" :up="upOption" @down="downCallback" @up="upCallback"> <mescroll-body class="containter" ref="mescrollRef" @init="mescrollInit" :down="downOption" :up="upOption" @down="downCallback"
@up="upCallback">
<view class="news-li" v-for="news in dataList" :key="news.id" hover-class="hover" @click="goDetail(news)"> <view class="news-li" v-for="news in dataList" :key="news.id" hover-class="hover" @click="goDetail(news)">
<view class="top-container" > <view class="top-container">
<view style="width: 500rpx;"><text class="title">{{news.name}}</text></view> <view style="width: 500rpx;"><text class="title">{{news.name}}</text></view>
<view :class="news.color=='finish' ? 'status-finish' : 'status' "> <view :class="news.color=='finish' ? 'status-finish' : 'status' ">
<text :class="news.color=='finish' ? 'status-finish-text' : 'status-text' ">{{news.taskstatus}}</text> <text :class="news.color=='finish' ? 'status-finish-text' : 'status-text' ">{{news.taskstatus}}</text>
</view> </view>
</view> </view>
<view style="width: 700rpx;" ><text class="des">{{news.check_point}}</text></view> <view style="width: 700rpx;"><text class="des">{{news.check_point}}</text></view>
<view><image class="icon" src="../../static/security-check/safeTime.png"><text class="detail">{{JSON.parse(news.schedule).startdate}}~{{JSON.parse(news.schedule).enddate}}</text></view> <view>
<image class="icon" src="../../static/security-check/safeTime.png"><text class="detail">{{JSON.parse(news.schedule).startdate}}~{{JSON.parse(news.schedule).enddate}}</text>
</view>
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<view style="width: 20rpx;margin-right:20rpx;"><image class="icon" src="../../static/security-check/safeSys.png"></view> <view style="width: 20rpx;margin-right:20rpx;">
<image class="icon" src="../../static/security-check/safeSys.png">
</view>
<view style="display:flex;flex-direction: row; -webkit-flex-wrap: wrap;flex-wrap: wrap"> <view style="display:flex;flex-direction: row; -webkit-flex-wrap: wrap;flex-wrap: wrap">
<view style="display: flex;margin-right:30px" v-for="(data,index) in JSON.parse(news.check_scope)" :key="index" > <view style="display: flex;margin-right:30px" v-for="(data,index) in JSON.parse(news.check_scope)" :key="index">
<text class="detail">{{data.name}}</text> <text class="detail">{{data.name}}</text>
</view> </view>
</view> </view>
</view> </view>
<view><image class="icon" src="../../static/security-check/safePerson.png"><text class="detail">{{news.taskexecutor}}</text></view> <view>
<image class="icon" src="../../static/security-check/safePerson.png"><text class="detail">{{news.taskexecutor}}</text>
</view>
<view><text class="type">{{news.taskTypeTitle}}</text></view> <view><text class="type">{{news.taskTypeTitle}}</text></view>
</view> </view>
</mescroll-body> </mescroll-body>
...@@ -41,14 +48,13 @@ ...@@ -41,14 +48,13 @@
methods: { methods: {
onLoad() { onLoad() {
var that = this; var that = this;
uni.$on('refreshTaskList',function(data){ uni.$on('refreshTaskList', function(data) {
that.loadData(); that.loadData();
}) })
this.loadData(); this.loadData();
}, },
onUnload(){ onUnload() {
uni.$off('refreshTaskList',function(data){ uni.$off('refreshTaskList', function(data) {})
})
}, },
/*下拉刷新的回调 */ /*下拉刷新的回调 */
downCallback() { downCallback() {
...@@ -59,66 +65,69 @@ ...@@ -59,66 +65,69 @@
}, },
/*获取列表*/ /*获取列表*/
loadData(){ loadData() {
var body = {}; var body = {};
var user = {}; var user = {};
user.id = this.GLOBALUTIL.user.userid; user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username); user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({ uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-tasks?page_size=200&page_number=1', url: this.GLOBALUTIL.url + '/safety/v1/check-tasks?page_size=200&page_number=1',
method: 'GET', method: 'GET',
header: { header: {
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user) 'user': JSON.stringify(user)
}, },
body:null, body: null,
success: (res) => { success: (res) => {
console.log(JSON.stringify(res)) console.log(JSON.stringify(res))
var data = res.data.data; var data = res.data.data;
data.map((opt)=>{ data.map((opt) => {
opt.taskstatus = (this.handleStatus(opt)).text; opt.taskstatus = (this.handleStatus(opt)).text;
opt.color = (this.handleStatus(opt)).color; opt.color = (this.handleStatus(opt)).color;
var taskexecutor = JSON.parse(opt.excutor); var taskexecutor = JSON.parse(opt.excutor);
var taskexecutortext = ""; var taskexecutortext = "";
taskexecutor.map((opt)=>{ taskexecutor.map((opt) => {
taskexecutortext = opt.name +" "; taskexecutortext = opt.name + " ";
}) })
opt.taskexecutor = taskexecutortext; opt.taskexecutor = taskexecutortext;
opt.taskTypeTitle = opt.auto_task?"上级下发":"自建任务" opt.taskTypeTitle = opt.auto_task ? "上级下发" : "自建任务"
}) })
this.dataList = data; this.dataList = data;
} }
}) })
}, },
handleStatus(data){ handleStatus(data) {
var text = ""; var text = "";
var color = "" var color = ""
if(data.execute_state){ if (data.execute_state) {
var check_scope = JSON.parse(data.check_scope); var check_scope = JSON.parse(data.check_scope);
text = "已完成" + check_scope.length +"/" + check_scope.length; text = "已完成" + check_scope.length + "/" + check_scope.length;
color = "finish" color = "finish"
}else{ } else {
var check_scope = JSON.parse(data.check_scope); var check_scope = JSON.parse(data.check_scope);
var checked = 0; var checked = 0;
check_scope.map((opt)=>{ check_scope.map((opt) => {
if(opt.execute_state){ if (opt.execute_state) {
checked++ checked++
} }
}) })
if(checked == check_scope.length){ if (checked == check_scope.length) {
text = "已完成 " + check_scope.length +"/" + check_scope.length; text = "已完成 " + check_scope.length + "/" + check_scope.length;
color = "finish" color = "finish"
}else{ } else {
text = '未完成 '+checked+'/'+check_scope.length; text = '未完成 ' + checked + '/' + check_scope.length;
color = "unfinish" color = "unfinish"
} }
} }
return {text:text,color:color} return {
text: text,
color: color
}
}, },
goDetail(data){ goDetail(data) {
uni.navigateTo({ uni.navigateTo({
url:"./select-checkobject?taskId="+data.id url: "./select-checkobject?taskId=" + data.id
}) })
} }
} }
...@@ -127,14 +136,15 @@ ...@@ -127,14 +136,15 @@
<style> <style>
/*说明*/ /*说明*/
.notice{ .notice {
font-size: 30upx; font-size: 30upx;
padding: 40upx 0; padding: 40upx 0;
border-bottom: 1upx solid #eee; border-bottom: 1upx solid #eee;
text-align: center; text-align: center;
} }
/*展示上拉加载的数据列表*/ /*展示上拉加载的数据列表*/
.news-li{ .news-li {
font-size: 32upx; font-size: 32upx;
padding: 32upx; padding: 32upx;
border-bottom: 1upx solid #eee; border-bottom: 1upx solid #eee;
...@@ -142,69 +152,82 @@ ...@@ -142,69 +152,82 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.news-li .new-content{
.news-li .new-content {
font-size: 28upx; font-size: 28upx;
margin-top: 10upx; margin-top: 10upx;
margin-left: 20upx; margin-left: 20upx;
color: #666; color: #666;
} }
.icon { .icon {
width:20rpx; width: 20rpx;
height:20rpx; height: 20rpx;
margin-right: 20rpx; margin-right: 20rpx;
} }
.top-container { .top-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.status { .status {
width:170rpx; width: 170rpx;
height:35rpx; height: 35rpx;
background-color: rgba(242,115,115,0.10); background-color: rgba(242, 115, 115, 0.10);
border-radius: 50rpx; border-radius: 50rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-left: 35rpx; margin-left: 35rpx;
} }
.status-finish { .status-finish {
width:170rpx; width: 170rpx;
height:35rpx; height: 35rpx;
background-color: rgba(47,190,178,0.10); background-color: rgba(47, 190, 178, 0.10);
border-radius: 50rpx; border-radius: 50rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-left: 35rpx; margin-left: 35rpx;
} }
.status-text{
.status-text {
color: #F27373; color: #F27373;
font-size: 11px; font-size: 11px;
} }
.status-finish-text{
.status-finish-text {
color: #2FBEB2; color: #2FBEB2;
font-size: 11px; font-size: 11px;
} }
.hover{
.hover {
opacity: 0.7; opacity: 0.7;
} }
.title { .title {
font-size: 17px; font-size: 17px;
font-weight: 300; font-weight: 300;
} }
.des { .des {
font-weight:200; font-weight: 200;
font-size:14px; font-size: 14px;
color:#676767 color: #676767
} }
.detail { .detail {
font-size:14px; font-size: 14px;
} }
.type { .type {
font-size:14px; font-size: 14px;
} }
.containter{
.containter {
display: flex; display: flex;
width: 100%; width: 100%;
} }
......
cloudTrain/pages/Security-Check/select-checkobject.vue
...@@ -13,33 +13,27 @@ ...@@ -13,33 +13,27 @@
<button hover-class="submithover" @click="onSubmitClick" class="submit-button"> <button hover-class="submithover" @click="onSubmitClick" class="submit-button">
<text class="submittext">开始检查</text> <text class="submittext">开始检查</text>
</button> </button>
<Picker <Picker mode="selector" @confirm="onConfirm" ref="picker" themeColor="#f00" :selectList="itemList"></Picker>
mode="selector"
@confirm="onConfirm"
ref="picker"
themeColor="#f00"
:selectList="itemList"
></Picker>
</view> </view>
</template> </template>
<script> <script>
import Picker from "@/components/w-picker/w-picker.vue"; import Picker from "@/components/w-picker/w-picker.vue";
export default { export default {
data() { data() {
return { return {
showActionSheet: false, showActionSheet: false,
itemList: [], itemList: [],
taskId:"", taskId: "",
selObject:"", selObject: "",
selObjectText:"", selObjectText: "",
selectItem:"", selectItem: "",
selectItemText:"", selectItemText: "",
objectarr:[], objectarr: [],
itemarr:[], itemarr: [],
curType:"object", curType: "object",
objectData:[], objectData: [],
itemData:[] itemData: []
} }
}, },
onLoad(option) { onLoad(option) {
...@@ -53,103 +47,109 @@ import Picker from "@/components/w-picker/w-picker.vue"; ...@@ -53,103 +47,109 @@ import Picker from "@/components/w-picker/w-picker.vue";
closeActionSheet: function() { closeActionSheet: function() {
this.showActionSheet = false this.showActionSheet = false
}, },
onConfirm(data){ onConfirm(data) {
if(this.curType == "object"){ if (this.curType == "object") {
this.selObject = data.checkArr.value; this.selObject = data.checkArr.value;
this.selObjectText = data.checkArr.label; this.selObjectText = data.checkArr.label;
this.itemarr = []; this.itemarr = [];
this.selectItem = ""; this.selectItem = "";
this.selectItemText = ""; this.selectItemText = "";
this.loadItemData(); this.loadItemData();
}else{ } else {
this.selectItem = data.checkArr.value; this.selectItem = data.checkArr.value;
this.selectItemText = data.checkArr.label; this.selectItemText = data.checkArr.label;
} }
}, },
onSubmitClick(){ onSubmitClick() {
var objectData = this.findObjectData(); var objectData = this.findObjectData();
var itemData = this.findItemData(); var itemData = this.findItemData();
uni.navigateTo({ uni.navigateTo({
url:"security-checkitem" url: "security-checkitem"
}) })
uni.$emit("sendCheckItem",[objectData,itemData,this.taskId]); uni.$emit("sendCheckItem", [objectData, itemData, this.taskId]);
}, },
showObjectPicker(){ showObjectPicker() {
this.itemList = this.objectarr; this.itemList = this.objectarr;
this.curType = "object" this.curType = "object"
this.$refs.picker.show() this.$refs.picker.show()
}, },
showTypePicker(){ showTypePicker() {
if(this.selObject == ""){ if (this.selObject == "") {
return return
} }
this.itemList = this.itemarr; this.itemList = this.itemarr;
this.curType = "item"; this.curType = "item";
this.$refs.picker.show() this.$refs.picker.show()
}, },
loadTaskObject(){ loadTaskObject() {
var user = {}; var user = {};
user.id = this.GLOBALUTIL.user.userid; user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username); user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({ uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-task-scope/'+this.taskId, url: this.GLOBALUTIL.url + '/safety/v1/check-task-scope/' + this.taskId,
method: 'GET', method: 'GET',
header: { header: {
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user) 'user': JSON.stringify(user)
}, },
body:null, body: null,
success: (res) => { success: (res) => {
var data = res.data; var data = res.data;
this.objectData = data; this.objectData = data;
var itemList = data.map((opt)=>{ var itemList = data.map((opt) => {
var status = opt.execute_state?"(已完成)":"" var status = opt.execute_state ? "(已完成)" : ""
return {label:opt.name+status,value:opt.id}; return {
label: opt.name + status,
value: opt.id
};
}) })
this.objectarr = itemList; this.objectarr = itemList;
this.itemList = itemList; this.itemList = itemList;
} }
}) })
}, },
loadItemData(){ loadItemData() {
var user = {}; var user = {};
user.id = this.GLOBALUTIL.user.userid; user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username); user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({ uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-task-lists/'+this.taskId+"?check_site_id="+this.selObject, url: this.GLOBALUTIL.url + '/safety/v1/check-task-lists/' + this.taskId + "?check_site_id=" + this.selObject,
method: 'GET', method: 'GET',
header: { header: {
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user) 'user': JSON.stringify(user)
}, },
body:null, body: null,
success: (res) => { success: (res) => {
var data = res.data; var data = res.data;
this.itemData = data; this.itemData = data;
var itemList = data.map((opt)=>{ var itemList = data.map((opt) => {
var status = opt.execute_state?"(已完成)":"" var status = opt.execute_state ? "(已完成)" : ""
return {label:opt.content+status,value:opt.id}; return {
label: opt.content + status,
value: opt.id
};
}) })
this.itemarr = itemList; this.itemarr = itemList;
} }
}) })
}, },
findObjectData(){ findObjectData() {
var obj = {}; var obj = {};
this.objectData.map((opt)=>{ this.objectData.map((opt) => {
if(opt.id == this.selObject){ if (opt.id == this.selObject) {
obj = opt; obj = opt;
} }
}) })
return obj; return obj;
}, },
findItemData(){ findItemData() {
var obj = {}; var obj = {};
this.itemData.map((opt)=>{ this.itemData.map((opt) => {
if(opt.id == this.selectItem){ if (opt.id == this.selectItem) {
obj = opt; obj = opt;
} }
}) })
...@@ -189,21 +189,25 @@ import Picker from "@/components/w-picker/w-picker.vue"; ...@@ -189,21 +189,25 @@ import Picker from "@/components/w-picker/w-picker.vue";
color: #8f8f94; color: #8f8f94;
width: 100%; width: 100%;
} }
.loginbtn { .loginbtn {
width:180rpx; width: 180rpx;
height:200rpx; height: 200rpx;
} }
.login-hover { .login-hover {
width:200rpx; width: 200rpx;
height:200rpx; height: 200rpx;
background-color:#00CE47; background-color: #00CE47;
} }
.testview { .testview {
width:209rpx; width: 209rpx;
height:200rpx; height: 200rpx;
background-color:linear-gradient(red, yellow, blue); background-color: linear-gradient(red, yellow, blue);
} }
.location-container{
.location-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
...@@ -213,49 +217,58 @@ import Picker from "@/components/w-picker/w-picker.vue"; ...@@ -213,49 +217,58 @@ import Picker from "@/components/w-picker/w-picker.vue";
border-bottom: 1rpx solid #898989; border-bottom: 1rpx solid #898989;
} }
.arrow-right{
width:40rpx; .arrow-right {
height:40rpx; width: 40rpx;
height: 40rpx;
} }
.camera-button { .camera-button {
display:flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width:200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
} }
.camera { .camera {
width:50rpx; width: 50rpx;
height:50rpx; height: 50rpx;
} }
.submit-button { .submit-button {
display: flex; display: flex;
width:600rpx; width: 600rpx;
height:60rpx; height: 60rpx;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%); background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%);
border-radius: 15rpx; border-radius: 15rpx;
margin-top: 80rpx; margin-top: 80rpx;
} }
.submittext { .submittext {
font-size: 14px; font-size: 14px;
color: #FFFFFF; color: #FFFFFF;
font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
} }
.submithover{
.submithover {
opacity: 0.7; opacity: 0.7;
} }
.detail { .detail {
width:400rpx; width: 400rpx;
height:100rpx; height: 100rpx;
border: 1rpx solid #000000; border: 1rpx solid #000000;
} }
.status_bar { .status_bar {
height: var(--status-bar-height); height: var(--status-bar-height);
width: 100%; width: 100%;
} }
.value { .value {
font-size: 30rpx; font-size: 30rpx;
color: #000000; color: #000000;
......
cloudTrain/pages/Security-Submit/index.vue
<template> <template>
<view style="width: 100%;height: 100%;padding: 10px;"> <view style="width: 100%;height: 100%;padding: 10px;">
<scroll-view scroll-y="true" class="scroll-Y" show-scrollbar="false" > <scroll-view scroll-y="true" class="scroll-Y" show-scrollbar="false">
<view style="display: flex;flex-direction: row;border-bottom: 1rpx solid #4BBC9A;align-items: center;"> <view style="display: flex;flex-direction: row;border-bottom: 1rpx solid #4BBC9A;align-items: center;">
<image class="tip" src="../../static/security-submit/tip.png"> <image class="tip" src="../../static/security-submit/tip.png">
<text class="toptitle">整改项提交</text> <text class="toptitle">整改项提交</text>
......
cloudTrain/pages/main/main.vue
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
} }
}, },
methods:{ methods:{
clickSubmit(){ clickSubmit(){
uni.navigateTo({ uni.navigateTo({
url:"../Security-Submit/index" url:"../Security-Submit/index"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment