diff --git a/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css b/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css
new file mode 100644
index 0000000..e44913d
--- /dev/null
+++ b/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css
@@ -0,0 +1,176 @@
+html {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+}
+
+body {
+ margin: 0;
+ font-family: 'Alibaba PuHuiTi R';
+ height: 98%;
+}
+
+.layout {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+#main-box {
+ width: 100%;
+ height: 100%;
+ padding: 0 1% 0 1%;
+ box-sizing: border-box;
+ background-color: #fff;
+ border-radius: 5px;
+}
+
+#pro-detail-box {
+ width: 100%;
+ height: 80px;
+ align-items: center;
+ justify-content: space-between;
+}
+
+#pro-basic-detail-box {
+ width: 100%;
+ height: 70px;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 0 0 4%;
+ box-sizing: border-box;
+}
+
+.basic-detail {
+ flex-direction: column;
+ width: 12%;
+ height: 100%;
+ align-items: start;
+ justify-content: space-evenly;
+}
+
+.basic-detail:nth-child(8) {
+ width: 28%;
+}
+
+#data-box {
+ width: 100%;
+ height: calc(100% - 160px);
+}
+
+#gx-num-box {
+ width: 100%;
+ height: 40px;
+ justify-content: space-between;
+}
+
+.num-box {
+ width: 10%;
+ height: 100%;
+ margin-right: 2%;
+ justify-content: space-around;
+}
+
+.num-box > p:nth-child(1) {
+ font-weight: bold;
+ font-size: 18px;
+}
+
+.num-box > p:nth-child(2) {
+ font-size: 18px;
+}
+
+.num-box:nth-child(1) > p:nth-child(2) {
+ color: #666;
+}
+
+.num-box:nth-child(2) > p:nth-child(2) {
+ color: #ffff00;
+}
+
+.num-box:nth-child(3) > p:nth-child(2) {
+ color: #19be6b;
+}
+
+.num-box:nth-child(4) > p:nth-child(2) {
+ color: #66b1ff;
+}
+
+.num-box:nth-child(5) > p:nth-child(2) {
+ color: #ff9900;
+}
+
+.num-box:nth-child(6) > p:nth-child(2) {
+ color: #f56c6c;
+}
+
+.num-box:nth-child(7) > p:nth-child(2) {
+ color: #8400ff;
+}
+
+.num-box:nth-child(8) > p:nth-child(2) {
+ color: #00bfbf;
+}
+
+.layui-tab-brief > .layui-tab-title .layui-this {
+ color: #409eff;
+}
+
+.oper-info {
+ width: 100%;
+ height: auto;
+}
+
+.oper-info > div {
+ margin: 10px 0;
+}
+
+.oper-info > div:nth-child(1) {
+ width: 7%;
+ height: 100%
+}
+
+.oper-info > div:nth-child(2) {
+ width: 73%;
+ height: 100%
+}
+
+.oper-info > div:nth-child(3) {
+ width: 20%;
+ height: 100%
+}
+
+.user-oper {
+ flex-direction: column;
+}
+
+.table-box {
+ width: 99%;
+ padding: 0 0.5%;
+ height: calc(100% - 240px);
+}
+
+.layui-tab-brief > .layui-tab-more li.layui-this:after,
+.layui-tab-brief > .layui-tab-title .layui-this:after {
+ border-bottom: 2px solid #409eff;
+}
+
+.layui-tab .layui-tab-title li {
+ font-size: 16px;
+ font-weight: bold;
+}
+
+a {
+ color: #428bca;
+ text-decoration: none;
+}
+
+a:hover,
+a:focus {
+ color: #2a6496;
+ text-decoration: underline;
+}
+
+.layui-tab-item{
+ height: 100%;
+}
\ No newline at end of file
diff --git a/src/main/resources/static/img/synthesisQuery/pro_icon.png b/src/main/resources/static/img/synthesisQuery/pro_icon.png
new file mode 100644
index 0000000..5a288a0
Binary files /dev/null and b/src/main/resources/static/img/synthesisQuery/pro_icon.png differ
diff --git a/src/main/resources/static/img/synthesisQuery/time_icon.png b/src/main/resources/static/img/synthesisQuery/time_icon.png
new file mode 100644
index 0000000..805f8e6
Binary files /dev/null and b/src/main/resources/static/img/synthesisQuery/time_icon.png differ
diff --git a/src/main/resources/static/img/synthesisQuery/user_head_icon.png b/src/main/resources/static/img/synthesisQuery/user_head_icon.png
new file mode 100644
index 0000000..3e6c3db
Binary files /dev/null and b/src/main/resources/static/img/synthesisQuery/user_head_icon.png differ
diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdate.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdate.js
index d272134..e612498 100644
--- a/src/main/resources/static/js/synthesisQuery/proProgressUpdate.js
+++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdate.js
@@ -130,7 +130,7 @@ function query(type) {
}
/**详情*/
function viewData(obj){
- openIframeByParamObj("viewData", "详情", "./proClassifyStatisticsDetail.html", "92%", "95%", obj);
+ openIframeByParamObj("viewData", "更新进度", "./proProgressUpdateDetail.html", "92%", "95%", obj);
}
/*下载*/
diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
new file mode 100644
index 0000000..4ba4929
--- /dev/null
+++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
@@ -0,0 +1,176 @@
+let form, layer, element, table, tableIns;
+let pageNum = 1, pageSize = 15; // 图片定义分页
+let objParams = {};
+
+function setParams(obj) {
+ objParams = JSON.parse(obj);
+ layui.use(['form', 'layer', 'element', 'table'], function () {
+ form = layui.form;
+ layer = layui.layer;
+ table = layui.table;
+ element = layui.element;
+ element.on('tab(demo-filter-tab)', function (data) {
+ let value = $(this).attr('value');
+ if (value === '1') {
+ $('#layui-tab-title li').eq(0).addClass('layui-this');
+ $('#layui-tab-content>div').eq(0).addClass('layui-show');
+ $('#layui-tab-title li').eq(1).removeClass('layui-this');
+ $('#layui-tab-content>div').eq(1).removeClass('layui-show');
+ } else if (value === '2') {
+ $('#layui-tab-title li').eq(0).removeClass('layui-this');
+ $('#layui-tab-content>div').eq(0).removeClass('layui-show');
+ $('#layui-tab-title li').eq(1).addClass('layui-this');
+ $('#layui-tab-content>div').eq(1).addClass('layui-show');
+ }
+ });
+ pages(1, 10, 1);
+ });
+}
+
+function pages(pageNum, pageSize, typeNum) {
+ let params = getReqParams(pageNum, pageSize, typeNum);
+ let url = dataUrl + "/backstage/proProgress/getList"
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ console.log(result);
+ if (result.code === 200) {
+ if (result.data) {
+ initTable(result.data, result.limit, result.curr)
+ laypages(result.count, result.curr, result.limit)
+ element.render();
+ }
+ } else if (result.code === 500) {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ error(xhr)
+ });
+
+}
+
+function laypages(total, page, limit) {
+ layui.use(['laypage'], function () {
+ let laypage = layui.laypage;
+ laypage.render({
+ elem: 'voi-page',
+ count: total,
+ curr: page,
+ limit: limit,
+ limits: [10, 20, 50, 100, 200, 500],
+ layout: ['prev', 'page', 'next', 'skip', 'count', 'limit'],
+ groups: 5,
+ jump: function (obj, first) {
+ if (!first) {
+ pageNum = obj.curr, limitSize = obj.limit;
+ pages(obj.curr, obj.limit, null);
+ }
+ }
+ });
+ })
+}
+
+/*初始化表格*/
+function initTable(dataList, limit, page) {
+ let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+ pageNum = page, limitSize = limit;
+ tableIns = table.render({
+ elem: "#table_data",
+ height: "full-330",
+ data: dataList,
+ limit: limit,
+ cols: [
+ [
+ {
+ title: "序号", width: "5%", unresize: true, align: "center",
+ templet: function (d) {
+ return (page - 1) * limit + d.LAY_NUM;
+ }
+ },
+ {field: "towName", title: "杆塔", width: "25%", unresize: true, align: "center"},
+ {title: "基础开挖",width: "10%",unresize: true,align: "center",
+ templet: function (d) {
+ let html = '';
+ return html;
+ }
+ },
+ {title: "基础开挖完成",width: "10%",unresize: true,align: "center",
+ templet: function (d) {
+ let html = '';
+ return html;
+ }
+ },
+ {title: "基础浇筑完成",width: "10%",unresize: true,align: "center",
+ templet: function (d) {
+ let html = '';
+ return html;
+ }
+ },
+ {title: "铁塔组立",width: "10%",unresize: true,align: "center",
+ templet: function (d) {
+ let html = '';
+ return html;
+ }
+ },
+ {title: "铁塔组立完成",width: "10%",unresize: true,align: "center",
+ templet: function (d) {
+ let html = '';
+ return html;
+ }
+ },
+ {title: "架线施工完成",width: "10%",unresize: true,align: "center",
+ templet: function (d) {
+ let html = '';
+ return html;
+ }
+ },
+ {title: "附件安装完成",width: "10%",unresize: true,align: "center",
+ templet: function (d) {
+ let html = '';
+ return html;
+ }
+ },
+ ],
+ ],
+ done: function (res, curr, count) {
+ layer.close(loadingMsg);
+ table.resize("table_data");
+ count || this.elem.next(".layui-table-view").find(".layui-table-header").css("display", "inline-block");
+ count || this.elem.next(".layui-table-view").find(".layui-table-box").css("overflow", "auto");
+ element.render();
+ },
+ });
+}
+
+
+// 获取参数
+function getReqParams(page, limit, type) {
+ let obj = {};
+ if (!type) {
+ obj = {
+ pageNum: page + "",
+ pageSize: limit + "",
+ keyWord: $('#keyWord').val(),
+
+ };
+ } else {
+ obj = {
+ pageNum: '1',
+ pageSize: '10',
+ keyWord: '',
+ };
+ }
+ obj = {
+ encryptedData: encryptCBC(JSON.stringify(obj))
+ }
+ return obj;
+}
+
+// 查询/重置
+function query(type) {
+ pageNum = 1;
+ if (type === 2) {
+ $('#keyWord').val('');
+ layui.form.render();
+ }
+ pages(1, limitSize);
+}
\ No newline at end of file
diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/static/pages/synthesisQuery/proProgressUpdate.html b/src/main/resources/static/pages/synthesisQuery/proProgressUpdate.html
index 0a553e6..7a83ada 100644
--- a/src/main/resources/static/pages/synthesisQuery/proProgressUpdate.html
+++ b/src/main/resources/static/pages/synthesisQuery/proProgressUpdate.html
@@ -9,7 +9,6 @@
-
diff --git a/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
new file mode 100644
index 0000000..3bbbcfc
--- /dev/null
+++ b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工程进度更新
+
+
+
+
+
+

+
+
安全工器具需求计划
+
安全工器具需求计划
+
+
+
+
+
+
+
+
+
+
+
+
+
项目计划开始时间
+
2022-11-01
+
+
+
项目计划结束时间
+
2023-11-30
+
+
+
最后更新
+
2022-11-25 23:26:08
+
+
+
+
+
+
+
+
+
+
+
+
+
8月18日
+
+
+
+

+
+
+
+ 王天峰(13787220576)项目管理中心
+
+
+ 完结-审核确认通过,共耗时:21小时16分钟 原因备注:无
+
+
+

+
2020-12-23 22:31
+
+
+
+
2020-12-23 22:31
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file