From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/sbgl/byjl.vue | 1431 ++++++++++++++++++++++++++--------------------------------
1 files changed, 643 insertions(+), 788 deletions(-)
diff --git a/src/views/sbgl/byjl.vue b/src/views/sbgl/byjl.vue
index 1def61d..9e51ecb 100644
--- a/src/views/sbgl/byjl.vue
+++ b/src/views/sbgl/byjl.vue
@@ -1,828 +1,683 @@
<template>
<div>
- <el-tabs>
- <el-row style="margin-bottom:20px">
- <!-- <el-col :span="2">
- <el-input v-model="form.Seach" @keyup.enter.native="SeachKey" placeholder="璇疯緭鍏ュ叧閿瘝" size="small"></el-input>
- </el-col>-->
- <el-col :span="7" :offset="1">
- <span class="t_size" style="margin-left:7px">鎺掔▼鏃ユ湡</span>
- <el-date-picker
- v-model="value1"
- type="daterange"
- range-separator="~"
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- size="small"
- :picker-options="pickerOptions1"
- />
- </el-col>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup">
+ <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+ <!-- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+ <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ </div>
- <el-col :span="3">
- <span class="t_size">鎺掔▼鏂瑰紡</span>
- <el-select v-model="types" size="small" style="width:120px" @change="changeTypes">
- <el-option value="N" label="璁惧浼樺厛" />
- <el-option value="Y" label="鏃堕棿浼樺厛" />
- </el-select>
- </el-col>
-
- <el-col :span="3" :offset="1">
- <div style="height:32px;">
- <span class="t_size">鏃堕棿鍒诲害</span>
- <select id="scale" v-model.number="scale">
- <option v-for="i in scaleList" :key="i">{{ i }}</option>
- </select>
- <span class="t_size">鍒嗛挓</span>
- </div>
- </el-col>
-
- <el-col :span="3">
- <div style="height:32px;">
- <span class="t_size">鎹㈠瀷鏃堕棿</span>
- <el-input
- id="scale"
- v-model="times"
- type="number"
- size="mini"
- style="display:inline-block;width:80px;"
- @change="no_zero"
- />
- <span class="t_size">鍒嗛挓</span>
- </div>
- </el-col>
-
- <el-col :span="3">
- <div style="height:32px;line-height: 28px;">
- <span class="t_size">棰勬帓杩涘害</span>
- <span>
- <span style="text-decoration:underline;">{{ real_num }}</span> /
- <span style="text-decoration:underline">{{ meter }}</span>
- </span>
- </div>
- </el-col>
-
- <el-col :span="3">
- <el-button
- type="primary"
- size="mini"
- icon="el-icon-document-remove"
- style="margin-left:20px;"
- >棰勬帓
- <!-- @click="click_schedule"-->
-
- </el-button>
- <el-button
- type="primary"
- size="mini"
- icon="el-icon-document-checked"
- >鎻愪氦
- <!-- @click="click_yes"-->
-
- </el-button>
- <p />
- </el-col>
- </el-row>
- <el-row />
- </el-tabs>
- <div class="container">
- <v-gantt-chart
- :start-time="time_data[0]"
- :end-time="time_data[1]"
- :cell-width="cellWidth"
- :cell-height="cellHeight"
- :time-lines="timeLines"
- :title-height="titleHeight"
- :scale="scale"
- :title-width="titleWidth"
- show-current-time
- :hide-header="hideHeader"
- :data-key="dataKey"
- :array-keys="arrayKeys"
- :scroll-to-postion="positionA"
- :datas="bm_data"
- >
- <!-- @scrollLeft="scrollLeftA"-->
-
- <template slot="block" slot-scope="{data,item}">
- <Test
- :data="data"
- :update-time-lines="updateTimeLines"
- :cell-height="cellHeight"
- :current-time="currentTime"
- :item="item"
- />
- </template>
- <template slot="left" slot-scope="{data}">
- <div class="name">
- <div class="carId">
- <el-checkbox
- v-model="data.status"
- style="margin-right:5px;"
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm" style="justify-content: flex-start">
+ <el-form-item label="鐢熶骇杞﹂棿" label-width="70px" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in wkshopSelectArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁惧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.eqpcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="璁惧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.eqpname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.stanedname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm"label="淇濆吇浜哄憳" label-width="70px" style=" display: flex;">
+ <el-input v-model="form.repairuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="淇濆吇鏃堕棿" style=" display: flex;font-size:14px;align-items: center">
+ <el-date-picker
+ v-model="form.repairdate"
+ type="daterange"
+ :clearable="false"
+ class="timeMini"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 200px;display: flex;line-height: 34px ;height: 34px;"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
/>
- <!-- @change="click_box(data)"-->
-
- {{ data.id }} {{ data.name }}
- </div>
- <div class="speed">
- <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
- <el-button type="text" size="mini">
- <!-- @click="look(data)"-->
- <i class="el-icon-document size i-color" />
- </el-button>
- </el-tooltip>
- </div>
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="淇濆吇缁撴灉" style=" display: flex;">
+ <el-select v-model="form.repairresult" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in repairresultArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
</div>
- </template>
- <template slot="title">
- <span class="tc">宸ヤ綅鍒楄〃</span>
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
+ </div>
- <el-checkbox v-model="all_status" class="box_style" @change="changeLift()" />
- <input v-model.number="cellWidth" type="range" min="20" max="100" class="box_styles">
- </template>
- </v-gantt-chart>
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px'}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="bywo"
+ width="160"
+ label="淇濆吇鍗曞彿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="org_name"
+ label="鐢熶骇杞﹂棿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_code"
+ label="璁惧缂栧彿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_name"
+ label="璁惧鍚嶇О"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stanedcode"
+ label="淇濆吇鏍囧噯缂栫爜"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stanedname"
+ label="淇濆吇鏍囧噯鍚嶇О"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="maint_cyc"
+ label="淇濆吇鍛ㄦ湡"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.maint_cyc==='M'">鏈�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_user"
+ label="淇濆吇浜哄憳"
+ width="160"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.maint_user">{{ row.maint_user }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_result"
+ label="淇濆吇缁撴灉"
+ width="160"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.maint_result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
+ <div v-if="row.maint_result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_date"
+ label="淇濆吇鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鏌ョ湅璁板綍"
+ width="80"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <i
+ class="el-icon-tickets"
+ style="cursor: pointer;color: #42b983;margin-right: 15px"
+ @click="edit('edit',row)"
+ />
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getDeviceRepairTakeSearch"
+ />
</div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'淇濆吇鏄庣粏'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+
+ <div class="elTableDiv" style="margin-top: 0">
+ <el-table
+ :data="tableDataDialog"
+ :height="500+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:500+'px'}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="seq"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="itemcode"
+ label="閮ㄤ綅缂栫爜"
+ />
+ <el-table-column
+ prop="itemname"
+ label="閮ㄤ綅鍚嶇О"
+ />
+ <el-table-column
+ prop="result"
+ label="鐐规缁撴灉"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
+ <div v-if="row.result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_value"
+ label="鏁板��"
+ />
+ <el-table-column
+ prop="remark"
+ label="澶囨敞"
+ show-tooltip-when-overflow
+ />
+ </el-table>
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisible = false">杩� 鍥�</el-button>
+ <!-- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+ <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ </div>
+ </span>
+ </el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
+
</div>
</template>
<script>
-import dayjs from 'dayjs'
-import { mockDatas } from '@/views/sbgl/index1'
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import ImportPicker from '@/components/ImportPicker'
+import { handleDatetime } from '@/utils/global'
+import { DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch
+} from '@/api/sbgl'
+import { ShopSearch } from '@/api/dzkb'
export default {
- name: 'Byjl',
+ name: 'Zzjg',
+ components: {
+ Pagination, ImportPicker
+ },
data() {
return {
- show: true,
- pickerOptions1: {
- disabledDate(time) {
- return time.getTime() <= Date.now() - 24 * 60 * 60 * 1000
- }
- },
- real_num: 0,
- keep_data: [],
- all_status: true,
- look_data: [],
- look_total: 0,
- cl_name: '',
- cl_code: '',
- work_order: '',
- false_arr: [],
- ckeckVal: true,
- AdvaScheUom: '',
- list: [],
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
+ mainHeight: 0,
+ tableHeight: 0,
form: {
- WorkShop: '',
- PartNumber: '',
- PartName: '',
- rows: 10,
- page: 1
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ eqpcode: '', // 璁惧缂栫爜
+ eqpname: '', // 璁惧鍚嶇О
+ stanedname: '', // 鏍囧噯鍚嶇О
+ repairuser: '', // 鐐规浜哄憳
+ repairdate: '', // 鐐规鏃堕棿
+ repairresult: '', // 淇濆吇缁撴灉
+ prop: 'maint_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
- showDialog: false,
- time_data: [],
- forms: {
- WorkCode: '',
- WorkShop: '',
- PartNumber: '',
- BotProceCode: '',
- StartTime: '',
- EndTime: ''
- },
- click_one: 0,
- datasC: [],
- radio: '',
- value1: '',
- types: 'N',
- no: false,
- total: 0,
- mn_data: [],
- bm_data: [],
- facility_data: [],
- end_start: '',
- timeLines: [
- {
- time: dayjs()
- .add(2, 'hour')
- .toString()
- },
- {
- time: dayjs()
- .add(5, 'hour')
- .toString(),
- color: '#747e80'
- }
+ wkshopSelectArr: [],
+ repairresultArr: [
+ { code: 'OK', name: '鍚堟牸' },
+ { code: 'NG', name: '涓嶈壇' }
],
- formUpdata: {
- WorkCode: '',
- BotProceCode: '',
- json: []
- },
- currentTime: dayjs(),
- startTime: dayjs()
- .subtract(5, 'hour')
- .toString(),
- endTime: dayjs()
- .add(2, 'day')
- .add(2, 'hour')
- .toString(),
- cellWidth: 50,
- cellHeight: 30,
- titleHeight: 40,
- titleWidth: 250,
- scale: 60,
- datasNum: 100,
- // datasA: [],
- // datasB: mockDatas(100),
- dataKey: 'id',
- times: 0,
- timeList: timeList,
- scaleList: scaleList,
- scrollToTime: dayjs()
- .add(1, 'day')
- .toString(),
- scrollToPostion: { x: 10000, y: 10000 },
- hideHeader: false,
- arrayKeys: ['gtArray', 'error'],
- scrollToY: 0,
- positionB: {},
- positionA: {},
- meter: 0, // 鑺傛媿
- title_list: [],
- imp_id: '',
- submit_flag: false,
- search_from: {
- page: 1,
- rows: 10,
- WorkTime: '',
- BotProceName: ''
- },
- testValue: {
- 'rus': {
- 'statusCode': '',
- 'message': '',
- 'MOD_S': '',
- 'MAR_S': '',
- 'EQP_S': '',
- 'CUT_S': '',
- 'FIXT_S': '',
- 'HouseNumber': '',
- 'navTabId': '',
- 'dialogid': '',
- 'rel': '',
- 'dt': null,
- 'list': {},
- 'callbackType': '',
- 'forwardUrl': ''
- },
- 'rows': [
- {
- 'YearDate': '2022-09-01',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-02',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-03',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-04',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-05',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-06',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- }
- ],
- 'Cont': null
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ // dialogForm: {
+ // OrgType: '',
+ // OrgCode: '',
+ // OrgName: '',
+ // SupUnit: ''// 涓婄骇鍗曚綅
+ // },
+ operation: '',
+
+ tableDataDialog: [], // 鐐规鏄庣粏瀵硅瘽妗唗able
+
+ title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
+ code: '4',
+ shows: false
+
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getDeviceRepairTakeSearch()
}
}
+ // 'tableData': {
+ // handler() {
+ // this.$nextTick(() => {
+ // this.$refs.tableDataRef.doLayout()
+ // })
+ // },
+ // deep: true
+ // }
+ },
+ created() {
+ this.handleRequest()
},
mounted() {
- this.OnclickAdvancedSchedulingDevice()
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
},
methods: {
- OnclickAdvancedSchedulingDevice() {
- this.facility_top()
-
- // automaticScheduling
- // .OnclickAdvancedSchedulingDevice(this.forms)
- // .then(res => {
- const res = this.testValue
- // if (res.rus.message) {
- // this.$message({
- // showClose: true,
- // type: 'error',
- // message: res.rus.message
- // })
- // }
- this.submit_flag = false
- const list = []
- this.time_all = res
- const cont = res.Cont
- this.real_num = 0
- for (const i in this.time_all.rows[0].children) {
- const obj = {
- id: '',
- name: '',
- AdvaDevicRhythm: '',
- status: true,
- colorPair: {
- dark: 'rgb(83, 186, 241,0.8)',
- light: 'rgb(83, 186, 241,0.1)',
- light_capacity: 'rgb(209,239,237,0.8)',
- h_schedule: ' rgb(100,255,192,0.8)',
- scheduleing: 'rgb(20,182,231,0.8)'
- },
- gtArray: []
+ handleRequest() {
+ this.getDeviceRepairTakeSearch().then(res => {
+ if (res.code === '200') {
+ this.getShopSearch()
}
- obj.id = this.time_all.rows[0].children[i].AdvaDevicNumber
- obj.name = this.time_all.rows[0].children[i].AdvaDevicName
- obj.AdvaDevicRhythm = this.time_all.rows[0].children[
- i
- ].AdvaDevicRhythm
- list.push(obj)
- }
- console.log(list, 1)
- for (const i in this.time_all.rows) {
- for (const j in this.time_all.rows[i].children) {
- if (this.time_all.rows[i].children[j].OneStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].OneStartDate = this.time_all.rows[i].children[
- j
- ].OneStartDate.split('~')
- this.time_all.rows[i].children[j].OneStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].OneStartDate[0]
- this.time_all.rows[i].children[j].OneStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].OneStartDate[1]
- }
- if (this.time_all.rows[i].children[j].TwoStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].TwoStartDate = this.time_all.rows[i].children[
- j
- ].TwoStartDate.split('~')
- this.time_all.rows[i].children[j].TwoStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].TwoStartDate[0]
- this.time_all.rows[i].children[j].TwoStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].TwoStartDate[1]
- }
- if (this.time_all.rows[i].children[j].ThreeStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].ThreeStartDate = this.time_all.rows[i].children[
- j
- ].ThreeStartDate.split('~')
- this.time_all.rows[i].children[j].ThreeStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].ThreeStartDate[0]
- this.time_all.rows[i].children[j].ThreeStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].ThreeStartDate[1]
- }
- if (this.time_all.rows[i].children[j].FourStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].FourStartDate = this.time_all.rows[i].children[
- j
- ].FourStartDate.split('~')
- this.time_all.rows[i].children[j].FourStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FourStartDate[0]
- this.time_all.rows[i].children[j].FourStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FourStartDate[1]
- }
- if (this.time_all.rows[i].children[j].FiveStartDate != '') {
- this.time_all.rows[i].children[
- j
- ].FiveStartDate = this.time_all.rows[i].children[
- j
- ].FiveStartDate.split('~')
- this.time_all.rows[i].children[j].FiveStartDate[0] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FiveStartDate[0]
- this.time_all.rows[i].children[j].FiveStartDate[1] =
- this.time_all.rows[i].YearDate +
- ' ' +
- this.time_all.rows[i].children[j].FiveStartDate[1]
- }
- }
- }
- // 缁勫悎鏂扮殑缁撴瀯
- const newList = []
- for (const i in this.time_all.rows) {
- for (const j in this.time_all.rows[i].children) {
- if (this.time_all.rows[i].children[j].OneStartDate != '') {
- const data1 = {
- id: '',
- start: '',
- end: '',
- mod: ''
- }
- data1.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data1.start = this.time_all.rows[i].children[j].OneStartDate[0]
- data1.end = this.time_all.rows[i].children[j].OneStartDate[1]
- data1.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
- newList.push(data1)
- }
- if (this.time_all.rows[i].children[j].TwoStartDate != '') {
- const data2 = {
- id: '',
- start: '',
- end: '',
- mod: ''
- }
- data2.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data2.start = this.time_all.rows[i].children[j].TwoStartDate[0]
- data2.end = this.time_all.rows[i].children[j].TwoStartDate[1]
- data2.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
- newList.push(data2)
- }
- if (this.time_all.rows[i].children[j].ThreeStartDate != '') {
- const data3 = {
- id: '',
- start: '',
- end: '',
- mod: ''
- }
- data3.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data3.start = this.time_all.rows[i].children[
- j
- ].ThreeStartDate[0]
- data3.end = this.time_all.rows[i].children[j].ThreeStartDate[1]
- data3.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
- newList.push(data3)
- }
- if (this.time_all.rows[i].children[j].FourStartDate != '') {
- const data4 = {
- id: '',
- start: '',
- end: '',
- mod: ''
- }
- data4.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data4.start = this.time_all.rows[i].children[
- j
- ].FourStartDate[0]
- data4.end = this.time_all.rows[i].children[j].FourStartDate[1]
- data4.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
- newList.push(data4)
- }
- if (this.time_all.rows[i].children[j].FiveStartDate != '') {
- const data5 = {
- id: '',
- start: '',
- end: '',
- mod: ''
- }
- data5.id = this.time_all.rows[i].children[j].AdvaDevicNumber
- data5.start = this.time_all.rows[i].children[
- j
- ].FiveStartDate[0]
- data5.end = this.time_all.rows[i].children[j].FiveStartDate[1]
- data5.mod =
- (this.time_all.rows[i].children[j].AdvaDevicCropMob * 1) /
- 100
- newList.push(data5)
- }
- }
- }
- for (const i in list) {
- this.pushTiem(newList, list[i].id, list[i].gtArray)
- }
- this.bm_data = list
- const _this = this
- if (cont != '') {
- for (const i in cont) {
- for (const j in this.bm_data) {
- if (this.bm_data[j].id == cont[i].EQP_CODE) {
- const data = {
- id: cont[i].EQP_CODE,
- number: cont[i].ALLOC_QTY,
- cl_name: cont[i].PART_NAME,
- cl_code: this.cl_code,
- work_order: cont[i].WO_CODE,
- STATUS: _this.AdvaScheUom,
- start: cont[i].TIME_START,
- end: cont[i].TIME_END,
- type: cont[i].STATUS == 'S' ? 'h_schedule' : 'bm_schedule'
- }
-
- this.bm_data[j].flag = 'isCont'
-
- this.bm_data[j].gtArray.unshift(data)
- }
- }
- }
+ })
+ },
+ async getDeviceRepairTakeSearch() {
+ let tempDate = this.form.repairdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
- if (this.false_arr != '') {
- for (const j in this.bm_data) {
- if (this.false_arr.indexOf(this.bm_data[j].id) >= 0) {
- this.bm_data[j].gtArray = []
- this.bm_data[j].status = false
- }
- }
+ const data = {
+ wkshopcode: this.form.wkshopcode,
+ eqpcode: this.form.eqpcode,
+ eqpname: this.form.eqpname,
+ stanedname: this.form.stanedname,
+ repairuser: this.form.repairuser,
+ repairdate: tempDate,
+ repairresult: this.form.repairresult,
+ prop: this.form.prop, // 鎺掑簭瀛楁
+ order: this.form.order, // 鎺掑簭瀛楁
+ page: this.form.page, // 绗嚑椤�
+ rows: this.form.rows // 姣忛〉澶氬皯鏉�
}
+
+ const res = await DeviceRepairTakeSearch(data)
+ this.tableData = res.data
+ this.total = res.count
+ return { code: res.code }
+ },
+ // 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
+ async getShopSearch() {
+ const { data: res } = await ShopSearch()
+ this.wkshopSelectArr = res
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getDeviceRepairTakeSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getDeviceRepairTakeSearch()
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.wkshopcode = ''
+ this.form.eqpcode = ''
+ this.form.eqpname = ''
+ this.form.stanedname = ''
+ this.form.repairuser = ''
+ this.form.repairdate = ''
+ this.form.repairresult = ''
+ this.getDeviceRepairTakeSearch()
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ const res = await DeviceRepairSubTakeSearch({ bywo: row.bywo })
+
+ this.tableDataDialog = res.data
+ // this.$nextTick(() => {
+ // this.dialogForm.OrgCode = row.org_code
+ // this.dialogForm.OrgName = row.org_name
+ // this.dialogForm.SupUnit = row.parent_id
// })
},
- // 璁惧浼樺厛
- facility_top() {
- // automaticScheduling
- // .OnclickAdvancedSchedulingDevice(this.forms)
- // .then(res => {
- const res = this.testValue
- this.show = true
- const data = res.rows
- const cont = res.Cont
- this.title_list = []
- for (const i in data[0].children) {
- const obj = {
- id: '',
- name: '',
- status: true,
- AdvaDevicRhythm: '',
- // mod:'',
- colorPair: {
- dark: 'rgb(83, 186, 241,0.8)',
- light: 'rgb(83, 186, 241,0.1)',
- light_capacity: 'rgb(209,239,237,0.8)',
- h_schedule: ' rgb(100,255,192,0.8)',
- scheduleing: 'rgb(20,182,231,0.8)'
- },
- gtArray: []
- }
- obj.id = data[0].children[i].AdvaDevicNumber
- obj.name = data[0].children[i].AdvaDevicName
- obj.AdvaDevicRhythm = data[0].children[i].AdvaDevicRhythm
- // obj.mod =data[0].children[i].AdvaDevicCropMob *1
-
- this.title_list.push(obj)
- }
- for (const i in data) {
- for (const j in data[i].children) {
- if (data[i].children[j].OneStartDate != '') {
- data[i].children[j].OneStartDate = data[i].children[
- j
- ].OneStartDate.split('~')
- data[i].children[j].OneStartDate[0] =
- data[i].YearDate + ' ' + data[i].children[j].OneStartDate[0]
- data[i].children[j].OneStartDate[1] =
- data[i].YearDate + ' ' + data[i].children[j].OneStartDate[1]
- }
- if (data[i].children[j].TwoStartDate != '') {
- data[i].children[j].TwoStartDate = data[i].children[
- j
- ].TwoStartDate.split('~')
- data[i].children[j].TwoStartDate[0] =
- data[i].YearDate + ' ' + data[i].children[j].TwoStartDate[0]
- data[i].children[j].TwoStartDate[1] =
- data[i].YearDate + ' ' + data[i].children[j].TwoStartDate[1]
- }
- if (data[i].children[j].ThreeStartDate != '') {
- data[i].children[j].ThreeStartDate = data[i].children[
- j
- ].ThreeStartDate.split('~')
- data[i].children[j].ThreeStartDate[0] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].ThreeStartDate[0]
- data[i].children[j].ThreeStartDate[1] =
- data[i].YearDate +
- ' ' +
- data[i].children[j].ThreeStartDate[1]
- }
- if (data[i].children[j].FourStartDate != '') {
- data[i].children[j].FourStartDate = data[i].children[
- j
- ].FourStartDate.split('~')
- data[i].children[j].FourStartDate[0] =
- data[i].YearDate + ' ' + data[i].children[j].FourStartDate[0]
- data[i].children[j].FourStartDate[1] =
- data[i].YearDate + ' ' + data[i].children[j].FourStartDate[1]
- }
- if (data[i].children[j].FiveStartDate != '') {
- data[i].children[j].FiveStartDate = data[i].children[
- j
- ].FiveStartDate.split('~')
- data[i].children[j].FiveStartDate[0] =
- data[i].YearDate + ' ' + data[i].children[j].FiveStartDate[0]
- data[i].children[j].FiveStartDate[1] =
- data[i].YearDate + ' ' + data[i].children[j].FiveStartDate[1]
- }
- }
- }
- // 鏇存敼鏍煎紡
- this.facility_data = []
-
- for (const i in data) {
- const time = {
- date: data[i].YearDate,
- AdvaDevicRhythm: '',
- gtArray: []
- }
- if (data[i].children != '') {
- time.AdvaDevicRhythm = data[i].children[0].AdvaDevicRhythm
- }
- for (const j in data[i].children) {
- if (data[i].children[j].OneStartDate != '') {
- const icu1 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].OneStartDate[0],
- end: data[i].children[j].OneStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgid: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
}
- time.gtArray.push(icu1)
+ this.getDeviceRepairTakeSearch()
}
- if (data[i].children[j].TwoStartDate != '') {
- const icu2 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].TwoStartDate[0],
- end: data[i].children[j].TwoStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu2)
- }
- if (data[i].children[j].ThreeStartDate != '') {
- const icu3 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].ThreeStartDate[0],
- end: data[i].children[j].ThreeStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu3)
- }
- if (data[i].children[j].FourStartDate != '') {
- const icu4 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].FourStartDate[0],
- end: data[i].children[j].FourStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu4)
- }
- if (data[i].children[j].FiveStartDate != '') {
- const icu5 = {
- name: data[i].children[j].AdvaDevicName,
- id: data[i].children[j].AdvaDevicNumber,
- type: 'capacity',
- rhythm: data[i].children[j].AdvaDevicRhythm,
- start: data[i].children[j].FiveStartDate[0],
- end: data[i].children[j].FiveStartDate[1],
- mod: (data[i].children[j].AdvaDevicCropMob * 1) / 100
- }
- time.gtArray.push(icu5)
- }
- }
-
- this.facility_data.push(time)
- }
-
- if (cont != '') {
- for (const i in cont) {
- const date_time = cont[i].TIME_START.split(' ')
- const cont_date = date_time[0]
- for (const j in this.facility_data) {
- const data = {
- id: cont[i].EQP_CODE,
- date: cont_date,
- number: cont[i].ALLOC_QTY,
- cl_name: cont[i].PART_NAME,
- cl_code: this.cl_code,
- work_order: cont[i].WO_CODE,
- start: cont[i].TIME_START,
- end: cont[i].TIME_END,
- type: 'h_schedule'
- }
- if (this.facility_data[j].date == data.date) {
- this.facility_data[j].gtArray.unshift(data)
- }
- }
- }
- }
- // })
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
},
- updateTimeLines() {
-
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ // this.dialogForm.OrgType = ''
+ // this.dialogForm.OrgCode = ''
+ // this.dialogForm.OrgName = ''
+ // this.dialogForm.SupUnit = ''
+ // this.$refs.dialogForm.clearValidate()
+ this.tableDataDialog = []
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ OrganCode: this.dialogForm.OrgCode,
+ OrganName: this.dialogForm.OrgName,
+ OperType: this.operation === 'add' ? 'Add' : 'Update',
+ Operator: getCookie('admin')
+ }
+ AddUpdateOrganization(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getDeviceRepairTakeSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ async download() {
+ let tempDate = this.form.repairdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ const data = {
+ wkshopcode: this.form.wkshopcode,
+ eqpcode: this.form.eqpcode,
+ eqpname: this.form.eqpname,
+ stanedname: this.form.stanedname,
+ repairuser: this.form.repairuser,
+ repairdate: tempDate,
+ repairresult: this.form.repairresult
+ }
+ const { data: res } = await DeviceRepairTakeOutExcel(data)
+ window.location.href = res
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 255
+ this.$refs.tableDataRef.doLayout()
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
+
}
}
</script>
-<style scoped>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-range__icon{
+ line-height: 28px !important;
+}
+::v-deep .el-range-separator{
+ line-height: 28px !important;
+}
+::v-deep .el-range-input{
+ font-size: 14px;
+}
+::v-deep .el-range-separator{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+//::v-deep .el-dialog__body {
+// padding: 20px 100px !important;
+//}
+::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
</style>
--
Gitblit v1.9.3