Merge pull request 'projects/mesxc-zjl' (#327) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #327
This commit is contained in:
commit
b1cdf083dd
@ -76,10 +76,6 @@ export default {
|
|||||||
name: this.chartData[i].objName + this.chartData[i].objCode,
|
name: this.chartData[i].objName + this.chartData[i].objCode,
|
||||||
type: 'bar',
|
type: 'bar',
|
||||||
barMaxWidth: 20,
|
barMaxWidth: 20,
|
||||||
label: {
|
|
||||||
show: true,
|
|
||||||
position: 'top',
|
|
||||||
},
|
|
||||||
data: [],
|
data: [],
|
||||||
};
|
};
|
||||||
legendData.push(this.chartData[i].objName + this.chartData[i].objCode);
|
legendData.push(this.chartData[i].objName + this.chartData[i].objCode);
|
||||||
|
@ -68,9 +68,9 @@ export default {
|
|||||||
|
|
||||||
var option = {
|
var option = {
|
||||||
color: ['#288AFF'],
|
color: ['#288AFF'],
|
||||||
// tooltip: {
|
tooltip: {
|
||||||
// trigger: 'axis'
|
trigger: 'axis',
|
||||||
// },
|
},
|
||||||
grid: {
|
grid: {
|
||||||
left: '4%',
|
left: '4%',
|
||||||
right: '1%',
|
right: '1%',
|
||||||
|
@ -57,8 +57,10 @@ export default {
|
|||||||
let listObj = { useNum: '消耗量' }; // 数据
|
let listObj = { useNum: '消耗量' }; // 数据
|
||||||
for (let i = 0; i < arr.length; i++) {
|
for (let i = 0; i < arr.length; i++) {
|
||||||
let obj = {};
|
let obj = {};
|
||||||
|
let fName = arr[i].time.slice(0, 4);
|
||||||
|
let lName = arr[i].time.slice(4, 6);
|
||||||
obj.prop = arr[i].time;
|
obj.prop = arr[i].time;
|
||||||
obj.label = arr[i].time;
|
obj.label = fName + ' 第 ' + lName + ' 周';
|
||||||
obj.minWidth = 100;
|
obj.minWidth = 100;
|
||||||
tempX.push(obj);
|
tempX.push(obj);
|
||||||
listObj[arr[i].time] = arr[i].useNum || null;
|
listObj[arr[i].time] = arr[i].useNum || null;
|
||||||
|
@ -45,6 +45,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-button
|
<el-button
|
||||||
|
v-show="!isEdit"
|
||||||
class="addButton"
|
class="addButton"
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
@click="emitButtonClick">
|
@click="emitButtonClick">
|
||||||
@ -70,6 +71,13 @@ export default {
|
|||||||
return [];
|
return [];
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
isEdit: {
|
||||||
|
type: Boolean,
|
||||||
|
required: true,
|
||||||
|
default: () => {
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {};
|
return {};
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
<add-table
|
<add-table
|
||||||
:table-data="tableData"
|
:table-data="tableData"
|
||||||
:table-name-list="tableNameList"
|
:table-name-list="tableNameList"
|
||||||
|
:isEdit="isEdit"
|
||||||
@emitFun="inputChange"
|
@emitFun="inputChange"
|
||||||
@emitButtonClick="emitButtonClick" />
|
@emitButtonClick="emitButtonClick" />
|
||||||
</el-col>
|
</el-col>
|
||||||
|
@ -66,7 +66,7 @@
|
|||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
style="width: 100%">
|
style="width: 100%">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
|
v-for="item in tableNameList"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value"></el-option>
|
:value="item.value"></el-option>
|
||||||
@ -154,6 +154,7 @@ import {
|
|||||||
createEnergyLimit,
|
createEnergyLimit,
|
||||||
getEnergyParamList,
|
getEnergyParamList,
|
||||||
} from '@/api/monitoring/energyLimit';
|
} from '@/api/monitoring/energyLimit';
|
||||||
|
import { energyTableGet } from '@/api/base/energyQuantityManual';
|
||||||
export default {
|
export default {
|
||||||
name: 'energyLimitAdd',
|
name: 'energyLimitAdd',
|
||||||
props: {
|
props: {
|
||||||
@ -203,6 +204,7 @@ export default {
|
|||||||
{ required: true, message: '指标类型不能为空', trigger: 'change' },
|
{ required: true, message: '指标类型不能为空', trigger: 'change' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
tableNameList: [],
|
||||||
detailList: [],
|
detailList: [],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -267,11 +269,22 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
toggleType() {
|
toggleType() {
|
||||||
if (this.form.energyTypeId && this.form.type) {
|
if (this.form.energyTypeId && this.form.method == 2) {
|
||||||
this.getDetailList();
|
this.form.tableName = '';
|
||||||
this.form.plcParamId = '';
|
this.getTableNameList(this.form.energyTypeId);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// 获取能源表名list
|
||||||
|
getTableNameList(id) {
|
||||||
|
energyTableGet({ energyTypeId: id }).then((res) => {
|
||||||
|
this.tableNameList = res.data.tableObjs || [];
|
||||||
|
if (this.tableNameList.length === 0) {
|
||||||
|
this.$modal.msgWarning(
|
||||||
|
'当前能源类型暂无配置表名,请先到《表名配置》页面配置'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
// 递归处理分类回显问题
|
// 递归处理分类回显问题
|
||||||
changeDetSelect(key, treeData) {
|
changeDetSelect(key, treeData) {
|
||||||
let arr = []; // 递归时操作的数组
|
let arr = []; // 递归时操作的数组
|
||||||
|
@ -1,46 +1,52 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
|
<el-switch
|
||||||
|
v-hasPermi="['base:group-team:edit-worker']"
|
||||||
|
v-model="state"
|
||||||
|
type="text"
|
||||||
|
size="small"
|
||||||
|
:disabled="readonly"
|
||||||
|
@change="changeHandler" />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
injectData: {
|
injectData: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({})
|
default: () => ({}),
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
state: false
|
state: false,
|
||||||
}
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
readonly() {
|
readonly() {
|
||||||
return !!this.injectData.readonly
|
return !!this.injectData.readonly;
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.mapToState()
|
this.mapToState();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
mapToState() {
|
mapToState() {
|
||||||
if (this.injectData.prop === 'enabled') {
|
if (this.injectData.prop === 'enabled') {
|
||||||
this.state = this.injectData.enabled === 1 ? true : false
|
this.state = this.injectData.enabled === 1 ? true : false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
changeHandler() {
|
changeHandler() {
|
||||||
let params = {}
|
let params = {};
|
||||||
let payload = {}
|
let payload = {};
|
||||||
params.name = 'state'
|
params.name = 'state';
|
||||||
payload.id = this.injectData.id
|
payload.id = this.injectData.id;
|
||||||
payload.enabled = this.state ? '1' : '0'
|
payload.enabled = this.state ? '1' : '0';
|
||||||
payload.code = this.injectData.code
|
payload.code = this.injectData.code;
|
||||||
payload.name = this.injectData.name
|
payload.name = this.injectData.name;
|
||||||
payload.leaderId = this.injectData.leaderId
|
payload.leaderId = this.injectData.leaderId;
|
||||||
params.payload = payload
|
params.payload = payload;
|
||||||
this.$emit('emitData', params)
|
this.$emit('emitData', params);
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -1,41 +1,51 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="workerOperate">
|
<div class="workerOperate">
|
||||||
<div class="operateBtn">
|
<div class="operateBtn">
|
||||||
<span class="view" v-if="this.$auth.hasPermi('base:group-team:view-worker')" @click="emitParams('view')">查看</span>
|
<span
|
||||||
<span class="edit" v-if="this.$auth.hasPermi('base:group-team:edit-worker')" @click="emitParams('edit')">编辑</span>
|
class="view"
|
||||||
</div>
|
v-hasPermi="['base:group-team:view-worker']"
|
||||||
</div>
|
@click="emitParams('view')">
|
||||||
|
查看
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
class="edit"
|
||||||
|
v-hasPermi="['base:group-team:edit-worker']"
|
||||||
|
@click="emitParams('edit')">
|
||||||
|
编辑
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: 'WorkerOperate',
|
name: 'WorkerOperate',
|
||||||
props: {
|
props: {
|
||||||
injectData: {
|
injectData: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({})
|
default: () => ({}),
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
emitParams(data) {
|
emitParams(data) {
|
||||||
let params = {}
|
let params = {};
|
||||||
params.name = data
|
params.name = data;
|
||||||
params.payload = this.injectData
|
params.payload = this.injectData;
|
||||||
this.$emit('emitData', params)
|
this.$emit('emitData', params);
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang='scss' scoped>
|
<style lang='scss' scoped>
|
||||||
.workerOperate {
|
.workerOperate {
|
||||||
.operateBtn{
|
.operateBtn {
|
||||||
color: #0B58FF;
|
color: #0b58ff;
|
||||||
.view {
|
.view {
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.edit {
|
.edit {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -125,7 +125,7 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'separate',
|
type: this.$auth.hasPermi('base:group-team:create') ? 'separate' : '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
|
type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -88,7 +88,7 @@ export default {
|
|||||||
workOrderList: [],
|
workOrderList: [],
|
||||||
workOrderName: '',
|
workOrderName: '',
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:group-team-view:detail')
|
this.$auth.hasPermi('monitoring:group-team-scheduling:query')
|
||||||
? {
|
? {
|
||||||
type: 'detail',
|
type: 'detail',
|
||||||
btnName: '详情',
|
btnName: '详情',
|
||||||
|
@ -97,7 +97,7 @@ export default {
|
|||||||
},
|
},
|
||||||
tableProps,
|
tableProps,
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:team-production:detail')
|
this.$auth.hasPermi('monitoring:group-team-scheduling:query')
|
||||||
? {
|
? {
|
||||||
type: 'productionDetail',
|
type: 'productionDetail',
|
||||||
btnName: '查看',
|
btnName: '查看',
|
||||||
|
@ -173,12 +173,24 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:order-group:create')
|
type: this.$auth.hasPermiAnd([
|
||||||
|
'base:order-group:create',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:core-customer:query',
|
||||||
|
'base:order:query',
|
||||||
|
])
|
||||||
? 'separate'
|
? 'separate'
|
||||||
: '',
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
|
type: this.$auth.hasPermiAnd([
|
||||||
|
'base:order-group:create',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:core-customer:query',
|
||||||
|
'base:order:query',
|
||||||
|
])
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
name: 'add',
|
name: 'add',
|
||||||
color: 'success',
|
color: 'success',
|
||||||
@ -197,7 +209,10 @@ export default {
|
|||||||
tableProps,
|
tableProps,
|
||||||
list: [],
|
list: [],
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:order-group:bind')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:order:query',
|
||||||
|
'base:order-con-group-order:create',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'bind',
|
type: 'bind',
|
||||||
btnName: '绑定',
|
btnName: '绑定',
|
||||||
@ -214,7 +229,7 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-group:complete')
|
this.$auth.hasPermi('base:order-group:update')
|
||||||
? {
|
? {
|
||||||
type: 'complete',
|
type: 'complete',
|
||||||
btnName: '完成',
|
btnName: '完成',
|
||||||
@ -231,7 +246,7 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-group:termination')
|
this.$auth.hasPermi('base:order-group:update')
|
||||||
? {
|
? {
|
||||||
type: 'termination',
|
type: 'termination',
|
||||||
btnName: '终止',
|
btnName: '终止',
|
||||||
@ -248,7 +263,7 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-group:cancel')
|
this.$auth.hasPermi('base:order-group:update')
|
||||||
? {
|
? {
|
||||||
type: 'cancel',
|
type: 'cancel',
|
||||||
btnName: '作废',
|
btnName: '作废',
|
||||||
@ -265,11 +280,17 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
{
|
this.$auth.hasPermi('base:order-group:update')
|
||||||
type: 'detail',
|
? {
|
||||||
btnName: '详情',
|
type: 'detail',
|
||||||
},
|
btnName: '详情',
|
||||||
this.$auth.hasPermi('base:order-group:edit')
|
}
|
||||||
|
: undefined,
|
||||||
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:order-group:update',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:core-customer:query',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'edit',
|
type: 'edit',
|
||||||
btnName: '编辑',
|
btnName: '编辑',
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
<method-btn
|
<method-btn
|
||||||
v-if="tableBtn.length"
|
v-if="tableBtn.length"
|
||||||
slot="handleBtn"
|
slot="handleBtn"
|
||||||
:width="290"
|
:width="250"
|
||||||
label="操作"
|
label="操作"
|
||||||
:method-list="tableBtn"
|
:method-list="tableBtn"
|
||||||
@clickBtn="handleClick" />
|
@clickBtn="handleClick" />
|
||||||
@ -169,12 +169,22 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:order-manage:create')
|
type: this.$auth.hasPermiAnd([
|
||||||
|
'base:order:query',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:order:create',
|
||||||
|
])
|
||||||
? 'separate'
|
? 'separate'
|
||||||
: '',
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
|
type: this.$auth.hasPermiAnd([
|
||||||
|
'base:order:query',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:order:create',
|
||||||
|
])
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
name: 'add',
|
name: 'add',
|
||||||
color: 'success',
|
color: 'success',
|
||||||
@ -210,7 +220,14 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-manage:bindWorkOrder')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:order:update',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:production-line:query',
|
||||||
|
'extend:process-flow:query',
|
||||||
|
'base:core-work-order:query',
|
||||||
|
'base:order:query',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'bind',
|
type: 'bind',
|
||||||
btnName: '绑定',
|
btnName: '绑定',
|
||||||
@ -227,7 +244,7 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-manage:complete')
|
this.$auth.hasPermi('base:order:update')
|
||||||
? {
|
? {
|
||||||
type: 'complete',
|
type: 'complete',
|
||||||
btnName: '完成',
|
btnName: '完成',
|
||||||
@ -244,7 +261,7 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-manage:termination')
|
this.$auth.hasPermi('base:order:update')
|
||||||
? {
|
? {
|
||||||
type: 'termination',
|
type: 'termination',
|
||||||
btnName: '终止',
|
btnName: '终止',
|
||||||
@ -261,7 +278,7 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-manage:cancel')
|
this.$auth.hasPermi('base:order:update')
|
||||||
? {
|
? {
|
||||||
type: 'cancel',
|
type: 'cancel',
|
||||||
btnName: '作废',
|
btnName: '作废',
|
||||||
@ -278,13 +295,20 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-manage:detail')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:order:query',
|
||||||
|
'extend:process-flow:query',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'detail',
|
type: 'detail',
|
||||||
btnName: '详情',
|
btnName: '详情',
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-manage:edit')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:order:query',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:order:update',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'edit',
|
type: 'edit',
|
||||||
btnName: '编辑',
|
btnName: '编辑',
|
||||||
|
@ -181,7 +181,10 @@ export default {
|
|||||||
list: [],
|
list: [],
|
||||||
total: 0,
|
total: 0,
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:order:query',
|
||||||
|
'extend:process-flow:query',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'orderDetail',
|
type: 'orderDetail',
|
||||||
btnName: '详情',
|
btnName: '详情',
|
||||||
@ -198,7 +201,11 @@ export default {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:quality-inspection-record:query',
|
||||||
|
'base:core-product:query',
|
||||||
|
'base:core-work-order:query',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'qualityDetail',
|
type: 'qualityDetail',
|
||||||
btnName: '质量',
|
btnName: '质量',
|
||||||
|
@ -99,10 +99,14 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
|
type: this.$auth.hasPermi('base:environmental-check-record:export')
|
||||||
|
? 'separate'
|
||||||
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
|
type: this.$auth.hasPermi('base:environmental-check-record:export')
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
name: 'export',
|
name: 'export',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
@ -103,10 +103,14 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
|
type: this.$auth.hasPermi('base:environmental-check:create')
|
||||||
|
? 'separate'
|
||||||
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
|
type: this.$auth.hasPermi('base:environmental-check:create')
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
name: 'add',
|
name: 'add',
|
||||||
color: 'success',
|
color: 'success',
|
||||||
@ -124,13 +128,16 @@ export default {
|
|||||||
tableProps,
|
tableProps,
|
||||||
list: [],
|
list: [],
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:voc:update')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:environmental-check:update',
|
||||||
|
'base:environmental-check:query',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'edit',
|
type: 'edit',
|
||||||
btnName: '编辑',
|
btnName: '编辑',
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:voc:delete')
|
this.$auth.hasPermi('base:environmental-check:delete')
|
||||||
? {
|
? {
|
||||||
type: 'delete',
|
type: 'delete',
|
||||||
btnName: '删除',
|
btnName: '删除',
|
||||||
|
@ -99,10 +99,14 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
|
type: this.$auth.hasPermi('base:environmental-check-record:export')
|
||||||
|
? 'separate'
|
||||||
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
|
type: this.$auth.hasPermi('base:environmental-check-record:export')
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
name: 'export',
|
name: 'export',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
@ -103,10 +103,14 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
|
type: this.$auth.hasPermi('base:environmental-check:create')
|
||||||
|
? 'separate'
|
||||||
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
|
type: this.$auth.hasPermi('base:environmental-check:create')
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
name: 'add',
|
name: 'add',
|
||||||
color: 'success',
|
color: 'success',
|
||||||
@ -124,13 +128,16 @@ export default {
|
|||||||
tableProps,
|
tableProps,
|
||||||
list: [],
|
list: [],
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:waste-gas:update')
|
this.$auth.hasPermiAnd([
|
||||||
|
'base:environmental-check:update',
|
||||||
|
'base:environmental-check:query',
|
||||||
|
])
|
||||||
? {
|
? {
|
||||||
type: 'edit',
|
type: 'edit',
|
||||||
btnName: '编辑',
|
btnName: '编辑',
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:waste-gas:delete')
|
this.$auth.hasPermi('base:environmental-check:delete')
|
||||||
? {
|
? {
|
||||||
type: 'delete',
|
type: 'delete',
|
||||||
btnName: '删除',
|
btnName: '删除',
|
||||||
|
@ -99,12 +99,14 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-water:export')
|
type: this.$auth.hasPermi('base:environmental-check-record:export')
|
||||||
? 'separate'
|
? 'separate'
|
||||||
: '',
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
|
type: this.$auth.hasPermi('base:environmental-check-record:export')
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '导出',
|
btnName: '导出',
|
||||||
name: 'export',
|
name: 'export',
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
|
@ -103,12 +103,14 @@ export default {
|
|||||||
color: 'primary',
|
color: 'primary',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-water:create')
|
type: this.$auth.hasPermi('base:environmental-check:create')
|
||||||
? 'separate'
|
? 'separate'
|
||||||
: '',
|
: '',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
|
type: this.$auth.hasPermi('base:environmental-check:create')
|
||||||
|
? 'button'
|
||||||
|
: '',
|
||||||
btnName: '新增',
|
btnName: '新增',
|
||||||
name: 'add',
|
name: 'add',
|
||||||
color: 'success',
|
color: 'success',
|
||||||
@ -126,13 +128,13 @@ export default {
|
|||||||
tableProps,
|
tableProps,
|
||||||
list: [],
|
list: [],
|
||||||
tableBtn: [
|
tableBtn: [
|
||||||
this.$auth.hasPermi('base:waste-water:update')
|
this.$auth.hasPermi('base:environmental-check:update')
|
||||||
? {
|
? {
|
||||||
type: 'edit',
|
type: 'edit',
|
||||||
btnName: '编辑',
|
btnName: '编辑',
|
||||||
}
|
}
|
||||||
: undefined,
|
: undefined,
|
||||||
this.$auth.hasPermi('base:waste-water:delete')
|
this.$auth.hasPermi('base:environmental-check:delete')
|
||||||
? {
|
? {
|
||||||
type: 'delete',
|
type: 'delete',
|
||||||
btnName: '删除',
|
btnName: '删除',
|
||||||
|
Loading…
Reference in New Issue
Block a user