diff --git a/jero-web/src/assets/jspg.png b/jero-web/src/assets/jspg.png new file mode 100644 index 000000000..7a0a50b54 Binary files /dev/null and b/jero-web/src/assets/jspg.png differ diff --git a/jero-web/src/assets/new.png b/jero-web/src/assets/new.png new file mode 100644 index 000000000..9a73b4442 Binary files /dev/null and b/jero-web/src/assets/new.png differ diff --git a/jero-web/src/assets/wdcf.png b/jero-web/src/assets/wdcf.png new file mode 100644 index 000000000..e1948c9b9 Binary files /dev/null and b/jero-web/src/assets/wdcf.png differ diff --git a/jero-web/src/assets/wddb.png b/jero-web/src/assets/wddb.png new file mode 100644 index 000000000..5db1b6cba Binary files /dev/null and b/jero-web/src/assets/wddb.png differ diff --git a/jero-web/src/assets/wdfy.png b/jero-web/src/assets/wdfy.png new file mode 100644 index 000000000..2348991fc Binary files /dev/null and b/jero-web/src/assets/wdfy.png differ diff --git a/jero-web/src/assets/wdk.png b/jero-web/src/assets/wdk.png new file mode 100644 index 000000000..9eec0396e Binary files /dev/null and b/jero-web/src/assets/wdk.png differ diff --git a/jero-web/src/assets/wdsb.png b/jero-web/src/assets/wdsb.png new file mode 100644 index 000000000..5948fd0bd Binary files /dev/null and b/jero-web/src/assets/wdsb.png differ diff --git a/jero-web/src/assets/wdsc.png b/jero-web/src/assets/wdsc.png new file mode 100644 index 000000000..8cb017b4c Binary files /dev/null and b/jero-web/src/assets/wdsc.png differ diff --git a/jero-web/src/assets/xmk.png b/jero-web/src/assets/xmk.png new file mode 100644 index 000000000..3136ddf3a Binary files /dev/null and b/jero-web/src/assets/xmk.png differ diff --git a/jero-web/src/assets/xxsj.png b/jero-web/src/assets/xxsj.png new file mode 100644 index 000000000..0d49e11db Binary files /dev/null and b/jero-web/src/assets/xxsj.png differ diff --git a/jero-web/src/assets/yjcj.png b/jero-web/src/assets/yjcj.png new file mode 100644 index 000000000..2a0af2b81 Binary files /dev/null and b/jero-web/src/assets/yjcj.png differ diff --git a/jero-web/src/assets/zdy.png b/jero-web/src/assets/zdy.png new file mode 100644 index 000000000..bf539cfc4 Binary files /dev/null and b/jero-web/src/assets/zdy.png differ diff --git a/jero-web/src/assets/zswdk.png b/jero-web/src/assets/zswdk.png new file mode 100644 index 000000000..43be627ea Binary files /dev/null and b/jero-web/src/assets/zswdk.png differ diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 872875005..7ef69b789 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -880,4 +880,6 @@ module.exports = { testReportLocation:'Test report location', explain:'Explain', dataCannotEmpty:'Data Cannot Empty', + documentDynamics:'Document Dynamics', + theNumberAgain:'The number already exists and cannot be added again', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 3d500fa5d..d5ac502f9 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -884,5 +884,7 @@ module.exports = { testScheme:'试验方案', testReportLocation:'检测报告位置', explain:'说明', - dataCannotEmpty:'数据不能为空' + dataCannotEmpty:'数据不能为空', + documentDynamics:'文档动态', + theNumberAgain:'编号已存在不能重复添加', } \ No newline at end of file diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index d98cf9eb0..f4e9cddcd 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -328,6 +328,8 @@ this.confirmLoading = false if (res.message.indexOf('发布日期不能大于') >= 0) { this.$message.warning(res.message) + } else if (res.message.indexOf('编号已存在') >= 0) { + this.$message.warning(this.$t('theNumberAgain')) } else { this.$message.warning(this.$t('operationFailed')) } @@ -506,6 +508,7 @@ .itemModel-text .ant-form-item-control-wrapper { width: 100% !important; } + .box-input .ant-select-selection--single { height: 38px; } diff --git a/jero-web/src/views/dashboard/components/customContent.vue b/jero-web/src/views/dashboard/components/customContent.vue new file mode 100644 index 000000000..170c1698e --- /dev/null +++ b/jero-web/src/views/dashboard/components/customContent.vue @@ -0,0 +1,51 @@ + + + + + 我的收藏 + + + + 我的收藏 + + + + 我的收藏 + + + + 自定义 + + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/dashboard/components/documentDynamics.vue b/jero-web/src/views/dashboard/components/documentDynamics.vue new file mode 100644 index 000000000..10ca546ad --- /dev/null +++ b/jero-web/src/views/dashboard/components/documentDynamics.vue @@ -0,0 +1,85 @@ + + + + {{this.$t('documentDynamics')}} + {{$t('more')}} + + + + + 文档库中新增了新的标准 GB 7258 机动车文件 + + + + + + + + + \ No newline at end of file