Skip to content

S
sedu-mobile-v2
Commit a3c5e62c by liuzhanxin
Options

fix

parent 896752f3
Showing with 1440 additions and 52 deletions
cloudTrain/App.vue
<script>
import util from "common/util.js"
import Vue from 'vue'
Vue.prototype.GLOBALUTIL = util;
export default {
onLaunch: function() {
......@@ -129,4 +130,7 @@ Vue.prototype.GLOBALUTIL = util;
button.primary {
background-color: #0faeff;
}
scroll-view ::-webkit-scrollbar {
  display: none
}
</style>
cloudTrain/common/moment.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
cloudTrain/common/util.js
......@@ -2,9 +2,11 @@ var url = "http://47.94.204.226";
var addressSelectionTemp = [];
var user = {};
var sysInfo = {};
import moment from "./moment.js"
export default{
url,
addressSelectionTemp,
user,
sysInfo
sysInfo,
moment
}
\ No newline at end of file
cloudTrain/components/address-select/index.vue
<template>
<view class="content">
<view class="status_bar">
<!-- 这里是状态栏 -->
</view>
<uni-nav-bar @clickLeft="goBackClick" @clickRight="saveClick" left-icon="back" left-text="返回" right-text="确定" :title="title[index]"></uni-nav-bar>
<uni-list v-for="(item,index) in listData" :key=index>
<view class="itemclass" hover-class="hoverclass" hover-stay-time="40" @click="itemClick(item,index)">
<view>
......@@ -25,21 +21,36 @@
data() {
return {
title: ["校区","楼栋","楼层","教室"],
listData:[{name:"名字",selected:false},{name:"名字2",selected:false},{name:"名字3",selected:false},{name:"名字4",selected:false}],
listData:[],
index:0,
addressSel:[]
addressSel:[],
id:""
}
},
onLoad(option) {
if(option.maxLevel){
this.maxLevel = option.maxLevel
}
if(option.id){
this.id = option.id
}
if(option.lastIndex){
this.index = parseInt(option.lastIndex) +1;
}
this.getData();
if(this.index == 0){
this.getStartId()
}else{
this.getData(this.id);
}
uni.setNavigationBarTitle({
title:this.title[this.index]
})
},
methods: {
onNavigationBarButtonTap(){
this.saveClick();
console.log("ad")
},
goBackClick:function(){
uni.navigateBack({
......@@ -55,9 +66,15 @@
},
itemClick:function(item,index){
if(this.GLOBALUTIL.addressSelectionTemp[this.index]){
this.GLOBALUTIL.addressSelectionTemp[this.index] = item.name;
this.GLOBALUTIL.addressSelectionTemp[this.index].name = item.name;
this.GLOBALUTIL.addressSelectionTemp[this.index].id = item.name;
this.GLOBALUTIL.addressSelectionTemp[this.index].code = item.code;
}else{
this.GLOBALUTIL.addressSelectionTemp.push(item.name)
this.GLOBALUTIL.addressSelectionTemp.push({
code:item.code,
id:item.id,
name:item.name
})
}
this.listData.map((opt)=>{
opt.selected = false;
......@@ -67,12 +84,52 @@
return
}else{
uni.navigateTo({
url:'../../components/address-select/index?lastIndex='+this.index+"&maxLevel="+this.maxLevel
url:'../../components/address-select/index?lastIndex='+this.index+"&maxLevel="+this.maxLevel+"&id="+item.id
})
}
},
getData:function(){
getData:function(id){
var body = {};
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/base-data/v1/dict-items?sort_property=ID&sort_direction=ASC&dict_code=jsxx&&page_number=1&page_size=100&prev_id='+id,
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
console.log(JSON.stringify(res))
var list = res.data.data;
list.map((opt)=>{
opt.selected = false;
})
this.listData = list
}
})
},
getStartId(){
var body = {};
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/base-data/v1/dicts-code/jsxx',
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
this.getData(res.data.id);
}
})
}
},
components: {uniList,uniListItem,uniNavBar}
......@@ -84,6 +141,7 @@
display: flex;
flex-direction: column;
background-color: #F7F7F7;
padding:0
}
.status_bar {
height: var(--status-bar-height);
......
cloudTrain/components/mescroll-uni/mescroll-body.vue
......@@ -279,4 +279,7 @@
@import "./mescroll-body.css";
@import "./components/mescroll-down.css";
@import './components/mescroll-up.css';
.mescroll-body-content{
width: 100%;
}
</style>
cloudTrain/components/uni-drawer/uni-drawer.vue 0 → 100644
<template>
<view class="tui-drawer-class tui-drawer" :class="[visible ? 'tui-drawer-show' : '','tui-drawer-' + mode]">
<view v-if="mask" class="tui-drawer-mask" @tap="handleMaskClick" @touchmove.stop.prevent></view>
<view class="tui-drawer-container" @touchmove.stop.prevent>
<slot></slot>
</view>
</view>
</template>
<script>
export default {
name:"tuiDrawer",
props: {
visible: {
type: Boolean,
default: false
},
mask: {
type: Boolean,
default: true
},
maskClosable: {
type: Boolean,
default: true
},
mode: {
type: String,
default: 'left' // left right
}
},
methods: {
handleMaskClick() {
if (!this.maskClosable) {
return;
}
this.$emit('close', {});
}
}
}
</script>
<style>
.tui-drawer {
visibility: hidden;
}
.tui-drawer-show {
visibility: visible;
}
.tui-drawer-show .tui-drawer-mask {
display: block;
opacity: 1;
}
.tui-drawer-show .tui-drawer-container {
opacity: 1;
}
.tui-drawer-show.tui-drawer-left .tui-drawer-container,
.tui-drawer-show.tui-drawer-right .tui-drawer-container {
transform: translate3d(0, -50%, 0);
}
.tui-drawer-mask {
opacity: 0;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 998;
background: rgba(0, 0, 0, 0.6);
transition: all 0.3s ease-in-out;
}
.tui-drawer-container {
position: fixed;
left: 50%;
height: 100.2%;
top: 0;
transform: translate3d(-50%, -50%, 0);
transform-origin: center;
transition: all 0.3s ease-in-out;
z-index: 998;
opacity: 0;
overflow-y: scroll;
background: #fff;
-webkit-overflow-scrolling: touch;
-ms-touch-action: pan-y cross-slide-y;
-ms-scroll-chaining: none;
-ms-scroll-limit: 0 50 0 50;
}
.tui-drawer-left .tui-drawer-container {
left: 0;
top: 50%;
transform: translate3d(-100%, -50%, 0);
}
.tui-drawer-right .tui-drawer-container {
right: 0;
top: 50%;
left: auto;
transform: translate3d(100%, -50%, 0);
}
</style>
cloudTrain/components/w-picker/w-picker.vue
......@@ -1024,7 +1024,7 @@
<style lang="scss">
.w-picker{
position: relative;
z-index: 888;
z-index: 999;
.mask {
position: fixed;
z-index: 1000;
......
cloudTrain/pages.json
......@@ -21,12 +21,30 @@
{
"path": "pages/Security-Check/security-task-list",
"style": {
"navigationBarTitleText": "安全检查",
"navigationBarTitleText": "安全检查"
}
},
{
"path": "pages/Security-Check/index",
"style": {
"navigationBarTitleText": "安全检查"
}
},
{
"path": "pages/Security-Check/select-checkobject",
"style": {
"navigationBarTitleText": "检查对象"
}
},
{
"path": "pages/Security-Check/security-checkitem",
"style": {
"navigationBarTitleText": "检查对象",
"app-plus" : {
"titleNView" : {
"buttons" : [
{
"text" : "消息",
"text" : "查看危险源",
"fontSize" : "14"
}
]
......@@ -35,21 +53,35 @@
}
},
{
"path": "pages/Security-Check/index",
"path": "pages/Rectification-Item/list",
"style": {
"navigationBarTitleText": "安全检查"
}
},
"navigationBarTitleText": "整改项查询",
"app-plus" : {
"titleNView" : {
"buttons" : [
{
"path": "pages/Security-Check/select-checkobject",
"style": {
"navigationBarTitleText": "检查对象"
"text" : "筛选",
"fontSize" : "14"
}
]
}
}
}
},
{
"path": "pages/Security-Check/security-checkitem",
"path": "pages/Rectification-Item/detail",
"style": {
"navigationBarTitleText": "检查对象"
"navigationBarTitleText": "整改项详情",
"app-plus" : {
"titleNView" : {
"buttons" : [
{
"text" : "编辑",
"fontSize" : "14"
}
]
}
}
}
},
{
......@@ -61,7 +93,18 @@
{
"path": "components/address-select/index",
"style": {
"navigationStyle":"custom"
"navigationBarTitleText":"校区",
"app-plus" : {
"titleNView" : {
"buttons" : [
{
"text" : "确定",
"fontSize" : "14"
}
]
}
}
}
}
],
......
cloudTrain/pages/Rectification-Item/detail.vue 0 → 100644
<template>
<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">{{roomName}}</text></view>
<view class="detailtext"><text class="titletext">实验室</text><text class="contenttext">{{roomName}}</text></view>
<view class="detailtext"><text class="titletextlong">整改项照片</text></view>
<view class="detailtext"><text class="remind">未上传整改项照片</text></view>
<image v-if="imgUrl.length>0" class="pic" src="../../static/common/camera.png">
</view>
</template>
<script>
export default {
data() {
return {
imgUrl:"",
roomName:"",
description:"",
detailData:{}
}
},
methods: {
onLoad() {
console.log("onllllllllllllllload")
var that = this
uni.$on('rectificationListData',function(data){
var detailData = data[0]
that.roomName = JSON.parse(detailData.room).name
that.description = detailData.description;
that.detailData = detailData;
that.$forceUpdate();
})
},
onUnload(){
console.log("onunnnnnnnnnnnnnnload")
uni.$off('rectificationListData',function(data){
})
},
/*下拉刷新的回调 */
downCallback() {
this.mescroll.endSuccess();
},
/*上拉加载的回调 */
upCallback(page) {
},
onNavigationBarButtonTap(){
uni.navigateTo({
url:"../Security-Check/index"
})
uni.$emit("rectificationEdit",[this.detailData])
},
}
}
</script>
<style>
.top-container {
display: flex;
flex-direction: column;
width: 100%;
padding-left: 20rpx;
margin-top: 10rpx;
margin-bottom: 20rpx;
}
.title {
font-size: 16px;
color: #333333;
}
.containter{
display: flex;
width: 100%;
background-color: #F5F5F5;
padding: 20rpx;
}
.statuspic{
width:80rpx;
height:80rpx;
}
.titletext{
font-size:28rpx;
color: #666666;
margin-right: 78rpx;
flex:1
}
.titletextlong{
font-size:28rpx;
color: #666666;
margin-right: 50rpx;
flex:1
}
.contenttext{
font-size:28rpx;
color: #333333;
flex:3
}
.pic {
width:80rpx;
height:80rpx;
}
.remind {
font-size:32rpx;
color: #CDCDCD;
}
.detailtext {
display: flex;
flex-direction: row;
margin-top: 20rpx;
}
</style>
cloudTrain/pages/Rectification-Item/list.vue 0 → 100644
<template>
<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)">
<image class="statuspic" :src="news.imgsrc">
<view class="top-container" >
<text class="title">{{news.description}}</text>
<view class="detailtext"><text class="titletext">实验室</text><text class="contenttext">{{JSON.parse(news.check_scope).name}}</text></view>
<view class="detailtext"><text class="titletext">负责人</text><text class="contenttext">{{JSON.parse(news.manager).name}}</text></view>
<view class="detailtext"><text class="titletext">创建人</text><text class="contenttext">{{JSON.parse(news.creator).name}}</text></view>
<view class="detailtext"><text class="titletextlong">创建时间</text><text class="contenttext">{{GLOBALUTIL.moment(news.created).format("YYYY-MM-DD HH:mm:ss")}}</text></view>
<view class="detailtext"><text class="titletextlong">检查任务</text><text class="contenttext">{{news.check_task_code_name}}</text></view>
</view>
</view>
<Drawer mode="left" :visible="showDrawer" @close="closeDrawer">
<view class="d-container">
<view style="width: 100%; height:100%;padding:10px">
<view hover-class="hover" @click="close" style="width: auto;display: flex;flex-direction: row; justify-content: flex-end;padding-right: 20px;">
<image class="tip" src="../../static/rectification-item/close.png">
</view>
<text style="font-size: 24px; line-height:33px;margin-top: 50px;">过滤条件</text>
<view class="item" hover-class="hover" @click="showStatusPicker">
<text class="title" style="margin-top: 30rpx;">状态</text>
<view class="selcontent">
<text class="datacontent">{{curStatus.name}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="item" hover-class="hover" @click="showTaskPicker">
<text class="title" style="margin-top: 30rpx;">检查任务</text>
<view class="selcontent">
<text class="datacontent">{{curTask.name}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="item" hover-class="hover" @click="showLabPicker">
<text class="title" style="margin-top: 30rpx;">实验室</text>
<view class="selcontent">
<text class="datacontent">{{curLab.name}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="datetime" hover-class="hover" @click="showStartTimePicker">
<text class="title" style="margin-left: 15rpx;" >开始日期</text>
<view class="selcontent-time">
<text class="datacontent">{{startTime!=""?startTime:"请选择开始时间"}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="datetime" hover-class="hover" @click="showEndTimePicker">
<text class="title" style="margin-left: 15rpx;">结束日期</text>
<view class="selcontent-time">
<text class="datacontent">{{endTime !=""?endTime:"请选择开始时间"}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view style="display: flex;justify-content: center;align-items: center;width: 100%;margin-top: 80px;">
<view hover-class="submithover" @click="onSubmitClick" class="submit-button">
<text class="submittext" >提交</text>
</view>
</view>
</view>
</view>
</Drawer>
<Picker
mode="selector"
@confirm="onConfirm"
ref="picker"
themeColor="#f00"
:selectList="itemList"
></Picker>
</mescroll-body>
</template>
<script>
import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
import Drawer from '@/components/uni-drawer/uni-drawer.vue'
import Picker from "@/components/w-picker/w-picker.vue";
export default {
mixins: [MescrollMixin],
data() {
return {
downOption: {
auto: false //是否在初始化后,自动执行downCallback; 默认true
},
dataList: [],
upOption: {
use: false, // 是否启用上拉加载; 默认true
},
showDrawer:false,
drawer:{status:"fckkk"},
itemList:[],
statusData : [{label:"待确定",value:"unconfirmed"}, {label:"待处理",value:"pend"}, {label:"待整改",value:"correct"},{label:"整改中",value:"processed"},{label:"已处理",value:"finish"}, {label:'已取消',value:'cancel'}],
curType:"",
labData:[],
taskData:[],
filterBody:"",
pickerMod:"linkage",
curTask:{},
curStatus:{},
curLab:{},
startTime:"",
endTime:"",
}
},
components: {
Drawer,
Picker
},
methods: {
closeDrawer(){
},
close(){
this.showDrawer = false;
},
onNavigationBarButtonTap(){
this.showDrawer = true;
},
onLoad() {
this.loadData();
this.getTaskList();
this.getLabList();
},
/*下拉刷新的回调 */
downCallback() {
this.mescroll.endSuccess();
},
/*上拉加载的回调 */
upCallback(page) {
},
/*获取列表*/
loadData(){
var body = {};
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/dangers?page_number=1&page_size=200'+this.filterBody,
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
var data = res.data.data;
data.map((opt)=>{
opt.imgsrc = this.handleStatus(opt)
})
this.dataList = data;
// console.log(JSON.stringify(data))
}
})
},
handleStatus(opt) {
switch (opt.status) {
case 'unconfirmed':
return "../../static/rectification-item/daiqueding.png"
case 'pend':
return "../../static/rectification-item/daichuli.png"
case 'correct':
return "../../static/rectification-item/daizhenggai.png"
case 'processed':
return "../../static/rectification-item/zhenggaizhong.png"
case 'finish':
return "../../static/rectification-item/yiwancheng.png"
case 'cancel':
return "../../static/rectification-item/cancel.png"
default:
return"../../static/rectification-item/daiqueding.png"
}
},
goDetail(data){
uni.navigateTo({
url:"./detail"
})
uni.$emit("rectificationListData",[data])
},
showStatusPicker(){
this.curType = "status"
this.pickerMod = "linkage";
this.itemList = this.statusData;
this.$refs.picker.show()
},
showTaskPicker(){
this.curType = "task"
this.pickerMod = "linkage";
this.itemList = this.taskData;
this.$refs.picker.show()
},
showLabPicker(){
this.curType = "lab"
this.pickerMod = "linkage";
this.itemList = this.labData;
this.$refs.picker.show()
},
showStartTimePicker(){
this.curType = "startTime";
this.pickerMod = "date";
this.$refs.picker.show()
},
showEndTimePicker(){
this.curType = "endTime";
this.pickerMod = "date";
this.$refs.picker.show()
},
onConfirm(data){
console.log(JSON.stringify(data))
if(this.curType == "status"){
this.curStatus = {"name":data.checkArr.label,value:data.checkArr.value}
}else if(this.curType == "task"){
this.curTask = {"name":data.checkArr.label,value:data.checkArr.value}
}else if(this.curType == "lab"){
this.curLab = {"name":data.checkArr.label,value:data.checkArr.value}
}
else if(this.curType == "startTime"){
this.startTime = data.result
}else{
this.endTime = data.result
}
//this.curTask = {"name":data.checkArr[0],value:data.checkValue[0]}
},
getTaskList(){
var body = {};
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-tasks?page_size=200&page_number=1',
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
var data = res.data.data;
var itemList = data.map((opt)=>{
return {label:opt.name,value:opt.id};
})
this.taskData = itemList;
}
})
},
getLabList(){
var body = {};
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/education-manage/v1/experiment-centers?page_number=1&page_size=100&_=1539337073882',
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
var data = res.data.data;
var itemList = data.map((opt)=>{
return {label:opt.name,value:opt.id};
})
this.labData = itemList;
}
})
},
onSubmitClick(){
this.filterBody = "";
if(this.curTask.value){
this.filterBody = this.filterBody +'&check_task_id='+this.curTask.value
}
if(this.curLab.value){
this.filterBody = this.filterBody +'&check_scope='+this.curLab.value
}
if(this.curStatus.value){
this.filterBody = this.filterBody +'&status='+this.curStatus.value
}
if(this.startTime){
this.filterBody = this.filterBody+'&check_start_date='+this.startTime
}
if(this.endTime){
this.filterBody = this.filterBody+'&check_end_date='+this.endTime
}
this.showDrawer = false;
this.loadData();
}
}
}
</script>
<style>
/*说明*/
.notice{
font-size: 30upx;
padding: 40upx 0;
border-bottom: 1upx solid #eee;
text-align: center;
}
/*展示上拉加载的数据列表*/
.news-li{
font-size: 32upx;
border-bottom: 1upx solid #eee;
width: auto;
display: flex;
flex-direction: column;
background-color: #FFFFFF;
margin-top:20rpx;
}
.news-li .new-content{
font-size: 28upx;
margin-top: 10upx;
margin-left: 20upx;
color: #666;
}
.icon {
width:20rpx;
height:20rpx;
margin-right: 20rpx;
}
.top-container {
display: flex;
flex-direction: column;
width: 100%;
padding-left: 50rpx;
margin-top: -35rpx;
margin-bottom: 20rpx;
}
.status {
width:170rpx;
height:35rpx;
background-color: rgba(242,115,115,0.10);
border-radius: 50rpx;
display: flex;
justify-content: center;
align-items: center;
margin-left: 35rpx;
}
.status-text{
color: #F27373;
font-size: 11px;
}
.hover{
opacity: 0.7;
}
.title {
font-size: 16px;
color: #333333;
}
.des {
font-weight:200;
font-size:14px;
color:#676767
}
.detail {
font-size:14px;
}
.type {
font-size:14px;
}
.containter{
display: flex;
width: 100%;
background-color: #F5F5F5;
padding: 20rpx;
}
.statuspic{
width:80rpx;
height:80rpx;
}
.titletext{
font-size:28rpx;
color: #666666;
margin-right: 78rpx;
}
.titletextlong{
font-size:28rpx;
color: #666666;
margin-right: 50rpx;
}
.contenttext{
font-size:28rpx;
color: #333333;
},
.selcontent {
display: flex;
flex-direction: row;
align-items: center;
margin-top: 20px;
}
.selcontent-time {
display: flex;
flex-direction: row;
align-items: center;
}
.item {
border-bottom: 1rpx solid #D0D0D0;
width: auto;
margin-top: 20rpx;
margin-left: 20rpx;
margin-right: 40rpx;
padding-bottom: 10rpx;
}
.datacontent {
width: 100%;
font-size: 16px;
color: #4F4F4F;
}
.hover {
opacity: 0.7;
}
.tip {
width: 30rpx;
height:30rpx
}
.submit-button {
display: flex;
width:500rpx;
height:60rpx;
align-items: center;
justify-content: center;
background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%);
border-radius: 15rpx;
margin-left: 0;
margin-right: 0;
margin-bottom: 40rpx;
}
.submittext {
font-size: 14px;
color: #FFFFFF;
font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}
.submithover{
opacity: 0.7;
}
.d-container {
width: 600upx;
}
.datetime{
width: auto;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-top:20px;
}
</style>
cloudTrain/pages/Security-Check/index.vue
......@@ -2,12 +2,13 @@
<view class="content">
<text class="title"> 实验室名称: {{objectData.name}}</text>
<text class="title" style="margin-top: 30rpx;">位置</text>
<view class="location-container">
<text class="location">{{objectData.name}}</text>
<view class="location-container" hover-class="hover" @click="showAddressSel">
<text class="location">{{address}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
<text class="title" style="margin-top: 30rpx;">整改项详情</text>
<view style="width: 100%;">
<textarea class="detail" />
<textarea class="detail" @blur="changeTextValue" />
</view>
<text class="title" style="margin-top: 30rpx;">整改项照片</text>
<view style="width: 100%;display: flex;align-items: flex-start; justify-content: flex-start;margin-top: 30rpx;">
......@@ -18,7 +19,7 @@
</view>
</view>
<button hover-class="submithover" @click="onSubmitClick" class="submit-button">
<text class="submittext">提交</text>
<text class="submittext" >提交</text>
</button>
<ActionSheet :show="showActionSheet" :tips="tips" :item-list="itemList" :mask-closable="maskClosable"
:color="color" :size="size" :is-cancel="isCancel" @click="itemClick" @cancel="closeActionSheet"></ActionSheet>
......@@ -44,19 +45,45 @@ import uniNavBar from "@/components/uni-header/uni-nav-bar/uni-nav-bar.vue"
checkitem:{},
taskId:"",
images:[],
room:{}
room:{},
description:"",
address:"",
addressType:""
}
},
onLoad() {
var that = this;
uni.$on('addressSave',function(data){
console.log(JSON.stringify(that.GLOBALUTIL.addressSelectionTemp))
var roomData = {};
roomData.code = that.GLOBALUTIL.addressSelectionTemp[3].code;
roomData.id = that.GLOBALUTIL.addressSelectionTemp[3].id;
roomData.name = that.GLOBALUTIL.addressSelectionTemp[1].name + that.GLOBALUTIL.addressSelectionTemp[3].name;
that.room = roomData
that.address = that.GLOBALUTIL.addressSelectionTemp[0].name + that.GLOBALUTIL.addressSelectionTemp[1].name+that.GLOBALUTIL.addressSelectionTemp[2].name + that.GLOBALUTIL.addressSelectionTemp[3].name;
})
uni.$on('safeReportData',function(data){
that.objectData = data[0]
that.checkitem = data[1]
that.taskId = data[2]
that.room = that.objectData
if(that.objectData.type == "site"){
that.addressType = "site";
that.address = that.objectData.name
}
})
uni.$on('rectificationEdit',function(data){
var baseData = data[0];
that.objectData = JSON.parse(baseData.check_scope)
that.checkitem = baseData.check_item
that.taskId = baseData.check_task_id ;
that.room = JSON.parse(baseData.room);
if(that.objectData.type == "site"){
that.addressType = "site";
that.address = that.objectData.name
}
})
},
onUnload(){
......@@ -64,11 +91,22 @@ import uniNavBar from "@/components/uni-header/uni-nav-bar/uni-nav-bar.vue"
uni.$off('addressSave',function(data){
that.GLOBALUTIL.addressSelectionTemp = [];
})
uni.$on('safeReportData',function(data){
uni.$off('safeReportData',function(data){
})
uni.$off('rectificationEdit',function(data){
})
},
methods: {
showAddressSel(){
if(this.addressType == "site"){
return
}
uni.navigateTo({
url:"../../components/address-select/index?maxLevel=4"
})
},
onclick: function() {
console.log(this.textvalue)
this.showActionSheet = true;
},
......@@ -95,7 +133,7 @@ import uniNavBar from "@/components/uni-header/uni-nav-bar/uni-nav-bar.vue"
body:JSON.stringify(body),
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'Content-Type': 'application/json',
'user' : JSON.stringify(user)
},
success: (res) => {
......@@ -127,27 +165,51 @@ import uniNavBar from "@/components/uni-header/uni-nav-bar/uni-nav-bar.vue"
this.closeActionSheet();
},
uploadPic(imgPath){
var currentTime = new Date().getTime();
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
// uni.request({
// url: this.GLOBALUTIL.url+'/safety/v1/file/image',
// method: 'POST',
// data:{
// file:[{"uri": imgPath[0],"name":"file"}]
// },
// header: {
// 'Accept': 'application/json',
// 'Content-Type': 'multipart/form-data',
// 'user' : JSON.stringify(user)
// },
// success: (res) => {
// console.log(res)
// }
// })
// console.log(imgPath[0])
// let imgs = imgPath.map((value, index) => {
// return {
// name: "file["+index+"]",//注意这一行，uni的hello的示例中，这里为key名+index，这样是无法和使用一个固定key名接多个文件的php接口对接上的改为数组下标形式的字符串就解决这个问题了。其效果等同于在html页面上多个同name文件域同时提交表单。
// uri: value
// }
// });
uni.uploadFile({
url: this.GLOBALUTIL.url+'/safety/v1/file/image',
files:[{uri: imgPath[0],name: currentTime+'.jpg'}],
filePath:"",
name:"",
// files:imgs,
filePath:imgPath[0],
name:"file",
header: {
'Accept': 'application/json',
'user' : JSON.stringify(user)
'user' : JSON.stringify(user),
'Content-Type': 'multipart/form-data',
},
success: (res) => {
console.log(res)
console.log(JSON.stringify(res))
}
})
},
closeActionSheet: function() {
this.showActionSheet = false
},
changeTextValue:function(e){
this.description = e.detail.value;
},
},
components: {
......@@ -200,6 +262,7 @@ import uniNavBar from "@/components/uni-header/uni-nav-bar/uni-nav-bar.vue"
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
width:100%;
}
.arrow-right{
......@@ -249,4 +312,11 @@ import uniNavBar from "@/components/uni-header/uni-nav-bar/uni-nav-bar.vue"
font-size: 34rpx;
color: #000000;
}
.tip {
width: 30rpx;
height:30rpx
}
.hover {
opacity: 0.7;
}
</style>
cloudTrain/pages/Security-Check/security-checkitem.vue
......@@ -38,7 +38,8 @@
isShow:false,
checkitems:[],
objectData:{},
taskId:""
taskId:"",
checkResult:[]
}
},
methods: {
......@@ -76,7 +77,14 @@
},
itemClick(index,status){
this.dataList[index].status = status;
var res = {
name:this.checkitems[status].name,
code:this.checkitems[status].code,
id:this.checkitems[status].id
}
this.checkResult[index].result_type = res
this.$forceUpdate();
console.log(JSON.stringify(this.checkResult))
},
checkItem(item){
uni.navigateTo({
......@@ -103,12 +111,47 @@
})
this.checkitems = res.data.data;
this.isShow = true;
// console.log(JSON.stringify(this.objectData))
// console.log(JSON.stringify(this.dataList))
// console.log(JSON.stringify(this.checkitems))
this.checkResult = [];
this.dataList.map((opt)=>{
var res = {
name:this.checkitems[0].name,
id:this.checkitems[0].id,
code:this.checkitems[0].code
}
var item = {
"result_type":JSON.stringify(res),
"check_item_id":opt.id,
"check_list_id":opt.check_list_id,
"check_task_id":this.taskId,
"lab_id":this.objectData.id
}
this.checkResult.push(item)
})
}
})
},
onSubmitClick(){
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
var body = this.checkResult
uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-result',
method: 'POST',
data:JSON.stringify(body),
header: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'user' : JSON.stringify(user)
},
success: (res) => {
console.log(JSON.stringify(res))
}
})
}
}
}
......
cloudTrain/pages/Security-Check/security-task-list.vue
<template>
<mescroll-body 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="top-container" >
<text class="title">{{news.name}}</text>
<view class="status">
<text class="status-text">{{news.taskstatus}}</text>
<view :class="news.color=='finish' ? 'status-finish' : 'status' ">
<text :class="news.color=='finish' ? 'status-finish-text' : 'status-text' ">{{news.taskstatus}}</text>
</view>
</view>
<view><text class="des">{{news.check_point}}</text></view>
......@@ -15,8 +15,8 @@
<text class="detail">{{data.name}}</text>
</view>
</view>
<view><image class="icon" src="../../static/security-check/safePerson.png"><text class="detail">陆冬梅</text></view>
<view><text class="type">自建任务</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>
</mescroll-body>
</template>
......@@ -67,13 +67,15 @@
success: (res) => {
var data = res.data.data;
data.map((opt)=>{
opt.taskstatus = this.handleStatus(opt);
opt.taskstatus = (this.handleStatus(opt)).text;
opt.color = (this.handleStatus(opt)).color;
var taskexecutor = JSON.parse(opt.excutor);
var taskexecutortext = "";
taskexecutor.map((opt)=>{
taskexecutortext = opt.name +" ";
})
opt.taskexecutor = taskexecutortext;
opt.taskTypeTitle = opt.auto_task?"上级下发":"自建任务"
})
this.dataList = data;
}
......@@ -81,9 +83,11 @@
},
handleStatus(data){
var text = "";
var color = ""
if(data.execute_state){
var check_scope = JSON.parse(data.check_scope);
text = "已完成" + check_scope.length +"/" + check_scope.length;
color = "finish"
}else{
var check_scope = JSON.parse(data.check_scope);
var checked = 0;
......@@ -94,11 +98,13 @@
})
if(checked == check_scope.length){
text = "已完成 " + check_scope.length +"/" + check_scope.length;
color = "finish"
}else{
text = '未完成 '+checked+'/'+check_scope.length;
color = "unfinish"
}
}
return text
return {text:text,color:color}
},
goDetail(data){
uni.navigateTo({
......@@ -122,6 +128,9 @@
font-size: 32upx;
padding: 32upx;
border-bottom: 1upx solid #eee;
width: 100%;
display: flex;
flex-direction: column;
}
.news-li .new-content{
font-size: 28upx;
......@@ -149,10 +158,24 @@
align-items: center;
margin-left: 35rpx;
}
.status-finish {
width:170rpx;
height:35rpx;
background-color: rgba(47,190,178,0.10);
border-radius: 50rpx;
display: flex;
justify-content: center;
align-items: center;
margin-left: 35rpx;
}
.status-text{
color: #F27373;
font-size: 11px;
}
.status-finish-text{
color: #2FBEB2;
font-size: 11px;
}
.hover{
opacity: 0.7;
}
......@@ -171,4 +194,8 @@
.type {
font-size:14px;
}
.containter{
display: flex;
width: 100%;
}
</style>
cloudTrain/pages/Security-Submit/index.vue
<template>
<scroll-view scroll-y="true" class="scroll-Y" show-scrollbar="false" >
<view style="display: flex;flex-direction: row;padding:10rpx;border-bottom: 1rpx solid #4BBC9A;align-items: center;">
<image class="tip" src="../../static/security-submit/tip.png">
<text class="toptitle">整改项提交</text>
</view>
<view class="item" hover-class="hover" @click="showTaskPicker">
<text class="title" style="margin-top: 30rpx;">检查任务</text>
<view class="selcontent">
<text class="datacontent">{{curTask.name}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="item" hover-class="hover" @click="showObjectPicker">
<text class="title" style="margin-top: 30rpx;">检查对象</text>
<view class="selcontent">
<text class="datacontent">{{curObject.name}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="item" hover-class="hover" @click="showItemTypePicker">
<text class="title" style="margin-top: 30rpx;">检查项类型</text>
<view class="selcontent">
<text class="datacontent">{{curItemType.name}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="item" hover-class="hover" @click="showItemPicker">
<text class="title" style="margin-top: 30rpx;">检查项</text>
<view class="selcontent">
<text class="datacontent">{{curItem.name}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view class="item" hover-class="hover" @click="showAddressSel">
<text class="title" style="margin-top: 30rpx;">位置</text>
<view class="selcontent">
<text class="datacontent">{{address}}</text>
<image class="tip" src="../../static/common/arrow_right_gray.png">
</view>
</view>
<view style="margin-top: 20px;">
<text class="title">整改项详情</text>
<view style="width: auto;margin-top: 10px;">
<textarea class="detail" @blur="changeTextValue" />
</view>
</view>
<view style="margin-top: 20px;">
<text class="title" style="margin-top: 30rpx;">整改项照片</text>
<view style="width: 100%;display: flex;align-items: flex-start; justify-content: flex-start;margin-top: 30rpx;">
<view>
这里是整改项提交
<button @click="onclick" class="camera-button">
<image class="camera" src="../../static/common/camera.png">
</button>
</view>
</view>
</view>
<view style="display: flex;justify-content: center;align-items: center;width: 100%;margin-top: 40px;">
<view hover-class="submithover" @click="onSubmitClick" class="submit-button">
<text class="submittext" >提交</text>
</view>
</view>
<view style="width: 100%;height: 40px;">
</view>
<ActionSheet :show="showActionSheet" :tips="tips" :item-list="actionList" :mask-closable="maskClosable"
:color="color" :size="size" :is-cancel="isCancel" @click="itemClick" @cancel="closeActionSheet"></ActionSheet>
<Picker
mode="linkage"
:level="1"
@confirm="onConfirm"
ref="picker"
:linkList="itemList"
themeColor="#f00"
></Picker>
</scroll-view>
</template>
<script>
import ActionSheet from "@/components/actionsheet/actionsheet.vue"
import AddressSelect from "@/components/multi-select/cityChiden.vue"
import Picker from "@/components/w-picker/w-picker.vue";
export default {
data() {
return {
showActionSheet: false,
maskClosable: true,
tips: "请选择",
color: "#9a9a9a",
size: 26,
isCancel: true,
actionList: [{text:"打开相机"},{text:"从相册中选择"}],
objectData:{},
checkitem:{},
taskId:"",
images:[],
textvalue:"kk",
itemList:[],
curPicker:"",
curTask:{},
curObject:{},
curItemType:{},
curItem:{},
taskList:[],
objectList:[],
itemTypeList:[],
checkItemList:[],
address:"",
addressType:"",
description:"",
room:{}
}
},
onLoad() {
var that = this;
uni.$on('addressSave',function(data){
console.log(JSON.stringify(that.GLOBALUTIL.addressSelectionTemp))
var roomData = {};
roomData.code = that.GLOBALUTIL.addressSelectionTemp[3].code;
roomData.id = that.GLOBALUTIL.addressSelectionTemp[3].id;
roomData.name = that.GLOBALUTIL.addressSelectionTemp[1].name + that.GLOBALUTIL.addressSelectionTemp[3].name;
that.room = roomData
that.address = that.GLOBALUTIL.addressSelectionTemp[0].name + that.GLOBALUTIL.addressSelectionTemp[1].name+that.GLOBALUTIL.addressSelectionTemp[2].name + that.GLOBALUTIL.addressSelectionTemp[3].name;
})
this.getTaskList();
},
onUnload(){
var that = this;
uni.$off('addressSave',function(data){
that.GLOBALUTIL.addressSelectionTemp = [];
})
},
methods: {
onclick: function() {
console.log(this.textvalue)
this.showActionSheet = true;
},
onSubmitClick: function() {
var body = {
"check_scope":JSON.stringify(this.curCheckScope),
"check_item_id":this.curItem.value,
"check_list_id":this.curItemType.value,
"check_task_id":this.curTask.value,
"images":JSON.stringify(this.images),
"description":this.description,
"room":JSON.stringify(this.room)
}
console.log(JSON.stringify(body))
console.log(this.GLOBALUTIL.url)
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
var bd = JSON.stringify(body);
uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/danger',
method: 'POST',
data:bd,
header: {
'Accept': 'application/json',
'Content-Type': 'application/json',
'user' : JSON.stringify(user)
},
success: (res) => {
console.log(JSON.stringify(res))
}
})
},
itemClick: function(item) {
var that = this
if(item.index == 0){
uni.chooseImage({
sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['camera'], //相机
success: function (res) {
var imgPath = res.tempFilePaths;
that.uploadPic(imgPath);
}
});
}else{
uni.chooseImage({
sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album'], //从相册选择
success: function (res) {
var imgPath = res.tempFilePaths;
that.uploadPic(imgPath);
}
});
}
this.closeActionSheet();
},
uploadPic(imgPath){
},
closeActionSheet: function() {
this.showActionSheet = false
},
changeTextValue:function(e){
this.description = e.detail.value;
},
showTaskPicker(){
this.curPicker = "task";
this.itemList = this.taskList
this.$refs.picker.show()
},
showObjectPicker(){
this.curPicker = "object";
this.itemList = this.objectList
this.$refs.picker.show()
},
showItemTypePicker(){
this.curPicker = "type";
this.itemList = this.itemTypeList
this.$refs.picker.show()
},
showItemPicker(){
this.curPicker = "item";
this.itemTypeList.map((opt)=>{
if(opt.value == this.curItemType.value){
this.checkItemList = opt.children
var itemlist = []
this.checkItemList.map((opt)=>{
itemlist.push({label:opt.content,value:opt.id})
})
this.itemList = itemlist
}
})
this.$refs.picker.show()
},
onConfirm(data){
if(this.curPicker == "task"){
this.curTask = {"name":data.checkArr[0],value:data.checkValue[0]}
this.loadTaskObject();
}else if(this.curPicker == "object"){
this.curObject = {"name":data.checkArr[0],value:data.checkValue[0]}
this.objectData.map((opt)=>{
if(opt.id == this.curObject.value){
if(opt.type == "site"){
this.addressType = "site";
this.address = opt.name
}
this.curCheckScope = opt;
this.room = opt
}
})
this.loadItemTypeData();
}else if (this.curPicker == "type"){
this.curItemType = {"name":data.checkArr[0],value:data.checkValue[0]}
}else{
this.curItem = {"name":data.checkArr[0],value:data.checkValue[0]}
}
},
showAddressSel(){
if(this.addressType == "site"){
return
}
uni.navigateTo({
url:"../../components/address-select/index?maxLevel=4"
})
},
//任务列表
getTaskList(){
var body = {};
var user = {};
console.log(this.GLOBALUTIL.user)
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-tasks?page_size=200&page_number=1',
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
var data = res.data.data;
var itemList = data.map((opt)=>{
return {label:opt.name,value:opt.id};
})
this.tasklist = itemList;
this.itemList = itemList;
}
})
},
//任务对象
loadTaskObject(){
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-task-scope/'+this.curTask.value,
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
var data = res.data;
this.objectData = data;
var itemList = data.map((opt)=>{
return {label:opt.name,value:opt.id};
})
this.objectList = itemList;
this.itemList = itemList;
}
})
},
loadItemTypeData(){
var user = {};
user.id = this.GLOBALUTIL.user.userid;
user.name = encodeURI(this.GLOBALUTIL.user.username);
uni.request({
url: this.GLOBALUTIL.url+'/safety/v1/check-task-lists/'+this.curTask.value+"?check_site_id="+this.selObject,
method: 'GET',
header: {
'Accept': 'application/json',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'user' : JSON.stringify(user)
},
body:null,
success: (res) => {
var data = res.data;
this.itemData = data;
var itemList = data.map((opt)=>{
return {label:opt.content,value:opt.id,children:opt.children};
})
this.itemarr = itemList;
this.itemTypeList = itemList;
}
})
},
},
components: {
ActionSheet,
AddressSelect,
Picker
},
}
</script>
<style>
.content {
display: flex;
flex-direction: column;
background-color: #F5F5F5;
}
.logo {
height: 200rpx;
width: 200rpx;
margin-top: 200rpx;
margin-left: auto;
margin-right: auto;
margin-bottom: 50rpx;
}
.text-area {
display: flex;
justify-content: center;
}
.title {
font-size: 30rpx;
color: #8f8f94;
}
.loginbtn {
width:180rpx;
height:200rpx;
}
.login-hover {
width:200rpx;
height:200rpx;
background-color:#00CE47;
}
.testview {
width:209rpx;
height:200rpx;
background-color:linear-gradient(red, yellow, blue);
}
.location-container{
display: flex;
flex-direction: row;
align-items: center;
width:100%;
}
.arrow-right{
width:40rpx;
height:40rpx;
}
.camera-button {
display:flex;
flex-direction: row;
align-items: center;
justify-content: center;
width:200rpx;
height: 200rpx;
}
.camera {
width:50rpx;
height:50rpx;
}
.submit-button {
display: flex;
width:600rpx;
height:60rpx;
align-items: center;
justify-content: center;
background: linear-gradient(-45deg, rgba(87, 225, 181, 1) 0%, rgba(0, 63, 255, 1) 100%);
border-radius: 15rpx;
margin-left: 0;
margin-right: 0;
margin-bottom: 40rpx;
}
.submittext {
font-size: 14px;
color: #FFFFFF;
font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
}
.submithover{
opacity: 0.7;
}
.detail {
width:auto;
height:300rpx;
border: 1rpx solid #000000;
}
.status_bar {
height: var(--status-bar-height);
width: 100%;
}
.location{
font-size: 34rpx;
color: #000000;
}
.tip {
width: 30rpx;
height:30rpx
}
.toptitle {
color: #666666;
font-size: 17px;
}
.selcontent {
display: flex;
flex-direction: row;
align-items: center;
margin-top: 20rpx;
}
.item {
border-bottom: 1rpx solid #D0D0D0;
width: 100%;
margin-top: 20rpx;
padding-bottom: 10rpx;
}
.datacontent {
width: 100%;
font-size: 16px;
color: #4F4F4F;
}
.hover {
opacity: 0.7;
}
.scroll-Y{
height: 100%;
padding-left: 20rpx;
padding-right: 20rpx;
}
</style>
cloudTrain/pages/main/main.vue
......@@ -62,7 +62,7 @@
},
clickQuery(){
uni.navigateTo({
url:"./select-checkobject?taskId="+data.id
url:"../Rectification-Item/list"
})
}
}
......
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