From 79ced684c6ec28c8f6affa0ac6cd44e1a88f9cf3 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 22 八月 2025 15:33:26 +0800
Subject: [PATCH] 自定义算法配置，设备车间管理，用户管理
---
src/views/mdc/base/EquipmentList.vue | 14
src/views/user/Login.vue | 32 -
src/views/mdc/base/MdcParameterList.vue | 173 +++++++
src/views/system/ProductionManager.vue | 3
src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue | 302 ++++++------
src/views/system/modules/ProductionManager/ProductionModal.vue | 7
src/views/system/modules/SelectDeviceModal.vue | 2
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 70 --
src/views/system/UserList.vue | 116 ----
src/api/api.js | 7
src/views/system/modules/UserModal.vue | 152 ------
src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue | 318 +++++++++++--
src/views/mdc/base/modules/mdcParameter/MdcParameterModal.vue | 131 +++++
src/views/mdc/base/MdcEquipmentTypeList.vue | 4
14 files changed, 738 insertions(+), 593 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 9c6111c..e43da5b 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -58,7 +58,6 @@
//杞﹂棿绠＄悊
const queryProductionTreeList = (params)=>getAction("/mdc/mdcProduction/queryTreeList",params);
-const queryProductionTreeListByMdc = (params)=>getAction("/mdc/mdcProduction/queryTreeListByMdc",params);
const queryById = (params)=>getAction("/mdc/mdcProduction/queryIdTree",params);
const deleteByProduction = (params)=>deleteAction("/mdc/mdcProduction/delete",params);
@@ -102,8 +101,6 @@
//鍔犺浇鎴戠殑閫氬憡淇℃伅
const getUserNoticeInfo= (params)=>getAction("/sys/sysAnnouncementSend/getMyAnnouncementSend",params);
const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
-//绯荤粺閰嶇疆鍙傛暟鍊艰幏鍙�
-const getSystemConfigValue = (params)=>getAction("/system/sysParams/query/by/settingKey",params);
// 涓浆HTTP璇锋眰
export const transitRESTful = {
get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -169,12 +166,10 @@
getUserNoticeInfo,
getDictItemsFromCache,
queryProductionTreeList,
- queryProductionTreeListByMdc,
deleteByProduction,
queryById,
addEquipment,
- editEquipment,
- getSystemConfigValue
+ editEquipment
}
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 451f73e..9abfd7a 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -27,20 +27,6 @@
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧绾у埆">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
- allow-clear/>
- </a-form-item>
- </a-col>
-
- <a-col :md="4" :sm="4">
- <a-form-item label="璁惧绉嶇被">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
- allow-clear/>
- </a-form-item>
- </a-col>
-
- <a-col :md="4" :sm="4">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</a-col>
diff --git a/src/views/mdc/base/MdcEquipmentTypeList.vue b/src/views/mdc/base/MdcEquipmentTypeList.vue
index 055aee8..19f15f2 100644
--- a/src/views/mdc/base/MdcEquipmentTypeList.vue
+++ b/src/views/mdc/base/MdcEquipmentTypeList.vue
@@ -165,7 +165,7 @@
}
},
created() {
- this.$set(this.dictOptions, 'equipmentTypeStates', [{text:'鏄�',value:'Y'},{text:'鍚�',value:'N'}])
+ this.$set(this.dictOptions, 'equipmentTypeStates', [{text:'鍚敤',value:'Y'},{text:'鍏抽棴',value:'N'}])
this.getSuperFieldList();
},
computed: {
@@ -174,8 +174,6 @@
},
},
methods: {
- initDictConfig(){
- },
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'equipmentTypeName',text:'璁惧绫诲瀷鍚嶇О',dictCode:''})
diff --git a/src/views/mdc/base/MdcParameterList.vue b/src/views/mdc/base/MdcParameterList.vue
new file mode 100644
index 0000000..a936f8e
--- /dev/null
+++ b/src/views/mdc/base/MdcParameterList.vue
@@ -0,0 +1,173 @@
+<template>
+ <a-card :bordered="false">
+
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍙傛暟缂栫爜">
+ <j-input placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" v-model="queryParam.code"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍙傛暟鍚嶇О">
+ <j-input placeholder="璇疯緭鍏ュ弬鏁板悕绉�" v-model="queryParam.name"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍙傛暟绫诲瀷">
+ <a-select v-model="queryParam.type" placeholder="璇烽�夋嫨鍙傛暟绫诲瀷">
+ <a-select-option :key=true>鍏紡</a-select-option>
+ <a-select-option :key=false>鍩烘湰鍙傛暟</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ class="j-table-force-nowrap"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange">
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">缂栬緫</a>
+
+ <a-divider type="vertical" />
+
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
+
+ </a-table>
+ </div>
+ <!-- table鍖哄煙-end -->
+
+ <!-- 琛ㄥ崟鍖哄煙 -->
+ <mdcParameter-modal ref="modalForm" @ok="modalFormOk"></mdcParameter-modal>
+ </a-card>
+</template>
+
+<script>
+ import '@/assets/less/TableExpand.less'
+ import MdcParameterModal from './modules/mdcParameter/MdcParameterModal'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+ export default {
+ name: "MdcParameterList",
+ mixins:[JeecgListMixin],
+ components: {
+ MdcParameterModal
+ },
+ data () {
+ return {
+ description: 'mdc绠楁硶鍏紡绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title: '鍙傛暟缂栫爜',
+ align:"center",
+ dataIndex: 'code'
+ },
+ {
+ title: '鍙傛暟鍚嶇О',
+ align:"center",
+ dataIndex: 'name'
+ },
+ {
+ title: '鍙傛暟鎻忚堪',
+ align:"center",
+ dataIndex: 'description'
+ },
+ {
+ title: '鍙傛暟鍊�',
+ align:"center",
+ dataIndex: 'value'
+ },
+ {
+ title: '鍙傛暟绫诲瀷',
+ align:"center",
+ dataIndex: 'type',
+ customRender: (text) => {
+ return text ? '鍏紡' : '鍩烘湰鍙傛暟';
+ }
+ },
+ {
+ title: '澶囨敞',
+ align:"center",
+ dataIndex: 'remark'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ scopedSlots: { customRender: 'action' },
+ }
+ ],
+ url: {
+ list: "/mdc/mdcParameter/list",
+ delete: "/mdc/mdcParameter/delete",
+ deleteBatch: "/mdc/mdcParameter/deleteBatch",
+ exportXlsUrl: "mdc/mdcParameter/exportXls",
+ importExcelUrl: "mdc/mdcParameter/importExcel",
+ },
+ }
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index b42763e..3259818 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -120,21 +120,6 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧绾у埆">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="model.deviceLevel"
- :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="12">
- <a-form-model-item label="璁惧绉嶇被">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="model.deviceCategory"
- :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
<a-form-model-item label="鎺掑簭">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇疯緭鍏ユ帓搴�"
v-model="model.sortNo" style="width: 100%"/>
@@ -144,36 +129,8 @@
<a-row :gutter="24">
<a-col :span='12'>
- <a-form-model-item label="閰嶉�佸皬缁�" prop="teamCode">
- <j-dict-select-tag placeholder="璇烽�夋嫨閰嶉�佸皬缁�" dictCode="mdc_staff_team" v-model="model.teamCode"
- :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span='12'>
<a-form-model-item label="璁惧鍥剧墖">
<j-image-upload v-model="model.equipmentImage" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="24" v-if="systemType">
- <a-col :span='24'>
- <a-form-model-item label="绯荤粺绫诲瀷" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-radio-group name="radioGroup" v-model="systemValue" :disabled="disableSubmit">
- <a-radio value="1">DNC</a-radio>
- <a-radio value="2">MDC</a-radio>
- <a-radio value="3">閫氱敤</a-radio>
- </a-radio-group>
- </a-form-model-item>
- </a-col>
- </a-row>
-
-
- <a-row :gutter="24">
- <a-col :span='12'>
- <a-form-model-item v-if="isDepartType == 0" label="绯荤粺鐗堟湰鍙�">
- <a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="璇疯緭鍏ョ郴缁熺増鏈彿"
- v-model="model.systemVersion"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -243,9 +200,7 @@
driveType: '',
systemType: '',
deviceLevel: '',
- deviceCategory: '',
- deviceTypeDnc: '',
- deviceTypeMdc: ''
+ deviceCategory: ''
},
labelCol: {
xs: { span: 24 },
@@ -264,8 +219,6 @@
sm: { span: 19 }
},
confirmLoading: false,
- systemType: false,
- systemValue: '3',
url: {
userWithDepart: '/mdc/mdcEquipment/equipmentDepartList', // 寮曞叆涓烘寚瀹氱敤鎴锋煡鐪嬮儴闂ㄤ俊鎭渶瑕佺殑url
//寮曞叆涓烘寚瀹氱敤鎴锋煡鐪嬭溅闂翠俊鎭渶瑕佺殑url
@@ -283,7 +236,6 @@
created() {
this.queryGroup()
this.queryTreeData()
- this.getAppPlatformName()
},
methods: {
...mapActions(['QueryDepartTree']),
@@ -296,13 +248,6 @@
message: '娑堟伅',
description: res.message
})
- }
- })
- },
- getAppPlatformName() {
- getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res => {
- if (res.success) {
- this.systemType = res.result.settingValue === '0'
}
})
},
@@ -359,16 +304,11 @@
//鏍规嵁灞忓箷瀹藉害鑷�傚簲鎶藉眽瀹藉害
this.resetScreenSize()
- if (record.systemValue != null) {
- this.systemValue = record.systemValue
- } else {
- this.systemValue = '3'
- }
that.model = Object.assign({}, record)
this.$nextTick(() => {
this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
- 'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue'))
+ 'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName'))
})
if (record.hasOwnProperty('id')) {
that.getUserDeparts(record.id)
@@ -462,17 +402,11 @@
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true
- if (this.systemValue == null) {
- this.$message.warning('璇烽�夋嫨绯荤粺绫诲瀷!')
- return false
- }
let obj
if (!this.model.id) {
this.model.id = this.userId
- this.model.systemValue = this.systemValue
obj = addEquipment(this.model)
} else {
- this.model.systemValue = this.systemValue
obj = editEquipment(this.model, {
id: this.model.id
})
diff --git a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue
index 4aa61a5..bbbc17b 100644
--- a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue
+++ b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownList.vue
@@ -6,17 +6,26 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="4" :sm="4">
- <a-form-item label="鏃ユ湡">
- <a-date-picker value-format="YYYY-MM-DD" style="width: 100%" v-model="queryParam.theDate"/>
+ <a-form-item label="鍋滄満鏃ユ湡">
+ <a-date-picker placeholder="璇烽�夋嫨鍋滄満鏃ユ湡" value-format="YYYY-MM-DD" style="width: 100%"
+ v-model="queryParam.theDate" :allow-clear="false"/>
</a-form-item>
</a-col>
- <a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
</a-col>
</a-row>
</a-form>
</div>
+ </div>
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
</div>
<div style="overflow: hidden;width: 100%;flex: 1" id="DeviceList">
@@ -30,7 +39,7 @@
</template>
<template slot="action" slot-scope="text, record">
- <a @click="handleReport(record)">涓婃姤</a>
+ <a @click="handleEdit(record)">缂栬緫</a>
<a-divider type="vertical"/>
@@ -46,168 +55,167 @@
</template>
<script>
-import moment from 'moment'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import EquipmentStandbyShutdownModal
- from '@views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue'
+ import moment from 'moment'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import EquipmentStandbyShutdownModal
+ from '@views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue'
-export default {
- name: 'EquipmentStandbyShutdownList',
- components: { EquipmentStandbyShutdownModal },
- mixins: [JeecgListMixin],
- data() {
- return {
- disableMixinCreated: true,
- scrollY: 465,
- queryParam: {
- theDate: moment().subtract('days', 1).format('YYYY-MM-DD')
- },
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
+ export default {
+ name: 'EquipmentStandbyShutdownList',
+ components: { EquipmentStandbyShutdownModal },
+ mixins: [JeecgListMixin],
+ data() {
+ return {
+ disableMixinCreated: true,
+ scrollY: 465,
+ queryParam: {
+ theDate: moment().subtract('days', 1).format('YYYY-MM-DD')
+ },
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '璁惧缂栧彿',
+ align: 'center',
+ dataIndex: 'equipmentId',
+ width: 200
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ width: 200
+ },
+ {
+ title: '鍋滄満绫诲瀷',
+ align: 'center',
+ dataIndex: 'downtimeType',
+ scopedSlots: { customRender: 'downtimeType' },
+ width: 150
+ },
+ {
+ title: '鍋滄満鍘熷洜',
+ align: 'center',
+ dataIndex: 'downtimeDescription',
+ width: 200
+ },
+ {
+ title: '鍋滄満鏃ユ湡',
+ align: 'center',
+ dataIndex: 'theDate',
+ width: 150
+ },
+ {
+ title: '鍋滄満鏃堕暱(min)',
+ align: 'center',
+ dataIndex: 'downLong',
+ width: 150
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ width: 150,
+ scopedSlots: { customRender: 'action' },
+ fixed: 'right'
}
- },
- {
- title: '璁惧缂栧彿',
- align: 'center',
- dataIndex: 'equipmentId',
- width: 200
- },
- {
- title: '璁惧鍚嶇О',
- align: 'center',
- dataIndex: 'equipmentName',
- width: 200
- },
- {
- title: '鍋滄満绫诲瀷',
- align: 'center',
- dataIndex: 'downtimeType',
- scopedSlots: { customRender: 'downtimeType' },
- width: 150
- },
- {
- title: '鍋滄満鍘熷洜',
- align: 'center',
- dataIndex: 'downtimeDescription',
- width: 200
- },
- {
- title: '寮�濮嬫椂闂�',
- align: 'center',
- dataIndex: 'startDate',
- width: 150
- },
- {
- title: '缁撴潫鏃堕棿',
- align: 'center',
- dataIndex: 'endDate',
- width: 150
- },
- {
- title: '澶囨敞',
- align: 'center',
- dataIndex: 'remark',
- width: 200
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: 'center',
- width: 150,
- scopedSlots: { customRender: 'action' },
- fixed: 'right'
+ ],
+ url: {
+ list: '/mdc/mdcDowntime/list',
+ delete: '/mdc/mdcDowntime/delete'
}
- ],
- url: {
- list: '/mdc/mdcDowntime/list',
- delete: '/mdc/mdcDowntime/delete'
}
- }
- },
- props: { node: {}, Type: '' },
- created() {
- this.queryParam.typeTree = '1'
- this.loadData()
- },
- mounted() {
- window.addEventListener('resize', this.handleWindowResize)
- this.handleWindowResize()
- },
- beforeDestroy() {
- window.removeEventListener('resize', this.handleWindowResize)
- },
- watch: {
- Type(valmath) {
- this.queryParam.typeTree = valmath
},
- node(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
- if (JSON.stringify(val) != '{}') {
- if (val.equipmentId != null) {
- this.queryParam.equipmentId = val.equipmentId
- this.queryParam.parentId = ''
- } else {
- this.queryParam.parentId = val.key
- this.queryParam.equipmentId = ''
+ props: { node: {}, Type: '' },
+ created() {
+ this.queryParam.typeTree = '1'
+ this.loadData()
+ },
+ mounted() {
+ window.addEventListener('resize', this.handleWindowResize)
+ this.handleWindowResize()
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.handleWindowResize)
+ },
+ watch: {
+ Type(valmath) {
+ this.queryParam.typeTree = valmath
+ },
+ node(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
+ if (JSON.stringify(val) != '{}') {
+ if (val.equipmentId != null) {
+ this.queryParam.equipmentId = val.equipmentId
+ this.queryParam.parentId = ''
+ } else {
+ this.queryParam.parentId = val.key
+ this.queryParam.equipmentId = ''
+ }
+ this.loadData(1)
}
+ }
+ },
+ methods: {
+ searchReset() {
+ this.queryParam = { theDate: moment().subtract('days', 1).format('YYYY-MM-DD') }
this.loadData(1)
- }
- }
- },
- methods: {
- handleReport(record) {
- this.$refs.modalForm.edit(record)
- this.$refs.modalForm.title = '涓婃姤'
- },
+ },
- handleWindowResize() {
- const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0, -2)
- const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2)
- this.scrollY = boxHeight - tableHeadHeight - 50
+ handleWindowResize() {
+ const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0, -2)
+ const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2)
+ this.scrollY = boxHeight - tableHeadHeight - 50
+ }
}
}
-}
</script>
<style scoped>
-.page-container {
- overflow: hidden;
- display: flex;
- flex-direction: column;
-}
-
-@media screen and (min-width: 1920px) {
.page-container {
- height: 812px !important;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
}
-}
-@media screen and (min-width: 1680px) and (max-width: 1920px) {
- .page-container {
- height: 812px !important;
+ @media screen and (min-width: 1920px) {
+ .page-container {
+ height: 812px !important;
+ }
}
-}
-@media screen and (min-width: 1400px) and (max-width: 1680px) {
- .page-container {
- height: 664px !important;
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ .page-container {
+ height: 812px !important;
+ }
}
-}
-@media screen and (min-width: 1280px) and (max-width: 1400px) {
- .page-container {
- height: 565px !important;
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ .page-container {
+ height: 664px !important;
+ }
}
-}
-@media screen and (max-width: 1280px) {
- .page-container {
- height: 565px !important;
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ .page-container {
+ height: 565px !important;
+ }
}
-}
+
+ @media screen and (max-width: 1280px) {
+ .page-container {
+ height: 565px !important;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue
index 3332d8a..4a88cd5 100644
--- a/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue
+++ b/src/views/mdc/base/modules/EquipmentStandbyShutDown/EquipmentStandbyShutdownModal.vue
@@ -1,9 +1,18 @@
<template>
- <a-modal :title="title" :width="500" :visible="visible" :confirmLoading="confirmLoading" @ok="handleOk"
+ <a-modal :title="title" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleOk"
@cancel="handleCancel" cancelText="鍏抽棴">
- <a-spin :spinning="confirmLoading">
- <a-form-model ref="form" :form="form" :model="model" :rules="validatorRules" :labelCol="labelColLong"
+ <a-spin :spinning="spinning">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelColLong"
:wrapperCol="wrapperColLong">
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item label="璁惧缁�" prop="equipmentIds">
+ <a-input-search readOnly v-model="model.equipmentIds" @search="deviceSearch" enter-button
+ placeholder="璇烽�夋嫨璁惧" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
<a-row :gutter="24">
<a-col :span="24">
<a-form-model-item label="鍋滄満绫诲瀷" prop="downtimeType">
@@ -14,6 +23,7 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+
</a-row>
<a-row :gutter="24">
@@ -30,68 +40,112 @@
<a-row :gutter="24">
<a-col :span="24">
+ <a-form-model-item v-if="title === '缂栬緫'" label="鍋滄満鏃ユ湡" prop="theDate">
+ <a-date-picker :disabled="true" v-model="model.theDate" placeholder="璇烽�夋嫨鍋滄満鏃ユ湡"
+ value-format="YYYY-MM-DD"
+ style="width: 100%" />
+ </a-form-model-item>
+
+ <a-form-item v-if="title === '鏂板'" label="鍋滄満鏃ユ湡" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <div class="mainBox">
+ <Calendar
+ v-on:choseDay="clickDay"
+ :markDate="shiData"
+ :agoDayHide="value"
+ ></Calendar>
+ </div>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-model-item label="鍋滄満鏃堕暱(min)" prop="downLong">
+ <a-input-number v-model="model.downLong" :min="1" :max="1440" :step="1" :precision="0"
+ placeholder="璇疯緭鍏ュ仠鏈烘椂闀�(min)"
+ style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="24">
<a-form-model-item label="澶囨敞">
- <a-textarea v-model="model.remark" placeholder="璇疯緭鍏ュ娉�"/>
+ <a-textarea v-model="model.remark" placeholder="璇疯緭鍏ュ娉�" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-spin>
+
+ <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'" />
</a-modal>
</template>
<script>
+import Calendar from 'vue-calendar-component'
import { getAction, postAction } from '@api/manage'
+import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer'
export default {
name: 'EquipmentStandbyShutdownModal',
- components: {},
+ components: { SelectDeviceDrawer, Calendar },
props: {},
data() {
return {
title: '',
visible: false,
+ value: '',
model: {},
+ equipmentList: [],
downtimeDescriptionList: [],
labelColLong: {
- xs: {
- span: 24
- },
- sm: {
- span: 5
- }
+ xs: { span: 24 },
+ sm: { span: 6 }
},
wrapperColLong: {
- xs: {
- span: 24
- },
- sm: {
- span: 17
- }
+ xs: { span: 24 },
+ sm: { span: 16 }
},
confirmLoading: false,
- form: this.$form.createForm(this),
+ spinning: false,
+ disableSelectDevice: false,
validatorRules: {
+ equipmentIds: [
+ { required: true, message: '璇烽�夋嫨璁惧', trigger: 'change' }
+ ],
downtimeType: [
- {
- required: true, message: '璇烽�夋嫨鍋滄満绫诲瀷'
- }
+ { required: true, message: '璇烽�夋嫨鍋滄満绫诲瀷' }
],
reasonId: [
- {
- required: true, message: '璇烽�夋嫨鍋滄満鍘熷洜'
- }
+ { required: true, message: '璇烽�夋嫨鍋滄満鍘熷洜' }
+ ],
+ theDate: [
+ { required: true, message: '璇烽�夋嫨鍋滄満鏃ユ湡' }
+ ],
+ downLong: [
+ { required: true, message: '璇疯緭鍏ュ仠鏈烘椂闀�(min)' }
]
},
url: {
+ add: '/mdc/mdcDowntime/add',
edit: '/mdc/mdcDowntime/edit',
getDowntimeDescriptionListByDowntimeType: '/mdc/mdcDowntimeReason/downtimeReasonList'
- }
+ },
+ shiData: [],
+ sendDte: []
}
},
methods: {
+ add() {
+ this.resetSelect()
+ this.edit({
+ downtimeType: 0
+ })
+ },
+
edit(record) {
- this.model = Object.assign({}, record)
+ this.model = Object.assign({}, record, { equipmentIds: record.equipmentId })
this.getDowntimeDescriptionListByApi()
if (this.model.downtimeType === null) {
delete this.model.downtimeType
@@ -111,9 +165,13 @@
getDowntimeDescriptionListByApi() {
const that = this
this.downtimeDescriptionList = []
+ this.spinning = true
getAction(this.url.getDowntimeDescriptionListByDowntimeType, { downtimeType: this.model.downtimeType })
.then(res => {
if (res.success) that.downtimeDescriptionList = res.result
+ })
+ .finally(() => {
+ that.spinning = false
})
},
@@ -122,46 +180,210 @@
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.$refs.form.validate(valid => {
if (valid) {
- that.confirmLoading = true
- postAction(this.url.edit, that.model)
- .then((res) => {
- if (res.success) {
- that.$notification.success({
- message: '娑堟伅',
- description: res.message
- })
- that.$emit('ok', res.result)
- that.handleCancel()
- } else {
- that.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
+ that.confirmLoading = that.spinning = true
+ let url
+ if (!that.model.id) {
+ url = that.url.add
+ } else {
+ url = that.url.edit
+ }
+ that.model.dateList = this.sendDte
+ if (that.model.dateList && that.model.dateList.length > 0) {
+ postAction(url, that.model)
+ .then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.$emit('ok')
+ that.handleCancel()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ .finally(() => {
+ that.confirmLoading = that.spinning = false
+ })
+ } else {
+ that.confirmLoading = false
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: '璇烽�夋嫨鐢熸晥鏃堕棿!'
})
- .finally(() => {
- that.confirmLoading = false
- })
- } else {
- return false
+ }
}
})
+ },
+
+ deviceSearch() {
+ this.$refs.selectDeviceDrawer.visible = true
+ this.$refs.selectDeviceDrawer.selectedRowKeys = []
+ this.$refs.selectDeviceDrawer.selectedRows = []
+ this.$refs.selectDeviceDrawer.checkedKeys = this.model.equipmentIds ? this.model.equipmentIds.split(',') : []
+ },
+
+ /**
+ * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+ * @param data 宸查�夋嫨鐨勮澶�
+ */
+ selectOK(data) {
+ this.$set(this.model, 'equipmentIds', data.join(','))
+ if (this.model.equipmentIds) this.$refs.form.clearValidate('equipmentIds')
},
handleCancel() {
this.visible = false
this.removeValidate()
},
-
// 鍏抽棴寮圭獥鏃舵竻妤氳〃鍗曟牎楠�
removeValidate() {
if (this.$refs.form) this.$refs.form.clearValidate()
+ },
+ resetSelect() {//閲嶇疆閫変腑鐨勬棩鏈�
+ this.selectDate = []
+ this.shiData = []
+ this.sendDte = []
+ },
+ fun(obj) {
+ console.log(obj)
+ if (obj) {
+ if (obj = obj.split('/')) {
+ var timShi = obj[1]
+ var timFen = obj[2]
+ if (timShi < 10) {
+ timShi = '0' + timShi
+ }
+ if (timFen < 10) {
+ timFen = '0' + timFen
+ }
+ var dd = (obj[0] + timShi + timFen)
+ return dd
+ }
+ }
+ },
+ clickDay(today) {//閫変腑鏃ユ湡
+ let existDate = this.selectDate
+ let isExist = true
+ for (var i = 0; i < existDate.length; i++) {
+ if (existDate[i].date === today) {
+ this.selectDate.splice(i, 1)
+ this.shiData.splice(i, 1)
+ this.sendDte.splice(i, 1)
+ isExist = false
+ }
+ }
+ if (isExist) {//褰撳墠鏃ユ湡瀛樺湪绉婚櫎
+ let tempDate = { date: today, className: 'mark1' }
+ // let ddd = this.fun(today)
+ let ddd = today
+ let ccc = this.fun(today)
+ this.selectDate.push(tempDate)
+ this.shiData.push(ddd)
+ this.sendDte.push(ccc)
+ }
}
}
}
</script>
+<style scoped lang="less">
+/deep/ .ant-modal-close {
+ color: #1191b0;
+ font-size: 24px;
+}
+/deep/ .ant-modal-close-x {
+ font-size: 24px;
+}
+
+.ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+}
+
+.ant-form-item-control {
+ line-height: 0px;
+}
+
+/** 涓昏〃鍗曡闂磋窛 */
+.ant-form .ant-form-item {
+ margin-bottom: 10px;
+}
+
+/** Tab椤甸潰琛岄棿璺� */
+.ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+}
+
+/deep/ .mark1 {
+ color: white !important;
+ background-color: #1890ff !important;
+ border-radius: 50%;
+}
+
+/deep/ .mainBox .wh_content_all {
+ background-color: #ffffff;
+ border: 1px silver solid;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+}
+
+/deep/ .mainBox .wh_content_all .wh_jiantou1 {
+ border-top: 2px solid #000000;
+ border-left: 2px solid #000000;
+}
+
+/deep/ .mainBox .wh_content_all .wh_jiantou2 {
+ border-top: 2px solid #000000;
+ border-right: 2px solid #000000;
+}
+
+/deep/ .mainBox .wh_content_all .wh_top_changge li {
+ color: black;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item {
+ margin-top: 5px;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item .wh_top_tag {
+ color: #000000;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item .wh_item_date {
+ color: #000000;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item .wh_item_date:hover {
+ color: #1890ff;
+ border: 1px solid #1890ff;
+ border-radius: 50%;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item .wh_other_dayhide {
+ color: #bfbfbf !important;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item .wh_want_dayhide {
+ color: #bfbfbf !important;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item .wh_chose_day {
+ background: #ffffff;
+ color: #000000;
+}
+
+/deep/ .mainBox .wh_content_all .wh_content_item .wh_isMark {
+ color: #ffffff;
+ background-color: blue;
+}
+
+</style>
diff --git a/src/views/mdc/base/modules/mdcParameter/MdcParameterModal.vue b/src/views/mdc/base/modules/mdcParameter/MdcParameterModal.vue
new file mode 100644
index 0000000..80cdce7
--- /dev/null
+++ b/src/views/mdc/base/modules/mdcParameter/MdcParameterModal.vue
@@ -0,0 +1,131 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴">
+
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :rules="validatorRules">
+
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="鍙傛暟缂栫爜">
+ <a-input placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" v-model="model.code" />
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name" label="鍙傛暟鍚嶇О">
+ <a-input placeholder="璇疯緭鍏ュ弬鏁板悕绉�" v-model="model.name" />
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type" label="鍙傛暟绫诲瀷">
+ <a-radio-group v-model="model.type" placeholder="璇烽�夋嫨鍙傛暟绫诲瀷">
+ <a-radio :value=true>鍏紡</a-radio>
+ <a-radio :value=false>鍩烘湰鍙傛暟</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value" label="鍙傛暟鍊�" v-if="model.type">
+ <a-input placeholder="璇疯緭鍏ュ弬鏁板��" v-model="model.value" />
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description" label="鍙傛暟鎻忚堪">
+ <a-input placeholder="璇疯緭鍏ュ弬鏁版弿杩�" v-model="model.description" />
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="澶囨敞">
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" />
+ </a-form-model-item>
+
+ </a-form-model>
+ </a-spin>
+ </j-modal>
+</template>
+
+<script>
+ import { httpAction } from '@/api/manage'
+ import moment from "moment"
+
+ export default {
+ name: "MdcParameterModal",
+ data () {
+ return {
+ title:"鎿嶄綔",
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+
+ confirmLoading: false,
+ validatorRules:{
+ code:[{ required: true, message: '璇疯緭鍏ュ弬鏁扮紪鐮�!' }],
+ type:[{ required: true, message: '璇疯緭鍏ュ弬鏁扮被鍨�!' }],
+ },
+ url: {
+ add: "/mdc/mdcParameter/add",
+ edit: "/mdc/mdcParameter/edit",
+ },
+ }
+ },
+ created () {
+ },
+ methods: {
+ add () {
+ //鍒濆鍖栭粯璁ゅ��
+ this.edit({type:false});
+ },
+ edit (record) {
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ this.$refs.form.clearValidate();
+ },
+ handleOk () {
+ const that = this;
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ httpAction(httpurl,this.model,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }else{
+ return false;
+ }
+ })
+ },
+ handleCancel () {
+ this.close()
+ },
+
+
+ }
+ }
+</script>
+
+<style lang="less" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/system/ProductionManager.vue b/src/views/system/ProductionManager.vue
index c6420c2..985bcb0 100644
--- a/src/views/system/ProductionManager.vue
+++ b/src/views/system/ProductionManager.vue
@@ -109,9 +109,6 @@
placeholder="鏃�">
</a-tree-select>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鏄惁MDC浣跨敤">
- <lx-switch checked-children='鏄�' un-checked-children='鍚�' v-model="model.mdcFlag"/>
- </a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鎺掑簭">
<a-input-number v-model="model.productionOrder"/>
</a-form-model-item>
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 917d8b8..9186386 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -8,7 +8,6 @@
<a-col :md="6" :sm="12">
<a-form-item label="璐﹀彿">
- <!--<a-input placeholder="璇疯緭鍏ヨ处鍙锋煡璇�" v-model="queryParam.username"></a-input>-->
<j-input placeholder="杈撳叆璐﹀彿妯＄硦鏌ヨ" v-model="queryParam.username"></j-input>
</a-form-item>
</a-col>
@@ -180,16 +179,6 @@
queryParam: {},
recycleBinVisible: false,
columns: [
- /*{
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },*/
{
title: '鐢ㄦ埛璐﹀彿',
align: "center",
@@ -202,39 +191,6 @@
align: "center",
width: 100,
dataIndex: 'realname',
- },
- {
- title: '澶村儚',
- align: "center",
- width: 80,
- dataIndex: 'avatar',
- scopedSlots: {customRender: "avatarslot"}
- },
-
- // {
- // title: '鎬у埆',
- // align: "center",
- // width: 80,
- // dataIndex: 'sex_dictText',
- // sorter: true
- // },
- // {
- // title: '鐢熸棩',
- // align: "center",
- // width: 100,
- // dataIndex: 'birthday'
- // },
- // {
- // title: '鎵嬫満鍙风爜',
- // align: "center",
- // width: 100,
- // dataIndex: 'phone'
- // },
- {
- title: '宀椾綅',
- align: "center",
- width: 80,
- dataIndex: 'post_dictText'
},
{
title: '閮ㄩ棬',
@@ -312,37 +268,10 @@
dataIndex: 'realname',
},
{
- title: '澶村儚',
+ title: '宸ュ彿',
align: "center",
- width: 80,
- dataIndex: 'avatar',
- scopedSlots: {customRender: "avatarslot"}
- },
-
- // {
- // title: '鎬у埆',
- // align: "center",
- // width: 80,
- // dataIndex: 'sex_dictText',
- // sorter: true
- // },
- // {
- // title: '鐢熸棩',
- // align: "center",
- // width: 100,
- // dataIndex: 'birthday'
- // },
- // {
- // title: '鎵嬫満鍙风爜',
- // align: "center",
- // width: 100,
- // dataIndex: 'phone'
- // },
- {
- title: '宀椾綅',
- align: "center",
- width: 80,
- dataIndex: 'post_dictText'
+ width: 100,
+ dataIndex: 'workNo',
},
{
title: '杞﹂棿',
@@ -383,39 +312,6 @@
dataIndex: 'realname',
},
{
- title: '澶村儚',
- align: "center",
- width: 80,
- dataIndex: 'avatar',
- scopedSlots: {customRender: "avatarslot"}
- },
-
- // {
- // title: '鎬у埆',
- // align: "center",
- // width: 80,
- // dataIndex: 'sex_dictText',
- // sorter: true
- // },
- // {
- // title: '鐢熸棩',
- // align: "center",
- // width: 100,
- // dataIndex: 'birthday'
- // },
- // {
- // title: '鎵嬫満鍙风爜',
- // align: "center",
- // width: 100,
- // dataIndex: 'phone'
- // },
- {
- title: '宀椾綅',
- align: "center",
- width: 80,
- dataIndex: 'post_dictText'
- },
- {
title: '閮ㄩ棬',
align: "center",
width: 240,
@@ -427,12 +323,6 @@
width: 240,
dataIndex: 'productionName',
ellipsis: true,
- },
- {
- title: '鐝粍',
- align: "center",
- width: 240,
- dataIndex: 'teamId_dictText'
},
{
title: '鐘舵��',
diff --git a/src/views/system/modules/ProductionManager/ProductionModal.vue b/src/views/system/modules/ProductionManager/ProductionModal.vue
index 3a93426..8ac2113 100644
--- a/src/views/system/modules/ProductionManager/ProductionModal.vue
+++ b/src/views/system/modules/ProductionManager/ProductionModal.vue
@@ -43,12 +43,6 @@
<a-form-model-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="鏄惁MDC浣跨敤">
- <lx-switch checked-children='鏄�' un-checked-children='鍚�' v-model="model.mdcFlag"/>
- </a-form-model-item>
- <a-form-model-item
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
label="鎺掑簭">
<a-input-number v-model="model.productionOrder"/>
</a-form-model-item>
@@ -127,7 +121,6 @@
this.seen = false;
this.dictDisabled = false;
this.model.parentId = depart.id;
- this.model.mdcFlag = depart.mdcFlag;
}else{
this.seen = true;
this.dictDisabled = true;
diff --git a/src/views/system/modules/SelectDeviceModal.vue b/src/views/system/modules/SelectDeviceModal.vue
index 8cdac87..7235149 100644
--- a/src/views/system/modules/SelectDeviceModal.vue
+++ b/src/views/system/modules/SelectDeviceModal.vue
@@ -58,7 +58,7 @@
} from '@/api/manage'
import BaseTree from '@/views/mdc/common/BaseTree'
import DepartTree from '@/views/mdc/base/modules/DepartList/DepartListTree/DepartTree'
- import { getSystemConfigValue } from '@api/api'
+ // import { getSystemConfigValue } from '@api/api'
export default {
name: 'SelectDeviceModal',
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 32c2078..e78d524 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -97,11 +97,6 @@
/>
</a-form-model-item>
- <a-form-model-item label="宀椾綅" :labelCol="labelCol" :wrapperCol="wrapperCol">
-<!-- <j-select-position placeholder="璇烽�夋嫨宀椾綅" :multiple="false" v-model="model.post"/>-->
- <j-dict-select-tag placeholder="璇烽�夋嫨宀椾綅" dict-code="sys_position, name, code" v-model="model.post" />
- </a-form-model-item>
-
<a-form-model-item
label="瑙掕壊鍒嗛厤"
:labelCol="labelCol"
@@ -170,153 +165,6 @@
/>
</a-tooltip>
</a-form-model-item>
-
-
- <!--<a-form-model-item-->
- <!--label="棣栭〉鏉冮檺"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!-->-->
- <!--<a-radio-group-->
- <!--v-model="model.userType"-->
- <!--:defaultValue="0"-->
- <!-->-->
- <!--<a-radio :value="4">鍏徃绾�</a-radio>-->
- <!--<a-radio :value="3">杞﹂棿绾�</a-radio>-->
- <!--<a-radio :value="2">宸ユ绾�</a-radio>-->
- <!--<a-radio :value="1">鎿嶄綔宸�</a-radio>-->
- <!--<a-radio :value="0">鏃�</a-radio>-->
- <!--</a-radio-group>-->
- <!--</a-form-model-item>-->
-
- <!--<a-form-model-item-->
- <!--label="鐝粍鍒嗛厤"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!--prop="teamId"-->
- <!-->-->
- <!--<j-dict-select-tag-->
- <!--v-model="model.teamId"-->
- <!--:triggerChange="true"-->
- <!--dictCode="mom_base_team,name,id,del_flag = 0"-->
- <!--placeholder="璇风淮鎶ょ彮缁�"-->
- <!--></j-dict-select-tag>-->
- <!--</a-form-model-item>-->
- <!--<a-form-model-item-->
- <!--label="涓績鍒嗛厤"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!--prop="areaId"-->
- <!-->-->
- <!--<!– <j-dict-select-tag-->
- <!--v-model="model.areaId"-->
- <!--:triggerChange="true"-->
- <!--dictCode="mom_base_area,name,id,del_flag = 0"-->
- <!--placeholder="璇风淮鎶や腑蹇�"-->
- <!--></j-dict-select-tag> –>-->
- <!--<j-multi-select-tag-->
- <!--:triggerChange="true"-->
- <!--v-model="model.areaId"-->
- <!--dictCode="mom_base_area,name,id,del_flag = 0 and type = 1"-->
- <!--placeholder="璇风淮鎶や腑蹇�"-->
- <!-->-->
- <!--</j-multi-select-tag>-->
- <!--</a-form-model-item>-->
- <!--<a-form-model-item-->
- <!--label="璐熻矗閮ㄩ棬"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!--v-if="departIdShow==true"-->
- <!-->-->
- <!--<j-multi-select-tag-->
- <!--:disabled="disableSubmit"-->
- <!--v-model="model.departIds"-->
- <!--:options="nextDepartOptions"-->
- <!--placeholder="璇烽�夋嫨璐熻矗閮ㄩ棬"-->
- <!-->-->
- <!--</j-multi-select-tag>-->
- <!--</a-form-model-item>-->
-
- <!--<a-form-model-item-->
- <!--label="澶村儚"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!-->-->
- <!--<j-image-upload-->
- <!--class="avatar-uploader"-->
- <!--text="涓婁紶"-->
- <!--v-model="model.avatar"-->
- <!--></j-image-upload>-->
- <!--</a-form-model-item>-->
-
- <!--<a-form-model-item-->
- <!--label="鐢熸棩"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!-->-->
- <!--<a-date-picker-->
- <!--style="width: 100%"-->
- <!--placeholder="璇烽�夋嫨鐢熸棩"-->
- <!--v-model="model.birthday"-->
- <!--:format="dateFormat"-->
- <!--:getCalendarContainer="node => node.parentNode"-->
- <!--/>-->
- <!--</a-form-model-item>-->
-
- <!--<a-form-model-item-->
- <!--label="鎬у埆"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!-->-->
- <!--<a-select-->
- <!--v-model="model.sex"-->
- <!--placeholder="璇烽�夋嫨鎬у埆"-->
- <!--:getPopupContainer="(target) => target.parentNode"-->
- <!-->-->
- <!--<a-select-option :value="1">鐢�</a-select-option>-->
- <!--<a-select-option :value="2">濂�</a-select-option>-->
- <!--</a-select>-->
- <!--</a-form-model-item>-->
-
- <!--<a-form-model-item-->
- <!--label="閭"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!--prop="email"-->
- <!-->-->
- <!--<a-input-->
- <!--placeholder="璇疯緭鍏ラ偖绠�"-->
- <!--v-model="model.email"-->
- <!--/>-->
- <!--</a-form-model-item>-->
-
- <!--<a-form-model-item-->
- <!--label="鎵嬫満鍙风爜"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!--prop="phone"-->
- <!-->-->
- <!--<a-input-->
- <!--placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"-->
- <!--v-model="model.phone"-->
- <!--/>-->
- <!--</a-form-model-item>-->
-
- <!--<a-form-model-item-->
- <!--label="搴ф満"-->
- <!--:labelCol="labelCol"-->
- <!--:wrapperCol="wrapperCol"-->
- <!--prop="telephone"-->
- <!-->-->
- <!--<a-input-->
- <!--placeholder="璇疯緭鍏ュ骇鏈�"-->
- <!--v-model="model.telephone"-->
- <!--/>-->
- <!--</a-form-model-item>-->
- <!--<a-form-model-item label="宸ヤ綔娴佸紩鎿�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<j-dict-select-tag v-model="model.activitiSync" placeholder="璇烽�夋嫨鏄惁鍚屾宸ヤ綔娴佸紩鎿�" :type="'radio'" dictCode="activiti_sync"/>-->
- <!--</a-form-model-item>-->
-
</a-form-model>
</a-spin>
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index bc0b15d..c87024b 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -34,10 +34,6 @@
@fail="requestFailed"
></login-account>
</a-tab-pane>
-
- <!--<a-tab-pane key="tab2" tab="鎵嬫満鍙风櫥褰�">-->
- <!--<login-phone ref="plogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-phone>-->
- <!--</a-tab-pane>-->
</a-tabs>
<a-form-model-item>
@@ -70,12 +66,10 @@
</a-form-model>
</div>
- <!--<two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>-->
<login-select-tenant
ref="loginSelect"
@success="loginSelectOk"
></login-select-tenant>
- <!--<third-login ref="thirdLogin"></third-login>-->
<user-password ref="userPassword"/>
</div>
</template>
@@ -168,10 +162,7 @@
description: description,
duration: 4,
});
- //璐︽埛瀵嗙爜鐧诲綍閿欒鍚庢洿鏂伴獙璇佺爜
- if(this.customActiveKey === 'tab1' && description.indexOf('瀵嗙爜閿欒')>0){
- this.$refs.alogin.handleChangeCheckCode()
- }
+
this.loginBtn = false;
},
loginSelectOk(){
@@ -186,27 +177,6 @@
message: '娆㈣繋',
description: `${timeFix()}锛屾杩庡洖鏉,
});
- },
-
- stepCaptchaSuccess() {
- this.loginSuccess()
- },
- stepCaptchaCancel() {
- this.Logout().then(() => {
- this.loginBtn = false
- this.stepCaptchaVisible = false
- })
- },
- //鑾峰彇瀵嗙爜鍔犲瘑瑙勫垯
- getEncrypte() {
- var encryptedString = Vue.ls.get(ENCRYPTED_STRING)
- if (encryptedString == null) {
- getEncryptedString().then((data) => {
- this.encryptedString = data
- })
- } else {
- this.encryptedString = encryptedString
- }
}
}
--
Gitblit v1.9.3