zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logoChange

This commit is contained in:
shijing 2022-08-23 15:59:00 +07:00
parent 55f821cc03
commit 334625e90b
18 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -5,9 +5,10 @@ NODE_ENV = development
VUE_APP_TITLE = '曲阳金隅安全智能管控平台' 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_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000' #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 #VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口 # 本地端口

1
.env.production
View File

@ -6,4 +6,5 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
# 接口地址 # 接口地址
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api 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 VUE_APP_BASEURL = http://10.99.5.79:20309

4
README.md
View File

@ -1,7 +1,7 @@
<div align="center"> <div align="center">
![logo](https://lolicode.gitee.io/scui-doc/logo.png) ![logo](https://lolicode.gitee.io/scui-doc/bbmg.jpg)
<p align="center"> <p align="center">
<a href="https://v3.vuejs.org/" target="_blank"> <a href="https://v3.vuejs.org/" target="_blank">
@ -69,7 +69,7 @@ npm run serve
## 鸣谢 ## 鸣谢
<img src="https://www.fastmock.site/resource/images/logo.png" style="height:40px"/> <img src="https://www.fastmock.site/resource/images/bbmg.jpg" style="height:40px"/>
## 支持 ## 支持
如果觉得本项目还不错或在工作中有所启发，请在Gitee(码云)帮开发者点亮星星，这是对开发者最大的支持和鼓励！ 如果觉得本项目还不错或在工作中有所启发，请在Gitee(码云)帮开发者点亮星星，这是对开发者最大的支持和鼓励！

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
public/img/bbmg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
public/img/bbmg1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 56 KiB

BIN
public/img/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

2
public/index.html
View File

@ -26,7 +26,7 @@
<div id="app" class="aminui"> <div id="app" class="aminui">
<div class="app-loading"> <div class="app-loading">
<div class="app-loading__logo"> <div class="app-loading__logo">
<img src="img/logo.png"/> <img src="img/bbmg.jpg"/>
</div> </div>
<div class="app-loading__loader"></div> <div class="app-loading__loader"></div>
<div class="app-loading__title"><%= VUE_APP_TITLE %></div> <div class="app-loading__title"><%= VUE_APP_TITLE %></div>

6
src/api/model/rpm.js
View File

@ -122,7 +122,7 @@ export default {
}, },
/*相关方入场项目 */ /*相关方入厂项目 */
rpj: { rpj: {
list: { list: {
name: "获取", name: "获取",
@ -206,7 +206,7 @@ export default {
} }
} }
}, },
/*相关方入场项目文件 */ /*相关方入厂项目文件 */
rpjfile: { rpjfile: {
list: { list: {
name: "获取", name: "获取",
@ -240,7 +240,7 @@ export default {
} }
} }
}, },
/*相关方入场人员 */ /*相关方入厂人员 */
member: { member: {
list: { list: {
name: "获取", name: "获取",

6
src/layout/index.vue
View File

@ -4,7 +4,7 @@
<header class="adminui-header"> <header class="adminui-header">
<div class="adminui-header-left"> <div class="adminui-header-left">
<div class="logo-bar"> <div class="logo-bar">
<img class="logo" src="img/logo.png"> <img class="logo" src="img/bbmg1.png">
<span>{{ $CONFIG.APP_NAME }}</span> <span>{{ $CONFIG.APP_NAME }}</span>
</div> </div>
<ul v-if="!ismobile" class="nav"> <ul v-if="!ismobile" class="nav">
@ -55,7 +55,7 @@
<header class="adminui-header"> <header class="adminui-header">
<div class="adminui-header-left"> <div class="adminui-header-left">
<div class="logo-bar"> <div class="logo-bar">
<img class="logo" src="img/logo.png"> <img class="logo" src="img/bbmg.jpg">
<span>{{ $CONFIG.APP_NAME }}</span> <span>{{ $CONFIG.APP_NAME }}</span>
</div> </div>
</div> </div>
@ -97,7 +97,7 @@
<header class="adminui-header"> <header class="adminui-header">
<div class="adminui-header-left"> <div class="adminui-header-left">
<div class="logo-bar"> <div class="logo-bar">
<img class="logo" src="img/logo.png"> <img class="logo" src="img/bbmg.jpg">
<span>{{ $CONFIG.APP_NAME }}</span> <span>{{ $CONFIG.APP_NAME }}</span>
</div> </div>
</div> </div>

2
src/style/app.scss
View File

@ -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-left {display: flex;align-items: center;padding-left:20px;}
.adminui-header-right {display: flex;align-items: center;} .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 {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 {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 {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;} .adminui-header .nav li i {margin-right: 5px;}

2
src/views/am/area_form.vue
View File

@ -50,7 +50,7 @@
<el-form-item label="区域编号"> <el-form-item label="区域编号">
<el-input <el-input
v-model="form.number" v-model="form.number"
placeholder="请输入手机号" placeholder="请输入区域编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>

2
src/views/home/widgets/components/ticket.vue
View File

@ -159,7 +159,7 @@ export default {
this.operationnumber = res.count; this.operationnumber = res.count;
}); });
}, },
//相关方入场项目 //相关方入厂项目
getRpj() { getRpj() {
this.$API.rpm.rpj.list this.$API.rpm.rpj.list
.req({ page: 1, page_size: 1, state: 40 }) .req({ page: 1, page_size: 1, state: 40 })

2
src/views/login/components/commonPage.vue
View File

@ -3,7 +3,7 @@
<el-header style="height:50px;"> <el-header style="height:50px;">
<div class="common-header-left"> <div class="common-header-left">
<div class="common-header-logo"> <div class="common-header-logo">
<img :alt="$CONFIG.APP_NAME" src="img/logo.png"> <img :alt="$CONFIG.APP_NAME" src="img/bbmg.jpg">
<label>{{$CONFIG.APP_NAME}}</label> <label>{{$CONFIG.APP_NAME}}</label>
</div> </div>
<div class="common-header-title">{{title}}</div> <div class="common-header-title">{{title}}</div>

10
src/views/login/index.vue
View File

@ -2,7 +2,7 @@
<div class="login_bg"> <div class="login_bg">
<div class="login_adv" style="background-image: url(img/auth_banner.jpg);"> <div class="login_adv" style="background-image: url(img/auth_banner.jpg);">
<div class="login_adv__title"> <div class="login_adv__title">
<h2>曲阳金隅安全智能管控平台</h2> <h2>曲阳金隅智能安全管控平台</h2>
</div> </div>
<div class="login_adv__mask"></div> <div class="login_adv__mask"></div>
@ -18,7 +18,7 @@
<div class="login-form"> <div class="login-form">
<div class="login-header"> <div class="login-header">
<div class="logo"> <div class="logo">
<img :alt="$CONFIG.APP_NAME" src="img/logo.png"> <img :alt="$CONFIG.APP_NAME" src="img/bbmg.jpg">
<label>{{$CONFIG.APP_NAME}}</label> <label>{{$CONFIG.APP_NAME}}</label>
</div> </div>
</div> </div>
@ -155,10 +155,10 @@
.login_adv__mask {position: absolute;top:0px;left:0px;right: 0px;bottom: 0px;background: rgba(0,0,0,0.5);z-index: 1;} .login_adv__mask {position: absolute;top:0px;left:0px;right: 0px;bottom: 0px;background: rgba(0,0,0,0.5);z-index: 1;}
.login_main {flex: 1;overflow: auto;display:flex;} .login_main {flex: 1;overflow: auto;display:flex;}
.login-form {width: 400px;margin: auto;padding:20px 0;} .login-form {width: 410px;margin: auto;padding:20px 0;}
.login-header {margin-bottom: 40px;} .login-header {margin-bottom: 40px; width: 460px;margin-left: -30px;}
.login-header .logo {display: flex;align-items: center;} .login-header .logo {display: flex;align-items: center;}
.login-header .logo img {width: 40px;height: 40px;vertical-align: bottom;margin-right: 10px;} .login-header .logo img {width: 120px;height: 90px;vertical-align: bottom;margin-right: 10px;}
.login-header .logo label {font-size: 26px;font-weight: bold;} .login-header .logo label {font-size: 26px;font-weight: bold;}
.login-oauth {display: flex;justify-content:space-around;} .login-oauth {display: flex;justify-content:space-around;}
.login-form .el-divider {margin-top:40px;} .login-form .el-divider {margin-top:40px;}

6
src/views/rpm/rpj.vue
View File

@ -46,12 +46,12 @@
width="180" width="180"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="进场时间" label="进厂时间"
prop="come_time" prop="come_time"
width="180" width="180"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="离场时间" label="离厂时间"
prop="leave_time" prop="leave_time"
width="180" width="180"
></el-table-column> ></el-table-column>
@ -237,7 +237,7 @@
this.$router.push({ this.$router.push({
name: "rpjadd", name: "rpjadd",
query: { query: {
rpjid: row.id, //入场项目id rpjid: row.id, //入厂项目id
}, },
}); });
}, },

8
src/views/rpm/rpj_form.vue
View File

@ -48,20 +48,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="进场时间"> <el-form-item label="进厂时间">
<el-date-picker <el-date-picker
v-model="form.come_time" v-model="form.come_time"
type="datetime" type="datetime"
placeholder="选择进场时间" placeholder="选择进厂时间"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="离场时间"> <el-form-item label="离厂时间">
<el-date-picker <el-date-picker
v-model="form.leave_time" v-model="form.leave_time"
type="datetime" type="datetime"
placeholder="选择离场时间" placeholder="选择离厂时间"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>

6
src/views/rpm/rpjadd.vue
View File

@ -53,7 +53,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="进场时间"> <el-form-item label="进厂时间">
<el-date-picker <el-date-picker
v-model="rpjform.come_time" v-model="rpjform.come_time"
type="datetime" type="datetime"
@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="离场时间"> <el-form-item label="离厂时间">
<el-date-picker <el-date-picker
v-model="rpjform.leave_time" v-model="rpjform.leave_time"
type="datetime" type="datetime"
@ -434,7 +434,7 @@
this.getRpartyOptions(); this.getRpartyOptions();
} }
}, },
//入场项目基本信息 //入厂项目基本信息
getRpj() { getRpj() {
console.log(this.$route.query.rpjid); console.log(this.$route.query.rpjid);
this.$API.rpm.rpj.read.req(this.rpjId).then((res) => { this.$API.rpm.rpj.read.req(this.rpjId).then((res) => {