diff --git a/.env.development b/.env.development index 4f914a5e..7f80cbb6 100644 --- a/.env.development +++ b/.env.development @@ -5,9 +5,10 @@ NODE_ENV = development VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # 接口地址 +VUE_APP_API_BASEURL = http://10.99.5.79:20309/api #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api #VUE_APP_WS_API = 'ws://localhost:8000' -VUE_APP_API_BASEURL = http://127.0.0.1:8000/api +#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api #VUE_APP_BASEURL = http://127.0.0.1:8000 # 本地端口 diff --git a/.env.production b/.env.production index e94de36f..5eb2b864 100644 --- a/.env.production +++ b/.env.production @@ -6,4 +6,5 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # 接口地址 VUE_APP_API_BASEURL = http://10.99.5.79:20309/api +#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api VUE_APP_BASEURL = http://10.99.5.79:20309 diff --git a/README.md b/README.md index d5e80f34..1d4c5d23 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
-![logo](https://lolicode.gitee.io/scui-doc/logo.png) +![logo](https://lolicode.gitee.io/scui-doc/bbmg.jpg)

@@ -69,7 +69,7 @@ npm run serve ## 鸣谢 - + ## 支持 如果觉得本项目还不错或在工作中有所启发，请在Gitee(码云)帮开发者点亮星星，这是对开发者最大的支持和鼓励！ diff --git a/public/favicon.ico b/public/favicon.ico index 23156d86..4f3d75ee 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/img/bbmg.jpg b/public/img/bbmg.jpg new file mode 100644 index 00000000..f9306f7e Binary files /dev/null and b/public/img/bbmg.jpg differ diff --git a/public/img/bbmg1.png b/public/img/bbmg1.png new file mode 100644 index 00000000..5f9ea144 Binary files /dev/null and b/public/img/bbmg1.png differ diff --git a/public/img/favicon.ico b/public/img/favicon.ico new file mode 100644 index 00000000..4f3d75ee Binary files /dev/null and b/public/img/favicon.ico differ diff --git a/public/index.html b/public/index.html index 91d97d3a..359ab03c 100644 --- a/public/index.html +++ b/public/index.html @@ -26,7 +26,7 @@

<%= VUE_APP_TITLE %>
diff --git a/src/api/model/rpm.js b/src/api/model/rpm.js index 15b46174..3b94f578 100644 --- a/src/api/model/rpm.js +++ b/src/api/model/rpm.js @@ -122,7 +122,7 @@ export default { }, - /*相关方入场项目 */ + /*相关方入厂项目 */ rpj: { list: { name: "获取", @@ -206,7 +206,7 @@ export default { } } }, - /*相关方入场项目文件 */ + /*相关方入厂项目文件 */ rpjfile: { list: { name: "获取", @@ -240,7 +240,7 @@ export default { } } }, - /*相关方入场人员 */ + /*相关方入厂人员 */ member: { list: { name: "获取", diff --git a/src/layout/index.vue b/src/layout/index.vue index 616c3411..4f44dcdf 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -4,7 +4,7 @@
- + {{ $CONFIG.APP_NAME }}
    @@ -55,7 +55,7 @@
    - + {{ $CONFIG.APP_NAME }}
    @@ -97,7 +97,7 @@
    - + {{ $CONFIG.APP_NAME }}
    diff --git a/src/style/app.scss b/src/style/app.scss index 8e50a78a..6272c690 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -28,7 +28,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-header-left {display: flex;align-items: center;padding-left:20px;} .adminui-header-right {display: flex;align-items: center;} .adminui-header .logo-bar {font-size: 20px;font-weight: bold;display: flex;align-items: center;} -.adminui-header .logo-bar .logo {margin-right: 10px;width: 35px;height: 35px;} +.adminui-header .logo-bar .logo {margin-right: 10px;height: 45px;} .adminui-header .nav {display: flex;height: 100%;margin-left: 40px;} .adminui-header .nav li {padding:0 10px;margin: 0 10px 0 0;font-size: 14px;color: rgba(255, 255, 255, 0.6);list-style: none;height: 100%;display: flex;align-items: center;cursor: pointer;} .adminui-header .nav li i {margin-right: 5px;} diff --git a/src/views/am/area_form.vue b/src/views/am/area_form.vue index 85157217..13992c2d 100644 --- a/src/views/am/area_form.vue +++ b/src/views/am/area_form.vue @@ -50,7 +50,7 @@ diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue index 679ee96d..f2c8eaf7 100644 --- a/src/views/home/widgets/components/ticket.vue +++ b/src/views/home/widgets/components/ticket.vue @@ -159,7 +159,7 @@ export default { this.operationnumber = res.count; }); }, - //相关方入场项目 + //相关方入厂项目 getRpj() { this.$API.rpm.rpj.list .req({ page: 1, page_size: 1, state: 40 }) diff --git a/src/views/login/components/commonPage.vue b/src/views/login/components/commonPage.vue index ccac3d02..5d789186 100644 --- a/src/views/login/components/commonPage.vue +++ b/src/views/login/components/commonPage.vue @@ -3,7 +3,7 @@
    {{title}}
    diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 1338db05..02e66442 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -2,7 +2,7 @@