Merge remote-tracking branch 'origin/dev' into dev

pull/5/head
fangjiakai 2024-02-20 17:03:46 +08:00
commit 5052eba52a
12 changed files with 1387 additions and 8 deletions

View File

@ -747,6 +747,22 @@
"path": "pages/application/key-project-management/safety-environmental-inspection/list",
"style": {}
},
{
"path": "pages/application/key-project-management/positioning_management/index",
"style": {}
},
{
"path": "pages/application/key-project-management/positioning_management/keyProjectApply",
"style": {}
},
{
"path": "pages/application/key-project-management/positioning_management/list",
"style": {}
},
{
"path": "pages/application/key-project-management/positioning_management/videoView",
"style": {}
},
{
"path": "pages/application/key-project-management/safety-environmental-inspection/detail-list",
"style": {}
@ -865,6 +881,14 @@
"style": {}
},
{
"path": "pages/application/safetymeeting/index",
"style": {}
},
{
"path": "pages/application/safetymeeting/info",
"style": {}
},
{
"path" : "pages/my/updateSignature/index",
"style" : {}

View File

@ -76,7 +76,8 @@
permissionID:'',
noClick:true,
buttonloading: false,
listId:'',
listId: '',
CHECK_ITEM: '',
listName:'',
baoBaoType:'',
list: [],
@ -85,6 +86,7 @@
}
},
onLoad(e){
this.CHECK_ITEM = e.CHECK_ITEM
this.listId=e.listId;
this.listName=e.listName;
this.baoBaoType=e.baoBaoType
@ -114,6 +116,7 @@
},
data: {
CUSTOM_ID: _this.listId,
CHECK_ITEM: _this.CHECK_ITEM,
USER_NAME : loginUser.NAME,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,

View File

@ -161,9 +161,7 @@
uni.navigateTo({
url: '/pages/application/hidden-danger-check-standard/custom/list-item-check-list?CHECK_ITEM=' +
e.CHECK_ITEM + "&listId=" + this.listId + '&listName=' + this.listName +
"&CHECKRECORD_ID=" + (this.CHECKRECORD_ID ? this.CHECKRECORD_ID : '') + "&baoBaoType=" +
this
.baoBaoType
"&CHECKRECORD_ID=" + (this.CHECKRECORD_ID ? this.CHECKRECORD_ID : '') + "&baoBaoType=" + this.baoBaoType
});
}
// uni.navigateTo({

View File

@ -11,6 +11,15 @@
<text>重点工程管理</text>
</view>
<view class="apps-warp">
<navigator class="apps-item" hover-class="none" url="/pages/application/key-project-management/positioning_management/index">
<view class="imgs action">
<image src="../../../../static/icon-apps/icon-yxkj-1.png" mode=""></image>
<view v-if="count.GC_COUNT" class="cu-tag badge">{{count.GC_COUNT}}</view>
</view>
<view class="text-semi" style="text-align: center;">
<view>重点工程管理</view>
</view>
</navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/key-project-management/safety-environmental-inspection/list">
<view class="imgs action">
<image src="../../../../static/icon-apps/icon-yxkj-1.png" mode=""></image>

View File

@ -0,0 +1,276 @@
<template>
<view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
<block slot="backText">返回</block>
<block slot="content">重点工程管理</block>
</cu-custom>
<view class="select-fixed top-fixed">
<view class="cu-bar search bg-white">
<view class="search-form radius">
<text class="cuIcon-search"></text>
<input @input="InputBlur" placeholder="请输入关键字"
confirm-type="search" />
</view>
<view class="action">
<button class="cu-btn bg-green shadow-blur radius" @click="getQuery"></button>
</view>
</view>
<view class="line"></view>
</view>
<scroll-view class="dy-scroll" @scrolltolower="scrolltolower" scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
<view v-if="list.length>0" >
<view class="dy-list">
<view v-for="(item,index) of list" :key="index" :data-id="item.INSPECTION_ID" @click="$noMultipleClicks(goToDetail,item.OUTSOURCED_ID)" class="dy-list-item p20">
<view class="dy-title-flex align-center">
<text>{{item.OUTSOURCED_NAME}}</text>
<text>
<view v-if="(item.STATE==='-1' || item.STATE==='-2') && userId == item.CREATOR "
style="border-radius: 96px;
font-size: 10px;
padding: 0px 10px;
height: 13px;
color: #ffffff;
background-color:#dd514c ;">1</view>
</text>
</view>
<view v-show="item.IS_CORP_TYPE== '1'" class="dy-subtitle-flex">
<text>
主管部门{{ item.Q_COMPETENT_DEPT_NAME }}
</text>
</view>
<view v-show="item.IS_CORP_TYPE== '1'" class="dy-subtitle-flex">
<text>
监督部门{{ item.DEPARTMENT_NAME }}
</text>
</view>
<view v-show="item.IS_CORP_TYPE== '0'" class="dy-subtitle-flex">
<text>
主管部门{{ item.MANAGER_DEPARTMENT_NAME }}
</text>
</view>
<view v-show="item.IS_CORP_TYPE== '0'" class="dy-subtitle-flex">
<text>
监管部门{{ item.DEPARTMENT_NAME }}
</text>
</view>
<view class="dy-subtitle-flex">
<text>相关方单位负责人{{item.UNITS_PIC_NAME}}</text>
<text>电话{{item.UNITS_PHONE}}</text>
</view>
<view class="dy-subtitle-flex" @click="fnKeyProjectApply(item.OUTSOURCED_ID)">
<text>定位坐标{{ item.WORK_LONGITUDE?item.WORK_LONGITUDE+'*'+item.WORK_LATITUDE: ''}}</text>
</view>
<view class="dy-subtitle-flex" @click="fnKeyProjectApply(item.OUTSOURCED_ID)">
<text>状态{{ item.STATE == '-1'?'开工申请中':item.STATE == '-2'?'结束申请中': item.STATE == '0'?'未开工': item.STATE == '1'?'进行中': '已结束'}}</text>
</view>
<view class="dy-subtitle-flex" style="height: 34upx;">
<text></text>
<text>
<button class="cu-btn bg-blue margin-tb-sm sm" @click="$noMultipleClicks(goToDetail,item.OUTSOURCED_ID)"></button>
<button style="margin-left: 20upx;" class="cu-btn bg-blue margin-tb-sm sm" @click="$noMultipleClicks(goToVideo,item.OUTSOURCED_ID)"></button>
</text>
</view>
</view>
</view>
</view>
<view v-else-if="dataFlag=='noData'" class="dy-null">
<view class="dy-null-img">
<image :src="background[dataFlag].url" mode=""></image>
</view>
<view class="dy-null-title">
{{background[dataFlag].msg}}
</view>
</view>
<view class="cu-tabbar-height"></view>
</scroll-view>
</view>
</template>
<script>
import {
basePath,corpinfoId,loginSession,formatDate,loginUser,loginUserId
} from '@/common/tool.js';
import tkiTree from "@/components/select-tree/select-tree.vue"
export default {
components: {
tkiTree
},
data() {
return {
showRight: false,
dataFlag:'noData',
sTop:0,
totalHeight:0,
list:[],//
page:1,//--
rows:10,//--
totalCount:0,//--
isEnd:false,//
totalPage: 0, //--
NameLikes : '',
noClick:true,
userId: '',
}
},
onReady() {
let that=this;
let CustomBar = this.CustomBar;
uni.getSystemInfo({ //uni-app
success(res) { //
let titleH=uni.createSelectorQuery().select(".top-fixed"); //class/id
titleH.boundingClientRect(data=>{
that._data.sTop=data.height //=-data.top
that.totalHeight = data.height+CustomBar
}).exec()
}
})
},
onLoad() {//
},
onShow() {
//
var _this = this;
_this.background = require('@/common/background.json');
_this.showCount = 10;
_this.currentPage = 1;
_this.list = [];
_this.isEnd = false;
_this.getData();
loginSession();
},
methods: {
//
goToDetail(e) {
uni.navigateTo({
url: '/pages/application/key-project-management/positioning_management/keyProjectApply?OUTSOURCED_ID='+e
});
},
goToVideo(e) {
uni.navigateTo({
url: '/pages/application/key-project-management/positioning_management/list?OUTSOURCED_ID='+e
});
},
getQuery(){ //
var _this = this;
_this.showCount = 10;
_this.currentPage = 1;
_this.list = [];
_this.isEnd = false;
_this.getData();
},
InputBlur(e){
this.NameLikes = e.detail.value
},
//
scrolltolower(){
var _this = this;
_this.showCount = 10;
_this.currentPage = _this.currentPage + 1;
_this.isEnd = false;
if(_this.totalPage >= _this.currentPage){
_this.getData();//
}
},
getData(){
var _this = this;
_this.userId = loginUserId;
if (_this.isEnd) {
return
}else{
this.isEnd =true;
}
uni.showLoading({
title:"加载中..."
});//
uni.request({
url: basePath +'/app/keyProjects/outSouceslistPage?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
KEYWORDS : _this.NameLikes, //
CORPINFO_ID:corpinfoId,
UserId:loginUserId
},
success: (res) => {
uni.hideLoading();//
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
if(_this.list.length == 0){
_this.list = res.data.varList;
}else{
if(res.data.varList != null){
_this.list2 = res.data.varList;
_this.list = _this.list.concat(_this.list2);
}
}
}
}
})
},
}
}
</script>
<style>
.dy-card {
background-color: #fff;
border-radius: 10upx;
margin: 30upx
}
.dy-card-title {
display: flex;
justify-content: space-between;
border-bottom: 1px solid #eee;
min-height: 80upx;
line-height: 80upx;
padding: 0 30upx;
}
.dy-card-content {
padding: 0upx 30upx 30upx;
}
.dy-card-content-item {
margin-top: 20upx;
}
.dy-card-content-item .title {
display: flex;
align-items: center;
}
.dy-card-content-item .title .l {
width: 10upx;
height: 30upx;
border-radius: 20upx;
background-color: #666;
margin-right: 10upx;
}
.dy-card-content-item .content {
background-color: #F1F1F1;
padding: 10upx 14upx;
margin-top: 14upx;
line-height: 1.6;
}
.dy-card-content-item .name text {
background-color: #F1F1F1;
padding: 10upx 14upx;
margin-top: 14upx;
line-height: 1.6;
display: inline-block;
}
.dy-card-foot {
border-top: 1px solid #eee;
padding: 30upx;
}
</style>

View File

@ -0,0 +1,192 @@
<template>
<view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true">
<block slot="backText">返回</block>
<block slot="content">重点工程信息</block>
</cu-custom>
<view class="form">
<view class="wui-form-list">
<view class="cu-form-group">
<view class="title">重点工程名称</view>
<view>{{info.OUTSOURCED_NAME}}</view>
</view>
<view class="cu-form-group">
<view class="title">计划工期</view>
<view>{{info.STARTTIME}}{{info.ENDTIME}}</view>
</view>
<view class="cu-form-group">
<view class="title">合同号</view>
<view>{{info.CONTRACT_NUM}}</view>
</view>
<view class="cu-form-group">
<view class="title">施工相关方</view>
<view>{{info.UNITS_NAME}}</view>
</view>
<view class="cu-form-group">
<view class="title">相关方单位工程负责人</view>
<view>{{info.UNITS_PIC_NAME}}</view>
</view>
<view class="cu-form-group" >
<view class="title">相关方单位负责人手机</view>
<view>{{info.UNITS_PHONE}}</view>
</view>
<view v-if="info.WORK_LONGITUDE" class="cu-form-group" >
<view class="title">经度</view>
<view>{{info.WORK_LONGITUDE}}</view>
</view>
<view v-if="info.WORK_LATITUDE" class="cu-form-group" >
<view class="title">纬度</view>
<view>{{info.WORK_LATITUDE}}</view>
</view>
<view class="cu-form-group" >
<view class="title">具体位置</view>
<view>{{info.LOCATION}}</view>
</view>
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button v-if="info.STATE==='-1'&& anniuShow" class="cu-btn bg-blue margin-tb-sm lg"
@click="fnUpdateStateKeyProject('1')">工程开始</button>
<button v-if="info.STATE==='-2'&& anniuShow" class="cu-btn bg-blue margin-tb-sm lg"
@click="fnUpdateStateKeyProject('2')">工程结束</button>
<button class="cu-btn bg-green margin-tb-sm lg"
@click="goback">返回</button>
</view>
</view>
</template>
<script>
import {
basePath,corpinfoId,loginSession,formatDate,loginUser,loginUserId
} from '@/common/tool.js';
export default {
data() {
return {
OUTSOURCED_ID: '',
KEYPROJECTCHECK_ID: '',
type: '',
info: {},
WORK_LONGITUDE: '', //
WORK_LATITUDE: '', //
hiddenData: {},
popupShow: false,
videoShow: false,
videoSrc: '',
anniuShow: false
}
},
computed: {
userInfo() {
return this.$store.getters.getUserInfo
}
},
onLoad(options) {
this.OUTSOURCED_ID = options.OUTSOURCED_ID
this.fnGetData()
},
methods: {
fnGetData() {
var _this = this;
uni.showLoading({
title:"加载中..."
});//
//
uni.request({
url: basePath +'/app/keyProjects/getOutsourced',
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
OUTSOURCED_ID: _this.OUTSOURCED_ID,
},
success: (res) => {
uni.hideLoading();//
if (res.data != null) {
_this.info = res.data.pd;
_this.WORK_LONGITUDE = _this.info.WORK_LONGITUDE; //
_this.WORK_LATITUDE = _this.info.WORK_LATITUDE; //
_this.anniuShow = true;
}
}
})
},
//
goback() {
var pages = getCurrentPages(); //
var prePage = pages[pages.length - 2]; //
prePage.$vm.initflag = true; // A init true
uni.navigateBack({
delta: 1
});
uni.hideLoading();
},
//
fnUpdateStateKeyProject(state){
var _this = this;
var content = '';
if(state === '1'){
content = '确定同意开工吗?'
}else if(state === '2'){
content = '确定同意结束吗?'
}
uni.showModal({
title: '提示',
cancelText: '确认',
confirmText: '取消',
content: content,
success: function (res) {
if (res.cancel) {
//
uni.request({
url: basePath +'/app/keyProjects/updateState',
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
OUTSOURCED_ID: _this.OUTSOURCED_ID,
STATE:state,
OPERATOR: loginUserId //
},
success: (res) => {
uni.hideLoading();//
_this.goback()
}
})
}
}
});
},
},
}
</script>
<style lang="scss" scoped>
.content {
padding: 0 20upx;
background-color: #fff;
}
.button {
text-align: center;
margin-top: 40upx;
margin-bottom: 40upx;
display: flex;
justify-content: space-between;
button {
width: 45%;
}
}
.ml-10:first-child {
margin-left: 0 !important;
}
</style>

View File

@ -0,0 +1,205 @@
<template>
<view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
<block slot="backText">返回</block>
<block slot="content">视频列表</block>
</cu-custom>
<scroll-view class="dy-scroll" @scrolltolower="scrolltolower" scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
<view v-if="list.length>0" >
<view class="dy-list">
<view v-for="(item,index) of list" :key="index" :data-id="item.INSPECTION_ID" @click="fnVideo(item)" class="dy-list-item p20">
<view class="dy-title-flex align-center">
<text>{{ item.VIDEONAME }}</text>
</view>
<view class="dy-subtitle-flex">
<text>
播放地址{{ item.VIDEOURL }}
</text>
</view>
<view class="dy-subtitle-flex" v-if="item.LATITUDE&&item.LONGITUDE">
<text>
坐标{{ item.LATITUDE }}*{{item.LONGITUDE}}
</text>
</view>
<view class="dy-subtitle-flex">
<text>
状态{{ item.LATITUDE&&item.LONGITUDE? "已定位":"未定位" }}
</text>
<view class="flex-between">
<button class="cu-btn bg-blue margin-tb-sm sm" @click="fnVideo(item)"></button>
</view>
</view>
</view>
</view>
</view>
<view v-else-if="dataFlag=='noData'" class="dy-null">
<view class="dy-null-img">
<image :src="background[dataFlag].url" mode=""></image>
</view>
<view class="dy-null-title">
{{background[dataFlag].msg}}
</view>
</view>
<view class="cu-tabbar-height"></view>
</scroll-view>
</view>
</template>
<script>
import {
basePath,corpinfoId,loginSession,formatDate,loginUser,loginUserId
} from '@/common/tool.js';
export default {
data() {
return {
dataFlag:'noData',
OUTSOURCED_ID: '',
KEYWORDS: '',
list: [],
pageSize: 10,
currentPage: 1,
totalPage: 0,
noClick:true,
sTop:0,
totalHeight:0,
}
},
onLoad(options) {
this.OUTSOURCED_ID = options.OUTSOURCED_ID
},
onShow() {
var _this = this;
_this.background = require('@/common/background.json');
_this.showCount = 10;
_this.currentPage = 1;
_this.list = [];
_this.fnSearchList()
},
computed: {
userInfo() {
return this.$store.getters.getUserInfo
}
},
methods: {
fnGetData() {
var _this = this;
uni.showLoading({
title:"加载中..."
});//
uni.request({
url: basePath +'/app/keyProjects/videomanagerList?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
OUTSOURCED_ID: this.OUTSOURCED_ID,
KEYWORDS: this.KEYWORDS,
showCount: this.pageSize,
currentPage: this.currentPage
},
success: (res) => {
uni.hideLoading();//
_this.list = [...this.list, ...res.data.varList];
//
for(var i =0;i<_this.list.length;i++){
var videourl = '';
var old = this.list[i].VIDEOURL;
var k = 1;
if(_this.list[i].VIDEOURL){
for(var j =0;j<_this.list[i].VIDEOURL.length;j++){
if(j/2==22*k){
videourl+='\n';
k++;
}
videourl+=_this.list[i].VIDEOURL[j];
}
}
_this.list[i].VIDEOURL = videourl
_this.list[i].old = old
}
_this.totalPage = res.data.page.totalPage;
}
})
},
scrolltolower() {
this.currentPage++;
if (this.totalPage >= this.currentPage) this.fnGetData();
},
fnSearchList() {
var _this = this;
_this.showCount = 10;
_this.currentPage = _this.currentPage + 1;
_this.list = [];
_this.fnGetData();
},
fnVideo(video) {
uni.navigateTo({
url: '/pages/application/key-project-management/positioning_management/videoView?url='+video.old
});
}
},
}
</script>
<style>
.dy-card {
background-color: #fff;
border-radius: 10upx;
margin: 30upx
}
.dy-card-title {
display: flex;
justify-content: space-between;
border-bottom: 1px solid #eee;
min-height: 80upx;
line-height: 80upx;
padding: 0 30upx;
}
.dy-card-content {
padding: 0upx 30upx 30upx;
}
.dy-card-content-item {
margin-top: 20upx;
}
.dy-card-content-item .title {
display: flex;
align-items: center;
}
.dy-card-content-item .title .l {
width: 10upx;
height: 30upx;
border-radius: 20upx;
background-color: #666;
margin-right: 10upx;
}
.dy-card-content-item .content {
background-color: #F1F1F1;
padding: 10upx 14upx;
margin-top: 14upx;
line-height: 1.6;
}
.dy-card-content-item .name text {
background-color: #F1F1F1;
padding: 10upx 14upx;
margin-top: 14upx;
line-height: 1.6;
display: inline-block;
}
.dy-card-foot {
border-top: 1px solid #eee;
padding: 30upx;
}
</style>

View File

@ -0,0 +1,112 @@
<template>
<view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
<block slot="backText">返回</block>
<block slot="content">视频播放</block>
</cu-custom>
<video id="coursewareVideo" :src="src"
controls autoplay="autoplay" style="width: 100%;"></video>
</view>
</template>
<script>
import {
videoPath
} from '@/common/tool.js';
export default {
data() {
return {
url: '',
src:''
}
},
onLoad(options) {
var _this = this;
_this.url = options.url
_this.fnInit()
},
methods: {
fnInit(){
var _this = this;
_this.fnInitVideoPlat()
},
fnInitVideoPlat(){
var _this = this;
uni.showLoading({
title: '加载中'
});
const params = _this.getUrlParams(_this.url)
if(!params || !params.serial){
uni.showToast({
title: '网络错误请重试',
duration: 2000
});
return
}
const serial = params.serial
uni.request({
url: videoPath +'/api/v1/login',
data: {
username:"admin",
password:"234f3424be5a75ad898a1b55f6e34d9e",
url_token_only:true
},
method: 'GET',
header: {
'Content-type': 'application/json'
},
success: (res) => {
console.log(res);
const token = res.data.URLToken
uni.request({
url: videoPath +'/api/v1/stream/start',
data: {
serial,
token
},
method: 'GET',
header: {
'Content-type': 'application/json'
},
success: (ress) => {
console.log(ress);
_this.src = ress.data.HLS
uni.hideLoading();//
}
})
}
})
},
getUrlParams(url) {
const params = {};
const paramStr = url.split('?')[1]; //
if (paramStr) {
const paramArr = paramStr.split('&'); //
paramArr.forEach((param) => {
const [key, value] = param.split('='); //
params[key] = value; // params
});
}
return params;
}
},
}
</script>
<style lang="scss" scoped>
.content {
background-color: #fff;
padding: 0 20upx;
}
.button {
text-align: center;
margin-top: 40upx;
margin-bottom: 40upx;
button {
width: 70%;
}
}
</style>

View File

@ -137,7 +137,6 @@
</view>
<view class="form">
<view class="wui-form-list">
<view class="cu-form-group" v-if="!forbidEdit">
<view class="title">核实结果</view>
<radio-group @change="changeRadioGroup($event)">
@ -572,7 +571,6 @@
}
})
},
changeStartDate(e) {
this.form.INSPECTION_TIME_START = e
this.$forceUpdate();//

View File

@ -0,0 +1,256 @@
<template>
<view>
<cu-custom ref="cuCustom" bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true" >
<block slot="backText">返回</block>
<block slot="content">安全例会</block>
</cu-custom>
<view class="top-fixed">
<scroll-view scroll-x class="bg-white nav" scroll-with-animation :scroll-left="scrollLeft">
<view class="flex text-center">
<view class="cu-item flex-sub" :class="index==TabCur?'text-blue cur':''"
v-for="(item,index) in tabNav" :key="index" @tap="tabSelect" :data-id="index">
{{tabNav[index]}}
</view>
</view>
</scroll-view>
<view class="line"></view>
</view>
<scroll-view class="dy-scroll" @scrolltolower="scrolltolower" scroll-y
:style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
<view v-if="list.length>0">
<view class="dy-list">
<!-- @click="$noMultipleClicks(goToDetail,item.HIDDEN_ID)" -->
<view v-for="(item,index) of list" :key="index" :data-id="item.SAFETY_MEETING_ID"
class="dy-list-item p20">
<view class="dy-title-flex align-center">
<text>{{item.SAFETY_MEETING_TITLE}}</text>
</view>
<view class="dy-subtitle-flex">
<text>例会正文{{ item.SAFETY_MEETING_CONTENT }}</text>
</view>
<view class="dy-subtitle-flex">
<text>发布人{{ item.NAME }}</text>
</view>
<view class="dy-subtitle-flex">
<text>发布时间{{ item.CREATTIME }}</text>
</view>
<view class="dy-subtitle-flex" style="height: 34upx;">
<text/>
<text>
<button class="cu-btn bg-blue margin-tb-sm sm" @click="$noMultipleClicks(goToDetail,item.SAFETY_MEETING_ID)">{{TabCur==0?'':''}}</button>
</text>
</view>
</view>
</view>
</view>
<view v-else-if="dataFlag=='noData'" class="dy-null">
<view class="dy-null-img">
<image :src="background[dataFlag].url" mode=""></image>
</view>
<view class="dy-null-title">
{{background[dataFlag].msg}}
</view>
</view>
<view class="cu-tabbar-height"></view>
</scroll-view>
<view :class="['cu-modal',{'show':modalShow}]" v-if="modalShow"/>
</view>
</template>
<script>
import {
basePath,
corpinfoId,
loginSession,
formatDate,
loginUser,
loginUserId
} from '@/common/tool.js';
import tkiTree from "@/components/select-tree/select-tree.vue"
import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue'
export default {
components: {
tkiTree,
ruiDatePicker,
},
data() {
return {
showRight: false,
dataFlag: 'noData',
sTop: 0,
totalHeight: 0,
list: [], //
page: 1, //--
rows: 10, //--
totalCount: 0, //--
isEnd: false, //
totalPage: 0, //--
noClick: true,
TabCur: 0,
scrollLeft: 0,
tabNav: ['待反馈', '已反馈'],
modalShow: false,
loginUserId: loginUserId
}
},
onReady() {
let that = this;
let CustomBar = this.CustomBar;
uni.getSystemInfo({ //uni-app
success(res) { //
let titleH = uni.createSelectorQuery().select(".top-fixed"); //class/id
titleH.boundingClientRect(data => {
that._data.sTop = data.height //=-data.top
that.totalHeight = data.height + CustomBar
}).exec()
}
})
},
onLoad(e) { //
},
onShow() {
//
var _this = this;
_this.background = require('@/common/background.json');
_this.showCount = 10;
_this.currentPage = 1;
_this.list = [];
_this.isEnd = false;
_this.getData();
loginSession();
},
methods: {
tabSelect(e) {
this.TabCur = e.currentTarget.dataset.id;
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
this.getQuery();
},
//
goToDetail(e) {
uni.navigateTo({
url: '/pages/application/safetymeeting/info?SAFETY_MEETING_ID=' + e +'&TabCur=' + (this.TabCur)
});
},
getQuery() { //
var _this = this;
_this.showCount = 10;
_this.currentPage = 1;
_this.list = [];
_this.isEnd = false;
_this.getData();
},
//
scrolltolower() {
var _this = this;
_this.showCount = 10;
_this.currentPage = _this.currentPage + 1;
_this.isEnd = false;
if (_this.totalPage >= _this.currentPage) {
_this.getData(); //
}
},
getData() {
var _this = this;
if (_this.isEnd) {
return
} else {
this.isEnd = true;
}
uni.showLoading({
title: "加载中..."
}); //
uni.request({
url: basePath + '/app/safetyMeeting/list?selectType='+ _this.TabCur + '&showCount=' + _this.showCount +
'&currentPage=' + _this.currentPage,
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
CORPINFO_ID: corpinfoId,
USER_ID: loginUserId
},
success: (res) => {
uni.hideLoading(); //
console.log(res)
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
if (_this.list.length == 0) {
_this.list = res.data.varList;
} else {
if (res.data.varList != null) {
_this.list2 = res.data.varList;
_this.list = _this.list.concat(_this.list2);
}
}
}
}
})
},
}
}
</script>
<style>
.dy-card {
background-color: #fff;
border-radius: 10upx;
margin: 30upx
}
.dy-card-title {
display: flex;
justify-content: space-between;
border-bottom: 1px solid #eee;
min-height: 80upx;
line-height: 80upx;
padding: 0 30upx;
}
.dy-card-content {
padding: 0upx 30upx 30upx;
}
.dy-card-content-item {
margin-top: 20upx;
}
.dy-card-content-item .title {
display: flex;
align-items: center;
}
.dy-card-content-item .title .l {
width: 10upx;
height: 30upx;
border-radius: 20upx;
background-color: #666;
margin-right: 10upx;
}
.dy-card-content-item .content {
background-color: #F1F1F1;
padding: 10upx 14upx;
margin-top: 14upx;
line-height: 1.6;
}
.dy-card-content-item .name text {
background-color: #F1F1F1;
padding: 10upx 14upx;
margin-top: 14upx;
line-height: 1.6;
display: inline-block;
}
.dy-card-foot {
border-top: 1px solid #eee;
padding: 30upx;
}
.cu-modal {
z-index: 0;
}
</style>

View File

@ -0,0 +1,306 @@
<template>
<view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true">
<block slot="backText">返回</block>
<block slot="content">安全例会-详情</block>
</cu-custom>
<scroll-view scroll-y>
<view class="wui-form-list">
<view class="cu-form-group">
<view class="title">例会标题</view>
<view>
{{pd.SAFETY_MEETING_TITLE}}
</view>
</view>
<view class="cu-form-group">
<view class="title">
<text>内容</text>
</view>
<view>
<text>{{pd.SAFETY_MEETING_CONTENT}}</text>
</view>
</view>
<view class="cu-form-textarea">
<view class="title">
<text>附件</text>
</view>
<view class="cu-form-p">
<scroll-view scroll-x class="bg-white nav" scroll-with-animation>
<view class="cu-item" v-for="(item,index) in files" v-bind:key="index">
<view class="imgs">
<image :src="baseImgPath+item.FILEPATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.FILEPATH)"
mode=""></image>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" >
<view class="cu-form-title text-hui">核实意见</view>
<textarea :disabled="forbidEdit" maxlength="-1" v-model="FEED_BACK" placeholder="(必填)"></textarea>
</view>
<view v-if="!forbidEdit">
<view class="cu-form-group" style="border: none;" v-if="!forbidEdit">
<view class="title">签字</view>
<button class="cu-btn bg-green shadow" @tap="modalShow = true" data-target="Modal">手写签字</button>
</view>
<view class="cu-bar bg-white" v-show="signImgList && signImgList.length > 0">
<view class="action">
签字照片
</view>
</view>
<view class="cu-form-group" v-show="signImgList && signImgList.length > 0">
<view class="grid col-4 grid-square flex-sub">
<view style="width: 60%;" class="bg-img" v-for="(item,index) in signImgList" :key="index" @tap="ViewImage" data-type="0" :data-url="signImgList[index].filePath">
<image :src="signImgList[index].filePath" mode="aspectFill"></image>
<view v-if="!forbidEdit" class="cu-tag bg-red" @tap.stop="delImg" data-type="0" :data-index="index">
<text class='cuIcon-close'></text>
</view>
</view>
</view>
</view>
<view class="cu-modal" :class="{'show':modalShow}">
<sign @confirm="subCanvas" @cancel="modalShow = false"></sign>
</view>
</view>
<view v-else>
<view class="cu-form-textarea">
<view class="title">
<text>签字信息</text>
</view>
<view class="cu-form-p">
<scroll-view scroll-x class="bg-white nav" scroll-with-animation>
<view class="cu-item" v-for="(item,index) in filesSing" v-bind:key="index">
<view class="imgs">
<image :src="baseImgPath+item.FILEPATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.FILEPATH)"
mode=""></image>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button v-if="!forbidEdit" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit)"></button>
</view>
</scroll-view>
</view>
</template>
<script>
import {
basePath,
baseImgPath,
corpinfoId,
loginUser
} from '@/common/tool.js';
import sign from '@/components/writing-board/writing-board.vue';
export default {
components: {
sign
},
data() {
return {
noClick: true,
SPECIALEQUIPMENTAQXJ_ID: '',
pd: [],
files: [],
FEED_BACK: '',
signImgList: [],
filesSing: [],
forbidEdit: false,
modalShow: false,
basePath: basePath,
baseImgPath: baseImgPath
}
},
onLoad(e) {
this.SAFETY_MEETING_ID = e.SAFETY_MEETING_ID;
if (e.TabCur == 1) {
this.forbidEdit=true
}
this.getData();
},
methods: {
goSubmit() {
if (!this.FEED_BACK) {
uni.showLoading({
icon: 'none',
title: '反馈必填',
duration: 1500
})
return
}
if (this.signImgList.length ===0) {
uni.showLoading({
icon: 'none',
title: '请签字 ',
duration: 1500
})
return
}
uni.showToast({
title: '请稍后',
});
let _this = this
uni.request({
url: basePath + '/app/safetyMeeting/confirm',
method: 'POST',
data: {
SAFETY_MEETING_ID: this.SAFETY_MEETING_ID,
FEED_BACK: this.FEED_BACK,
USER_ID: loginUser.USER_ID,
},
header: {
'content-type': 'application/x-www-form-urlencoded'
},
success: function(res) {
console.log(res)
if (res.data.code === 0) {
// _this.uploadImg(_this.signImgList[0],res.data.pd.SAFETY_MEETING_PEOPLE_ID)
let formData = {
FOREIGN_KEY: res.data.pd.SAFETY_MEETING_PEOPLE_ID,
CORPINFO_ID: loginUser.CORPINFO_ID,
TYPE: '106',
}
uni.uploadFile({
url: basePath + "/app/safetyMeeting/upload",
filePath: _this.signImgList[0].filePath,
name: 'FFILE',
formData:formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
setTimeout(() => { _this.goback()},2000)
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
}
}
})
},
goback(){
var pages = getCurrentPages(); //
var prePage = pages[pages.length - 2]; //
prePage.$vm.initflag = true; // A init true
uni.navigateBack({delta: 1});
uni.hideLoading();
},
uploadImg(file,FOREIGN_KEY){
return new Promise((resolve, reject) => {
var _this = this;
uni.uploadFile({
url: basePath+'/app/imgfiles/add',
filePath: file.filePath,
name: 'FFILE',
formData: {
'TYPE': file.type,
'FOREIGN_KEY': FOREIGN_KEY,
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
resolve();
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
})
},
delImg (e) {
var _this = this;
let i = e.currentTarget.dataset.index
uni.showModal({
content: '确定要删除这张图片吗?',
cancelColor: "#000000",
cancelText: '取消',
confirmText: '确定',
success: res => {
if (res.confirm) {
_this.signImgList.splice(i, 1)
}
}
})
},
ViewImage(e) {
let files =[];
for(var i=0;i<this.signImgList.length;i++){
files.push(this.signImgList[i].filePath)
}
uni.previewImage({
urls: files,
current: e.currentTarget.dataset.url
});
},
subCanvas(e){
this.signImgList.splice(0, this.signImgList.length);
this.signImgList.push(e);
this.modalShow = false;
},
getData() {
var _this = this;
uni.showLoading({
title: '请稍候'
})
uni.request({
url: basePath + '/app/safetyMeeting/goEdit',
method: 'POST',
dataType: 'json',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
SAFETY_MEETING_ID: _this.SAFETY_MEETING_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //map
_this.FEED_BACK = res.data.pd.FEED_BACK;
_this.files = res.data.imgs;
_this.filesSing = res.data.singImgs;
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',
duration: 2000
});
}
}
});
},
ViewShowImage(url) {
let files = [];
files.push(url)
uni.previewImage({
urls: files,
current: 0
});
},
}
}
</script>
<style>
</style>

View File

@ -188,7 +188,7 @@
<text>设备巡检</text>
</view>
</navigator>
<navigator class="home-apps-item" hover-class="none" url="/pages/application/speEquip/index">
<navigator class="home-apps-item" hover-class="none" url="/pages/application/safetymeeting/index">
<view class="home-apps-item-img">
<image src="../../static/icon-apps/safetymeeting.png" mode=""></image>
</view>
@ -196,7 +196,7 @@
<text>安全例会</text>
</view>
</navigator>
</view>
</view>