diff --git a/public/favicon.ico b/public/favicon.ico index e263760..ae3ab89 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/images/修改@2x.png b/src/assets/images/change.png similarity index 100% rename from src/assets/images/修改@2x.png rename to src/assets/images/change.png diff --git a/src/assets/images/关闭@2x.png b/src/assets/images/close.png similarity index 100% rename from src/assets/images/关闭@2x.png rename to src/assets/images/close.png diff --git a/src/assets/images/删除@2x.png b/src/assets/images/delete.png similarity index 100% rename from src/assets/images/删除@2x.png rename to src/assets/images/delete.png diff --git a/src/assets/images/下啦@2x.png b/src/assets/images/down.png similarity index 100% rename from src/assets/images/下啦@2x.png rename to src/assets/images/down.png diff --git a/src/assets/images/下啦@2x(1).png b/src/assets/images/down2.png similarity index 100% rename from src/assets/images/下啦@2x(1).png rename to src/assets/images/down2.png diff --git a/src/assets/images/导出@2x.png b/src/assets/images/export.png similarity index 100% rename from src/assets/images/导出@2x.png rename to src/assets/images/export.png diff --git a/src/assets/images/元素1@2x.png b/src/assets/images/issue2.png similarity index 100% rename from src/assets/images/元素1@2x.png rename to src/assets/images/issue2.png diff --git a/src/assets/images/logo@2x.png b/src/assets/images/logo.png similarity index 100% rename from src/assets/images/logo@2x.png rename to src/assets/images/logo.png diff --git a/src/assets/images/查看 @2x.png b/src/assets/images/look.png similarity index 100% rename from src/assets/images/查看 @2x.png rename to src/assets/images/look.png diff --git a/src/assets/images/lookInfo.png b/src/assets/images/lookInfo.png new file mode 100644 index 0000000..209bc11 Binary files /dev/null and b/src/assets/images/lookInfo.png differ diff --git a/src/assets/images/新增@2x.png b/src/assets/images/newProject.png similarity index 100% rename from src/assets/images/新增@2x.png rename to src/assets/images/newProject.png diff --git a/src/assets/images/元素1-选中@2x.png b/src/assets/images/select1.png similarity index 100% rename from src/assets/images/元素1-选中@2x.png rename to src/assets/images/select1.png diff --git a/src/assets/styles/fonts.scss b/src/assets/styles/fonts.scss new file mode 100644 index 0000000..7379939 --- /dev/null +++ b/src/assets/styles/fonts.scss @@ -0,0 +1,4 @@ +@font-face { + font-family: 'Alibaba PuHuiTi'; + src: url('./fonts/Alibaba-PuHuiTi-Regular.ttf'); +} \ No newline at end of file diff --git a/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.ttf b/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.ttf new file mode 100644 index 0000000..4261e49 Binary files /dev/null and b/src/assets/styles/fonts/Alibaba-PuHuiTi-Regular.ttf differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index e1bf2c1..b340ee4 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -5,6 +5,7 @@ @import "./sidebar.scss"; @import "./btn.scss"; @import "./diythem.scss"; +@import "./fonts.scss"; body { height: 100%; diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index b4f5fbd..27c4c04 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -101,30 +101,30 @@ h6 { padding: 10px 20px 0; } -.el-table { - // min-height: 480px !important; - // overflow-y: auto; - - .el-table__header-wrapper, - .el-table__fixed-header-wrapper { - th { - word-break: break-word; - background-color: #f8f8f9; - color: #515a6e; - height: 40px; - font-size: 13px; - } - } - - .el-table__body-wrapper { - height: 430px !important; - overflow-y: auto; - - .el-button [class*="el-icon-"]+span { - margin-left: 1px; - } - } -} +// .el-table { +// // min-height: 480px !important; +// // overflow-y: auto; + +// .el-table__header-wrapper, +// .el-table__fixed-header-wrapper { +// th { +// word-break: break-word; +// background-color: #f8f8f9; +// color: #515a6e; +// height: 40px; +// font-size: 13px; +// } +// } + +// .el-table__body-wrapper { +// height: 430px !important; +// overflow-y: auto; + +// .el-button [class*="el-icon-"]+span { +// margin-left: 1px; +// } +// } +// } /** 表单布局 **/ .form-header { diff --git a/src/settings.js b/src/settings.js index 86707b3..570dc74 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,11 +1,3 @@ -/* - * @Descripttion: - * @version: - * @Author: JC9527 - * @Date: 2023-09-04 10:20:06 - * @LastEditors: JC9527 - * @LastEditTime: 2023-09-04 10:30:46 - */ module.exports = { /** * 侧边栏主题 深色主题theme-dark,浅色主题theme-light diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue new file mode 100644 index 0000000..fc9c966 --- /dev/null +++ b/src/views/components/dialog/index.vue @@ -0,0 +1,575 @@ + + + diff --git a/src/views/components/myPagination/index.vue b/src/views/components/myPagination/index.vue new file mode 100644 index 0000000..a8cba02 --- /dev/null +++ b/src/views/components/myPagination/index.vue @@ -0,0 +1,108 @@ + + + + diff --git a/src/views/mudu/article/index.vue b/src/views/mudu/article/index.vue index 3baac17..6a617b3 100644 --- a/src/views/mudu/article/index.vue +++ b/src/views/mudu/article/index.vue @@ -1,730 +1,372 @@ + diff --git a/src/views/mudu/hcheck/index.vue b/src/views/mudu/hcheck/index.vue deleted file mode 100644 index 851a44e..0000000 --- a/src/views/mudu/hcheck/index.vue +++ /dev/null @@ -1,601 +0,0 @@ - - - diff --git a/src/views/mudu/newFire/index.vue b/src/views/mudu/newFire/index.vue index 3eaabeb..4c1a290 100644 --- a/src/views/mudu/newFire/index.vue +++ b/src/views/mudu/newFire/index.vue @@ -1,116 +1,374 @@ diff --git a/src/views/mudu/profile/index.vue b/src/views/mudu/profile/index.vue index 65ec532..93c64de 100644 --- a/src/views/mudu/profile/index.vue +++ b/src/views/mudu/profile/index.vue @@ -1,1161 +1,385 @@ + - diff --git a/src/views/mudu/trouble/index.vue b/src/views/mudu/trouble/index.vue deleted file mode 100644 index d103756..0000000 --- a/src/views/mudu/trouble/index.vue +++ /dev/null @@ -1,578 +0,0 @@ - - - diff --git a/vue.config.js b/vue.config.js index 10a79ec..e099e71 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require("compression-webpack-plugin"); -const name = process.env.VUE_APP_TITLE || "木渎二期管理系统"; // 网页标题 +const name = process.env.VUE_APP_TITLE || "苏州应急执法计划管理系统"; // 网页标题 const port = process.env.port || process.env.npm_config_port || 80; // 端口