jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改svg-icon

dev_xd
haha 2025-08-03 18:18:48 +08:00
parent 5c921bed95
commit 4e127bf4cf
5 changed files with 222 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yanzhu-ui-app/.vscode/settings.json vendored
View File

@ -22,5 +22,8 @@
"minapp-vscode.format.printWidth": 100, "minapp-vscode.format.printWidth": 100,
"minapp-vscode.format.useTabs": false, "minapp-vscode.format.useTabs": false,
"minapp-vscode.disableCustomComponentAutocompletion": false, "minapp-vscode.disableCustomComponentAutocompletion": false,
"minapp-vscode.disableAutoWxssCompelte": false "minapp-vscode.disableAutoWxssCompelte": false,
"less.compile": {
"outExt": ".wxss"
}
} }

111
yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js
View File

@ -1,40 +1,36 @@
// pageage/project_checked/add/index.js // pageage/project_checked/add/index.js
import config from '../../../config' import config from "../../../config";
import fmt from '../../../utils/date.js' import fmt from "../../../utils/date.js";
import { import { getToken, getUserInfo } from "../../../utils/auth";
getToken,
getUserInfo
} from '../../../utils/auth'
import { import {
projectCheckedList, projectCheckedList,
projectCheckedListCount projectCheckedListCount,
} from '../../../api/project' } from "../../../api/project";
import { import {
findPlanDatas, findPlanDatas,
findRecursionPlan, findRecursionPlan,
findPreviousSchedule, findPreviousSchedule,
submitPlanSchedule submitPlanSchedule,
} from '../../../api/project' } from "../../../api/project";
const app = getApp() const app = getApp();
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
maxDate: new Date(2088, 1, 1).getTime(), maxDate: new Date(2088, 1, 1).getTime(),
minDate: new Date().getTime() + (3600 * 48 * 1000), minDate: new Date().getTime() + 3600 * 48 * 1000,
form: { form: {
taskName: '', taskName: "",
task: null, task: null,
intro: '',//验收描述 intro: "", //验收描述
imageUrls: [], imageUrls: [],
groupDeptUser: '',//班组长 groupDeptUser: "", //班组长
checkingDate: '',//验收时间 checkingDate: "", //验收时间
technicianUser: '',//技术专员 technicianUser: "", //技术专员
superviseUser: '',//监理专员 superviseUser: "", //监理专员
}, },
projectUserInfo: {}, projectUserInfo: {},
projectId: "", projectId: "",
@ -55,8 +51,8 @@ Page({
onLoad(options) { onLoad(options) {
if (!getToken()) { if (!getToken()) {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/login/login', url: "../../../pages/login/login",
}) });
} }
const proUserInfo = getUserInfo(); const proUserInfo = getUserInfo();
this.setData({ this.setData({
@ -72,11 +68,11 @@ Page({
listData: [], listData: [],
total: 0, total: 0,
form: { form: {
taskName: '', taskName: "",
task: null, task: null,
intro: '', intro: "",
checkingDate: fmt(new Date()).format("YYYY-MM-DD HH:mm:ss"), checkingDate: fmt(new Date()).format("YYYY-MM-DD"),
} },
}); });
this.initPlanDatas(); this.initPlanDatas();
}, },
@ -96,28 +92,28 @@ Page({
findPlanDatas(app.globalData.useProjectId).then((res) => { findPlanDatas(app.globalData.useProjectId).then((res) => {
let treeDatas = this.buildTree(res.data, 1, ""); let treeDatas = this.buildTree(res.data, 1, "");
this.setData({ this.setData({
planOptions: treeDatas planOptions: treeDatas,
}) });
}); });
}, },
closePicker() { closePicker() {
this.setData({ this.setData({
picker: false picker: false,
}) });
}, },
/** /**
* 打开选择窗 * 打开选择窗
*/ */
openPicker() { openPicker() {
this.setData({ this.setData({
picker: true picker: true,
}) });
}, },
/** /**
* 构建树结构 * 构建树结构
* @param {*} all * @param {*} all
* @param {*} id * @param {*} id
*/ */
buildTree(all, id, path) { buildTree(all, id, path) {
let tmps = all.filter((d) => d.parentId == id); let tmps = all.filter((d) => d.parentId == id);
if (tmps.length > 0) { if (tmps.length > 0) {
@ -134,65 +130,51 @@ Page({
this.setData({ this.setData({
form: { form: {
task: item, task: item,
taskName: item.fullPath taskName: item.fullPath,
}, },
picker: false picker: false,
}) });
} }
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady() { onReady() {},
},
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow() { onShow() {},
},
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide() { onHide() {},
},
/** /**
* 生命周期函数--监听页面卸载 * 生命周期函数--监听页面卸载
*/ */
onUnload() { onUnload() {},
},
/** /**
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh() { onPullDownRefresh() {},
},
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom() { onReachBottom() {},
},
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage() { onShareAppMessage() {},
},
returnToPage: function () { returnToPage: function () {
/*关闭当前页面，跳转到其它页面。*/ /*关闭当前页面，跳转到其它页面。*/
wx.redirectTo({ wx.redirectTo({
url: '../list/index', url: "../list/index",
}) });
}, },
onScrollToLower() { onScrollToLower() {
let nal = Math.ceil(this.data.total / this.data.pageSize); let nal = Math.ceil(this.data.total / this.data.pageSize);
@ -205,5 +187,4 @@ Page({
console.log("已经到底了，没有数据可加载！！！"); console.log("已经到底了，没有数据可加载！！！");
} }
}, },
});
})

110
yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.wxml
View File

@ -1,6 +1,6 @@
<wxs module="format" src="/utils/format.wxs"></wxs> <wxs module="format" src="/utils/format.wxs"></wxs>
<view class="project-checked-add"> <view class="project-checked-add">
<view class="header_title "> <view class="header_title">
<view class="header_title_row"> <view class="header_title_row">
<van-row> <van-row>
<van-col span="4"> <van-col span="4">
@ -14,18 +14,32 @@
</van-row> </van-row>
</view> </view>
</view> </view>
<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower" <scroll-view
style="padding:30rpx"> class="max_content_scroll"
<project-select init="{{initData}}" bindchange="onProjectSelect" id="projectSel"></project-select> type="list"
scroll-y
bindscrolltolower="onScrollToLower"
style="padding: 30rpx"
>
<project-select
init="{{ initData }}"
bindchange="onProjectSelect"
id="projectSel"
></project-select>
<view class="mt40">分包单位</view> <view class="mt40">分包单位</view>
<view class="add-info">{{projectUserInfo.subDeptName}}</view> <view class="add-info">{{ projectUserInfo.subDeptName }}</view>
<view class="mt40 markers inspect_info_title">工程部位</view> <view class="mt40 markers inspect_info_title">工程部位</view>
<view class="inspect_info_content"> <view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写选择工程计划" placeholder-style="color:#6777aa;" bindtap="openPicker" <textarea
disabled model:value="{{form.taskName}}" /> class="add_textarea"
placeholder="请填写选择工程计划"
placeholder-style="color:#6777aa;"
bindtap="openPicker"
disabled
model:value="{{ form.taskName }}"
/>
<van-popup show="{{ picker }}" bind:close="closePicker" position="bottom"> <van-popup show="{{ picker }}" bind:close="closePicker" position="bottom">
<view class="rectifier_max"> <view class="rectifier_max">
<view class="rectifier_title"> <view class="rectifier_title">
@ -36,8 +50,13 @@
</view> </view>
<view class="rectifier_list"> <view class="rectifier_list">
<view class="rectifier_list_height"> <view class="rectifier_list_height">
<select-group-plan dataTree="{{planOptions}}" isOpenAll="{{fales}}" showCheckBox="{{fales}}" <select-group-plan
multiple="{{false}}" bind:clickItem="handleClick" /> dataTree="{{ planOptions }}"
isOpenAll="{{ fales }}"
showCheckBox="{{ fales }}"
multiple="{{ false }}"
bind:clickItem="handleClick"
/>
</view> </view>
</view> </view>
</view> </view>
@ -47,8 +66,14 @@
<view class="mt40 markers inspect_info_title">技术专员</view> <view class="mt40 markers inspect_info_title">技术专员</view>
<view class="inspect_info_content"> <view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写选择工程计划" placeholder-style="color:#6777aa;" bindtap="openPicker" <textarea
disabled model:value="{{form.taskName}}" /> class="add_textarea"
placeholder="请填写选择工程计划"
placeholder-style="color:#6777aa;"
bindtap="openPicker"
disabled
model:value="{{ form.taskName }}"
/>
<van-popup show="{{ picker }}" bind:close="closePicker" position="bottom"> <van-popup show="{{ picker }}" bind:close="closePicker" position="bottom">
<view class="rectifier_max"> <view class="rectifier_max">
<view class="rectifier_title"> <view class="rectifier_title">
@ -59,20 +84,30 @@
</view> </view>
<view class="rectifier_list"> <view class="rectifier_list">
<view class="rectifier_list_height"> <view class="rectifier_list_height">
<select-group-plan dataTree="{{planOptions}}" isOpenAll="{{fales}}" showCheckBox="{{fales}}" <select-group-plan
multiple="{{false}}" bind:clickItem="handleClick" /> dataTree="{{ planOptions }}"
isOpenAll="{{ fales }}"
showCheckBox="{{ fales }}"
multiple="{{ false }}"
bind:clickItem="handleClick"
/>
</view> </view>
</view> </view>
</view> </view>
</van-popup> </van-popup>
</view> </view>
<view class="mt40 markers inspect_info_title">监理员</view> <view class="mt40 markers inspect_info_title">监理员</view>
<view class="inspect_info_content"> <view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写选择工程计划" placeholder-style="color:#6777aa;" bindtap="openPicker" <textarea
disabled model:value="{{form.taskName}}" /> class="add_textarea"
placeholder="请填写选择工程计划"
placeholder-style="color:#6777aa;"
bindtap="openPicker"
disabled
model:value="{{ form.taskName }}"
/>
<van-popup show="{{ picker }}" bind:close="closePicker" position="bottom"> <van-popup show="{{ picker }}" bind:close="closePicker" position="bottom">
<view class="rectifier_max"> <view class="rectifier_max">
<view class="rectifier_title"> <view class="rectifier_title">
@ -83,8 +118,13 @@
</view> </view>
<view class="rectifier_list"> <view class="rectifier_list">
<view class="rectifier_list_height"> <view class="rectifier_list_height">
<select-group-plan dataTree="{{planOptions}}" isOpenAll="{{fales}}" showCheckBox="{{fales}}" <select-group-plan
multiple="{{false}}" bind:clickItem="handleClick" /> dataTree="{{ planOptions }}"
isOpenAll="{{ fales }}"
showCheckBox="{{ fales }}"
multiple="{{ false }}"
bind:clickItem="handleClick"
/>
</view> </view>
</view> </view>
</view> </view>
@ -94,31 +134,41 @@
<view class="mt40 markers inspect_info_title">结果描述</view> <view class="mt40 markers inspect_info_title">结果描述</view>
<view class="inspect_info_content"> <view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写结果描述" placeholder-style="color:#6777aa;" <textarea
model:value="{{form.intro}}" /> class="add_textarea"
placeholder="请填写结果描述"
placeholder-style="color:#6777aa;"
model:value="{{ form.intro }}"
/>
</view> </view>
<view class="mt40 markers inspect_info_title">验收时间</view> <view class="mt40 markers inspect_info_title">验收时间</view>
<view class="inspect_info_content"> <view class="inspect_info_content">
<voucher-datetime counts="5" placeholder="请选择完成时间" minDate="{{minDate}}" maxDate="{{maxDate}}" <voucher-date
model:value="{{form.checkingDate}}" currentDate="{{form.checkingDate}}"></voucher-datetime> counts="5"
placeholder="请选择完成时间"
minDate="{{ minDate }}"
maxDate="{{ maxDate }}"
model:value="{{ form.checkingDate }}"
currentDate="{{ form.checkingDate }}"
></voucher-date>
</view> </view>
<view class="mt40 markers inspect_info_title">验收照片</view> <view class="mt40 markers inspect_info_title">验收照片</view>
<view class="inspect_info_content"> <view class="inspect_info_content">
<view class="inspect_info_content" style="margin-left: 10px;"> <view class="inspect_info_content" style="margin-left: 10px">
<file-uploader bindimages="onImagesArr"></file-uploader> <file-uploader bindimages="onImagesArr"></file-uploader>
</view> </view>
</view> </view>
<view class="problem_submit_to"> <view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="returnToPage">取消</view> <view class="problem_submit_to_btn" bindtap="returnToPage">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="submitSave">确认</view> <view
class="problem_submit_to_btn problem_submit_to_save"
bindtap="submitSave"
>确认</view
>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

119
yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml
View File

@ -12,22 +12,57 @@
</van-row> </van-row>
</view> </view>
</view> </view>
<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower"> <scroll-view
<project-select init="{{initData}}" bindchange="onProjectSelect" id="projectSel"></project-select> class="max_content_scroll"
<view class="modify_video_nav" style="margin-top: 5rpx;"> type="list"
<view class="{{activeState=='qb'?'active':''}}" bindtap="trainJump" data-index="1"><text>全部（{{qbCount}}）</text></view> scroll-y
<view class="{{activeState=='jxz'?'active':''}}" bindtap="trainJump" data-index="2"><text>进行中（{{jxzCount}}）</text></view> bindscrolltolower="onScrollToLower"
<view class="{{activeState=='ywc'?'active':''}}" bindtap="trainJump" data-index="3"><text>已完成（{{ywcCount}}）</text></view> >
<project-select
init="{{ initData }}"
bindchange="onProjectSelect"
id="projectSel"
></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx">
<view
class="{{ activeState == 'qb' ? 'active' : '' }}"
bindtap="trainJump"
data-index="1"
><text>全部（{{ qbCount }}）</text></view
>
<view
class="{{ activeState == 'jxz' ? 'active' : '' }}"
bindtap="trainJump"
data-index="2"
><text>进行中（{{ jxzCount }}）</text></view
>
<view
class="{{ activeState == 'ywc' ? 'active' : '' }}"
bindtap="trainJump"
data-index="3"
><text>已完成（{{ ywcCount }}）</text></view
>
</view> </view>
<view class="inspect_max_scroll"> <view class="inspect_max_scroll">
<!--专项检查样式zxjc--> <!--专项检查样式zxjc-->
<view class="inspect_for_scroll" wx:if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo"> <view
class="inspect_for_scroll"
wx:if="{{ listData.length > 0 }}"
wx:for="{{ listData }}"
wx:key="index"
data-set="{{ item }}"
bindtap="getInfo"
>
<view class="inspect_for_bgd"> <view class="inspect_for_bgd">
<view class="inspect_list_title"> <view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width"> <view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 10 ? '0' + (index+1) : index+1}}</view> <view class="inspect_list_title_number">{{
<view class="module_title module_title_flex inspect_list_title_text_2"> index < 10 ? "0" + (index + 1) : index + 1
{{item.createTime}} }}</view>
<view
class="module_title module_title_flex inspect_list_title_text_2"
>
{{ item.createTime }}
</view> </view>
<!-- <text class="timeline_for_state_1">常规验收</text> --> <!-- <text class="timeline_for_state_1">常规验收</text> -->
</view> </view>
@ -35,37 +70,63 @@
<view class="inspect_list_info"> <view class="inspect_list_info">
<view class="inspect_list_info_details"> <view class="inspect_list_info_details">
<view class="inspect_list_info_img"> <view class="inspect_list_info_img">
<view wx:if="{{item.approveStatus==1}}" class="code_label code_label_yellow">待审批</view> <view
<view wx:if="{{item.approveStatus==3}}" class="code_label code_label_red">已驳回</view> wx:if="{{ item.approveStatus == 1 }}"
<view wx:if="{{item.approveStatus==4}}" class="code_label code_label_green">已完成</view> class="code_label code_label_yellow"
<van-image width="120rpx" height="120rpx" fit="cover" src="{{imgBaseUrl+item.mainImage+'.min.jpg'}}" /> >待审批</view
>
<view
wx:if="{{ item.approveStatus == 3 }}"
class="code_label code_label_red"
>已驳回</view
>
<view
wx:if="{{ item.approveStatus == 4 }}"
class="code_label code_label_green"
>已完成</view
>
<van-image
width="120rpx"
height="120rpx"
fit="cover"
src="{{ imgBaseUrl + item.mainImage + '.min.jpg' }}"
/>
</view> </view>
<view class="inspect_list_info_data"> <view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop color_blue">工序部位：<text>{{item.workingPosition}}</text></view> <view class="inspect_list_info_data_prop color_blue"
<view class="inspect_list_info_data_prop">技术专员：<text>{{item.technicianUserName}}</text></view> >工序部位：<text>{{ item.workingPosition }}</text></view
<view class="inspect_list_info_data_prop">监理专员：<text>{{item.superviseUserName}}</text></view> >
<view class="inspect_list_info_data_prop">验收时间：<text>{{item.recheckSendUser}}</text></view> <view class="inspect_list_info_data_prop"
>技术专员：<text>{{ item.technicianUserName }}</text></view
>
<view class="inspect_list_info_data_prop"
>监理专员：<text>{{ item.superviseUserName }}</text></view
>
<view class="inspect_list_info_data_prop"
>验收时间：<text>{{ item.recheckSendUser }}</text></view
>
</view> </view>
</view> </view>
<view class="inspect_list_info_position"> <view class="inspect_list_info_position">
验收描述：<text class="color_purple">{{item.intro}}</text> 验收描述：<text class="color_purple">{{ item.intro }}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{ listData.length == 0 }}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px; text-align: -webkit-center">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image> <image
<view style="color: #a5abbb;">暂无数据</view> src="https://szgcwx.jhncidg.com/staticFiles/nodata.png"
style="width: 130px; height: 105px"
></image>
<view style="color: #a5abbb">暂无数据</view>
</view> </view>
</view> </view>
<svg-icon src="/images/svg/add.svg" colors="{{['#ff0000','#fff','#fff']}}" /> <view wx:if="{{ isGroup }}" class="inspect_add_to" bindtap="skipAdd">
<svg-icon src="add2" color="green" size="64" /> <view style="padding-top: 22rpx">
<view wx:if="{{isGroup}}" class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>新增</view> <view>新增</view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>

2
yanzhu-ui-app/miniprogram/project.config.json
View File

@ -19,6 +19,8 @@
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"ignoreDevUnusedFiles": false,
"ignoreUploadUnusedFiles": false,
"condition": false, "condition": false,
"compileWorklet": false, "compileWorklet": false,
"uglifyFileName": false, "uglifyFileName": false,