diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index 31be3f39b..90bee7839 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -6649,13 +6649,13 @@ var PDFPageView = function () { watermark_txt: msg, watermark_x: 50,//水印起始位置x轴坐标 watermark_y: 0,//水印起始位置Y轴坐标 - watermark_rows: 7,//水印行数 - watermark_cols: 5,//水印列数 - watermark_x_space: 80,//水印x轴间隔 - watermark_y_space: 120,//水印y轴间隔 + watermark_rows: 15,//水印行数 + watermark_cols: 7,//水印列数 + watermark_x_space: 18,//水印x轴间隔 + watermark_y_space: 20,//水印y轴间隔 watermark_color: 'rgba(192, 192, 192)',//水印字体颜色 watermark_alpha: 0.3,//水印透明度 - watermark_fontsize: '30px',//水印字体大小 + watermark_fontsize: '40px',//水印字体大小 watermark_font: '微软雅黑',//水印字体 watermark_width: 120,//水印宽度 watermark_height: 80,//水印长度 diff --git a/public/static/ueditor/ADT/attachment/attachment.css b/public/static/ueditor/ADT/attachment/attachment.css index e1ff867cc..9d0ec4b5f 100644 --- a/public/static/ueditor/ADT/attachment/attachment.css +++ b/public/static/ueditor/ADT/attachment/attachment.css @@ -96,7 +96,6 @@ #upload .placeholder .webuploader-pick { font-size: 18px; background: #00b7ee; - 3px; line-height: 44px; padding: 0 30px; *width: 120px; @@ -198,7 +197,6 @@ overflow: hidden; z-index: 50; margin: 0; - 0; background: none; -webkit-box-shadow: 0 0 0; } @@ -317,7 +315,6 @@ height: 113px; background: url(./images/image.png) no-repeat center 12px; border: 1px solid #eeeeee; - 0; } #upload .filelist li.filePickerBlock div.webuploader-pick { width: 100%; @@ -447,7 +444,6 @@ color: #565656; padding: 0 18px; display: inline-block; - 3px; margin-left: 10px; cursor: pointer; font-size: 14px; diff --git a/src/api/linkApi.js b/src/api/linkApi.js new file mode 100644 index 000000000..9ee01f0ba --- /dev/null +++ b/src/api/linkApi.js @@ -0,0 +1,10 @@ +import axios from "@/common/axiosV2"; + +export function getImg (data) { + return axios({ + url: 'api/sarUrl/tsUrl/getIconImg', + method: 'get', + params: data, + responseType: 'arraybuffer' + }) +} diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less index 111d1293c..fd4c13f29 100644 --- a/src/assets/styles/common.less +++ b/src/assets/styles/common.less @@ -1,6 +1,8 @@ /*liuyan 全局公共样式*/ @import './style'; @import './mixins'; +// 移动端公共样式 +@import './phone'; // 左侧菜单样式 @import './navMenu'; // tree组件父组件内样式 diff --git a/src/assets/styles/phone.less b/src/assets/styles/phone.less new file mode 100644 index 000000000..d73daf347 --- /dev/null +++ b/src/assets/styles/phone.less @@ -0,0 +1,9 @@ +.phoneBox { + width: 100%; + height: 100%; +} +@media screen and (max-width: 1366px) { + .el-message { + min-width: 200px !important; + } +} diff --git a/src/assets/styles/reset.css b/src/assets/styles/reset.css index 1599c94dc..bebcef1bc 100644 --- a/src/assets/styles/reset.css +++ b/src/assets/styles/reset.css @@ -18,7 +18,12 @@ mark{background-color:transparent} a,ins,s,u,del{text-decoration:none} sup,sub{vertical-align:baseline} html {width:100%;height: 100%;font-size: 50px;-webkit-tap-highlight-color: transparent;} -body {font-family: 'PingFang SC', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif !important;color: #333;font-size: 14px;line-height: 1;-webkit-text-size-adjust: none;width:100%;height:100%;min-width:1280px;overflow-x:auto;} +@media screen and (min-width: 1366px) { + body { + min-width:1280px; + } +} +body {font-family: 'PingFang SC', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif !important;color: #333;font-size: 14px;line-height: 1;-webkit-text-size-adjust: none;width:100%;height:100%;overflow-x:auto;} hr {height: .02rem;margin: .1rem 0;border: medium none;border-top: .02rem solid #cacaca;} a {text-decoration: none;} /*意见反馈页面富文本表格宽度*/ diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index b0dccc5fe..bd1f90762 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -38,7 +38,6 @@ class="form-upload-btn" > - 上传 diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue new file mode 100644 index 000000000..04cf53df1 --- /dev/null +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -0,0 +1,566 @@ + + + + + + diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue new file mode 100644 index 000000000..f5c67b7fb --- /dev/null +++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue @@ -0,0 +1,564 @@ + + + + + + diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 9a33fbf29..5ae648fb6 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -4,15 +4,13 @@ 暂无评估结果 不满足 -
-
满足 -
-
加载中... @@ -170,12 +164,5 @@ export default { //width: 1200px; //margin: 0 auto; height: 100%; - .content{ - display: flex; - flex-direction: column; - justify-content: space-between; - height: calc(~'50% - 30px'); - overflow: auto; - } } diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index d215e83d8..cf109226c 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -22,6 +22,56 @@ style="border-top:none;position: absolute;right: 36px;">
+ 企标评价 + + + + + + + + + + + + + + + + + + + 更新记录 @@ -987,6 +1037,19 @@ export default { }, data () { return { + targetScore: '', + businessCommentDialog: false, + businessCommentForm: {}, + revise: '', + businessCommentTable: [{ + commentTarget: '企业标准内容完整、要求合理(指标、流程等。)', + }, { + commentTarget: '企业标准便于实施应用', + }, { + commentTarget: '标准编写规范,内容清晰易理解', + }, { + commentTarget: '标准对我的实际工作很有帮助', + }], activeNames: ['基础信息','过程稿件','实施日期'], activeState: true, visiblePlanCheck: false, @@ -1194,6 +1257,9 @@ export default { watch: { }, methods: { + targetScoreChange(row){ + console.log('1234',row) + }, child1Func(child1){ const list = [] if(child1 && child1.length > 1){ diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index ebfc39406..dd9c0b8d1 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3,7 +3,10 @@
- {{ sarStandardsInfoEO.standSortShow || '' }} {{ + {{ sarStandardsInfoEO.standSortShow || '' }} {{ + sarStandardsInfoEO.standNumber + }} 《{{ sarStandardsInfoEO.standName }}》 + {{ sarStandardsInfoEO.standSortShow || '' }} {{ sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》
@@ -46,7 +49,7 @@
-

+

{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear @@ -106,7 +109,7 @@ - {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }} + {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}

{{ sarStandardsInfoEO.issueTime || '-' @@ -3599,13 +3602,14 @@ export default { } & > div:not(.modular-item-more) { - /*border-bottom: 1px solid #E5E5E5;*/ + //英文名称变粗 + border-bottom: 1px solid #E5E5E5; min-height: 43px; line-height: 43px; .modular-content-p-name { display: inline-block; - width: 220px; + width: 213px; height: 43px; line-height: 43px; font-size: 16px; @@ -3619,10 +3623,10 @@ export default { .modular-content-p-val { display: inline-block; width: calc(~'100% - 225px'); - min-height: 50px; - line-height: 50px; - font-size: 16px; - color: #999999; + //min-height: 50px; + //line-height: 50px; + //font-size: 16px; + //color: #999999; word-break: break-all; //overflow: hidden; //white-space: nowrap; @@ -3636,9 +3640,10 @@ export default { & > .files-title { width: calc(~'100% - 120px'); - min-height: 50px; - line-height: 50px; - font-size: 16px; + //报批稿撑开 + //min-height: 50px; + //line-height: 50px; + //font-size: 16px; color: #409EFF; & > a { @@ -3668,7 +3673,8 @@ export default { .decomposition-btn { position: absolute; - top: 10px; + //报批稿撑开 + //top: 10px; right: 0; padding: 0 10px; height: 30px; diff --git a/src/pages/home/components/EnterCard.vue b/src/pages/home/components/EnterCard.vue index fe2ef511c..4f533f55d 100644 --- a/src/pages/home/components/EnterCard.vue +++ b/src/pages/home/components/EnterCard.vue @@ -3,7 +3,7 @@

- + {{ label }} @@ -67,7 +67,7 @@ diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue index de912b2bc..cfe0c4c93 100644 --- a/src/pages/home2/components/navMenu/index.vue +++ b/src/pages/home2/components/navMenu/index.vue @@ -77,7 +77,7 @@ height: 40px; line-height: 40px; background: #fff; - font-size: 14px; + font-size: 15px; border-radius: 10px; } .menu-wrap { @@ -92,11 +92,11 @@ margin-bottom: 0; } .wx-card { - height: 70px; + height: 50px; width: 33.333333%; } .wx-card1 { - height: 70px; + height: 50px; width: 33.333333%; } .menu-item { diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue index 0fe974c71..b78c54f8b 100644 --- a/src/pages/home2/components/release/index.vue +++ b/src/pages/home2/components/release/index.vue @@ -21,7 +21,7 @@ label="序号" type="index" align="center" - width="50"> + width="55"> .release { + /deep/.el-table th > .cell { + font-size: 15px; + } + /deep/.el-table td > .cell{ + font-size: 13px; + } width: 100%; .time-title { margin: 15px; diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue index f3af3f4f8..e978d8af3 100644 --- a/src/pages/home2/components/searchGroup/index.vue +++ b/src/pages/home2/components/searchGroup/index.vue @@ -22,8 +22,8 @@ placeholder="请输入关键词" clearable > - 一般检索 - 高级检索 + 一般检索 + 高级检索
@@ -106,7 +106,7 @@ export default { width: 18vm; height: 40px; color: #333333; - font-size: 14px; + font-size: 15px; border: 0; border-radius: 3px; background-color: #FFFFFF; diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue index 01d59e84a..1b36284bd 100644 --- a/src/pages/home2/components/solicitopinions/index.vue +++ b/src/pages/home2/components/solicitopinions/index.vue @@ -21,7 +21,7 @@ label="序号" type="index" align="center" - width="50"> + width="55"> .solicitopinions { + /deep/.el-table th > .cell { + font-size: 15px; + } + /deep/.el-table td > .cell{ + font-size: 13px; + } height: 100%; width: 100%; .time-title { diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 965aa38b1..b7faa2136 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -10,7 +10,8 @@
  • - {{ item.prcName }} + {{ item.prcName }} + {{ item.prcName.substring(0,25)+'...' }}
@@ -614,7 +615,7 @@ export default { break //项目清单确认流程 case '10' : - if(row.taskInfo === '确认人确认'){ + if(row.taskInfo === '产品工程经理分发清单'){ this.$router.push({ name: 'xmqdqrStep2', query: { @@ -625,7 +626,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '标准法规部经理审批') { + } else if (row.taskInfo === '确认人确认') { this.$router.push({ name: 'xmqdqrStep3', query: { @@ -636,6 +637,17 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '标准法规部经理审批'){ + this.$router.push({ + name: 'xmqdqrStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break case '14': @@ -1284,9 +1296,10 @@ export default { display: inline-block; margin: 15px; color: #333333; - font-size: 14px; + font-size: 15px; } .more { + font-size: 15px; float: right; color: #4788c0; margin: 15px 15px; diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index ee56d41a2..c56aee185 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -172,7 +172,7 @@ export default { .right_wrapper { display: flex; flex-direction: column; - width: 37vw; + width: 30vw; height: 100%; } .search-condition { diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 5203e4016..308c3e146 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -641,7 +641,20 @@ export default { }, { _this: this }, res => { - console.log('805',res) + // 适用车型转换 + for (let a = 0; a < res.data.records.length; a++) { + if (res.data.records[a].applyType !== null) { + let k = (res.data.records[a].applyType || "").split(","); + for (let i in this.energyKindOptions) { + for (let m = 0; m < k.length; m++) { + if (this.energyKindOptions[i].value === k[m]) { + k[m] = this.energyKindOptions[i].label; + } + res.data.records[a].applyType = k.join(","); + } + } + } + } this.warningTableDatas = res.data.records this.pageConfig.page = res.data.current this.pageConfig.pageSize = res.data.size @@ -650,9 +663,8 @@ export default { this.warningTableLoading = false }, e => { }); - }); - + this.searchBtnClick() } }; diff --git a/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue new file mode 100644 index 000000000..f419a885f --- /dev/null +++ b/src/pages/processCenter/pages/components/ProcessHeaderPhone.vue @@ -0,0 +1,83 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index ecf021766..fca2bdbc0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -325,12 +325,6 @@ submitBTNText="同意" > - 海外标准入库 - + @@ -1055,7 +1055,8 @@