diff --git a/components/dateTimePicker/index.vue b/components/dateTimePicker/index.vue
index 1f1dc087..56dd638a 100644
--- a/components/dateTimePicker/index.vue
+++ b/components/dateTimePicker/index.vue
@@ -32,14 +32,14 @@ export default {
// 字符串格式为 "YYYY-MM-DD hh:mm"
start: {
type: String,
- default: '1970-1-1 00:00'
+ default: '1970-01-01 00:00'
},
// 表示有效日期时间范围的结束
// 字符串格式为 "YYYY-MM-DD hh:mm"
end: {
type: String,
- default: '2300-1-1 00:00'
+ default: '2300-01-01 00:00'
},
// 表示选择器的粒度，有效值：year | month | day | hour | minute
@@ -102,11 +102,11 @@ export default {
// 验证是否是有效的开始和结束日期
if(!utils.isString(this.start)) {
- start = '1970-1-1 00:00';
+ start = '1970-01-01 00:00';
}
if(!utils.isString(this.start)) {
- start = '2300-1-1 00:00';
+ start = '2300-01-01 00:00';
}
// 将开始日期和结束日期转为 Date
@@ -135,6 +135,7 @@ export default {
*/
change(event) {
console.log(this.fields,777888999)
+ console.log(1111111,this.range)
let year, month, day, hour, minute, second;
if(this.fields == 'year') {
year = this.range[0][this.value[0]].number; // 年
@@ -178,6 +179,7 @@ export default {
day = this.range[2][this.value[2]].number; // 日
hour = this.range[3][this.value[3]].number; // 时
minute = this.range[4][this.value[4]].number; // 分
+
let dtStr = `${year}-${month}-${day} ${hour}:${minute}`;
this.setDateStr(dtStr);
this.$emit('change', utils.formatDate(dtStr));
diff --git a/components/levitatedsphere/levitatedsphere.vue b/components/levitatedsphere/levitatedsphere.vue
index 880d4d34..bafb5728 100644
--- a/components/levitatedsphere/levitatedsphere.vue
+++ b/components/levitatedsphere/levitatedsphere.vue
@@ -11,7 +11,7 @@
-->
-
+
+
\ No newline at end of file
diff --git a/pages/contractors/qualification.vue b/pages/contractors/qualification.vue
index 4ab883ef..f2c0d3d1 100644
--- a/pages/contractors/qualification.vue
+++ b/pages/contractors/qualification.vue
@@ -21,7 +21,8 @@
-
+
+
{{item.fileName}}
{{item.createTime}}
@@ -55,6 +56,7 @@
barBoxHeight: '',
scrollHeight:'',
listData: [],
+
};
},
onReady() {
@@ -76,6 +78,19 @@
// 检查文件后缀名是否在图片后缀名数组中
return imageExtensions.includes(extension);
},
+ getFileSuffix(fileName){
+ console.log(fileName)
+ let suffixName = fileName.split('.').pop().toLowerCase()
+ if(suffixName == 'pdf') return '/static/documentIcon/pdf.png'
+ if(suffixName == 'ppt' || suffixName == 'pptx') return '/static/documentIcon/ppt.png'
+ if(suffixName == 'rar' || suffixName == 'zip') return '/static/documentIcon/rar.png'
+ if(suffixName == 'txt') return '/static/documentIcon/txt.png'
+ if(suffixName == 'mp4') return '/static/documentIcon/video.png'
+ if(suffixName == 'doc' || suffixName == 'docx') return '/static/documentIcon/word.png'
+ if(suffixName == 'xlsx' || suffixName == 'excel') return '/static/documentIcon/excel.png'
+ return '/static/documentIcon/null.png'
+ // return fileName.split('.').pop();
+ },
async getHeight() {
const query = uni.createSelectorQuery().in(this);
@@ -120,6 +135,15 @@
this.scrollHeight = screenHeight - this.barBoxHeight;
console.log('this.scrollHeight', this.scrollHeight);
},
+ isJSON(str) {
+ try {
+ JSON.parse(str);
+ } catch (e) {
+ // 转换出错，抛出异常
+ return false;
+ }
+ return true;
+ },
getListData(){
this.searchForm.enterpriseId = this.id
// let data = {
@@ -132,7 +156,8 @@
success: res => {
console.log("enterpriseQualification", res);
this.listData = res.result.map(item => {
- item.logoUrl = this.url_config+'image/'+ JSON.parse(item.fileUrl)[0].url
+ const fileUrl = this.isJSON(item.fileUrl) && JSON.parse(item.fileUrl) instanceof Array ? JSON.parse(item.fileUrl)[0].url : item.fileUrl;
+ item.logoUrl = this.url_config+'image/'+ fileUrl
return item
})
}
@@ -144,7 +169,8 @@
// uni.previewImage({
// urls: [url]
// })
- let url = this.url_config + 'image/' + JSON.parse(item.fileUrl)[0].url
+ const fileUrl = this.isJSON(item.fileUrl) ? JSON.parse(item.fileUrl)[0].url: item.fileUrl;
+ let url = this.url_config + 'image/' + fileUrl
console.log(url)
uni.downloadFile({
url: url,
diff --git a/pages/personLocation/emergencyalarm/emergencyalarm.vue b/pages/personLocation/emergencyalarm/emergencyalarm.vue
index 1f95683a..719c2921 100644
--- a/pages/personLocation/emergencyalarm/emergencyalarm.vue
+++ b/pages/personLocation/emergencyalarm/emergencyalarm.vue
@@ -120,7 +120,7 @@
onLoad(options) {
this.id = options.id;
console.log(uni.getStorageSync('devInfoList'));
- this.projectSn = uni.getStorageSync('devInfoList').projectSn;
+ this.projectSn = options.sn ? options.sn : uni.getStorageSync('devInfoList').projectSn;
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
console.log(options);
emergencyRecordQueryById({
@@ -392,7 +392,8 @@
// console.log(res)
// // const latitude = parseFloat(res.latitude);
// // const longitude = parseFloat(res.longitude);
- // that.emergencyInfo.longitude =
+ // console.log(222222222,res)
+ // that.emergencyInfo.longitude = parseFloat(res.longitude);
// that.emergencyInfo.latitude = parseFloat(res.latitude);
// that.addressList = [
// res.address.province,
diff --git a/pages/personLocation/exam/studydetails/studydetails.vue b/pages/personLocation/exam/studydetails/studydetails.vue
index 41181b2f..cfa19c5e 100644
--- a/pages/personLocation/exam/studydetails/studydetails.vue
+++ b/pages/personLocation/exam/studydetails/studydetails.vue
@@ -8,7 +8,19 @@
学习详情
-
+
+
+
+
+
+
+ {{item.name}}
+
+
+ 下载预览
+
+
+
-
+
{{responseData.courseName}}
-
@@ -44,11 +57,42 @@
return {
videoUrl: "",
videoList: [],
+ dataList: [],
pageData: {},
videoStartTime: "",
userInfo: "",
responseData: {},
- isStartExam: false
+ isPageLength: 0,
+ startFlag: true,
+ // isStartExam: false
+ }
+ },
+ computed: {
+ isStartExam() {
+ const videoEvery = this.videoList.every(item => item.isVideoOver && item.controlsBool);
+ const dataEvery = this.dataList.every(item => item.isFileOver);
+ console.log('计算属性执行了', this.videoList, this.dataList, videoEvery, dataEvery)
+ if(this.startFlag){
+ this.videoStartTime = this.$formatDates(new Date().getTime(), 'yyyy-MM-dd HH:mm:ss');
+ this.startFlag = false;
+ }
+ console.log(dataEvery && videoEvery && (this.videoList.length > 0 || this.dataList > 0))
+ if(dataEvery && videoEvery && (this.videoList.length > 0 || this.dataList > 0)){
+ let requestData = {
+ workerId: this.userInfo.id,
+ trainId: this.pageData.trainId,
+ beginTime: this.videoStartTime,
+ endTime: this.$formatDates(new Date().getTime(), 'yyyy-MM-dd HH:mm:ss')
+ }
+ this.sendRequest({
+ url: "xmgl/workerExam/submitStudy",
+ data: requestData,
+ method: 'post',
+ success(res) {}
+ })
+ }
+
+ return !(videoEvery && dataEvery);
}
},
onReady: function(res) {
@@ -67,13 +111,76 @@
this.$forceUpdate();
},
methods: {
+ fileTypeCondition(file) {
+ // 获取文件后缀名
+ const extension = file.substring(file.lastIndexOf('.') + 1).toLowerCase();
+
+ // 常见的图片文件后缀名
+ const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg'];
+
+ // 检查文件后缀名是否在图片后缀名数组中
+ return imageExtensions.includes(extension);
+ },
+ downLoadFile(val, type, index) {
+ // let url = this.url_config + 'image/' + val.logoUrl
+ let that = this;
+ let url = val.url
+ console.log(val)
+ uni.downloadFile({
+ url: url,
+ success: function(res) {
+ var filePath = res.tempFilePath;
+ // if (type == 1) {
+ // //文件保存到本地
+ // console.log(navigator && navigator.userAgent && /Mobi|Android|iPhone/i.test(navigator.userAgent))
+ // if(navigator && navigator.userAgent && /Mobi|Android|iPhone/i.test(navigator.userAgent)){
+ // console.log("111")
+ // window.open(filePath, "_blank");
+ // return
+ // }
+ // console.log("222")
+ // return
+ // uni.saveFile({
+ // tempFilePath: filePath, //临时路径
+ // success: function(res) {
+ // uni.showToast({
+ // icon: 'none',
+ // mask: true,
+ // title: '文件已保存：' + res.savedFilePath, //保存路径
+ // duration: 3000,
+ // });
+ // setTimeout(() => {
+ // //打开文档查看
+ // uni.openDocument({
+ // filePath: res.savedFilePath,
+ // success: function(res) {
+ // // console.log('打开文档成功');
+ // }
+ // });
+ // }, 3000)
+ // }
+ // });
+ // } else
+ if (type == 2) {
+ uni.openDocument({
+ filePath: filePath,
+ success: function(res) {
+ console.log('打开文档成功');
+ that.dataList[index].isFileOver = true;
+ console.log(that.dataList);
+ }
+ });
+ }
+ }
+ });
+ },
returnBack() {
uni.navigateTo({
url: '../index/index'
})
},
videoStart(index) {
- this.videoStartTime = this.$formatDates(new Date().getTime(), 'yyyy-MM-dd HH:mm:ss');
+
},
videoEnd(index) {
var that = this
@@ -85,29 +192,18 @@
setTimeout(function() {
that.$forceUpdate();
}, 500)
- let startExamBool = true;
- that.videoList.map(item => {
- if (!item.isVideoOver) {
- startExamBool = false;
- }
- })
- if (!startExamBool) {
- that.isStartExam = true;
- } else {
- that.isStartExam = false;
- }
- let requestData = {
- workerId: this.userInfo.id,
- trainId: this.pageData.trainId,
- beginTime: this.videoStartTime,
- endTime: this.$formatDates(new Date().getTime(), 'yyyy-MM-dd HH:mm:ss')
- }
- this.sendRequest({
- url: "xmgl/workerExam/submitStudy",
- data: requestData,
- method: 'post',
- success(res) {}
- })
+ // let startExamBool = true;
+ // that.videoList.map(item => {
+ // if (!item.isVideoOver) {
+ // startExamBool = false;
+ // }
+ // })
+ // if (!startExamBool) {
+ // that.isStartExam = true;
+ // } else {
+ // that.isStartExam = false;
+ // }
+
},
getDataFn() {
var that = this
@@ -122,15 +218,19 @@
console.log('试题信息', res)
if (res.result) {
that.responseData = res.result;
- that.videoList = res.result.fileUrl ? JSON.parse(res.result.fileUrl) : [],
- that.videoList.map(item => {
- item.isVideoOver = false
- item.controlsBool = false
- })
- if (that.videoList.length) {
- that.isStartExam = true;
- that.videoUrl = that.videoList[0].url
- }
+ const result = res.result.fileUrl ? JSON.parse(res.result.fileUrl) : [];
+ that.videoList = result.filter(item => item.url.substring(item.url.lastIndexOf(".") +
+ 1) == "mp4");
+ that.dataList = result.filter(item => item.url.substring(item.url.lastIndexOf(".") +
+ 1) != "mp4");
+ console.log(result, that.videoList, that.dataList);
+ // that.videoList
+ // dataList
+ // if (that.videoList.length) {
+ // that.isStartExam = true;
+ // that.videoUrl = that.videoList[0].url
+ // }
+ that.trainRecordId();
console.log(that.src)
}
}
@@ -142,6 +242,37 @@
showCancel: false
})
},
+ trainRecordId() {
+ var that = this
+ const devInfoList = uni.getStorageSync('devInfoList')
+ let requestData = {
+ pageNo: 1,
+ pageSize: 10,
+ number: 1,
+ trainId: this.pageData.trainId,
+ workerCard: devInfoList.idCard,
+ projectSn: devInfoList.projectSn,
+ }
+ this.sendRequest({
+ url: "exam/courseRecord/page",
+ data: requestData,
+ method: 'post',
+ success(res) {
+ if (res.code == 200) {
+ that.isPageLength = res.result.records instanceof Array ? res.result.records.length : 0;
+ console.log(22222, res, that.isPageLength);
+ const isPageFlag = that.isPageLength > 0 ? true : false;
+ that.dataList.map(item => {
+ that.$set(item,'isFileOver',isPageFlag)
+ })
+ that.videoList.map(item => {
+ that.$set(item,'isVideoOver',isPageFlag)
+ that.$set(item,'controlsBool',isPageFlag)
+ })
+ }
+ }
+ })
+ },
goHiidden() {
var that = this
let requestData = {
@@ -226,4 +357,53 @@
margin: 159.62rpx 40.38rpx;
}
}
+
+ .rules {
+ box-shadow: 4rpx 4rpx 8rpx 2rpx rgba(81, 129, 246, 0.12);
+ // height: calc(100vh - 270rpx);
+ // padding-bottom: 60rpx;
+ // overflow-y: scroll;
+ }
+
+ .rules-box {
+ display: flex;
+ padding: 13.46rpx 28.85rpx 17.31rpx 23.08rpx;
+ border-top: 2rpx solid #D8DBE8;
+ }
+
+ .rules-box image {
+ width: 61.15rpx;
+ height: 70.77rpx;
+ }
+
+ .rules-box>view {
+ display: flex;
+ justify-content: space-between;
+ flex: 1;
+ }
+
+ .rules-text1 {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ margin-left: 13.46rpx;
+ }
+
+ .rules-text1>text {
+ font-size: 25rpx;
+ line-height: 40rpx;
+ }
+
+ .rules-text2 {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #5181F6;
+ font-size: 19.23rpx;
+ white-space: nowrap;
+
+ >text:last-child {
+ margin-left: 10rpx;
+ }
+ }
\ No newline at end of file
diff --git a/pages/projectEnd/InspectionRoute/inspectionPlan.vue b/pages/projectEnd/InspectionRoute/inspectionPlan.vue
index 93c5a686..e6cfea80 100644
--- a/pages/projectEnd/InspectionRoute/inspectionPlan.vue
+++ b/pages/projectEnd/InspectionRoute/inspectionPlan.vue
@@ -1,36 +1,76 @@
-
+
-
+
-
+
+
+
+
+ {{item.routeName}}
+
+
+ 巡检人员：
+ {{item.inspectUserIds}}
+
+
+ 巡检通知人员：
+ {{item.noticeUserNames}}
+
+
+ 巡检周期：
+ ({{item.startTime}} - {{item.endTime}})
+
+
+ 巡检频次：
+ {{item.enterpriseName}}
+
+
+ 查看5次巡检任务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
暂无数据
+
@@ -43,6 +83,138 @@
筛选条件
+ 检查时间
+
+
+
+
+ {{inspectStartTime}}
+ ×
+
+ 一
+
+
+
+ {{inspectEndTime}}
+ ×
+
+
+
+
+ 巡检人员
+
+
+ {{ item.name ? item.name : item.value }}
+
+
+ 查看更多
+
+
+
+
+ 收起
+
+
+ 巡检通知人员
+
+
+ {{ item.name ? item.name : item.value }}
+
+
+ 查看更多
+
+
+
+
+ 收起
+
+
+ 分包单位
+
+
+ {{ item.name }}
+
+
+ 查看更多
+
+
+
+
+ 收起
+
+
+
+
+
@@ -67,13 +240,19 @@
export default {
components: {
- dateTimePiccker,
+ dateTimePiccker
},
data() {
return {
mobileTopHeight: 0,
- popupShow: false,
- startTime: '请选择日期',
+ listNum: 0,
+ listData: [],
+ condition: {
+ pageNo: 1,
+ pageSize: 10,
+ projectSn: "",
+ routeName: '', //搜索字段
+ },
searchTypeList: [{
name: '全部',
type: 1,
@@ -87,7 +266,7 @@
type: 1,
value: 2
}], //查询类型
-
+
issueLevelList: [{
name: '全部',
type: 2,
@@ -183,15 +362,7 @@
checkPointList: [], //获取检查部位数据
checkPointName: '',
type: 1,
- listData: [],
checkedTab: 0,
- condition: {
- pageNo: 1,
- pageSize: 10,
- projectSn: "",
- status: 2,
- search: '', //搜索字段
- },
teach: true,
userInfo: '',
regionId: [],
@@ -203,28 +374,32 @@
chekItm6: '',
chekItm7: '',
chekItm8: '',
+ enterpriseList:[],
+ enterpriseId:"",
}
},
onLoad(option) {
this.condition.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
- this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
},
mounted() {
- this.getListData()
var that = this
uni.getSystemInfo({
success(res) {
that.mobileTopHeight = res.statusBarHeight ? res.statusBarHeight : 0;
- uni.setStorageSync('systemInfo',res)
+ uni.setStorageSync('systemInfo', res)
console.log(res)
}
})
- console.log('this.mobileTopHeight',this.mobileTopHeight)
+ console.log('this.mobileTopHeight', this.mobileTopHeight)
},
onShow() {
this.listData = [];
this.condition.pageNo = 1;
this.condition.pageSize = 10;
+ this.getListData()
+ this.getPeopleList()
+ this.getPeopleData()
+ this.getEnterpriseData()
},
//上拉触底时间
onReachBottom() {
@@ -246,8 +421,8 @@
}
},
closeMenu(e) {
- console.log("关闭！！！！",e)
- if(e.show == false){
+ console.log("关闭！！！！", e)
+ if (e.show == false) {
// this.$refs.screenShow.close()
this.popupShow = false;
// this.resettingBtn()
@@ -260,14 +435,570 @@
this.popupShow = false;
this.resettingBtn()
},
+ //重置
+ resettingBtn() {
+ this.listData = []
+ this.inspectStartTime = ""
+ this.inspectEndTime = ""
+ this.condition.inspectStartTime = ''
+ this.condition.inspectEndTime = ''
+ this.condition.recordType = null
+ this.condition.level = null
+ this.condition.status = null
+ this.condition.urgentLevel = null
+ this.condition.inspectUserIds = null
+ this.condition.reviewId = null
+ this.condition.enterpriseId = null
+ this.condition.noticeUserIds = null
+ this.condition.projectSn = this.condition.projectSn
+ this.condition.regionId = null
+ this.condition.pageNo = 1;
+ this.condition.pageSize = 10;
+ this.checkPointName = ""
+ this.chekItm = 0
+ this.chekItm2 = 0
+ this.chekItm3 = 0
+ this.chekItm4 = 0
+ this.chekItm5 = 0
+ this.chekItm6 = 0
+ this.chekItm7 = 0
+ this.chekItm8 = 0
+ this.getListData()
+ },
+ closeRed() {
+ this.$refs.screenShow.close()
+
+ this.popupShow = false;
+ },
+ //点击筛选项
+ searchItem(item, index) {
+
+ if (item.type === 1) {
+ this.chekItm = index
+ }
+ if (item.type === 2) {
+ this.chekItm2 = index
+ }
+ if (item.type === 3) {
+ this.chekItm3 = index
+ }
+ if (item.type === 4) {
+ this.chekItm4 = index
+ }
+ if (item.type === 5) {
+ this.chekItm5 = index
+ }
+ if (item.type === 6) {
+ this.chekItm6 = index
+ }
+ if (item.type === 7) {
+ this.chekItm7 = index
+ }
+ if (item.type === 8) {
+ this.chekItm8 = index
+ }
+ if (item.value === -1) {
+ this.valueList = this.valueList.filter(v => v.type !== item.type)
+ console.log('过滤list :{}', this.valueList.length)
+ }
+ let isSet = true;
+
+ for (var i = 0; i < this.valueList.length; i++) {
+ if (this.valueList[i].type === item.type) {
+ this.valueList[i] = item;
+ isSet = false;
+ }
+ }
+ if (isSet && item.value !== -1) {
+ this.valueList.push(item)
+ }
+ //点击筛选查看数据
+ this.condition.inspectStartTime = this.inspectStartTime
+ this.condition.inspectEndTime = this.inspectEndTime
+ this.condition.recordType = this.fileValueList(1)
+ this.condition.level = this.fileValueList(2)
+ this.condition.status = this.fileValueList(3)
+ this.condition.urgentLevel = this.fileValueList(4)
+ this.condition.inspectUserIds = this.fileValueList(5)
+ this.condition.reviewId = this.fileValueList(6)
+ this.condition.enterpriseId = this.fileValueList(7)
+ this.condition.noticeUserIds = this.fileValueList(8)
+ this.condition.projectSn = this.condition.projectSn
+ this.condition.regionId = this.regionId
+
+ let that = this;
+ this.sendRequest({
+ url: 'xmgl/xzCheckingRoute/page',
+ method: 'get',
+ data: that.condition,
+ success: res => {
+ that.listData = []
+ that.listNum = res.result.total
+ let arr = JSON.parse(JSON.stringify(that.listData));
+ if (res.result.records.length > 0) {
+ let newArr = arr.concat(res.result.records);
+ if (res.result.records.length < 10) {
+ that.teach = false;
+ } else {
+ that.teach = true;
+ }
+ that.listData = newArr;
+ } else {
+ that.teach = false;
+ }
+ }
+ })
+ console.log('点击的参数数量 :{}', JSON.stringify(this.valueList))
+ },
+ fileValueList(type) {
+ for (var i = 0; i < this.valueList.length; i++) {
+ if (this.valueList[i].type == type) {
+ return this.valueList[i].value;
+ }
+ }
+ return null;
+ },
+ //搜索
+ handleInput(e) {
+ this.listData = []
+ this.inspectStartTime = ""
+ this.inspectEndTime = ""
+ this.condition.recordType = null
+ this.condition.level = null
+ this.condition.status = null
+ this.condition.urgentLevel = null
+ this.condition.inspectUserIds = null
+ this.condition.reviewId = null
+ this.condition.enterpriseId = null
+ this.condition.noticeUserIds = null
+ this.condition.projectSn = this.condition.projectSn
+ this.condition.regionId = null
+ this.checkPointName = ""
+ this.chekItm = 0
+ this.chekItm2 = 0
+ this.chekItm3 = 0
+ this.chekItm4 = 0
+ this.chekItm5 = 0
+ this.chekItm6 = 0
+ this.chekItm7 = 0
+ this.chekItm8 = 0
+ this.condition.routeName = e.detail.value
+ let that = this;
+ // uni.showLoading({title: '加载中'})
+ this.sendRequest({
+ url: 'xmgl/xzCheckingRoute/page',
+ method: 'get',
+ data: that.condition,
+ success: res => {
+ console.log(res)
+ that.listNum = res.result.total
+ // uni.hideLoading()
+ let arr = JSON.parse(JSON.stringify(that.listData));
+ if (res.result.records.length > 0) {
+ let newArr = arr.concat(res.result.records);
+ if (res.result.records.length < 10) {
+ that.teach = false;
+ } else {
+ that.teach = true;
+ }
+ that.listData = newArr;
+ } else {
+ that.teach = false;
+ }
+ }
+ })
+ },
+ // 展开所有数据
+ expandItems(type) {
+ let netArr = [];
+ let sliceArr = this.items
+ if (type == 1) {
+ netArr.push({
+ name: '全部',
+ type: 5,
+ value: -1
+ })
+ sliceArr.forEach(s => {
+ netArr.push({
+ name: s.workerName,
+ type: 5,
+ value: s.userId
+ })
+
+ })
+ this.displayedItems1 = netArr;
+ this.isExpanded1 = true;
+ } else if (type == 2) {
+ netArr.push({
+ name: '全部',
+ type: 6,
+ value: -1
+ })
+ sliceArr.forEach(s => {
+ netArr.push({
+ name: s.workerName,
+ type: 6,
+ value: s.userId
+ })
+
+ })
+ this.displayedItems2 = netArr;
+ this.isExpanded2 = true;
+ } else if (type == 3) {
+ netArr.push({
+ name: '全部',
+ type: 7,
+ value: -1
+ })
+ this.enterpriseList.forEach(s => {
+ netArr.push({
+ name: s.enterpriseName,
+ type: 7,
+ value: s.id
+ })
+
+ })
+ this.displayedItems3 = netArr;
+ this.isExpanded3 = true;
+ } else {
+ netArr.push({
+ name: '全部',
+ type: 8,
+ value: -1
+ })
+ this.itemsList.forEach(s => {
+ netArr.push({
+ name: s.workerName,
+ type: 8,
+ value: s.userId
+ })
+
+ })
+ this.displayedItems4 = netArr;
+ this.isExpanded4 = true;
+ }
+
+
+ },
+ // 收起数据，只显示前两个
+ collapseItems(type) {
+ let sliceArr = this.items.slice(0, 2);
+ let sliceArr2 = this.itemsList.slice(0, 2)
+ let netArr = [];
+ if (type == 1) {
+ netArr.push({
+ name: "全部",
+ type: 5,
+ value: -1
+ })
+ sliceArr.forEach(s => {
+ netArr.push({
+ name: s.workerName,
+ type: 5,
+ value: s.userId
+ })
+
+ })
+ this.displayedItems1 = netArr;
+ this.isExpanded1 = false;
+ } else if (type == 2) {
+ netArr.push({
+ name: "全部",
+ type: 6,
+ value: -1
+ })
+ sliceArr.forEach(s => {
+ netArr.push({
+ name: s.workerName,
+ type: 6,
+ value: s.userId
+ })
+
+ })
+ this.displayedItems2 = netArr;
+ this.isExpanded2 = false;
+ } else if (type == 3) {
+ netArr.push({
+ name: "全部",
+ type: 7,
+ value: -1
+ })
+ this.enterpriseList.forEach(s => {
+ netArr.push({
+ name: s.enterpriseName,
+ type: 7,
+ value: s.id
+ })
+
+ })
+ this.displayedItems3 = netArr;
+ this.isExpanded3 = false;
+ } else {
+ netArr.push({
+ name: "全部",
+ type: 8,
+ value: -1
+ })
+ sliceArr2.forEach(s => {
+ netArr.push({
+ name: s.workerName,
+ type: 8,
+ value: s.userId
+ })
+
+ })
+ this.displayedItems4 = netArr;
+ this.isExpanded4 = false;
+ }
+ },
+ //筛选开始时间
+ bindPickerChangeStart(e, type) {
+
+ if (type == 'startTime') {
+ this.inspectStartTime = e.f3;
+ }
+ let userInfo = {
+ type: 9,
+ value: -1
+ }
+ if (this.inspectStartTime && this.inspectEndTime) {
+ this.searchItem(userInfo, 1)
+ }
+
+
+ },
+ //筛选结束时间
+ bindPickerChangeEnd(e, type) {
+ if (type == 'startTime') {
+ this.inspectEndTime = e.f3;
+ }
+ let userInfo = {
+ type: 10,
+ value: -1
+ }
+ if (this.inspectStartTime && this.inspectEndTime) {
+ this.searchItem(userInfo, 1)
+ }
+ },
+ //点击打开筛选
+ screenData() {
+ this.$refs.screenShow.open()
+
+ this.popupShow = true
+ // 默认显示前面2个数据
+ let sliceArr = this.items.slice(0, 2);
+ let sliceArr2 = this.itemsList.slice(0, 2)
+ this.condition.pageNo = 1;
+ this.condition.pageSize = 10;
+ this.displayedItems1 = []
+ this.displayedItems2 = []
+ this.displayedItems3 = []
+ this.displayedItems4 = []
+
+ this.displayedItems1.push({
+ name: '全部',
+ type: 5,
+ value: -1
+ })
+ this.displayedItems2.push({
+ name: '全部',
+ type: 6,
+ value: -1
+ })
+ this.displayedItems3.push({
+ name: '全部',
+ type: 7,
+ value: -1
+ })
+ this.displayedItems4.push({
+ name: '全部',
+ type: 8,
+ value: -1
+ })
+ console.log("人员数组：", JSON.stringify(sliceArr))
+
+ sliceArr.forEach(s => {
+
+ this.displayedItems1.push({
+ name: s.workerName,
+ type: 5,
+ value: s.userId
+ })
+ this.displayedItems2.push({
+ name: s.workerName,
+ type: 6,
+ value: s.userId
+ })
+ // this.displayedItems3.push({
+ // name: s.workerName,
+ // type: 7,
+ // value: s.userId
+ // })
+ })
+ this.enterpriseList.slice(0, 2).forEach(s => {
+ this.displayedItems3.push({
+ name: s.enterpriseName,
+ type: 7,
+ value: s.id
+ })
+
+ })
+ sliceArr2.forEach(v => {
+ this.displayedItems4.push({
+ name: v.workerName,
+ type: 8,
+ value: v.userId
+ })
+ })
+
+
+ },
+ //获取分包单位列表
+ getEnterpriseData() {
+ this.sendRequest({
+ url: 'xmgl/enterpriseInfo/list',
+ method: 'post',
+ data: {
+ projectSn: this.condition.projectSn
+ },
+ success: res => {
+ if (res.code == 200) {
+ this.enterpriseList = res.result
+ }
+ }
+ })
+ },
+ //获取巡检人员列表
+ getPeopleData() {
+ this.sendRequest({
+ url: 'xmgl/systemUser/getProjectChilderSystemUserList',
+ method: 'post',
+ data: {
+ enterpriseId: this.enterpriseId,
+ projectSn: this.condition.projectSn
+ },
+ success: res => {
+ if (res.code == 200) {
+ this.itemsList = res.result
+ }
+ }
+ })
+ },
+ //获取通知人员列表
+ getPeopleList() {
+ this.sendRequest({
+ url: 'xmgl/systemUser/getProjectChilderSystemUserList',
+ method: 'post',
+ data: {
+ projectSn: this.condition.projectSn
+ },
+ success: res => {
+ if (res.code == 200) {
+ this.items = res.result
+ }
+ }
+ })
+ },
+ //--------------------------------------
+ //确定选中--回显
+ checkPointBtn(val, type) {
+ if (type == 1) {
+
+ this.regionId = []
+ let arr = JSON.parse(JSON.stringify(val[0].parents));
+ let obj = {
+ id: val[0].id,
+ regionName: val[0].regionName
+ };
+
+ arr.push(obj);
+ this.regionId.push(obj.id)
+
+ //获取选中的字符串 名称
+ var regionName = arr.map(function(item, index) {
+ return item.regionName;
+ }).join("/");
+ this.checkPointName = regionName;
+ let userInfo = {
+ type: 11,
+ value: -1
+ }
+ this.searchItem(userInfo, 1)
+ }
+ // this.listData = [];
+ // this.getListData()
+ },
+ //获取检查部位 列表
+ getCheckPointList() {
+ this.sendRequest({
+ url: 'xmgl/qualityRegion/list',
+ method: 'post',
+ data: {
+ projectSn: this.condition.projectSn
+ },
+ success: res => {
+ if (res.code == 200) {
+ this.checkPointList = res.result;
+ }
+ }
+ })
+ },
+ //获取列表数据
getListData() {
- this.listData = [{
- id:1,
- name: 'cs'
- }, {
- id:2,
- name: 'cs2'
- }]
+ if (this.checkedTab == 2 || this.checkedTab == 5) {
+ this.condition.inspectUserIds = this.userInfo.userId
+ this.condition.reviewId = ''
+ this.condition.enterpriseId = ''
+ this.condition.regionId = []
+ } else if (this.checkedTab == 3) {
+ this.condition.reviewId = this.userInfo.userId
+ this.condition.inspectUserIds = '';
+ this.condition.enterpriseId = ''
+ this.condition.regionId = []
+ } else if (this.checkedTab == 4) {
+ this.condition.enterpriseId = this.userInfo.userId
+ this.condition.inspectUserIds = '';
+ this.condition.reviewId = ''
+ this.condition.regionId = []
+ } else if (this.checkedTab == 6) {
+ this.condition.status = ''
+ this.condition.enterpriseId = ''
+ this.condition.inspectUserIds = '';
+ this.condition.reviewId = ''
+ this.condition.regionId = this.regionId
+ } else {
+ this.condition.status = ''
+ this.condition.reviewId = '';
+ this.condition.inspectUserIds = '';
+ this.condition.enterpriseId = ''
+ this.condition.regionId = ''
+
+ }
+ console.log('查询列表条件数据', this.checkedTab)
+ let that = this;
+ // uni.showLoading({title: '加载中'})
+ this.sendRequest({
+ url: 'xmgl/xzCheckingRoute/page',
+ method: 'get',
+ data: that.condition,
+ success: res => {
+ console.log(res)
+ that.listNum = res.result.total
+ // uni.hideLoading()
+ let arr = JSON.parse(JSON.stringify(that.listData));
+ if (res.result.records.length > 0) {
+ let newArr = arr.concat(res.result.records);
+ if (res.result.records.length < 10) {
+ that.teach = false;
+ } else {
+ that.teach = true;
+ }
+ that.listData = newArr;
+ } else {
+ that.teach = false;
+ }
+ }
+ })
},
goDetails(obj) {
// uni.navigateTo({
@@ -276,8 +1007,33 @@
uni.navigateTo({
url: './details?id=' + obj.id + '&type=' + obj.status
})
- }
- }
+ },
+ handleDetail(item) {
+ let that = this;
+ let data = {
+ projectSn: this.condition.projectSn,
+ id: item.id
+ };
+ this.sendRequest({
+ url: 'xmgl/xzCheckingRoute/delete',
+ method: 'post',
+ data,
+ success: res => {
+ console.info(res, 'res')
+ if (res.code == 200) {
+ that.showToast('删除成功');
+ }
+ }
+ })
+ },
+ //搜索
+ loadData(e) {
+ // this.condition.routeName = e.detail.value
+ this.condition.pageNo = 1
+ this.listData = []
+ this.getListData(false)
+ },
+ },
}
@@ -301,6 +1057,306 @@
margin-top: 3%;
}
+ .searchBox {
+ background-color: white;
+ }
+
+ .uni-form-item {
+ position: relative;
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ /* .search-icon{
+ position: absolute;
+ top: 50%;
+ right: 50rpx;
+ transform: translateY(-50%);
+ } */
+ }
+
+ .uni-input {
+ border-radius: 20px;
+ margin: 10px 10px;
+ background-color: #f7f8fa;
+ height: 35px;
+ line-height: 30px;
+ padding: 0 20px;
+ font-size: 14px;
+ flex: 1;
+ }
+
+ .screen {
+ line-height: 50px;
+ color: gray;
+ }
+
+ .flex {
+ display: flex;
+ align-items: center;
+ }
+
+ .content {
+ padding: 0px 30rpx 0;
+ box-sizing: border-box;
+ width: 100%;
+ }
+
+ .item {
+ min-height: 320rpx;
+ width: 100%;
+ padding: 24rpx 16rpx;
+ box-sizing: border-box;
+ box-shadow: 0 0 10px rgba(194, 194, 194, 0.5);
+ border-radius: 4px;
+ margin-bottom: 15px;
+ color: rgba(51, 51, 51, 1);
+ font-size: 32rpx;
+ font-family: PingFangSC-Medium;
+ display: flex;
+ }
+
+ .safety_ic {
+ width: 23px;
+ height: 23px;
+ margin-right: 5px;
+ }
+
+ .item_left {
+ // flex: 1;
+ width: 66%;
+
+ .card_title {
+ display: flex;
+ align-items: flex-start;
+ margin-bottom: 8rpx;
+
+ // white-space: nowrap;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ &:first-child {
+ margin-bottom: 16rpx;
+ }
+
+ .title {
+ min-height: 40rpx;
+ color: rgba(81, 129, 246, 1);
+ font-size: 28rpx;
+ text-align: left;
+ font-weight: 600;
+ }
+
+ .value {
+ min-height: 40rpx;
+ color: rgba(16, 16, 16, 1);
+ font-size: 26rpx;
+ text-align: left;
+ white-space: nowrap;
+ font-family: SourceHanSansSC-regular;
+ overflow:hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow:ellipsis;
+ }
+
+ .label {
+ min-height: 40rpx;
+ color: rgba(16, 16, 16, 0.43);
+ font-size: 26rpx;
+ text-align: left;
+ font-family: SourceHanSansSC-regular;
+ white-space: nowrap;
+
+ &.wrap {
+ white-space: pre-wrap;
+ }
+ }
+ }
+ }
+
+ .item_right {
+ flex-shrink: 0;
+ width: 160rpx;
+ display: flex;
+ align-items: flex-end;
+
+ .text_wrap {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 12rpx;
+
+ .d_ic {
+ width: 32rpx;
+ height: 32rpx;
+ }
+
+ .d_text {
+ color: rgba(81, 129, 246, 1);
+ font-size: 20rpx;
+ }
+ }
+
+ .btn_wrap {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 12rpx;
+ }
+ }
+
+ .rightStatus {
+ float: right;
+ font-size: 12px;
+ margin-top: -18px;
+ width: 60px;
+ height: 20px;
+ text-align: center;
+ border-radius: 10px;
+ color: #fff;
+ line-height: 18px;
+ }
+
+ .item_title {
+ font-weight: 600;
+ margin-bottom: 2px;
+ }
+
+ .item_content {
+ width: 100%;
+ font-size: 28rpx;
+ color: rgba(51, 51, 51, 1);
+ font-family: PingFangSC-Regular;
+ line-height: 28px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ color: #999;
+
+ }
+
+ .item_info {
+ font-size: 26rpx;
+ line-height: 24px;
+ font-family: PingFangSC-Regular;
+ color: #999;
+ }
+
+ .state {
+ padding: 0px 8px;
+ color: #fff;
+ box-sizing: border-box;
+ border-radius: 30px;
+ font-size: 24rpx;
+ }
+
+ .bg1 {
+ background-color: rgba(245, 166, 35, 1);
+ box-shadow: 0px 2px 0px rgba(242, 76, 50, 0.28);
+ }
+
+ .bg2 {
+ background-color: rgba(88, 86, 214, 1);
+ box-shadow: 0px 2px 0px rgba(87, 81, 217, 0.28);
+ }
+
+ .bg3 {
+ background-color: rgba(238, 94, 94, 1);
+ box-shadow: 0px 2px 0px rgba(236, 92, 98, 0.28);
+ }
+
+ .bg4 {
+ background-color: rgba(76, 217, 100, 1);
+ box-shadow: 0px 2px 0px rgba(68, 219, 94, 0.28);
+ }
+
+ .noData {
+ text-align: center;
+ font-size: 32rpx;
+ margin-top: 120px;
+ color: #bed0fb;
+ }
+
+ .noDataImg {
+ width: 125px;
+ height: 98px;
+ }
+
+ ::v-deep .tki-tree-cnt {
+ z-index: 99999;
+ border-radius: 20px;
+ }
+
+ ::v-deep .tki-tree-bar {
+ border-top-left-radius: 20px;
+ border-top-right-radius: 20px;
+ }
+
+ ::v-deep .placeholder {
+ padding-left: 40px;
+ }
+
+ .mini-btn {
+ margin-right: 24rpx;
+ border-radius: 15px;
+ height: 30px;
+ line-height: 30px;
+ }
+
+ .common_btn {
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 50%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 0 8rpx;
+
+ &.primary {
+ background: #5181F6;
+ }
+
+ &.danger {
+ background: #F26161;
+ }
+ }
+
+ .b_ic {
+ width: 24rpx;
+ height: 24rpx;
+ }
+
+ .add_btn {
+ width: 108rpx;
+ height: 108rpx;
+ position: fixed;
+ bottom: 4rpx;
+ right: 28rpx;
+ }
+
+ .qrcode_img {
+ width: 160rpx;
+ height: 160rpx;
+ }
+
+ .fixedheader {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ z-index: 2;
+
+ .headerName {
+ z-index: 1;
+ }
+ }
+
+ .line {
+ width: 100%;
+ height: 1px;
+ background-color: #ccc;
+ margin-top: 3%;
+ }
+
.popupShow {
overflow: hidden;
position: fixed;
@@ -398,6 +1454,10 @@
line-height: 30px;
color: #000;
margin: 5% 5% 5% 0%;
+ overflow:hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow:ellipsis;
}
.active {
diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue
index 2ccabfe8..9ddd53ad 100644
--- a/pages/projectEnd/qualityManage/addIssue.vue
+++ b/pages/projectEnd/qualityManage/addIssue.vue
@@ -945,7 +945,7 @@
} else if (type == 'startTime') {
this.form.inspectTime = e.f3;
} else if (type == 'startTime2') {
- this.form.changeLimitTime = e.f3;
+ this.form.changeLimitTime = `${e.f1} ${e.f8}`;
} else if (type == 6) {
this.changePeopleIndex = e.detail.value;
this.form.changeId = this.personUpdateList[e.detail.value].userId;
@@ -1237,6 +1237,8 @@
//新增保存
async addSaveBtn() {
+ console.log(this.form.inspectTime)
+ console.log(this.form.changeLimitTime)
let arr = [],
arr2 = [];
diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue
index ff75663b..099dfc56 100644
--- a/pages/projectEnd/safeSame/addIssue.vue
+++ b/pages/projectEnd/safeSame/addIssue.vue
@@ -952,7 +952,7 @@
} else if (type == 'startTime') {
this.form.inspectTime = e.f3;
} else if (type == 'startTime2') {
- this.form.changeLimitTime = e.f3;
+ this.form.changeLimitTime = `${e.f1} ${e.f8}`;
} else if (type == 6) {
this.changePeopleIndex = e.detail.value;
this.form.changeId = this.personUpdateList[e.detail.value].userId;
diff --git a/pages/standardScheduleNews/auditDetail.vue b/pages/standardScheduleNews/auditDetail.vue
index 8ae672c6..4213e9ac 100644
--- a/pages/standardScheduleNews/auditDetail.vue
+++ b/pages/standardScheduleNews/auditDetail.vue
@@ -48,7 +48,7 @@
图片：
-
+
@@ -109,6 +109,11 @@
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
},
methods: {
+ previewImage(url) {
+ uni.previewImage({
+ urls: [url]
+ })
+ },
// 提交审核
submitAudit() {
// 获取统计信息
@@ -280,8 +285,8 @@
flex-wrap: wrap;
image {
- width: 80rpx;
- height: 80rpx;
+ width: 280rpx;
+ height: 200rpx;
margin-right: 20rpx;
}
}
diff --git a/pages/standardScheduleNews/recordDetail.vue b/pages/standardScheduleNews/recordDetail.vue
index 1cb0eaa5..02bc0482 100644
--- a/pages/standardScheduleNews/recordDetail.vue
+++ b/pages/standardScheduleNews/recordDetail.vue
@@ -48,7 +48,7 @@
图片：
-
+
@@ -108,6 +108,11 @@
},
},
methods: {
+ previewImage(url) {
+ uni.previewImage({
+ urls: [url]
+ })
+ },
filterItemForm() {
console.log(this.itemFrom)
if (this.itemFrom.image) {
@@ -163,8 +168,8 @@
flex-wrap: wrap;
image {
- width: 80rpx;
- height: 80rpx;
+ width: 280rpx;
+ height: 200rpx;
margin-right: 20rpx;
}
}
diff --git a/static/documentIcon/JPG.png b/static/documentIcon/JPG.png
deleted file mode 100644
index f1ac51c9..00000000
Binary files a/static/documentIcon/JPG.png and /dev/null differ
diff --git a/static/documentIcon/PDF.png b/static/documentIcon/PDF.png
index d49f074b..d083b7d0 100644
Binary files a/static/documentIcon/PDF.png and b/static/documentIcon/PDF.png differ
diff --git a/static/documentIcon/PNG.png b/static/documentIcon/PNG.png
deleted file mode 100644
index d7c452ab..00000000
Binary files a/static/documentIcon/PNG.png and /dev/null differ
diff --git a/static/documentIcon/PPT.png b/static/documentIcon/PPT.png
index 11a679b3..196d4932 100644
Binary files a/static/documentIcon/PPT.png and b/static/documentIcon/PPT.png differ
diff --git a/static/documentIcon/RAR.png b/static/documentIcon/RAR.png
index a8a81623..0dac2bbb 100644
Binary files a/static/documentIcon/RAR.png and b/static/documentIcon/RAR.png differ
diff --git a/static/documentIcon/TXT.png b/static/documentIcon/TXT.png
index 86fb2aa8..9dca2c63 100644
Binary files a/static/documentIcon/TXT.png and b/static/documentIcon/TXT.png differ
diff --git a/static/documentIcon/UNKNOWN.png b/static/documentIcon/UNKNOWN.png
deleted file mode 100644
index 8f3d88ba..00000000
Binary files a/static/documentIcon/UNKNOWN.png and /dev/null differ
diff --git a/static/documentIcon/VIDEO.png b/static/documentIcon/VIDEO.png
index 8ae92db8..ae1abf77 100644
Binary files a/static/documentIcon/VIDEO.png and b/static/documentIcon/VIDEO.png differ
diff --git a/static/documentIcon/WORD.png b/static/documentIcon/WORD.png
index 21070577..1af9e32b 100644
Binary files a/static/documentIcon/WORD.png and b/static/documentIcon/WORD.png differ
diff --git a/static/documentIcon/ZIP.png b/static/documentIcon/ZIP.png
deleted file mode 100644
index 505734dd..00000000
Binary files a/static/documentIcon/ZIP.png and /dev/null differ
diff --git a/static/documentIcon/excel.png b/static/documentIcon/excel.png
new file mode 100644
index 00000000..7eb3ba70
Binary files /dev/null and b/static/documentIcon/excel.png differ
diff --git a/static/documentIcon/img.png b/static/documentIcon/img.png
new file mode 100644
index 00000000..08bcb736
Binary files /dev/null and b/static/documentIcon/img.png differ
diff --git a/static/documentIcon/mp3.png b/static/documentIcon/mp3.png
new file mode 100644
index 00000000..086888e4
Binary files /dev/null and b/static/documentIcon/mp3.png differ
diff --git a/static/documentIcon/null.png b/static/documentIcon/null.png
new file mode 100644
index 00000000..ecc96d64
Binary files /dev/null and b/static/documentIcon/null.png differ