From c819024e241b9f7c54cc3786373ad0d2998f2190 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期五, 05 五月 2023 08:55:46 +0800 Subject: [PATCH] 修改 --- src/views/layout/components/Navbar.vue | 21 ++-- src/views/majorHazardSourceMonitoring/productionEquipment/index.vue | 104 ++++++++++---------- src/views/login/index.vue | 36 ++++-- config/prod.env.js | 16 ++ src/router/index.js | 6 src/views/exam/index.vue | 38 ------- src/styles/sidebar.scss | 2 src/views/login/components/login-form.vue | 35 ++++-- src/assets/bg.jpg | 0 src/assets/bg_login.png | 0 config/dev.env.js | 9 + src/views/layout/Layout.vue | 4 src/views/safetyproduction/checklistself.vue | 4 src/views/layout/components/Institute.vue | 15 +- package.json | 2 src/views/doubleIndex/saftyScreen/components/screen.vue | 2 16 files changed, 145 insertions(+), 149 deletions(-) diff --git a/config/dev.env.js b/config/dev.env.js index d975def..8c00726 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -5,8 +5,9 @@ // BASE_API: '"http://10.142.119.232:8100"', // IMG_API: '"http://10.142.119.232:8100/upload/"', - BASE_API: '"http://222.92.213.22:8006/zhongtai"', - IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"', + BASE_API: '"http://121.239.169.27:8006"', + IMG_API: '"http://121.239.169.27:8006"', + // // BASE_API: '"https://sinanoaq.cn:8100"', // BASE_API: '"http://127.0.0.1:8100"', @@ -25,8 +26,8 @@ // BASE_API: '"http://192.168.0.69:8006"', // IMG_API: '"http://192.168.0.69:8006/upload/"', - BASE_API: '"http://192.168.0.35:8006"', - IMG_API: '"http://192.168.0.35:8006/upload/"', + // BASE_API: '"http://192.168.0.35:8006"', + // IMG_API: '"http://192.168.0.35:8006/upload/"', // BASE_API: '"http://192.168.0.62:8006"', // IMG_API: '"http://192.168.0.62:8006/upload/"', // BASE_API: '"http://222.92.213.22:8006/zhongtai"', diff --git a/config/prod.env.js b/config/prod.env.js index a29d93b..4b82bf3 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -15,8 +15,16 @@ // BASE_API: '"http://220.171.99.118:4101/api"', // IMG_API: '"http://220.171.99.118:4101/api/upload/"', - BASE_API: '"http://222.92.213.22:8006/zhongtai"', - IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"', - NANO_API: '"http://222.92.213.22:8006/nanoweb"', - ZT_API:'"http://123.56.127.115:8011"' + BASE_API: '"http://121.239.169.27:8006"', + IMG_API: '"http://121.239.169.27:8006"', + + // BASE_API: '"http://222.92.213.22:8006/zhongtai"', + // IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"', + // NANO_API: '"http://222.92.213.22:8006/nanoweb"', + // ZT_API:'"http://123.56.127.115:8011"' + + // BASE_API: '"http://124.88.218.31:8081/zhongtai"', + // IMG_API: '"http://124.88.218.31:8081/zhongtai/upload/"', + // NANO_API: '"http://124.88.218.31:8081/nanoweb"', + // ZT_API:'"http://123.56.127.115:8011"' } diff --git a/package.json b/package.json index b71263c..7398748 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "python": "0.0.4", "qrcodejs2": "0.0.2", "ramda": "^0.27.1", - "screenfull": "4.0.0", + "screenfull": "^4.0.0", "showdown": "1.8.6", "sortablejs": "1.7.0", "swiper": "^3.4.2", diff --git a/src/assets/bg.jpg b/src/assets/bg.jpg index e17eaaf..eef7ee9 100644 --- a/src/assets/bg.jpg +++ b/src/assets/bg.jpg Binary files differ diff --git a/src/assets/bg_login.png b/src/assets/bg_login.png index 1f5723b..e2517b6 100644 --- a/src/assets/bg_login.png +++ b/src/assets/bg_login.png Binary files differ diff --git a/src/router/index.js b/src/router/index.js index f96b465..258d228 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -65,12 +65,12 @@ { path: '/', component: Layout, - redirect: "/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/riskSourceManage/index", - // redirect: '/workPlan/workPlan/reserve', + // redirect: "/doublePreventAction/doublePreventAction/riskLevelManage/index/doublePreventAction/riskLevelManage/riskSourceManage/index", + redirect: '/safetyproduction/safetyproduction/checklist', children: [ { path: 'dashboard', - component: () => import('@/views/workPlan/reserve'), + component: () => import('@/views/safetyproduction/checklist'), name: 'Dashboard1', meta: { title: '首页', icon: 'el-icon-dash', noCache: true, affix: true } } diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 1271353..81a58e2 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -16,7 +16,7 @@ position: fixed; //position: absolute; font-size: 0px; - top: 60px; + top: 80px; //top: 0; bottom: 0; left: 0; diff --git a/src/views/doubleIndex/saftyScreen/components/screen.vue b/src/views/doubleIndex/saftyScreen/components/screen.vue index e8a47c6..ec4bd8f 100644 --- a/src/views/doubleIndex/saftyScreen/components/screen.vue +++ b/src/views/doubleIndex/saftyScreen/components/screen.vue @@ -2,7 +2,7 @@ <div class="screen-container"> <div class="header-content"> <div class="logo"> - 众泰煤焦化智能化安全管理技术平台 + 隐患排查体系综合管控系统 </div> <div class="title">安全信息公示</div> <div class="title-right"> diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue index 97da243..5e2c9f9 100644 --- a/src/views/exam/index.vue +++ b/src/views/exam/index.vue @@ -1,25 +1,18 @@ <template> <div class="app-container"> - <el-alert - :title="message" - :type="userType !== 1?'success':'error'"> - </el-alert> - + <iframe src="http://121.239.169.27:6703/"></iframe> </div> - </template> <script> - import {getExamAuth} from '@/api/exam' import {getToken} from "@/utils/auth" import Cookies from 'js-cookie' import request from '@/utils/request' import { mapGetters } from 'vuex' export default { name: "current", - created(){ - this.getExamAuth() + }, computed: { ...mapGetters([ @@ -28,40 +21,15 @@ }, data(){ return { - pass:false, - message: '', - flag:false, + } }, methods:{ - queryHandle(){ - }, - getExamAuth(){ - if (this.userType !== 1) { - window.open(process.env.NANO_API + "/foreground/system/auth/verify.do?tokens=" + getToken()); - this.message ='拥有权限登入' - } - else - { - window.open(process.env.NANO_API + "/background/login/auth/verify.do?tokens=" + getToken()); - this.message = '拥有权限登入'; - } - - } } } </script> <style scoped> - .span-filter-label{ - font-size: 15px; - color: #606266; - margin-right: 4px; - margin-left: 7px; - } - .basic_search{ - margin-bottom: 15px; - } </style> diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index 6024cbf..7f54de9 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -2,7 +2,7 @@ <el-container > <div v-title :data-title="titleName" class="main"/> <div :class="classObj" class="app-wrapper"> - <el-header style="text-align: left; padding: 0"> + <el-header style="text-align: left; padding: 0;height: 80px"> <navbar /> </el-header> <el-container> @@ -45,7 +45,7 @@ return { path: null, WarningInfo: null, - titleName: '众泰煤焦化智能化安全管理技术平台' + titleName: '隐患排查体系综合管控系统' } }, mounted() { diff --git a/src/views/layout/components/Institute.vue b/src/views/layout/components/Institute.vue index 180d356..fe55937 100644 --- a/src/views/layout/components/Institute.vue +++ b/src/views/layout/components/Institute.vue @@ -1,7 +1,7 @@ <template> <div class="app-breadcrumb"> <img :src="avatorPath"> - <h1>众泰煤焦化智能化安全管理技术平台</h1> + <h1>隐患排查体系综合管控系统</h1> </div> <!-- <el-breadcrumb class="app-breadcrumb" separator="/">--> <!-- <transition-group name="breadcrumb">--> @@ -18,7 +18,7 @@ <script> import { mapGetters } from 'vuex' import pathToRegexp from 'path-to-regexp' -const imgUrl = require('@/assets/newzhongtai.jpg') +const imgUrl = require('@/assets/newLogo.png') export default { data() { return { @@ -77,8 +77,8 @@ .app-breadcrumb { display: inline-block; font-size: 14px; - line-height: 60px; - //margin-left: 8px; + line-height: 80px; + padding-left: 40px; vertical-align:middle; .no-redirect { color: #97a8be; @@ -86,8 +86,8 @@ } } .app-breadcrumb img{ - height: 62px; - width: 260px; + width: 48px; + height: auto; border: none; vertical-align: middle; margin-right: 20px; @@ -97,7 +97,8 @@ padding:0; display: inline; vertical-align: middle; - font-size: 20px; + font-size: 28px; color: white; + letter-spacing: 4px; } </style> diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 2343d63..fd58447 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -7,7 +7,7 @@ <template v-if="device!=='mobile'"> <screenfull class="right-menu-item hover-effect" /> </template> - <span v-if="appShow" style="color: white" @click="downApp">APP下载</span> +<!-- <span v-if="appShow" style="color: white" @click="downApp">APP下载</span>--> <!-- <el-popover--> <!-- placement="right"--> <!-- trigger="hover">--> @@ -34,12 +34,12 @@ </el-dropdown> </div> - <el-dialog :visible.sync="appDialogVisible" - :modal-append-to-body="false" :close-on-click-modal="false" - width="320px" - title="APP安卓版浏览器扫码下载"> - <div id="appcode" style="height: 200px;width: 200px"/> - </el-dialog> +<!-- <el-dialog :visible.sync="appDialogVisible"--> +<!-- :modal-append-to-body="false" :close-on-click-modal="false"--> +<!-- width="320px"--> +<!-- title="APP安卓版浏览器扫码下载">--> +<!-- <div id="appcode" style="height: 200px;width: 200px"/>--> +<!-- </el-dialog>--> </div> </template> @@ -176,12 +176,14 @@ </script> <style rel="stylesheet/scss" lang="scss" scoped> .navbar { - height: 60px; + height: 80px; position: fixed; z-index: 1000; width: 100%; background-color: rgba(3,78,162,1);; overflow: hidden; + box-shadow: 0 3px 8px rgba(3,78,162,.6); + .hamburger-container { line-height: 46px; height: 100%; @@ -206,7 +208,7 @@ .right-menu { float: right; height: 100%; - line-height: 50px; + line-height: 80px; &:focus { outline: none; @@ -234,7 +236,6 @@ margin-right: 30px; .avatar-wrapper { - margin-top: 5px; position: relative; .user-avatar { diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue index 3056ab0..fef76b7 100644 --- a/src/views/login/components/login-form.vue +++ b/src/views/login/components/login-form.vue @@ -1,6 +1,6 @@ <template> <div class="login-form"> - <div class="login-form-title"><span>登录</span></div> + <div class="login-form-title">登录</div> <div class="login-form-main"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" :inline="false" class="loginForm" @keydown.enter.native="handleSubmit"> <div class="login-form-main-user"><span>用户名</span></div> @@ -39,17 +39,11 @@ </div> <div class="pwd-change-redirect"><el-link :underline="false" type="primary" @click="()=>{ this.$router.push({path:'/pwdChange'})}">忘记密码</el-link></div> <div class="login-form-button"> - <el-button class="login-form-login-button" :loading="logingLoading" type="primary" @click.native.prevent="handleSubmit"> - <span> - 登录 - </span> - </el-button> + <el-button class="login-form-login-button" :loading="logingLoading" type="primary" @click.native.prevent="handleSubmit">登录</el-button> </div> <div style="padding-top: 20px" class="login-form-button"> - <el-button class="register-btn" @click="handleRegister"> - <span style="color: black">注册</span> - </el-button> + <el-button class="register-btn" @click="handleRegister">注册</el-button> </div> </div> <!-- <el-form ref="loginForm" :model="loginForm" :rules="loginRules" :inline="false" class="loginForm" @keydown.enter.native="handleSubmit">--> @@ -178,7 +172,7 @@ } </script> -<style scoped> +<style scoped lang="scss"> .login-form{ min-height: 100%; width:100%; @@ -187,7 +181,6 @@ margin-left:50px; } .login-form-title{ - width: 60px; height: 130px; font-size: 30px; font-family: PingFangSC-Medium, PingFang SC; @@ -195,7 +188,9 @@ color: #1851DC; line-height: 42px; padding-top: 53px; - margin:0 auto; + letter-spacing: 80px; + text-indent: 80px; + text-align: center; } .login-form-main-user{ height: 20px; @@ -245,13 +240,27 @@ height: 40px; background: #4778FF; border-radius: 4px; + text-align: center; + transition: .3s; + + &:hover{ + border-radius: 20px; + letter-spacing: 4px; + text-indent: 4px; + } } .register-btn{ width: 364px; height: 40px; - color: white; + color: #4778FF; border-radius: 4px; + transition: .3s; + &:hover{ + border-radius: 20px; + letter-spacing: 4px; + text-indent: 4px; + } } .pwd-change-redirect{ position: relative; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 9797916..4473cbd 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,10 +1,10 @@ <template> <div class="login-container"> <div class="title-one"> - <span>拜城县众泰煤焦化有限公司</span> + 欢迎访问 </div> <div class="title-two"> - <span>智能化安全管理技术平台</span> + 隐患排查体系综合管控系统 </div> <div class="login-main"> <div class="login-main-pic"></div> @@ -15,7 +15,7 @@ </div> </div> <div class="bottom-container"> - <span style="text-align: center">Copyright©2022 新疆阿克苏拜城众泰煤焦化有限公司 版权所有</span> + Copyright©2023 苏州国科鸿宇智能科技有限公司 版权所有 </div> <!-- <el-row>--> <!-- <el-col :xs="24" :sm="24" :lg="12">--> @@ -202,40 +202,47 @@ .title-one{ width: 360px; height: 42px; - font-size: 30px; + font-size: 36px; + text-align: center; font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; - color: #FFFFFF; + color: #1851DC; line-height: 42px; text-shadow: 0px 8px 10px rgba(16, 57, 193, 0.3); margin: 0 auto; - margin-top: 120px; + margin-top: 160px; } .title-two{ - width: 473px; + width: 80%; height: 61px; - font-size: 43px; + font-size: 48px; font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; - color: #FFFFFF; + color: #1851DC; + text-align: center; line-height: 61px; + letter-spacing: 10px; + text-indent: 10px; text-shadow: 0px 8px 10px rgba(16, 57, 193, 0.3); margin: 0 auto; - margin-top: 5px; + margin-top: 20px; } .login-main{ display: flex; background: linear-gradient(270deg, #FFFFFF 0%, #FFFFFF 100%); - box-shadow: 0px 20px 40px 0px rgba(34, 0, 255, 0.7); + box-shadow: 0px 20px 40px 0px rgba(1, 140, 255, 0.7); width:1036px; - min-height: 474px; + min-height: 476px; margin:0 auto; margin-top: 60px; + border-radius: 8px; + overflow: hidden; .login-main-pic{ display: inline-block; - height: 474px; + height: 476px; width: 572px; background: url("../../assets/bg.jpg") center no-repeat; + background-size: 100% auto; } .login-main-form{ display: inline-block; @@ -244,13 +251,14 @@ } } .bottom-container{ - width:600px; + width: 600px; height: 42px; font-family: PingFangSC-Semibold, PingFang SC; line-height: 42px; text-shadow: 0px 8px 10px rgba(16, 57, 193, 0.3); margin: 0 auto; margin-top: 150px; + text-align: center; } } diff --git a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue index 8c41171..63e172d 100644 --- a/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue +++ b/src/views/majorHazardSourceMonitoring/productionEquipment/index.vue @@ -2,25 +2,25 @@ <div class="app-container"> <el-form ref="form" :model="form" label-width="80px"> <el-row> - <el-col :span="6"> - <el-form-item label="设备区域"> - <el-select v-model="listQuery.filter.areaId" placeholder="请选择设备区域" clearable style="width: 100%"> - <el-option v-for="item in areaList" :key="item.id" :label="item.value" :value="item.id"></el-option> - </el-select> - </el-form-item> - </el-col> +<!-- <el-col :span="6">--> +<!-- <el-form-item label="设备区域">--> +<!-- <el-select v-model="listQuery.filter.areaId" placeholder="请选择设备区域" clearable style="width: 100%">--> +<!-- <el-option v-for="item in areaList" :key="item.id" :label="item.value" :value="item.id"></el-option>--> +<!-- </el-select>--> +<!-- </el-form-item>--> +<!-- </el-col>--> <el-col :span="5"> - <el-form-item label="设备名称"> - <el-input v-model="listQuery.filter.name" placeholder="请输入设备名称" clearable></el-input> + <el-form-item label="专家姓名"> + <el-input v-model="listQuery.filter.name" placeholder="请输入专家姓名" clearable></el-input> </el-form-item> </el-col> - <el-col :span="5"> - <el-form-item label="设备状态"> - <el-select v-model="listQuery.filter.status" placeholder="请选择设备状态" clearable> - <el-option v-for="item in unitIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option> - </el-select> - </el-form-item> - </el-col> +<!-- <el-col :span="5">--> +<!-- <el-form-item label="设备状态">--> +<!-- <el-select v-model="listQuery.filter.status" placeholder="请选择设备状态" clearable>--> +<!-- <el-option v-for="item in unitIdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>--> +<!-- </el-select>--> +<!-- </el-form-item>--> +<!-- </el-col>--> <el-col :span="6" style="text-align: center"> <el-button type="primary" icon="el-icon-search" @click="find()" class="btns" >搜索</el-button @@ -39,22 +39,22 @@ </el-row> </el-form> <el-table :data="list" border style="width: 100%"> - <el-table-column prop="serialNumber" align="center" label="设备编号"> + <el-table-column prop="serialNumber" align="center" label="编号"> </el-table-column> - <el-table-column prop="name" align="center" label="设备名称"> + <el-table-column prop="name" align="center" label="专家姓名"> </el-table-column> - <el-table-column prop="areaName" align="center" label="设备区域"> + <el-table-column prop="areaName" align="center" label="专业"> + </el-table-column> + <el-table-column prop="volume" label="手机" align="center"> </el-table-column> <el-table-column label="状态" align="center"> <template slot-scope="scope"> - <span v-if="scope.row.status == 0">在用</span> - <span v-if="scope.row.status == 1">停用</span> + <span v-if="scope.row.status == 0">空闲</span> + <span v-if="scope.row.status == 1">忙碌</span> </template> </el-table-column> - <el-table-column prop="volume" label="容积" align="center"> - </el-table-column> - <el-table-column prop="userName" label="负责人" align="center"> - </el-table-column> +<!-- <el-table-column prop="userName" label="负责人" align="center">--> +<!-- </el-table-column>--> <el-table-column align="center" label="操作"> <template slot-scope="scope"> <el-button @@ -95,13 +95,13 @@ <el-form ref="form" :rules="rules" :model="form" label-width="80px"> <el-row> <el-col :span="12"> - <el-form-item label="设备编号" prop="serialNumber"> - <el-input v-model="form.serialNumber" maxlength="50" placeholder="请输入设备编号"></el-input> + <el-form-item label="编号" prop="serialNumber"> + <el-input v-model="form.serialNumber" maxlength="50" placeholder="请输入编号"></el-input> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="设备名称" prop="name"> - <el-input v-model="form.name" maxlength="50" placeholder="请输入设备名称"></el-input> + <el-form-item label="专家姓名" prop="name"> + <el-input v-model="form.name" maxlength="50" placeholder="请输入专家姓名"></el-input> </el-form-item> </el-col> </el-row> @@ -110,7 +110,7 @@ <el-form-item label="状态" prop="status"> <el-select v-model="form.status" - placeholder="请选择设备状态" + placeholder="请选择专家状态" style="width: 100%" > <el-option @@ -124,37 +124,37 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="容积" prop="volume"> + <el-form-item label="手机" prop="volume"> <el-input v-model="form.volume" maxlength="50" - placeholder="请输入容积" + placeholder="请输入手机号" ></el-input> </el-form-item> </el-col> </el-row> <el-row> +<!-- <el-col :span="12">--> +<!-- <el-form-item label="负责人" prop="userId">--> +<!-- <el-select--> +<!-- v-model="form.userId"--> +<!-- placeholder="请选择负责人"--> +<!-- style="width: 100%"--> +<!-- filterable--> +<!-- >--> +<!-- <el-option--> +<!-- v-for="item in personInCharge"--> +<!-- :key="item.id"--> +<!-- :label="item.realname"--> +<!-- :value="item.id"--> +<!-- >--> +<!-- </el-option>--> +<!-- </el-select>--> +<!-- </el-form-item>--> +<!-- </el-col>--> <el-col :span="12"> - <el-form-item label="负责人" prop="userId"> - <el-select - v-model="form.userId" - placeholder="请选择负责人" - style="width: 100%" - filterable - > - <el-option - v-for="item in personInCharge" - :key="item.id" - :label="item.realname" - :value="item.id" - > - </el-option> - </el-select> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="设备区域" prop="areaId"> + <el-form-item label="专业" prop="areaId"> <el-select v-model="form.areaId" - placeholder="请选择设备区域" + placeholder="请选择专业" style="width: 100%" > <el-option diff --git a/src/views/safetyproduction/checklistself.vue b/src/views/safetyproduction/checklistself.vue index fcd0276..5ae3a1b 100644 --- a/src/views/safetyproduction/checklistself.vue +++ b/src/views/safetyproduction/checklistself.vue @@ -3,7 +3,7 @@ <el-form ref="form" :model="listQuery" label-width="80px"> <el-row> <el-col :span="5"> - <el-form-item label="自查任务"> + <el-form-item label="任务名称"> <el-input v-model="listQuery.filter.inspectionName"></el-input> </el-form-item> </el-col> @@ -63,7 +63,7 @@ </el-row> </el-form> <el-table :data="list" border style="width: 100%"> - <el-table-column align="center" prop="inspectionName" label="自查任务"> + <el-table-column align="center" prop="inspectionName" label="任务名称"> </el-table-column> <el-table-column align="center" prop="createTime" label="检查时间"> </el-table-column> -- Gitblit v1.9.2