diff --git a/config/index.js b/config/index.js index 32a0eb5..8589293 100644 --- a/config/index.js +++ b/config/index.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-11-19 10:10:51 * @LastEditors: gtz - * @LastEditTime: 2021-12-14 18:43:02 + * @LastEditTime: 2021-12-15 17:19:13 * @Description: file content * @FilePath: \mt-qj-wms-ui\config\index.js */ @@ -22,7 +22,7 @@ module.exports = { // 代理列表, 是否开启代理通过[./dev.env.js]配置 proxyTable: devEnv.OPEN_PROXY === false ? {} : { '/proxyApi': { - target: 'http://192.168.0.189:8080', + target: 'http://192.168.0.183:8080', changeOrigin: true, pathRewrite: { '^/proxyApi': '/api' diff --git a/src/assets/img/出库.png b/src/assets/img/出库.png new file mode 100644 index 0000000..c470ffb Binary files /dev/null and b/src/assets/img/出库.png differ diff --git a/src/assets/img/进工业炉加工.png b/src/assets/img/进工业炉加工.png new file mode 100644 index 0000000..7a964f8 Binary files /dev/null and b/src/assets/img/进工业炉加工.png differ diff --git a/src/assets/img/追加加工.png b/src/assets/img/追加加工.png new file mode 100644 index 0000000..3235027 Binary files /dev/null and b/src/assets/img/追加加工.png differ diff --git a/src/assets/scss/_base.scss b/src/assets/scss/_base.scss index 6078621..6e3f351 100644 --- a/src/assets/scss/_base.scss +++ b/src/assets/scss/_base.scss @@ -307,7 +307,6 @@ img { ------------------------------ */ .site-content { position: relative; - padding: 15px; &__wrapper { position: relative; @@ -337,7 +336,6 @@ img { } } > .el-tabs__content { - padding: 0 15px 15px; > .site-tabs__tools { position: fixed; top: 50px; @@ -362,3 +360,10 @@ img { vertical-align: middle; margin-right: 5px; } + +.mod-config{ + background-color: #fff; + border-radius: 15px; + padding: 20px; + min-height: calc(100vh - 145px); +} diff --git a/src/icons/svg/icon-侧边收纳.svg b/src/icons/svg/icon-侧边收纳.svg new file mode 100644 index 0000000..338485b --- /dev/null +++ b/src/icons/svg/icon-侧边收纳.svg @@ -0,0 +1,16 @@ + + + + outdent + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-出库.svg b/src/icons/svg/icon-出库.svg new file mode 100644 index 0000000..3acb3b1 --- /dev/null +++ b/src/icons/svg/icon-出库.svg @@ -0,0 +1,24 @@ + + + + 出库on + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-删除.svg b/src/icons/svg/icon-删除.svg new file mode 100644 index 0000000..faf0658 --- /dev/null +++ b/src/icons/svg/icon-删除.svg @@ -0,0 +1,16 @@ + + + + 删除 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-总电流.svg b/src/icons/svg/icon-总电流.svg new file mode 100644 index 0000000..262dbc6 --- /dev/null +++ b/src/icons/svg/icon-总电流.svg @@ -0,0 +1,24 @@ + + + + 编组 13 + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-总电量.svg b/src/icons/svg/icon-总电量.svg new file mode 100644 index 0000000..4fd9dec --- /dev/null +++ b/src/icons/svg/icon-总电量.svg @@ -0,0 +1,23 @@ + + + + 编组 7 + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-成功.svg b/src/icons/svg/icon-成功.svg new file mode 100644 index 0000000..2f011c8 --- /dev/null +++ b/src/icons/svg/icon-成功.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-新建.svg b/src/icons/svg/icon-新建.svg new file mode 100644 index 0000000..dd2d931 --- /dev/null +++ b/src/icons/svg/icon-新建.svg @@ -0,0 +1,13 @@ + + + + Shape + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-日历.svg b/src/icons/svg/icon-日历.svg new file mode 100644 index 0000000..d7c92af --- /dev/null +++ b/src/icons/svg/icon-日历.svg @@ -0,0 +1,13 @@ + + + + 编组 + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-用户名更多.svg b/src/icons/svg/icon-用户名更多.svg new file mode 100644 index 0000000..9d33a24 --- /dev/null +++ b/src/icons/svg/icon-用户名更多.svg @@ -0,0 +1,16 @@ + + + + 箭头 右 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-维护开始.svg b/src/icons/svg/icon-维护开始.svg new file mode 100644 index 0000000..8351e42 --- /dev/null +++ b/src/icons/svg/icon-维护开始.svg @@ -0,0 +1,18 @@ + + + + 编组 33 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-维护结束.svg b/src/icons/svg/icon-维护结束.svg new file mode 100644 index 0000000..e1d7932 --- /dev/null +++ b/src/icons/svg/icon-维护结束.svg @@ -0,0 +1,16 @@ + + + + 编组 32 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-编辑.svg b/src/icons/svg/icon-编辑.svg new file mode 100644 index 0000000..fdc6dc1 --- /dev/null +++ b/src/icons/svg/icon-编辑.svg @@ -0,0 +1,14 @@ + + + + 常用购票人/编辑32 + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-设置.svg b/src/icons/svg/icon-设置.svg new file mode 100644 index 0000000..3b8ffa2 --- /dev/null +++ b/src/icons/svg/icon-设置.svg @@ -0,0 +1,16 @@ + + + + 3.1 设置 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-详情.svg b/src/icons/svg/icon-详情.svg new file mode 100644 index 0000000..38dbd1b --- /dev/null +++ b/src/icons/svg/icon-详情.svg @@ -0,0 +1,14 @@ + + + + 详情备份 + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-进工业炉加工.svg b/src/icons/svg/icon-进工业炉加工.svg new file mode 100644 index 0000000..50d5f2c --- /dev/null +++ b/src/icons/svg/icon-进工业炉加工.svg @@ -0,0 +1,24 @@ + + + + 生产和加工情况 + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-追加加工.svg b/src/icons/svg/icon-追加加工.svg new file mode 100644 index 0000000..63eae85 --- /dev/null +++ b/src/icons/svg/icon-追加加工.svg @@ -0,0 +1,26 @@ + + + + 编组 15 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/basic/alarmInfo.vue b/src/views/basic/alarmInfo.vue index 46aa5ed..f9f3130 100644 --- a/src/views/basic/alarmInfo.vue +++ b/src/views/basic/alarmInfo.vue @@ -1,8 +1,8 @@