main
liuyiliang 1 year ago
parent 205cc37101
commit c08defe451
  1. BIN
      public/favicon (2).png
  2. 2
      src/lang/zh.js
  3. 2
      src/page/index/logo.vue
  4. 2
      src/page/index/sidebar/index.vue
  5. 2
      src/page/login/index.vue
  6. 18
      src/styles/element-ui.scss
  7. 2
      src/views/smart/workorder.vue
  8. 2
      src/views/system/user.vue
  9. 15
      src/views/wel/index.vue

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

@ -1,6 +1,6 @@
export default {
tip: '提示',
title: '新疆甘泉堡源荷储一体化控制系统',
title: '一体化控制系统',
logoutTip: '退出系统, 是否继续?',
submitText: '确定',
cancelText: '取消',

@ -13,7 +13,7 @@
<span class="avue-logo_title"
key="1">
<div>
新疆甘泉堡源荷储一体化控制系统
一体化控制系统
</div>
</span>
</template>

@ -37,7 +37,6 @@ export default {
};
},
created() {
// this.menuData = this.code ? this.menu : this.someMethod('system');
let menuList = window.sessionStorage.getItem('master-menuAll');
let code = 'system';
if (this.code) {
@ -58,7 +57,6 @@ export default {
mounted() {},
methods: {
someMethod(code) {
console.log(code)
let sidebar = document.querySelector('.avue-left');
let mainContent = document.querySelector('.avue-main');
let newWidth = '240px';

@ -6,7 +6,7 @@
<div class="login-border">
<div class="login-main">
<h4 class="login-title">
新疆甘泉堡源荷储<br>一体化控制系统
<br>一体化控制系统
<!-- <top-lang></top-lang>-->
</h4>
<userLogin v-if="activeName==='user'"></userLogin>

@ -70,3 +70,21 @@
//padding: 16px !important;
}
.el-select-dropdown__wrap.el-scrollbar__wrap {
margin-bottom: 0 !important;
}
body .el-table th.gutter {
display: table-cell !important;
}
body .el-table colgroup.gutter {
display: table-cell !important;
}
table {
width: 100% !important;
}
.el-table__header th {
line-height: 49px; /* 设置你想要的行高 */
}

@ -70,7 +70,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="closeDialog" size="small" :loading="loading">取消</el-button>
<!-- <el-button @click="closeDialog" size="small" :loading="loading">取消</el-button>-->
<el-button type="primary" @click="submitForm" size="small" :loading="loading">确定</el-button>
</div>
</el-dialog>

@ -504,7 +504,7 @@
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择账号密码重置为123456?", {
this.$confirm("确定将选择账号密码重置为【8Nn!yjWKpR】?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"

@ -43,7 +43,7 @@
&& !homePageData.equipmentLedgerAudit">
</el-empty>
<div class="el-collapse">
<div v-show="homePageData.equipmentLedgerAudit || homePageData.toolInventoryRecordsAudit">
<div v-show="(homePageData.equipmentLedgerAudit && homePageData.equipmentLedgerAudit.length) || (homePageData.toolInventoryRecordsAudit && homePageData.toolInventoryRecordsAudit.length)">
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核设备台账</span></div>
</div>
@ -54,7 +54,7 @@
<div class="el-collapse-item__header" @click="skip('/leger/toolinventoryrecordDetail', item.id)"><span class="el-collapse-span">{{item.toolsCodeId}}号工器具编码待审核</span></div>
</div>
</div>
<div v-show="homePageData.workOperationTicketAudit || homePageData.workPermitAudit">
<div v-show="(homePageData.workOperationTicketAudit && homePageData.workOperationTicketAudit.length > 0) || (homePageData.workPermitAudit && homePageData.workPermitAudit.length > 0)">
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核智能两票</span></div>
</div>
@ -65,11 +65,16 @@
<div class="el-collapse-item__header" @click="skip('/smart/workpermitDetail', item.id)"><span class="el-collapse-span">{{item.workTicketNo}}号工作票待审核</span></div>
</div>
</div>
<div v-show="homePageData.warehouseAudit || homePageData.manufacturerInfoAudit || homePageData.supplierInfoAudit || homePageData.materialAudit">
<div v-show="(homePageData.warehouseAudit && homePageData.warehouseAudit.length) ||
(homePageData.manufacturerInfoAudit && homePageData.manufacturerInfoAudit.length) ||
(homePageData.supplierInfoAudit && homePageData.supplierInfoAudit.length) ||
(homePageData.materialAudit && homePageData.materialAudit.length) ||
(homePageData.inboundAudit && homePageData.inboundAudit.length) ||
(homePageData.outboundAudit && homePageData.outboundAudit.length)">
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核备件管理</span></div>
</div>
<div class="el-collapse-item" v-for="(item, index) in homePageData.workOrderAudit" :key="index">
<div class="el-collapse-item" v-for="(item, index) in homePageData.warehouseAudit" :key="index">
<div class="el-collapse-item__header" @click="skip('/spares/warehouse', item.id)"><span class="el-collapse-span">{{item.code}}号仓库待审核</span></div>
</div>
<div class="el-collapse-item" v-for="(item, index) in homePageData.materialAudit" :key="index">
@ -88,7 +93,7 @@
<div class="el-collapse-item__header" @click="skip2('/spares/materialDetail', item.materialNo, 'out')"><span class="el-collapse-span">{{item.outboundNo}}号出库待审核</span></div>
</div>
</div>
<div v-show="homePageData.workOrderAudit">
<div v-show="homePageData.workOrderAudit && homePageData.workOrderAudit.length > 0">
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核工单</span></div>
</div>

Loading…
Cancel
Save