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

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
zty 2024-12-13 15:29:56 +08:00
parent c336a6ef1e 064860ed92
commit 5606d90eca
12 changed files with 109 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config/index.js
View File

@ -53,7 +53,8 @@ const DEFAULT_CONFIG = {
LANG: 'zh-cn',
//主题颜色
COLOR: '#536DFE',
// COLOR: '#536DFE',//gx、gz、tkx
COLOR: '#0052d9',//bx
//是否加密localStorage, 为空不加密，可填写AES(模式ECB,移位Pkcs7)加密
LS_ENCRYPTION: '',

24
src/style/media.scss
View File

@ -8,13 +8,17 @@
.el-form-item__content {margin-left: 0px!important;}
.adminui-main {
>.el-container {display: block;height:auto;}
>.el-container > .el-aside {width: 100%!important;border: 0}
// >.el-container {display: block;height:auto;}
// >.el-container > .el-aside {width: 100%!important;border: 0}
>.el-container {display: flex;}
>.el-container > .el-aside {width: 150px!important;border: 0}
}
.scTable {
.el-table,
.el-table__body-wrapper {display: block!important;height:auto!important;}
.el-scrollbar__wrap {height:auto!important;}
// .el-table__body-wrapper {display: block!important;height:auto!important;}
.el-table__body-wrapper {display: block!important;height:100%!important;}
// .el-scrollbar__wrap {height:auto!important;}
.el-scrollbar__wrap {height:100%!important;}
.scTable-page {padding: 0 5px!important;}
.el-pagination__total,
.el-pagination__jump,
@ -22,10 +26,12 @@
}
.headerPublic {
height: auto!important;display: block;
// height: auto!important;display: block;
height: auto!important;
.left-panel {overflow: auto;}
.left-panel::-webkit-scrollbar{display: none;}
.right-panel {display: block;border-top: 1px solid var(--el-border-color-light);margin-top: 15px;}
// .right-panel {display: block;border-top: 1px solid var(--el-border-color-light);margin-top: 15px;}
.right-panel {border-top: 1px solid var(--el-border-color-light);display: flex;}
.right-panel .right-panel-search {display: block;}
.right-panel .right-panel-search >* {width: 100%;margin: 0;margin-top: 15px;}
}
@ -34,13 +40,13 @@
.adminui-main > .el-container > .el-aside {border-bottom: 1px solid var(--el-border-color-light)!important;}
.adminui-main > .el-container > .el-container {border-top: 1px solid var(--el-border-color-light);border-bottom: 1px solid var(--el-border-color-light);margin-top: 15px;}
.adminui-main > .el-container > .el-container + .el-aside {border-top: 1px solid var(--el-border-color-light);margin-top: 15px;}
.adminui-main > .el-container > .el-header {@extend .headerPublic;}
.adminui-main > .el-container > .el-main.nopadding {border-top: 1px solid var(--el-border-color-light);border-bottom: 1px solid var(--el-border-color-light);margin-top: 15px;}
.adminui-main > .el-container > .el-header {@extend .headerPublic;display: flex;padding: 6px;}
.adminui-main > .el-container > .el-main.nopadding {border-top: 1px solid var(--el-border-color-light);border-bottom: 1px solid var(--el-border-color-light);margin-top: 5px;}
.adminui-main > .el-container > .el-main + .el-aside {border-left: 0!important;border-top: 1px solid var(--el-border-color-light);margin-top: 15px;}
.adminui-main > .el-container > .el-footer {margin-top: 15px;border-bottom: 1px solid var(--el-border-color-light);}
.adminui-main > .el-container > .el-container > .el-header {@extend .headerPublic}
.adminui-main > .el-container > .el-container > .el-header .left-panel {display: block;}
.adminui-main > .el-container > .el-container > .el-header .right-panel {display: block;margin-top: 15px;}
.adminui-main > .el-container > .el-container > .el-header .right-panel {margin-top: 15px;}
.sc-page {width: 100%;margin: 0;}

4
src/views/hrm/employee.vue
View File

@ -56,8 +56,7 @@
/>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input
<el-input
v-model="query.search"
placeholder="姓名/手机号"
clearable
@ -74,7 +73,6 @@
icon="el-icon-download"
@click="exportExcel"
>导出</el-button>
</div>
</div>
</el-header>
<el-main class="nopadding">

4
src/views/mtm/process.vue
View File

@ -149,8 +149,8 @@ export default {
60: "辅助工装",
},
types:{
'PRO_PROD':'生产工序',
'PRO_TEST':'检验工序',
10:'生产工序',
20:'检验工序',
},
baseCode :this.$TOOL.data.get('BASE_INFO').base.base_code
};

4
src/views/mtm/process_form.vue
View File

@ -130,8 +130,8 @@ export default {
],
},
processOptions:[
{name:'生产工序',value:'PRO_PROD'},
{name:'检验工序',value:'PRO_TEST'},
{name:'生产工序',value:10},
{name:'检验工序',value:20},
],
visible: false,
isSaveing: false,

24
src/views/mtm/routepack.vue
View File

@ -21,19 +21,17 @@
</el-select>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input
v-model="query.search"
placeholder="名称"
clearable
@keyup.enter="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
<el-input
v-model="query.search"
placeholder="名称"
clearable
@keyup.enter="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
</el-header>
<el-main class="nopadding">

84
src/views/ops/menu.vue
View File

@ -5,45 +5,47 @@
<el-button type="primary" icon="el-icon-plus" @click="addMenu"></el-button>
</div>
<div class="right-panel">
<el-input
v-model="query.search"
placeholder="名称/权限标识"
clearable
@keyup.enter="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-input v-model="query.search" placeholder="名称/权限标识" clearable @keyup.enter="handleQuery"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :isTree="true" :apiObj="apiObj" :params="params" :query="query" row-key="id"
@selection-change="selectionChange" hidePagination @dataChange="updateOptions">
<!-- <el-table-column type="selection" width="50"></el-table-column> -->
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="菜单名称" prop="name" min-width="200"></el-table-column>
<el-table-column label="类型" prop="type" min-width="200">
<el-table-column label="功能名" prop="name" width="200"></el-table-column>
<el-table-column label="类型" prop="type" width="80">
<template #default="scope">
<span>{{ types[scope.row.type] }}</span>
</template>
</el-table-column>
<el-table-column label="标识" prop="codes" min-width="200" :show-overflow-tooltip="true">
<el-table-column label="路由名" prop="route_name" width="100"></el-table-column>
<el-table-column label="图标" prop="icon" width="80"></el-table-column>
<el-table-column label="组件" prop="component" width="150" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="是否隐藏" width="80">
<template #default="scope">
<span v-show="scope.row.is_hidden">是</span>
</template>
</el-table-column>
<el-table-column label="是否全屏" width="80">
<template #default="scope">
<span v-show="scope.row.is_fullpage">是</span>
</template>
</el-table-column>
<el-table-column label="权限标识" prop="codes" min-width="100" :show-overflow-tooltip="true">
<template #default="scope">
<el-tag v-for="i in scope.row.codes" v-bind:key="i">{{ i }}</el-tag>
</template>
</el-table-column>
<el-table-column label="排序" prop="sort" min-width="200"></el-table-column>
<el-table-column label="排序" prop="sort" width="80"></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template #default="scope">
<el-button type="primary" size="small" @click="editMenu(scope.row, scope.$index)">编辑</el-button>
<el-button type="danger" size="small" @click="delMenu(scope.row.id)">删除</el-button>
<!--<el-popconfirm title="确定删除吗？" @confirm="delMenu(scope.row, scope.$index)">
<template #reference>
<el-button link size="small">删除</el-button>
</template>
</el-popconfirm>-->
<el-popconfirm title="确定删除吗？" @confirm="delMenu(scope.row, scope.$index)">
<template #reference>
<el-button type="danger" size="small">删除</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column>
</scTable>
@ -58,11 +60,33 @@
<el-radio :value="30">接口</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="名称" prop="name">
<el-form-item label="功能名" prop="name">
<el-input v-model="addForm.name" clearable></el-input>
</el-form-item>
<el-form-item label="标识">
<!-- <el-input v-model="codes" clearable style="width: 90%;"></el-input> -->
<span v-show="addForm.type != 30">
<el-form-item label="路由名" prop="route_name">
<el-input v-model="addForm.route_name" clearable></el-input>
</el-form-item>
<el-form-item label="图标" prop="icon">
<el-input v-model="addForm.icon" clearable></el-input>
</el-form-item>
<el-form-item label="路由地址" prop="path">
<el-input v-model="addForm.path" clearable></el-input>
</el-form-item>
<span v-show="addForm.type == 20">
<el-form-item label="组件地址" prop="component">
<el-input v-model="addForm.component" clearable></el-input>
</el-form-item>
<el-form-item label="是否隐藏" prop="is_hidden">
<el-switch v-model="addForm.is_hidden"></el-switch>
</el-form-item>
<el-form-item label="是否全屏" prop="is_fullpage">
<el-switch v-model="addForm.is_fullpage"></el-switch>
</el-form-item>
</span>
</span>
<el-form-item label="权限标识">
<el-select v-model="addForm.codes" multiple filterable allow-create default-first-option
:reserve-keyword="false" placeholder="权限标识(回车添加多个)" style="width: 100%">
<el-option v-for="item in permCodes" :key="item" :label="item" :value="item" />
@ -87,10 +111,12 @@
<script>
import { genTree } from "@/utils/verificate";
const dForm = {
codes: [],
type: 10,
sort: 1,
};
codes: [],
type: 10,
sort: 1,
is_hidden: false,
is_fullpage: false,
};
export default {
name: "dept",
data() {

14
src/views/sys/dept.vue
View File

@ -18,14 +18,12 @@
></el-button> -->
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="query.search" placeholder="部门名称" @keyup.enter="handleQuery"></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
<el-input v-model="query.search" placeholder="部门名称" @keyup.enter="handleQuery"></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
</el-header>
<el-main class="nopadding">

2
src/views/sys/post.vue
View File

@ -1,6 +1,6 @@
<template>
<el-container>
<el-aside width="45%">
<el-aside style="width: 50%!important">
<el-container>
<el-header>
<div class="left-panel">

6
src/views/sys/role.vue
View File

@ -7,10 +7,8 @@
<!--<el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button>-->
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="query.search" placeholder="角色名称" clearable @keyup.enter="handleQuery"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
<el-input v-model="query.search" placeholder="角色名称" clearable @keyup.enter="handleQuery"></el-input>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
</el-header>
<el-main class="nopadding">

24
src/views/sys/user.vue
View File

@ -60,19 +60,17 @@
</el-select>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input
v-model="query.search"
placeholder="登录账号 / 姓名"
clearable
@keyup.enter="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
<el-input
v-model="query.search"
placeholder="登录账号 / 姓名"
clearable
@keyup.enter="handleQuery"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
</el-header>
<el-main class="nopadding">

4
src/views/wf/workflow.vue
View File

@ -12,8 +12,7 @@
@click="batch_del" v-auth="'workflow.delete'"></el-button> -->
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input
<el-input
v-model="query.search"
placeholder="工作流名称"
clearable
@ -24,7 +23,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
</div>
</el-header>
<el-main class="nopadding">