From 029a6d4f2739cee27c7857af060b119eb461878f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 30 十月 2023 15:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/EquipmentListOfTester.vue | 17
src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue | 1
src/views/user/Login.vue | 21
src/views/eam/EquipmentListOfProduct.vue | 17
src/views/eam/EquipmentListOfTruck.vue | 19
src/views/eam/EquipmentListOfEnvProEquipment.vue | 17
src/views/eam/EquipmentListOfCrane.vue | 17
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue | 53
src/views/eam/EquipmentListOfAll.vue | 18
src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue | 21
src/views/dashboard/IndexBdc.vue | 957 +++++++----
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 32
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 4
src/views/eam/DailyMaintenanceOrderList.vue | 2
src/views/eam/InspectionCycleList.vue | 68
src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue | 10
src/views/dashboard/IndexChart.vue | 578 ++++--
src/views/eam/EquipmentListOfFilesCarousel.vue | 17
src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 1
src/views/eam/DailyInspectionOrderList.vue | 46
src/views/eam/EquipmentListOfPressureVessel.vue | 17
src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue | 9
src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue | 23
src/views/system/RoleUserList.vue | 999 +++++++-----
src/views/system/modules/UserRoleModalNew.vue | 245 +++
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue | 137 +
src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue | 30
src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue | 1
src/views/eam/EquipmentListOfRide.vue | 17
src/views/eam/EquipmentListOfWeldingMachine.vue | 17
src/views/eam/Daily3MaintenanceOrderList.vue | 2
src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue | 30
src/views/dashboard/Workplace.vue | 539 +++--
src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue | 35
src/views/dashboard/IndexTask.vue | 641 ++++---
src/views/dashboard/Monitor.vue | 7
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 38
src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue | 39
src/views/eam/MaintenanceCycleList.vue | 59
39 files changed, 2,980 insertions(+), 1,821 deletions(-)
diff --git a/src/views/dashboard/IndexBdc.vue b/src/views/dashboard/IndexBdc.vue
index fa8edea..87a6d25 100644
--- a/src/views/dashboard/IndexBdc.vue
+++ b/src/views/dashboard/IndexBdc.vue
@@ -1,9 +1,21 @@
<template>
<div class="page-header-index-wide">
<a-row :gutter="24">
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
- <chart-card :loading="loading" title="鍙楃悊閲�" :total="cardCount.sll | NumberFormat">
- <a-tooltip title="鎸囨爣璇存槑" slot="action">
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="鍙楃悊閲�"
+ :total="cardCount.sll | NumberFormat"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
<a-icon type="info-circle-o" />
</a-tooltip>
<div>
@@ -12,45 +24,98 @@
<template slot="footer">浠婃棩鍙楃悊閲忥細<span>{{ todaySll }}</span></template>
</chart-card>
</a-col>
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
- <chart-card :loading="loading" title="鍔炵粨閲�" :total="cardCount.bjl | NumberFormat">
- <a-tooltip title="鎸囨爣璇存槑" slot="action">
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="鍔炵粨閲�"
+ :total="cardCount.bjl | NumberFormat"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
<a-icon type="info-circle-o" />
</a-tooltip>
<div>
- <mini-area :data-source="chartData.bjl"/>
+ <mini-area :data-source="chartData.bjl" />
</div>
<template slot="footer">浠婃棩鍔炵粨閲忥細<span>{{ todayBjl }}</span></template>
</chart-card>
</a-col>
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
- <chart-card :loading="loading" title="鐢ㄦ埛鍙楃悊閲�" :total="cardCount.isll | NumberFormat">
- <a-tooltip title="鎸囨爣璇存槑" slot="action">
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="鐢ㄦ埛鍙楃悊閲�"
+ :total="cardCount.isll | NumberFormat"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
<a-icon type="info-circle-o" />
</a-tooltip>
<div>
- <mini-bar :datasource="chartData.isll" :height="50"/>
+ <mini-bar
+ :datasource="chartData.isll"
+ :height="50"
+ />
</div>
<template slot="footer">鐢ㄦ埛浠婃棩鍙楃悊閲忥細<span>{{ todayISll }}</span></template>
</chart-card>
</a-col>
- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
- <chart-card :loading="loading" title="鐢ㄦ埛鍔炵粨閲�" :total="cardCount.ibjl | NumberFormat">
- <a-tooltip title="鎸囨爣璇存槑" slot="action">
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="鐢ㄦ埛鍔炵粨閲�"
+ :total="cardCount.ibjl | NumberFormat"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
<a-icon type="info-circle-o" />
</a-tooltip>
<div>
- <mini-bar :datasource="chartData.ibjl" :height="50"/>
+ <mini-bar
+ :datasource="chartData.ibjl"
+ :height="50"
+ />
</div>
<template slot="footer">鐢ㄦ埛浠婃棩鍔炵粨閲忥細<span>{{ todayIBjl }}</span></template>
</chart-card>
</a-col>
</a-row>
- <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
+ <a-card
+ :loading="loading"
+ :bordered="false"
+ :body-style="{padding: '0'}"
+ >
<div class="salesCard">
- <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
- <div class="extra-wrapper" slot="tabBarExtraContent">
+ <a-tabs
+ default-active-key="1"
+ size="large"
+ :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}"
+ >
+ <div
+ class="extra-wrapper"
+ slot="tabBarExtraContent"
+ >
<div class="extra-item">
<a>浠婃棩</a>
<a>鏈懆</a>
@@ -60,18 +125,50 @@
<a-range-picker :style="{width: '256px'}" />
</div>
- <a-tab-pane loading="true" tab="鍙楃悊鐩戠" key="1">
+ <a-tab-pane
+ loading="true"
+ tab="鍙楃悊鐩戠"
+ key="1"
+ >
<a-row>
- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+ <a-col
+ :xl="16"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
<index-bar title="鍙楃悊閲忕粺璁�" />
</a-col>
- <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
+ <a-col
+ :xl="8"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
- <a-card title="蹇�熷紑濮� / 渚挎嵎瀵艰埅" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
+ <a-card
+ title="蹇�熷紑濮� / 渚挎嵎瀵艰埅"
+ style="margin-bottom: 24px"
+ :bordered="false"
+ :body-style="{padding: 0}"
+ >
<div class="item-group">
<a-row>
- <a-col :class="'more-btn'" :span="12" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
- <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
+ <a-col
+ :class="'more-btn'"
+ :span="12"
+ v-for="(item,index) in registerTypeList"
+ :key=" 'registerType'+index "
+ >
+ <a-button
+ @click="goPage(index)"
+ style="margin-bottom:10px"
+ size="small"
+ type="primary"
+ ghost
+ >{{ item.text }}</a-button>
</a-col>
</a-row>
</div>
@@ -81,18 +178,53 @@
</a-row>
</a-tab-pane>
- <a-tab-pane tab="浜や簰鐩戠" key="2">
+ <a-tab-pane
+ tab="浜や簰鐩戠"
+ key="2"
+ >
<a-row>
- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
- <bar-multid :sourceData="jhjgData" :fields="jhjgFields" title="骞冲彴涓庨儴闂ㄤ氦浜掗噺缁熻"></bar-multid>
+ <a-col
+ :xl="16"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
+ <bar-multid
+ :sourceData="jhjgData"
+ :fields="jhjgFields"
+ title="骞冲彴涓庨儴闂ㄤ氦浜掗噺缁熻"
+ ></bar-multid>
</a-col>
- <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
+ <a-col
+ :xl="8"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
- <a-card title="蹇�熷紑濮� / 渚挎嵎瀵艰埅" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
+ <a-card
+ title="蹇�熷紑濮� / 渚挎嵎瀵艰埅"
+ style="margin-bottom: 24px"
+ :bordered="false"
+ :body-style="{padding: 0}"
+ >
<div class="item-group">
<a-row>
- <a-col :class="'more-btn'" :span="12" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
- <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
+ <a-col
+ :class="'more-btn'"
+ :span="12"
+ v-for="(item,index) in registerTypeList"
+ :key=" 'registerType'+index "
+ >
+ <a-button
+ @click="goPage(index)"
+ style="margin-bottom:10px"
+ size="small"
+ type="primary"
+ ghost
+ >{{ item.text }}</a-button>
</a-col>
</a-row>
</div>
@@ -102,25 +234,63 @@
</a-row>
</a-tab-pane>
- <a-tab-pane tab="瀛樺偍鐩戠" key="4">
+ <a-tab-pane
+ tab="瀛樺偍鐩戠"
+ key="4"
+ >
<a-row>
- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
+ <a-col
+ :xl="16"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
<a-row>
<template v-if="diskInfo && diskInfo.length>0">
- <a-col :span="12" v-for="(item,index) in diskInfo" :key=" 'diskInfo'+index ">
- <dash-chart-demo :title="item.name" :datasource="item.restPPT"></dash-chart-demo>
+ <a-col
+ :span="12"
+ v-for="(item,index) in diskInfo"
+ :key=" 'diskInfo'+index "
+ >
+ <dash-chart-demo
+ :title="item.name"
+ :datasource="item.restPPT"
+ ></dash-chart-demo>
</a-col>
</template>
</a-row>
</a-col>
- <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
+ <a-col
+ :xl="8"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
- <a-card title="蹇�熷紑濮� / 渚挎嵎瀵艰埅" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
+ <a-card
+ title="蹇�熷紑濮� / 渚挎嵎瀵艰埅"
+ style="margin-bottom: 24px"
+ :bordered="false"
+ :body-style="{padding: 0}"
+ >
<div class="item-group">
<a-row>
- <a-col :class="'more-btn'" :span="10" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
- <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
+ <a-col
+ :class="'more-btn'"
+ :span="10"
+ v-for="(item,index) in registerTypeList"
+ :key=" 'registerType'+index "
+ >
+ <a-button
+ @click="goPage(index)"
+ style="margin-bottom:10px"
+ size="small"
+ type="primary"
+ ghost
+ >{{ item.text }}</a-button>
</a-col>
</a-row>
</div>
@@ -136,36 +306,83 @@
</a-card>
<a-row :gutter="12">
- <a-card :loading="loading" :class="{ 'anty-list-cust':true }" :bordered="false" :style="{ marginTop: '24px' }">
+ <a-card
+ :loading="loading"
+ :class="{ 'anty-list-cust':true }"
+ :bordered="false"
+ :style="{ marginTop: '24px' }"
+ >
- <a-tabs v-model="indexBottomTab" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
- <div class="extra-wrapper" slot="tabBarExtraContent">
- <a-radio-group v-model="indexRegisterType" @change="changeRegisterType">
+ <a-tabs
+ v-model="indexBottomTab"
+ size="large"
+ :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}"
+ >
+ <div
+ class="extra-wrapper"
+ slot="tabBarExtraContent"
+ >
+ <a-radio-group
+ v-model="indexRegisterType"
+ @change="changeRegisterType"
+ >
<a-radio-button value="杞Щ鐧昏">杞Щ鐧昏</a-radio-button>
<a-radio-button value="鎶垫娂鐧昏">鎶垫娂鐧昏</a-radio-button>
<a-radio-button value="">鎵�鏈�</a-radio-button>
</a-radio-group>
</div>
- <a-tab-pane loading="true" tab="涓氬姟娴佺▼闄愭椂鐩戠" key="1">
+ <a-tab-pane
+ loading="true"
+ tab="涓氬姟娴佺▼闄愭椂鐩戠"
+ key="1"
+ >
- <a-table :dataSource="dataSource1" size="default" rowKey="id" :columns="columns" :pagination="ipagination1" @change="tableChange1">
- <template slot="flowRate" slot-scope="text, record, index">
- <a-progress :strokeColor="getPercentColor(record.flowRate)" :format="getPercentFormat" :percent="getFlowRateNumber(record.flowRate)" style="width:80px" />
+ <a-table
+ :dataSource="dataSource1"
+ size="default"
+ rowKey="id"
+ :columns="columns"
+ :pagination="ipagination1"
+ @change="tableChange1"
+ >
+ <template
+ slot="flowRate"
+ slot-scope="text, record, index"
+ >
+ <a-progress
+ :strokeColor="getPercentColor(record.flowRate)"
+ :format="getPercentFormat"
+ :percent="getFlowRateNumber(record.flowRate)"
+ style="width:80px"
+ />
</template>
</a-table>
</a-tab-pane>
- <a-tab-pane loading="true" tab="涓氬姟鑺傜偣闄愭椂鐩戠" key="2">
- <a-table :dataSource="dataSource2" size="default" rowKey="id" :columns="columns2" :pagination="ipagination2" @change="tableChange2">
- <template slot="flowRate" slot-scope="text, record, index">
+ <a-tab-pane
+ loading="true"
+ tab="涓氬姟鑺傜偣闄愭椂鐩戠"
+ key="2"
+ >
+ <a-table
+ :dataSource="dataSource2"
+ size="default"
+ rowKey="id"
+ :columns="columns2"
+ :pagination="ipagination2"
+ @change="tableChange2"
+ >
+ <template
+ slot="flowRate"
+ slot-scope="text, record, index"
+ >
<span style="color: red;">{{ record.flowRate }}灏忔椂</span>
</template>
</a-table>
</a-tab-pane>
</a-tabs>
-
</a-card>
</a-row>
@@ -175,345 +392,355 @@
<script>
- import ACol from "ant-design-vue/es/grid/Col"
- import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
- import ChartCard from '@/components/ChartCard'
- import MiniBar from '@/components/chart/MiniBar'
- import MiniArea from '@/components/chart/MiniArea'
- import IndexBar from '@/components/chart/IndexBar'
- import BarMultid from '@/components/chart/BarMultid'
- import DashChartDemo from '@/components/chart/DashChartDemo'
+import ACol from "ant-design-vue/es/grid/Col"
+import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
+import ChartCard from '@/components/ChartCard'
+import MiniBar from '@/components/chart/MiniBar'
+import MiniArea from '@/components/chart/MiniArea'
+import IndexBar from '@/components/chart/IndexBar'
+import BarMultid from '@/components/chart/BarMultid'
+import DashChartDemo from '@/components/chart/DashChartDemo'
- const jhjgData = [
- { type: '鎴跨', '1鏈�': 900, '2鏈�': 1120, '3鏈�': 1380, '4鏈�': 1480, '5鏈�': 1450, '6鏈�': 1100, '7鏈�':1300, '8鏈�':900,'9鏈�':1000 ,'10鏈�':1200 ,'11鏈�':600 ,'12鏈�':900 },
- { type: '绋庡姟', '1鏈�':1200, '2鏈�': 1500, '3鏈�': 1980, '4鏈�': 2000, '5鏈�': 1000, '6鏈�': 600, '7鏈�':900, '8鏈�':1100,'9鏈�':1300 ,'10鏈�':2000 ,'11鏈�':900 ,'12鏈�':1100 },
- { type: '涓嶅姩浜�', '1鏈�':2000, '2鏈�': 1430, '3鏈�': 1300, '4鏈�': 1400, '5鏈�': 900, '6鏈�': 500, '7鏈�':600, '8鏈�':1000,'9鏈�':600 ,'10鏈�':1000 ,'11鏈�':1500 ,'12鏈�':1200 }
- ]
+const jhjgData = [
+ { type: '鎴跨', '1鏈�': 900, '2鏈�': 1120, '3鏈�': 1380, '4鏈�': 1480, '5鏈�': 1450, '6鏈�': 1100, '7鏈�': 1300, '8鏈�': 900, '9鏈�': 1000, '10鏈�': 1200, '11鏈�': 600, '12鏈�': 900 },
+ { type: '绋庡姟', '1鏈�': 1200, '2鏈�': 1500, '3鏈�': 1980, '4鏈�': 2000, '5鏈�': 1000, '6鏈�': 600, '7鏈�': 900, '8鏈�': 1100, '9鏈�': 1300, '10鏈�': 2000, '11鏈�': 900, '12鏈�': 1100 },
+ { type: '涓嶅姩浜�', '1鏈�': 2000, '2鏈�': 1430, '3鏈�': 1300, '4鏈�': 1400, '5鏈�': 900, '6鏈�': 500, '7鏈�': 600, '8鏈�': 1000, '9鏈�': 600, '10鏈�': 1000, '11鏈�': 1500, '12鏈�': 1200 }
+]
- const jhjgFields=[
- '1鏈�','2鏈�','3鏈�','4鏈�','5鏈�','6鏈�',
- '7鏈�','8鏈�','9鏈�','10鏈�','11鏈�','12鏈�'
- ]
+const jhjgFields = [
+ '1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�',
+ '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�'
+]
- const xljgData = [
- {type:'涓�鏈�',"鎴跨":1.12,"绋庡姟":1.55,"涓嶅姩浜�":1.2},
- {type:'浜屾湀',"鎴跨":1.65,"绋庡姟":1.32,"涓嶅姩浜�":1.42},
- {type:'涓夋湀',"鎴跨":1.85,"绋庡姟":1.1,"涓嶅姩浜�":1.5},
+const xljgData = [
+ { type: '涓�鏈�', "鎴跨": 1.12, "绋庡姟": 1.55, "涓嶅姩浜�": 1.2 },
+ { type: '浜屾湀', "鎴跨": 1.65, "绋庡姟": 1.32, "涓嶅姩浜�": 1.42 },
+ { type: '涓夋湀', "鎴跨": 1.85, "绋庡姟": 1.1, "涓嶅姩浜�": 1.5 },
- {type:'鍥涙湀',"鎴跨":1.33,"绋庡姟":1.63,"涓嶅姩浜�":1.4},
- {type:'浜旀湀',"鎴跨":1.63,"绋庡姟":1.8,"涓嶅姩浜�":1.7},
- {type:'鍏湀',"鎴跨":1.85,"绋庡姟":1.98,"涓嶅姩浜�":1.8},
+ { type: '鍥涙湀', "鎴跨": 1.33, "绋庡姟": 1.63, "涓嶅姩浜�": 1.4 },
+ { type: '浜旀湀', "鎴跨": 1.63, "绋庡姟": 1.8, "涓嶅姩浜�": 1.7 },
+ { type: '鍏湀', "鎴跨": 1.85, "绋庡姟": 1.98, "涓嶅姩浜�": 1.8 },
- {type:'涓冩湀',"鎴跨":1.98,"绋庡姟":1.5,"涓嶅姩浜�":1.76},
- {type:'鍏湀',"鎴跨":1.48,"绋庡姟":1.2,"涓嶅姩浜�":1.3},
- {type:'涔濇湀',"鎴跨":1.41,"绋庡姟":1.9,"涓嶅姩浜�":1.6},
+ { type: '涓冩湀', "鎴跨": 1.98, "绋庡姟": 1.5, "涓嶅姩浜�": 1.76 },
+ { type: '鍏湀', "鎴跨": 1.48, "绋庡姟": 1.2, "涓嶅姩浜�": 1.3 },
+ { type: '涔濇湀', "鎴跨": 1.41, "绋庡姟": 1.9, "涓嶅姩浜�": 1.6 },
- {type:'鍗佹湀',"鎴跨":1.1,"绋庡姟":1.1,"涓嶅姩浜�":1.4},
- {type:'鍗佷竴鏈�',"鎴跨":1.85,"绋庡姟":1.6,"涓嶅姩浜�":1.5},
- {type:'鍗佷簩鏈�',"鎴跨":1.5,"绋庡姟":1.4,"涓嶅姩浜�":1.3}
- ]
- const xljgFields=["鎴跨","绋庡姟","涓嶅姩浜�"]
+ { type: '鍗佹湀', "鎴跨": 1.1, "绋庡姟": 1.1, "涓嶅姩浜�": 1.4 },
+ { type: '鍗佷竴鏈�', "鎴跨": 1.85, "绋庡姟": 1.6, "涓嶅姩浜�": 1.5 },
+ { type: '鍗佷簩鏈�', "鎴跨": 1.5, "绋庡姟": 1.4, "涓嶅姩浜�": 1.3 }
+]
+const xljgFields = ["鎴跨", "绋庡姟", "涓嶅姩浜�"]
- const dataCol1 = [{
- title: '涓氬姟鍙�',
- align:"center",
- dataIndex: 'reBizCode'
- },{
- title: '涓氬姟绫诲瀷',
- align:"center",
- dataIndex: 'type'
- },{
- title: '鍙楃悊浜�',
- align:"center",
- dataIndex: 'acceptBy'
- },{
- title: '鍙楃悊鏃堕棿',
- align:"center",
- dataIndex: 'acceptDate'
- },{
- title: '褰撳墠鑺傜偣',
- align:"center",
- dataIndex: 'curNode'
- },{
- title: '鍔炵悊鏃堕暱',
- align:"center",
- dataIndex: 'flowRate',
- scopedSlots: { customRender: 'flowRate' }
- }];
- const dataSource1=[
- {reBizCode:"1",type:"杞Щ鐧昏",acceptBy:'寮犱笁',acceptDate:"2019-01-22",curNode:"浠诲姟鍒嗘淳",flowRate:60},
- {reBizCode:"2",type:"鎶垫娂鐧昏",acceptBy:'鏉庡洓',acceptDate:"2019-01-23",curNode:"棰嗗瀹℃牳",flowRate:30},
- {reBizCode:"3",type:"杞Щ鐧昏",acceptBy:'鐜嬫',acceptDate:"2019-01-25",curNode:"浠诲姟澶勭悊",flowRate:20},
- {reBizCode:"4",type:"杞Щ鐧昏",acceptBy:'璧垫ゼ',acceptDate:"2019-11-22",curNode:"閮ㄩ棬瀹℃牳",flowRate:80},
- {reBizCode:"5",type:"杞Щ鐧昏",acceptBy:'閽卞氨',acceptDate:"2019-12-12",curNode:"浠诲姟鍒嗘淳",flowRate:90},
- {reBizCode:"6",type:"杞Щ鐧昏",acceptBy:'瀛欏惂',acceptDate:"2019-03-06",curNode:"浠诲姟澶勭悊",flowRate:10},
- {reBizCode:"7",type:"鎶垫娂鐧昏",acceptBy:'鍛ㄥぇ',acceptDate:"2019-04-13",curNode:"浠诲姟鍒嗘淳",flowRate:100},
- {reBizCode:"8",type:"鎶垫娂鐧昏",acceptBy:'鍚翠簩',acceptDate:"2019-05-09",curNode:"浠诲姟涓婃姤",flowRate:50},
- {reBizCode:"9",type:"鎶垫娂鐧昏",acceptBy:'閮戠埥',acceptDate:"2019-07-12",curNode:"浠诲姟澶勭悊",flowRate:63},
- {reBizCode:"20",type:"鎶垫娂鐧昏",acceptBy:'鏋楁湁',acceptDate:"2019-12-12",curNode:"浠诲姟鎵撳洖",flowRate:59},
- {reBizCode:"11",type:"杞Щ鐧昏",acceptBy:'鐮佷簯',acceptDate:"2019-09-10",curNode:"浠诲姟绛炬敹",flowRate:87},
- ]
+const dataCol1 = [{
+ title: '涓氬姟鍙�',
+ align: "center",
+ dataIndex: 'reBizCode'
+}, {
+ title: '涓氬姟绫诲瀷',
+ align: "center",
+ dataIndex: 'type'
+}, {
+ title: '鍙楃悊浜�',
+ align: "center",
+ dataIndex: 'acceptBy'
+}, {
+ title: '鍙楃悊鏃堕棿',
+ align: "center",
+ dataIndex: 'acceptDate'
+}, {
+ title: '褰撳墠鑺傜偣',
+ align: "center",
+ dataIndex: 'curNode'
+}, {
+ title: '鍔炵悊鏃堕暱',
+ align: "center",
+ dataIndex: 'flowRate',
+ scopedSlots: { customRender: 'flowRate' }
+}];
+const dataSource1 = [
+ { reBizCode: "1", type: "杞Щ鐧昏", acceptBy: '寮犱笁', acceptDate: "2019-01-22", curNode: "浠诲姟鍒嗘淳", flowRate: 60 },
+ { reBizCode: "2", type: "鎶垫娂鐧昏", acceptBy: '鏉庡洓', acceptDate: "2019-01-23", curNode: "棰嗗瀹℃牳", flowRate: 30 },
+ { reBizCode: "3", type: "杞Щ鐧昏", acceptBy: '鐜嬫', acceptDate: "2019-01-25", curNode: "浠诲姟澶勭悊", flowRate: 20 },
+ { reBizCode: "4", type: "杞Щ鐧昏", acceptBy: '璧垫ゼ', acceptDate: "2019-11-22", curNode: "閮ㄩ棬瀹℃牳", flowRate: 80 },
+ { reBizCode: "5", type: "杞Щ鐧昏", acceptBy: '閽卞氨', acceptDate: "2019-12-12", curNode: "浠诲姟鍒嗘淳", flowRate: 90 },
+ { reBizCode: "6", type: "杞Щ鐧昏", acceptBy: '瀛欏惂', acceptDate: "2019-03-06", curNode: "浠诲姟澶勭悊", flowRate: 10 },
+ { reBizCode: "7", type: "鎶垫娂鐧昏", acceptBy: '鍛ㄥぇ', acceptDate: "2019-04-13", curNode: "浠诲姟鍒嗘淳", flowRate: 100 },
+ { reBizCode: "8", type: "鎶垫娂鐧昏", acceptBy: '鍚翠簩', acceptDate: "2019-05-09", curNode: "浠诲姟涓婃姤", flowRate: 50 },
+ { reBizCode: "9", type: "鎶垫娂鐧昏", acceptBy: '閮戠埥', acceptDate: "2019-07-12", curNode: "浠诲姟澶勭悊", flowRate: 63 },
+ { reBizCode: "20", type: "鎶垫娂鐧昏", acceptBy: '鏋楁湁', acceptDate: "2019-12-12", curNode: "浠诲姟鎵撳洖", flowRate: 59 },
+ { reBizCode: "11", type: "杞Щ鐧昏", acceptBy: '鐮佷簯', acceptDate: "2019-09-10", curNode: "浠诲姟绛炬敹", flowRate: 87 },
+]
- const dataCol2 = [{
- title: '涓氬姟鍙�',
- align:"center",
- dataIndex: 'reBizCode'
- },{
- title: '鍙楃悊浜�',
- align:"center",
- dataIndex: 'acceptBy'
- },{
- title: '鍙戣捣鏃堕棿',
- align:"center",
- dataIndex: 'acceptDate'
- },{
- title: '褰撳墠鑺傜偣',
- align:"center",
- dataIndex: 'curNode'
- },{
- title: '瓒呮椂鏃堕棿',
- align:"center",
- dataIndex: 'flowRate',
- scopedSlots: { customRender: 'flowRate' }
- }];
- const dataSource2=[
- {reBizCode:"A001",type:"杞Щ鐧昏",acceptBy:'寮犲洓',acceptDate:"2019-01-22",curNode:"浠诲姟鍒嗘淳",flowRate:12},
- {reBizCode:"A002",type:"鎶垫娂鐧昏",acceptBy:'鏉庡惂',acceptDate:"2019-01-23",curNode:"浠诲姟绛炬敹",flowRate:3},
- {reBizCode:"A003",type:"杞Щ鐧昏",acceptBy:'鐜嬩笁',acceptDate:"2019-01-25",curNode:"浠诲姟澶勭悊",flowRate:24},
- {reBizCode:"A004",type:"杞Щ鐧昏",acceptBy:'璧典簩',acceptDate:"2019-11-22",curNode:"閮ㄩ棬瀹℃牳",flowRate:10},
- {reBizCode:"A005",type:"杞Щ鐧昏",acceptBy:'閽卞ぇ',acceptDate:"2019-12-12",curNode:"浠诲姟绛炬敹",flowRate:8},
- {reBizCode:"A006",type:"杞Щ鐧昏",acceptBy:'瀛欏氨',acceptDate:"2019-03-06",curNode:"浠诲姟澶勭悊",flowRate:10},
- {reBizCode:"A007",type:"鎶垫娂鐧昏",acceptBy:'鍛ㄦ檿',acceptDate:"2019-04-13",curNode:"閮ㄩ棬瀹℃牳",flowRate:24},
- {reBizCode:"A008",type:"鎶垫娂鐧昏",acceptBy:'鍚存湁',acceptDate:"2019-05-09",curNode:"閮ㄩ棬瀹℃牳",flowRate:30},
- {reBizCode:"A009",type:"鎶垫娂鐧昏",acceptBy:'閮戞',acceptDate:"2019-07-12",curNode:"浠诲姟鍒嗘淳",flowRate:1},
- {reBizCode:"A0010",type:"鎶垫娂鐧昏",acceptBy:'鏋楃埥',acceptDate:"2019-12-12",curNode:"閮ㄩ棬瀹℃牳",flowRate:16},
- {reBizCode:"A0011",type:"杞Щ鐧昏",acceptBy:'鐮佹ゼ',acceptDate:"2019-09-10",curNode:"閮ㄩ棬瀹℃牳",flowRate:7},
- ]
+const dataCol2 = [{
+ title: '涓氬姟鍙�',
+ align: "center",
+ dataIndex: 'reBizCode'
+}, {
+ title: '鍙楃悊浜�',
+ align: "center",
+ dataIndex: 'acceptBy'
+}, {
+ title: '鍙戣捣鏃堕棿',
+ align: "center",
+ dataIndex: 'acceptDate'
+}, {
+ title: '褰撳墠鑺傜偣',
+ align: "center",
+ dataIndex: 'curNode'
+}, {
+ title: '瓒呮椂鏃堕棿',
+ align: "center",
+ dataIndex: 'flowRate',
+ scopedSlots: { customRender: 'flowRate' }
+}];
+const dataSource2 = [
+ { reBizCode: "A001", type: "杞Щ鐧昏", acceptBy: '寮犲洓', acceptDate: "2019-01-22", curNode: "浠诲姟鍒嗘淳", flowRate: 12 },
+ { reBizCode: "A002", type: "鎶垫娂鐧昏", acceptBy: '鏉庡惂', acceptDate: "2019-01-23", curNode: "浠诲姟绛炬敹", flowRate: 3 },
+ { reBizCode: "A003", type: "杞Щ鐧昏", acceptBy: '鐜嬩笁', acceptDate: "2019-01-25", curNode: "浠诲姟澶勭悊", flowRate: 24 },
+ { reBizCode: "A004", type: "杞Щ鐧昏", acceptBy: '璧典簩', acceptDate: "2019-11-22", curNode: "閮ㄩ棬瀹℃牳", flowRate: 10 },
+ { reBizCode: "A005", type: "杞Щ鐧昏", acceptBy: '閽卞ぇ', acceptDate: "2019-12-12", curNode: "浠诲姟绛炬敹", flowRate: 8 },
+ { reBizCode: "A006", type: "杞Щ鐧昏", acceptBy: '瀛欏氨', acceptDate: "2019-03-06", curNode: "浠诲姟澶勭悊", flowRate: 10 },
+ { reBizCode: "A007", type: "鎶垫娂鐧昏", acceptBy: '鍛ㄦ檿', acceptDate: "2019-04-13", curNode: "閮ㄩ棬瀹℃牳", flowRate: 24 },
+ { reBizCode: "A008", type: "鎶垫娂鐧昏", acceptBy: '鍚存湁', acceptDate: "2019-05-09", curNode: "閮ㄩ棬瀹℃牳", flowRate: 30 },
+ { reBizCode: "A009", type: "鎶垫娂鐧昏", acceptBy: '閮戞', acceptDate: "2019-07-12", curNode: "浠诲姟鍒嗘淳", flowRate: 1 },
+ { reBizCode: "A0010", type: "鎶垫娂鐧昏", acceptBy: '鏋楃埥', acceptDate: "2019-12-12", curNode: "閮ㄩ棬瀹℃牳", flowRate: 16 },
+ { reBizCode: "A0011", type: "杞Щ鐧昏", acceptBy: '鐮佹ゼ', acceptDate: "2019-09-10", curNode: "閮ㄩ棬瀹℃牳", flowRate: 7 },
+]
- export default {
- name: "IndexBdc",
- components: {
- ATooltip,
- ACol,
- ChartCard,
- MiniArea,
- MiniBar,
- DashChartDemo,
- BarMultid,
- IndexBar
- },
- data() {
- return {
- loading: true,
- cardCount:{
- sll:100,
- bjl:87,
- isll:15,
- ibjl:9
+export default {
+ name: "IndexBdc",
+ components: {
+ ATooltip,
+ ACol,
+ ChartCard,
+ MiniArea,
+ MiniBar,
+ DashChartDemo,
+ BarMultid,
+ IndexBar
+ },
+ data() {
+ return {
+ loading: true,
+ cardCount: {
+ sll: 100,
+ bjl: 87,
+ isll: 15,
+ ibjl: 9
+ },
+
+ todaySll: 60,
+ todayBjl: 54,
+ todayISll: 13,
+ todayIBjl: 7,
+
+ chartData: {
+ sll: [],
+ bjl: [],
+ isll: [],
+ ibjl: []
+ },
+ jhjgFields,
+ jhjgData,
+
+ xljgData,
+ xljgFields,
+
+ diskInfo: [
+ { name: "C鐩�", restPPT: 7 },
+ { name: "D鐩�", restPPT: 5 }
+ ],
+
+ registerTypeList: [{
+ text: "涓氬姟鍙楃悊"
+ }, {
+ text: "涓氬姟绠＄悊"
+ }, {
+ text: "鏂囦欢绠＄悊"
+ }, {
+ text: "淇℃伅鏌ヨ"
+ }],
+
+ dataSource1: [],
+ dataSource2: [],
+ columns: dataCol1,
+ columns2: dataCol2,
+ ipagination1: {
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
},
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0,
- todaySll:60,
- todayBjl:54,
- todayISll:13,
- todayIBjl:7,
-
- chartData:{
- sll:[],
- bjl:[],
- isll:[],
- ibjl:[]
+ },
+ ipagination2: {
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
},
- jhjgFields,
- jhjgData,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0,
+ },
+ indexRegisterType: "杞Щ鐧昏",
+ indexBottomTab: "1"
- xljgData,
- xljgFields,
-
- diskInfo:[
- {name:"C鐩�",restPPT:7},
- {name:"D鐩�",restPPT:5}
- ],
-
- registerTypeList:[{
- text:"涓氬姟鍙楃悊"
- },{
- text:"涓氬姟绠＄悊"
- },{
- text:"鏂囦欢绠＄悊"
- },{
- text:"淇℃伅鏌ヨ"
- }],
-
- dataSource1:[],
- dataSource2:[],
- columns:dataCol1,
- columns2:dataCol2,
- ipagination1:{
- current: 1,
- pageSize: 5,
- pageSizeOptions: ['10', '20', '30'],
- showTotal: (total, range) => {
- return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
- },
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0,
-
- },
- ipagination2:{
- current: 1,
- pageSize: 5,
- pageSizeOptions: ['10', '20', '30'],
- showTotal: (total, range) => {
- return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
- },
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0,
- },
- indexRegisterType:"杞Щ鐧昏",
- indexBottomTab:"1"
-
- }
- },
- methods:{
- goPage(){
- this.$message.success("鏍规嵁涓氬姟鑷澶勭悊璺宠浆椤甸潰!")
- },
- changeRegisterType(e){
- this.indexRegisterType = e.target.value
- if(this.indexBottomTab=="1"){
- this.loadDataSource1()
- }else{
- this.loadDataSource2()
- }
- },
- tableChange1(pagination){
- this.ipagination1.current = pagination.current
- this.ipagination1.pageSize = pagination.pageSize
- this.queryTimeoutInfo()
- },
- tableChange2(pagination){
- this.ipagination2.current = pagination.current
- this.ipagination2.pageSize = pagination.pageSize
- this.queryNodeTimeoutInfo()
- },
- getFlowRateNumber(value){
- return Number(value)
- },
- getPercentFormat(value){
- if(value==100){
- return "瓒呮椂"
- }else{
- return value+"%"
- }
- },
- getPercentColor(value){
- let p = Number(value)
- if(p>=90 && p<100){
- return 'rgb(244, 240, 89)'
- }else if(p>=100){
- return 'red'
- }else{
- return 'rgb(16, 142, 233)'
- }
- },
-
- loadDataSource1(){
- this.dataSource1 = dataSource1.filter(item=>{
- if(!this.indexRegisterType){
- return true
- }
- return item.type==this.indexRegisterType
- })
- },
- loadDataSource2(){
- this.dataSource2 = dataSource2.filter(item=>{
- if(!this.indexRegisterType){
- return true
- }
- return item.type==this.indexRegisterType
- })
- }
- },
- created() {
- this.loadDataSource1()
- this.loadDataSource2()
- setTimeout(() => {
- this.loading = !this.loading
- }, 1000)
}
+ },
+ methods: {
+ goPage() {
+ this.$message.success("鏍规嵁涓氬姟鑷澶勭悊璺宠浆椤甸潰!")
+ },
+ changeRegisterType(e) {
+ this.indexRegisterType = e.target.value
+ if (this.indexBottomTab == "1") {
+ this.loadDataSource1()
+ } else {
+ this.loadDataSource2()
+ }
+ },
+ tableChange1(pagination) {
+ this.ipagination1.current = pagination.current
+ this.ipagination1.pageSize = pagination.pageSize
+ this.queryTimeoutInfo()
+ },
+ tableChange2(pagination) {
+ this.ipagination2.current = pagination.current
+ this.ipagination2.pageSize = pagination.pageSize
+ this.queryNodeTimeoutInfo()
+ },
+ getFlowRateNumber(value) {
+ return Number(value)
+ },
+ getPercentFormat(value) {
+ if (value == 100) {
+ return "瓒呮椂"
+ } else {
+ return value + "%"
+ }
+ },
+ getPercentColor(value) {
+ let p = Number(value)
+ if (p >= 90 && p < 100) {
+ return 'rgb(244, 240, 89)'
+ } else if (p >= 100) {
+ return 'red'
+ } else {
+ return 'rgb(16, 142, 233)'
+ }
+ },
+
+ loadDataSource1() {
+ this.dataSource1 = dataSource1.filter(item => {
+ if (!this.indexRegisterType) {
+ return true
+ }
+ return item.type == this.indexRegisterType
+ })
+ },
+ loadDataSource2() {
+ this.dataSource2 = dataSource2.filter(item => {
+ if (!this.indexRegisterType) {
+ return true
+ }
+ return item.type == this.indexRegisterType
+ })
+ }
+ },
+ created() {
+ this.loadDataSource1()
+ this.loadDataSource2()
+ setTimeout(() => {
+ this.loading = !this.loading
+ }, 1000)
}
+}
</script>
<style lang="less" scoped>
- .extra-wrapper {
- line-height: 55px;
- padding-right: 24px;
+.extra-wrapper {
+ line-height: 55px;
+ padding-right: 24px;
- .extra-item {
- display: inline-block;
- margin-right: 24px;
-
- a {
- margin-left: 24px;
- }
- }
- }
-
- .item-group {
- padding: 20px 0 8px 24px;
- font-size: 0;
- a {
- color: rgba(0, 0, 0, 0.65);
- display: inline-block;
- font-size: 14px;
- margin-bottom: 13px;
- width: 25%;
- }
- }
-
- .item-group {
- .more-btn {
- margin-bottom: 13px;
- text-align: center;
- }
- }
-
- .list-content-item {
- color: rgba(0, 0, 0, .45);
+ .extra-item {
display: inline-block;
- vertical-align: middle;
+ margin-right: 24px;
+
+ a {
+ margin-left: 24px;
+ }
+ }
+}
+
+.item-group {
+ padding: 20px 0 8px 24px;
+ font-size: 0;
+ a {
+ color: rgba(0, 0, 0, 0.65);
+ display: inline-block;
font-size: 14px;
- margin-left: 40px;
+ margin-bottom: 13px;
+ width: 25%;
}
+}
- @media only screen and (min-width: 1600px) {
- .list-content-item{
- margin-left:60px;
- }
+.item-group {
+ .more-btn {
+ margin-bottom: 13px;
+ text-align: center;
}
+}
- @media only screen and (max-width: 1300px) {
- .list-content-item{
- margin-left:20px;
- }
- .width-hidden4{
- display:none
- }
- }
- .list-content-item{
- span{line-height: 20px;}
- }
- .list-content-item{
- p{margin-top: 4px;margin-bottom:0;line-height:22px;}
- }
- .anty-list-cust {
- .ant-list-item-meta{flex: 0.3 !important;}
- }
- .anty-list-cust {
- .ant-list-item-content{flex:1 !important; justify-content:flex-start !important;margin-left: 20px;}
- }
+.list-content-item {
+ color: rgba(0, 0, 0, 0.45);
+ display: inline-block;
+ vertical-align: middle;
+ font-size: 14px;
+ margin-left: 40px;
+}
+@media only screen and (min-width: 1600px) {
+ .list-content-item {
+ margin-left: 60px;
+ }
+}
+@media only screen and (max-width: 1300px) {
+ .list-content-item {
+ margin-left: 20px;
+ }
+ .width-hidden4 {
+ display: none;
+ }
+}
+.list-content-item {
+ span {
+ line-height: 20px;
+ }
+}
+.list-content-item {
+ p {
+ margin-top: 4px;
+ margin-bottom: 0;
+ line-height: 22px;
+ }
+}
+.anty-list-cust {
+ .ant-list-item-meta {
+ flex: 0.3 !important;
+ }
+}
+.anty-list-cust {
+ .ant-list-item-content {
+ flex: 1 !important;
+ justify-content: flex-start !important;
+ margin-left: 20px;
+ }
+}
</style>
\ No newline at end of file
diff --git a/src/views/dashboard/IndexChart.vue b/src/views/dashboard/IndexChart.vue
index 60406f6..eccd692 100644
--- a/src/views/dashboard/IndexChart.vue
+++ b/src/views/dashboard/IndexChart.vue
@@ -1,134 +1,276 @@
<template>
<div class="page-header-index-wide">
- <!--<a-row :gutter="24">-->
- <!--<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
- <!--<chart-card :loading="loading" title="鎬婚攢鍞" total="锟�126,560">-->
- <!--<a-tooltip title="鎸囨爣璇存槑" slot="action">-->
- <!--<a-icon type="info-circle-o" />-->
- <!--</a-tooltip>-->
- <!--<div>-->
- <!--<trend flag="up" style="margin-right: 16px;">-->
- <!--<span slot="term">鍛ㄥ悓姣�</span>-->
- <!--12%-->
- <!--</trend>-->
- <!--<trend flag="down">-->
- <!--<span slot="term">鏃ュ悓姣�</span>-->
- <!--11%-->
- <!--</trend>-->
- <!--</div>-->
- <!--<template slot="footer">鏃ュ潎閿�鍞<span>锟� 234.56</span></template>-->
- <!--</chart-card>-->
- <!--</a-col>-->
- <!--<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
- <!--<chart-card :loading="loading" title="璁㈠崟閲�" :total="8846 | NumberFormat">-->
- <!--<a-tooltip title="鎸囨爣璇存槑" slot="action">-->
- <!--<a-icon type="info-circle-o" />-->
- <!--</a-tooltip>-->
- <!--<div>-->
- <!--<mini-area />-->
- <!--</div>-->
- <!--<template slot="footer">鏃ヨ鍗曢噺<span> {{ '1234' | NumberFormat }}</span></template>-->
- <!--</chart-card>-->
- <!--</a-col>-->
- <!--<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
- <!--<chart-card :loading="loading" title="鏀粯绗旀暟" :total="6560 | NumberFormat">-->
- <!--<a-tooltip title="鎸囨爣璇存槑" slot="action">-->
- <!--<a-icon type="info-circle-o" />-->
- <!--</a-tooltip>-->
- <!--<div>-->
- <!--<mini-bar :height="40" />-->
- <!--</div>-->
- <!--<template slot="footer">杞寲鐜� <span>60%</span></template>-->
- <!--</chart-card>-->
- <!--</a-col>-->
- <!--<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
- <!--<chart-card :loading="loading" title="杩愯惀娲诲姩鏁堟灉" total="78%">-->
- <!--<a-tooltip title="鎸囨爣璇存槑" slot="action">-->
- <!--<a-icon type="info-circle-o" />-->
- <!--</a-tooltip>-->
- <!--<div>-->
- <!--<mini-progress color="rgb(19, 194, 194)" :target="80" :percentage="78" :height="8" />-->
- <!--</div>-->
- <!--<template slot="footer">-->
- <!--<trend flag="down" style="margin-right: 16px;">-->
- <!--<span slot="term">鍚屽懆姣�</span>-->
- <!--12%-->
- <!--</trend>-->
- <!--<trend flag="up">-->
- <!--<span slot="term">鏃ョ幆姣�</span>-->
- <!--80%-->
- <!--</trend>-->
- <!--</template>-->
- <!--</chart-card>-->
- <!--</a-col>-->
- <!--</a-row>-->
+ <a-row :gutter="24">
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="鎬婚攢鍞"
+ total="锟�126,560"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
+ <a-icon type="info-circle-o" />
+ </a-tooltip>
+ <div>
+ <trend
+ flag="up"
+ style="margin-right: 16px;"
+ >
+ <span slot="term">鍛ㄥ悓姣�</span>
+ 12%
+ </trend>
+ <trend flag="down">
+ <span slot="term">鏃ュ悓姣�</span>
+ 11%
+ </trend>
+ </div>
+ <template slot="footer">鏃ュ潎閿�鍞<span>锟� 234.56</span></template>
+ </chart-card>
+ </a-col>
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="璁㈠崟閲�"
+ :total="8846 | NumberFormat"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
+ <a-icon type="info-circle-o" />
+ </a-tooltip>
+ <div>
+ <mini-area />
+ </div>
+ <template slot="footer">鏃ヨ鍗曢噺<span> {{ '1234' | NumberFormat }}</span></template>
+ </chart-card>
+ </a-col>
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="鏀粯绗旀暟"
+ :total="6560 | NumberFormat"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
+ <a-icon type="info-circle-o" />
+ </a-tooltip>
+ <div>
+ <mini-bar :height="40" />
+ </div>
+ <template slot="footer">杞寲鐜� <span>60%</span></template>
+ </chart-card>
+ </a-col>
+ <a-col
+ :sm="24"
+ :md="12"
+ :xl="6"
+ :style="{ marginBottom: '24px' }"
+ >
+ <chart-card
+ :loading="loading"
+ title="杩愯惀娲诲姩鏁堟灉"
+ total="78%"
+ >
+ <a-tooltip
+ title="鎸囨爣璇存槑"
+ slot="action"
+ >
+ <a-icon type="info-circle-o" />
+ </a-tooltip>
+ <div>
+ <mini-progress
+ color="rgb(19, 194, 194)"
+ :target="80"
+ :percentage="78"
+ :height="8"
+ />
+ </div>
+ <template slot="footer">
+ <trend
+ flag="down"
+ style="margin-right: 16px;"
+ >
+ <span slot="term">鍚屽懆姣�</span>
+ 12%
+ </trend>
+ <trend flag="up">
+ <span slot="term">鏃ョ幆姣�</span>
+ 80%
+ </trend>
+ </template>
+ </chart-card>
+ </a-col>
+ </a-row>
- <!--<a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">-->
- <!--<div class="salesCard">-->
- <!--<a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">-->
- <!--<div class="extra-wrapper" slot="tabBarExtraContent">-->
- <!--<div class="extra-item">-->
- <!--<a>浠婃棩</a>-->
- <!--<a>鏈懆</a>-->
- <!--<a>鏈湀</a>-->
- <!--<a>鏈勾</a>-->
- <!--</div>-->
- <!--<a-range-picker :style="{width: '256px'}" />-->
- <!--</div>-->
- <!--<a-tab-pane loading="true" tab="閿�鍞" key="1">-->
- <!--<a-row>-->
- <!--<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
- <!--<bar title="閿�鍞鎺掕" :dataSource="barData"/>-->
- <!--</a-col>-->
- <!--<a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">-->
- <!--<rank-list title="闂ㄥ簵閿�鍞帓琛屾" :list="rankList"/>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--</a-tab-pane>-->
- <!--<a-tab-pane tab="閿�鍞秼鍔�" key="2">-->
- <!--<a-row>-->
- <!--<a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
- <!--<bar title="閿�鍞瓒嬪娍" :dataSource="barData"/>-->
- <!--</a-col>-->
- <!--<a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">-->
- <!--<rank-list title="闂ㄥ簵閿�鍞帓琛屾" :list="rankList"/>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--</a-tab-pane>-->
- <!--</a-tabs>-->
- <!--</div>-->
- <!--</a-card>-->
+ <a-card
+ :loading="loading"
+ :bordered="false"
+ :body-style="{padding: '0'}"
+ >
+ <div class="salesCard">
+ <a-tabs
+ default-active-key="1"
+ size="large"
+ :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}"
+ >
+ <div
+ class="extra-wrapper"
+ slot="tabBarExtraContent"
+ >
+ <div class="extra-item">
+ <a>浠婃棩</a>
+ <a>鏈懆</a>
+ <a>鏈湀</a>
+ <a>鏈勾</a>
+ </div>
+ <a-range-picker :style="{width: '256px'}" />
+ </div>
+ <a-tab-pane
+ loading="true"
+ tab="閿�鍞"
+ key="1"
+ >
+ <a-row>
+ <a-col
+ :xl="16"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
+ <bar
+ title="閿�鍞鎺掕"
+ :dataSource="barData"
+ />
+ </a-col>
+ <a-col
+ :xl="8"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
+ <rank-list
+ title="闂ㄥ簵閿�鍞帓琛屾"
+ :list="rankList"
+ />
+ </a-col>
+ </a-row>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="閿�鍞秼鍔�"
+ key="2"
+ >
+ <a-row>
+ <a-col
+ :xl="16"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
+ <bar
+ title="閿�鍞瓒嬪娍"
+ :dataSource="barData"
+ />
+ </a-col>
+ <a-col
+ :xl="8"
+ :lg="12"
+ :md="12"
+ :sm="24"
+ :xs="24"
+ >
+ <rank-list
+ title="闂ㄥ簵閿�鍞帓琛屾"
+ :list="rankList"
+ />
+ </a-col>
+ </a-row>
+ </a-tab-pane>
+ </a-tabs>
+ </div>
+ </a-card>
<a-row>
<a-col :span="24">
- <a-card :loading="loading" :bordered="false" title="鏈�杩戜竴鍛ㄨ闂噺缁熻" :style="{ marginTop: '24px' }">
+ <a-card
+ :loading="loading"
+ :bordered="false"
+ title="鏈�杩戜竴鍛ㄨ闂噺缁熻"
+ :style="{ marginTop: '24px' }"
+ >
<a-row>
<a-col :span="6">
- <head-info title="浠婃棩IP" :content="loginfo.todayIp"></head-info>
+ <head-info
+ title="浠婃棩IP"
+ :content="loginfo.todayIp"
+ ></head-info>
</a-col>
<a-col :span="2">
<a-spin class='circle-cust'>
- <a-icon slot="indicator" type="environment" style="font-size: 24px" />
+ <a-icon
+ slot="indicator"
+ type="environment"
+ style="font-size: 24px"
+ />
</a-spin>
</a-col>
<a-col :span="6">
- <head-info title="浠婃棩璁块棶" :content="loginfo.todayVisitCount"></head-info>
+ <head-info
+ title="浠婃棩璁块棶"
+ :content="loginfo.todayVisitCount"
+ ></head-info>
</a-col>
<a-col :span="2">
<a-spin class='circle-cust'>
- <a-icon slot="indicator" type="team" style="font-size: 24px" />
+ <a-icon
+ slot="indicator"
+ type="team"
+ style="font-size: 24px"
+ />
</a-spin>
</a-col>
<a-col :span="6">
- <head-info title="鎬昏闂噺" :content="loginfo.totalVisitCount"></head-info>
+ <head-info
+ title="鎬昏闂噺"
+ :content="loginfo.totalVisitCount"
+ ></head-info>
</a-col>
<a-col :span="2">
<a-spin class='circle-cust'>
- <a-icon slot="indicator" type="rise" style="font-size: 24px" />
+ <a-icon
+ slot="indicator"
+ type="rise"
+ style="font-size: 24px"
+ />
</a-spin>
</a-col>
</a-row>
- <line-chart-multid :fields="visitFields" :dataSource="visitInfo"></line-chart-multid>
+ <line-chart-multid
+ :fields="visitFields"
+ :dataSource="visitInfo"
+ ></line-chart-multid>
</a-card>
</a-col>
</a-row>
@@ -136,133 +278,133 @@
</template>
<script>
- import ChartCard from '@/components/ChartCard'
- import ACol from "ant-design-vue/es/grid/Col"
- import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
- import MiniArea from '@/components/chart/MiniArea'
- import MiniBar from '@/components/chart/MiniBar'
- import MiniProgress from '@/components/chart/MiniProgress'
- import RankList from '@/components/chart/RankList'
- import Bar from '@/components/chart/Bar'
- import LineChartMultid from '@/components/chart/LineChartMultid'
- import HeadInfo from '@/components/tools/HeadInfo.vue'
+import ChartCard from '@/components/ChartCard'
+import ACol from "ant-design-vue/es/grid/Col"
+import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
+import MiniArea from '@/components/chart/MiniArea'
+import MiniBar from '@/components/chart/MiniBar'
+import MiniProgress from '@/components/chart/MiniProgress'
+import RankList from '@/components/chart/RankList'
+import Bar from '@/components/chart/Bar'
+import LineChartMultid from '@/components/chart/LineChartMultid'
+import HeadInfo from '@/components/tools/HeadInfo.vue'
- import Trend from '@/components/Trend'
- import { getLoginfo,getVisitInfo } from '@/api/api'
+import Trend from '@/components/Trend'
+import { getLoginfo, getVisitInfo } from '@/api/api'
- const rankList = []
- for (let i = 0; i < 7; i++) {
- rankList.push({
- name: '鐧介弓宀� ' + (i+1) + ' 鍙峰簵',
- total: 1234.56 - i * 100
- })
- }
- const barData = []
- for (let i = 0; i < 12; i += 1) {
- barData.push({
- x: `${i + 1}鏈坄,
- y: Math.floor(Math.random() * 1000) + 200
- })
- }
- export default {
- name: "IndexChart",
- components: {
- ATooltip,
- ACol,
- ChartCard,
- MiniArea,
- MiniBar,
- MiniProgress,
- RankList,
- Bar,
- Trend,
- LineChartMultid,
- HeadInfo
- },
- data() {
- return {
- loading: true,
- center: null,
- rankList,
- barData,
- loginfo:{},
- visitFields:['ip','visit'],
- visitInfo:[],
- indicator: <a-icon type="loading" style="font-size: 24px" spin />
- }
- },
- created() {
- setTimeout(() => {
- this.loading = !this.loading
- }, 1000)
- this.initLogInfo();
- },
- methods: {
- initLogInfo () {
- getLoginfo(null).then((res)=>{
- if(res.success){
- Object.keys(res.result).forEach(key=>{
- res.result[key] =res.result[key]+""
- })
- this.loginfo = res.result;
- }
- })
- getVisitInfo().then(res=>{
- if(res.success){
- this.visitInfo = res.result;
- }
- })
- },
+const rankList = []
+for (let i = 0; i < 7; i++) {
+ rankList.push({
+ name: '鐧介弓宀� ' + (i + 1) + ' 鍙峰簵',
+ total: 1234.56 - i * 100
+ })
+}
+const barData = []
+for (let i = 0; i < 12; i += 1) {
+ barData.push({
+ x: `${i + 1}鏈坄,
+ y: Math.floor(Math.random() * 1000) + 200
+ })
+}
+export default {
+ name: "IndexChart",
+ components: {
+ ATooltip,
+ ACol,
+ ChartCard,
+ MiniArea,
+ MiniBar,
+ MiniProgress,
+ RankList,
+ Bar,
+ Trend,
+ LineChartMultid,
+ HeadInfo
+ },
+ data() {
+ return {
+ loading: true,
+ center: null,
+ rankList,
+ barData,
+ loginfo: {},
+ visitFields: ['ip', 'visit'],
+ visitInfo: [],
+ indicator: <a-icon type="loading" style="font-size: 24px" spin />
}
+ },
+ created() {
+ setTimeout(() => {
+ this.loading = !this.loading
+ }, 1000)
+ this.initLogInfo();
+ },
+ methods: {
+ initLogInfo() {
+ getLoginfo(null).then((res) => {
+ if (res.success) {
+ Object.keys(res.result).forEach(key => {
+ res.result[key] = res.result[key] + ""
+ })
+ this.loginfo = res.result;
+ }
+ })
+ getVisitInfo().then(res => {
+ if (res.success) {
+ this.visitInfo = res.result;
+ }
+ })
+ },
}
+}
</script>
<style lang="less" scoped>
- .circle-cust{
- position: relative;
- top: 28px;
- left: -100%;
- }
- .extra-wrapper {
- line-height: 55px;
- padding-right: 24px;
+.circle-cust {
+ position: relative;
+ top: 28px;
+ left: -100%;
+}
+.extra-wrapper {
+ line-height: 55px;
+ padding-right: 24px;
- .extra-item {
- display: inline-block;
- margin-right: 24px;
+ .extra-item {
+ display: inline-block;
+ margin-right: 24px;
- a {
- margin-left: 24px;
- }
+ a {
+ margin-left: 24px;
}
}
+}
- /* 棣栭〉璁块棶閲忕粺璁� */
- .head-info {
- position: relative;
- text-align: left;
- padding: 0 32px 0 0;
- min-width: 125px;
+/* 棣栭〉璁块棶閲忕粺璁� */
+.head-info {
+ position: relative;
+ text-align: left;
+ padding: 0 32px 0 0;
+ min-width: 125px;
- &.center {
- text-align: center;
- padding: 0 32px;
- }
+ &.center {
+ text-align: center;
+ padding: 0 32px;
+ }
- span {
- color: rgba(0, 0, 0, .45);
- display: inline-block;
- font-size: .95rem;
- line-height: 42px;
- margin-bottom: 4px;
- }
- p {
- line-height: 42px;
- margin: 0;
- a {
- font-weight: 600;
- font-size: 1rem;
- }
+ span {
+ color: rgba(0, 0, 0, 0.45);
+ display: inline-block;
+ font-size: 0.95rem;
+ line-height: 42px;
+ margin-bottom: 4px;
+ }
+ p {
+ line-height: 42px;
+ margin: 0;
+ a {
+ font-weight: 600;
+ font-size: 1rem;
}
}
+}
</style>
\ No newline at end of file
diff --git a/src/views/dashboard/IndexTask.vue b/src/views/dashboard/IndexTask.vue
index 8e9d84b..b945acf 100644
--- a/src/views/dashboard/IndexTask.vue
+++ b/src/views/dashboard/IndexTask.vue
@@ -1,15 +1,29 @@
<template>
<div class="index-container-ty">
<a-spin :spinning="loading">
- <a-row type="flex" justify="start" :gutter="3">
- <a-col :sm="24" :lg="12">
+ <a-row
+ type="flex"
+ justify="start"
+ :gutter="3"
+ >
+ <a-col
+ :sm="24"
+ :lg="12"
+ >
<a-card>
- <div slot="title" class="index-md-title">
- <img src="../../assets/daiban.png"/>
+ <div
+ slot="title"
+ class="index-md-title"
+ >
+ <img src="../../assets/daiban.png" />
鎴戠殑寰呭姙銆恵{ dataSource1.length }}銆�
</div>
<div slot="extra">
- <a v-if="dataSource1 && dataSource1.length>0" slot="footer" @click="goPage">鏇村 <a-icon type="double-right" /></a>
+ <a
+ v-if="dataSource1 && dataSource1.length>0"
+ slot="footer"
+ @click="goPage"
+ >鏇村 <a-icon type="double-right" /></a>
</div>
<a-table
:class="'my-index-table tytable1'"
@@ -18,16 +32,34 @@
rowKey="id"
:columns="columns"
:dataSource="dataSource1"
- :pagination="false">
- <template slot="ellipsisText" slot-scope="text">
- <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
+ :pagination="false"
+ >
+ <template
+ slot="ellipsisText"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="textMaxLength"
+ ></j-ellipsis>
</template>
- <template slot="dayWarnning" slot-scope="text,record">
- <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
+ <template
+ slot="dayWarnning"
+ slot-scope="text,record"
+ >
+ <a-icon
+ type="bulb"
+ theme="twoTone"
+ style="font-size:22px"
+ :twoToneColor="getTipColor(record)"
+ />
</template>
- <span slot="action" slot-scope="text, record">
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
<a @click="handleData">鍔炵悊</a>
</span>
@@ -35,14 +67,24 @@
</a-card>
</a-col>
- <a-col :sm="24" :lg="12">
+ <a-col
+ :sm="24"
+ :lg="12"
+ >
<a-card>
- <div slot="title" class="index-md-title">
- <img src="../../assets/zaiban.png"/>
+ <div
+ slot="title"
+ class="index-md-title"
+ >
+ <img src="../../assets/zaiban.png" />
鎴戠殑鍦ㄥ姙銆恵{ dataSource2.length }}銆�
</div>
<div slot="extra">
- <a v-if="dataSource2 && dataSource2.length>0" slot="footer" @click="goPage">鏇村 <a-icon type="double-right" /></a>
+ <a
+ v-if="dataSource2 && dataSource2.length>0"
+ slot="footer"
+ @click="goPage"
+ >鏇村 <a-icon type="double-right" /></a>
</div>
<a-table
:class="'my-index-table tytable2'"
@@ -51,16 +93,34 @@
rowKey="id"
:columns="columns"
:dataSource="dataSource2"
- :pagination="false">
- <template slot="ellipsisText" slot-scope="text">
- <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
+ :pagination="false"
+ >
+ <template
+ slot="ellipsisText"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="textMaxLength"
+ ></j-ellipsis>
</template>
- <template slot="dayWarnning" slot-scope="text,record">
- <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
+ <template
+ slot="dayWarnning"
+ slot-scope="text,record"
+ >
+ <a-icon
+ type="bulb"
+ theme="twoTone"
+ style="font-size:22px"
+ :twoToneColor="getTipColor(record)"
+ />
</template>
- <span slot="action" slot-scope="text, record">
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
<a @click="handleData">鍔炵悊</a>
</span>
@@ -72,10 +132,16 @@
<div style="height: 5px;"></div>
</a-col>
- <a-col :sm="24" :lg="12">
+ <a-col
+ :sm="24"
+ :lg="12"
+ >
<a-card>
- <div slot="title" class="index-md-title">
- <img src="../../assets/guaz.png"/>
+ <div
+ slot="title"
+ class="index-md-title"
+ >
+ <img src="../../assets/guaz.png" />
鎴戠殑鎸傝处銆恵{ dataSource4.length }}銆�
</div>
<a-table
@@ -85,16 +151,34 @@
rowKey="id"
:columns="columns"
:dataSource="dataSource4"
- :pagination="false">
- <template slot="ellipsisText" slot-scope="text">
- <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
+ :pagination="false"
+ >
+ <template
+ slot="ellipsisText"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="textMaxLength"
+ ></j-ellipsis>
</template>
- <template slot="dayWarnning" slot-scope="text,record">
- <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
+ <template
+ slot="dayWarnning"
+ slot-scope="text,record"
+ >
+ <a-icon
+ type="bulb"
+ theme="twoTone"
+ style="font-size:22px"
+ :twoToneColor="getTipColor(record)"
+ />
</template>
- <span slot="action" slot-scope="text, record">
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
<a @click="handleData">鍔炵悊</a>
</span>
@@ -102,10 +186,16 @@
</a-card>
</a-col>
- <a-col :sm="24" :lg="12">
+ <a-col
+ :sm="24"
+ :lg="12"
+ >
<a-card>
- <div slot="title" class="index-md-title">
- <img src="../../assets/duban.png"/>
+ <div
+ slot="title"
+ class="index-md-title"
+ >
+ <img src="../../assets/duban.png" />
鎴戠殑鐫ｅ姙銆恵{ dataSource3.length }}銆�
</div>
<a-table
@@ -115,16 +205,34 @@
rowKey="id"
:columns="columns"
:dataSource="dataSource3"
- :pagination="false">
- <template slot="ellipsisText" slot-scope="text">
- <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
+ :pagination="false"
+ >
+ <template
+ slot="ellipsisText"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="textMaxLength"
+ ></j-ellipsis>
</template>
- <template slot="dayWarnning" slot-scope="text,record">
- <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
+ <template
+ slot="dayWarnning"
+ slot-scope="text,record"
+ >
+ <a-icon
+ type="bulb"
+ theme="twoTone"
+ style="font-size:22px"
+ :twoToneColor="getTipColor(record)"
+ />
</template>
- <span slot="action" slot-scope="text, record">
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
<a @click="handleData">鍔炵悊</a>
</span>
@@ -139,234 +247,279 @@
</template>
<script>
- import noDataPng from '@/assets/nodata.png'
- import JEllipsis from '@/components/jeecg/JEllipsis'
+import noDataPng from '@/assets/nodata.png'
+import JEllipsis from '@/components/jeecg/JEllipsis'
- const tempSs1=[{
- id:"001",
- orderNo:"鐢礫1]1267102",
- orderTitle:"鑽搧鍑洪棶棰樹簡",
- restDay:1
- },{
- id:"002",
- orderNo:"鐢礫4]5967102",
- orderTitle:"鍚冧簡xxx鍖婚櫌鐨勮嵂锛岀梾鎯呰秺鏉ヨ秺涓ラ噸",
- restDay:0
- },{
- id:"003",
- orderNo:"鐢礫3]5988987",
- orderTitle:"浠婂ぉ鍘昏秴甯備拱楦¤泲锛岄浮铔嬮兘鏄潖鐨�",
- restDay:7
- },{
- id:"004",
- orderNo:"鐢礫2]5213491",
- orderTitle:"xx瀹濆疄浣撳簵楂樹环鍞崠xx",
- restDay:5
- },{
- id:"005",
- orderNo:"鐢礫1]1603491",
- orderTitle:"浠ョ孩鍒╃浉璇憋紝绛斿簲閫�淇濆悗鎵ｄ竴骞磋垂鐢�",
- restDay:0
- }]
+const tempSs1 = [{
+ id: "001",
+ orderNo: "鐢礫1]1267102",
+ orderTitle: "鑽搧鍑洪棶棰樹簡",
+ restDay: 1
+}, {
+ id: "002",
+ orderNo: "鐢礫4]5967102",
+ orderTitle: "鍚冧簡xxx鍖婚櫌鐨勮嵂锛岀梾鎯呰秺鏉ヨ秺涓ラ噸",
+ restDay: 0
+}, {
+ id: "003",
+ orderNo: "鐢礫3]5988987",
+ orderTitle: "浠婂ぉ鍘昏秴甯備拱楦¤泲锛岄浮铔嬮兘鏄潖鐨�",
+ restDay: 7
+}, {
+ id: "004",
+ orderNo: "鐢礫2]5213491",
+ orderTitle: "xx瀹濆疄浣撳簵楂樹环鍞崠xx",
+ restDay: 5
+}, {
+ id: "005",
+ orderNo: "鐢礫1]1603491",
+ orderTitle: "浠ョ孩鍒╃浉璇憋紝绛斿簲閫�淇濆悗鎵ｄ竴骞磋垂鐢�",
+ restDay: 0
+}]
- const tempSs2=[{
- id:"001",
- orderTitle:"鎴戣鎶曡瘔杩欎釜澶ц秴甯�",
- orderNo:"鐢礫1]10299456",
- restDay:6
- },{
- id:"002",
- orderTitle:"xxx鍖婚櫌涔卞紑鑽柟,鍞崠鍋囪嵂",
- orderNo:"鐢礫2]20235691",
- restDay:0
- },{
- id:"003",
- orderTitle:"鎴戞兂闂棶杩欏搴楁槸骞插暐鐨�",
- orderNo:"鐢礫3]495867322",
- restDay:7
- },{
- id:"004",
- orderTitle:"鎴戣涓炬姤鏈濋槼鍖哄ゥ妫叕鍥厭搴�",
- orderNo:"鐢礫2]1193849",
- restDay:3
- },{
- id:"005",
- orderTitle:"鎴戜粖澶╁悆楗悆鍒颁竴涓煶澶村瓙",
- orderNo:"鐢礫4]56782344",
- restDay:9
- }]
+const tempSs2 = [{
+ id: "001",
+ orderTitle: "鎴戣鎶曡瘔杩欎釜澶ц秴甯�",
+ orderNo: "鐢礫1]10299456",
+ restDay: 6
+}, {
+ id: "002",
+ orderTitle: "xxx鍖婚櫌涔卞紑鑽柟,鍞崠鍋囪嵂",
+ orderNo: "鐢礫2]20235691",
+ restDay: 0
+}, {
+ id: "003",
+ orderTitle: "鎴戞兂闂棶杩欏搴楁槸骞插暐鐨�",
+ orderNo: "鐢礫3]495867322",
+ restDay: 7
+}, {
+ id: "004",
+ orderTitle: "鎴戣涓炬姤鏈濋槼鍖哄ゥ妫叕鍥厭搴�",
+ orderNo: "鐢礫2]1193849",
+ restDay: 3
+}, {
+ id: "005",
+ orderTitle: "鎴戜粖澶╁悆楗悆鍒颁竴涓煶澶村瓙",
+ orderNo: "鐢礫4]56782344",
+ restDay: 9
+}]
- //4-7澶�
- const tip_green = "rgba(0, 255, 0, 1)"
- //1-3澶�
- const tip_yellow = "rgba(255, 255, 0, 1)"
- //瓒呮湡
- const tip_red = "rgba(255, 0, 0, 1)"
+//4-7澶�
+const tip_green = "rgba(0, 255, 0, 1)"
+//1-3澶�
+const tip_yellow = "rgba(255, 255, 0, 1)"
+//瓒呮湡
+const tip_red = "rgba(255, 0, 0, 1)"
- export default {
- name: "IndexTask",
- components:{ JEllipsis },
- data() {
- return {
- loading:false,
- textMaxLength:8,
- dataSource1:[],
- dataSource2:[],
- dataSource3:[],
- dataSource4:[],
- columns: [
- {
- title: '',
- dataIndex: '',
- key:'rowIndex',
- width:50,
- fixed:'left',
- align:"center",
- scopedSlots: {customRender: "dayWarnning"}
- },
- {
- title:'鍓╀綑澶╂暟',
- align:"center",
- dataIndex: 'restDay',
- width:80
- },
- {
- title:'宸ュ崟鏍囬',
- align:"center",
- dataIndex: 'orderTitle',
- scopedSlots: {customRender: "ellipsisText"}
- },
- {
- title:'宸ュ崟缂栧彿',
- align:"center",
- dataIndex: 'orderNo',
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- scopedSlots: { customRender: 'action' }
- }
- ]
-
- }
- },
- created() {
- this.mock();
- },
- mounted(){
-
- },
- methods: {
- getTipColor(rd){
- let num = rd.restDay
- if(num<=0){
- return tip_red
- }else if(num>=1 && num<4){
- return tip_yellow
- }else if(num>=4){
- return tip_green
+export default {
+ name: "IndexTask",
+ components: { JEllipsis },
+ data() {
+ return {
+ loading: false,
+ textMaxLength: 8,
+ dataSource1: [],
+ dataSource2: [],
+ dataSource3: [],
+ dataSource4: [],
+ columns: [
+ {
+ title: '',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 50,
+ fixed: 'left',
+ align: "center",
+ scopedSlots: { customRender: "dayWarnning" }
+ },
+ {
+ title: '鍓╀綑澶╂暟',
+ align: "center",
+ dataIndex: 'restDay',
+ width: 80
+ },
+ {
+ title: '宸ュ崟鏍囬',
+ align: "center",
+ dataIndex: 'orderTitle',
+ scopedSlots: { customRender: "ellipsisText" }
+ },
+ {
+ title: '宸ュ崟缂栧彿',
+ align: "center",
+ dataIndex: 'orderNo',
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: "center",
+ scopedSlots: { customRender: 'action' }
}
- },
- goPage(){
- this.$message.success("璇锋牴鎹叿浣撲笟鍔¤烦杞〉闈�")
- //this.$router.push({ path: '/comp/mytask' })
- },
- mock(){
- this.dataSource1=tempSs1
- this.dataSource2=tempSs2
- this.dataSource3=tempSs1
- this.dataSource4=[]
- this.ifNullDataSource(this.dataSource4,'.tytable4')
- },
-
- ifNullDataSource(ds,tb){
- this.$nextTick(()=>{
- if(!ds || ds.length==0){
- var tmp = document.createElement('img');
- tmp.src=noDataPng
- tmp.width=300
- let tbclass=`${tb} .ant-table-placeholder`
- document.querySelector(tbclass).innerHTML=""
- document.querySelector(tbclass).appendChild(tmp)
- }
- })
- },
- handleData(){
- this.$message.success("鍔炵悊瀹屾垚")
- }
-
-
-
+ ]
}
+ },
+ created() {
+ this.mock();
+ },
+ mounted() {
+
+ },
+ methods: {
+ getTipColor(rd) {
+ let num = rd.restDay
+ if (num <= 0) {
+ return tip_red
+ } else if (num >= 1 && num < 4) {
+ return tip_yellow
+ } else if (num >= 4) {
+ return tip_green
+ }
+ },
+ goPage() {
+ this.$message.success("璇锋牴鎹叿浣撲笟鍔¤烦杞〉闈�")
+ //this.$router.push({ path: '/comp/mytask' })
+ },
+ mock() {
+ this.dataSource1 = tempSs1
+ this.dataSource2 = tempSs2
+ this.dataSource3 = tempSs1
+ this.dataSource4 = []
+ this.ifNullDataSource(this.dataSource4, '.tytable4')
+ },
+
+ ifNullDataSource(ds, tb) {
+ this.$nextTick(() => {
+ if (!ds || ds.length == 0) {
+ var tmp = document.createElement('img');
+ tmp.src = noDataPng
+ tmp.width = 300
+ let tbclass = `${tb} .ant-table-placeholder`
+ document.querySelector(tbclass).innerHTML = ""
+ document.querySelector(tbclass).appendChild(tmp)
+ }
+ })
+ },
+ handleData() {
+ this.$message.success("鍔炵悊瀹屾垚")
+ }
+
+
+
+
}
+}
</script>
<style>
- .my-index-table{height:270px}
- .my-index-table table{font-size: 14px !important;}
+.my-index-table {
+ height: 270px;
+}
+.my-index-table table {
+ font-size: 14px !important;
+}
- .index-container-ty .ant-card-head-title{padding-top: 6px;padding-bottom: 6px;}
- .index-container-ty .ant-card-extra{padding:0}
- .index-container-ty .ant-card-extra a{color:#fff}
- .index-container-ty .ant-card-extra a:hover{color:#152ede}
- .index-container-ty .ant-card-head-wrapper,.index-container-ty .ant-card-head{
- line-height:24px;
- min-height:24px;
- /*background: #90aeff;*/
- background: #7196fb;
- }
- .index-container-ty .ant-card-body{padding: 10px 12px 0px 12px}
+.index-container-ty .ant-card-head-title {
+ padding-top: 6px;
+ padding-bottom: 6px;
+}
+.index-container-ty .ant-card-extra {
+ padding: 0;
+}
+.index-container-ty .ant-card-extra a {
+ color: #fff;
+}
+.index-container-ty .ant-card-extra a:hover {
+ color: #152ede;
+}
+.index-container-ty .ant-card-head-wrapper,
+.index-container-ty .ant-card-head {
+ line-height: 24px;
+ min-height: 24px;
+ /*background: #90aeff;*/
+ background: #7196fb;
+}
+.index-container-ty .ant-card-body {
+ padding: 10px 12px 0px 12px;
+}
- /* .index-container-ty .ant-card-actions{background: #fff}
+/* .index-container-ty .ant-card-actions{background: #fff}
.index-container-ty .ant-card-actions li {margin:2px 0;}
.index-container-ty .ant-card-actions > li > span{width: 100%}*/
+.index-container-ty .ant-table-footer {
+ text-align: right;
+ padding: 6px 12px 6px 6px;
+ background: #fff;
+ border-top: 2px solid #f7f1f1;
+}
- .index-container-ty .ant-table-footer{text-align: right;padding:6px 12px 6px 6px;background: #fff;border-top: 2px solid #f7f1f1;}
+.index-md-title {
+ postion: relative;
+ padding-left: 24px;
+ width: 100%;
+ color: #fff;
+ font-size: 21px;
+ font-family: cursive;
+}
+.index-md-title img {
+ position: absolute;
+ height: 32px;
+ top: 2px;
+ left: 14px;
+}
- .index-md-title{
- postion:relative;
- padding-left:24px;
- width: 100%;
- color: #fff;
- font-size: 21px;
- font-family: cursive;
- }
- .index-md-title img{
- position: absolute;
- height:32px;
- top: 2px;
- left:14px;
- }
-
- .index-container-ty .ant-card-body{
- /*border-left:1px solid #90aeff;
+.index-container-ty .ant-card-body {
+ /*border-left:1px solid #90aeff;
/*border-right:1px solid #90aeff;
border-bottom:1px solid #90aeff;*/
- }
+}
+.index-container-ty .ant-table-thead > tr > th,
+.index-container-ty .ant-table-tbody > tr > td {
+ border-bottom: 1px solid #90aeff;
+}
- .index-container-ty .ant-table-thead > tr > th,
- .index-container-ty .ant-table-tbody > tr > td{
- border-bottom: 1px solid #90aeff;
- }
+.index-container-ty
+ .ant-table-small
+ > .ant-table-content
+ > .ant-table-fixed-left
+ > .ant-table-body-outer
+ > .ant-table-body-inner
+ > table
+ > .ant-table-thead
+ > tr
+ > th,
+.index-container-ty
+ .ant-table-small
+ > .ant-table-content
+ > .ant-table-fixed-right
+ > .ant-table-body-outer
+ > .ant-table-body-inner
+ > table
+ > .ant-table-thead
+ > tr
+ > th {
+ border-bottom: 1px solid #90aeff;
+}
- .index-container-ty .ant-table-small > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th,
- .index-container-ty .ant-table-small > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th{
- border-bottom: 1px solid #90aeff;
- }
+.index-container-ty
+ .ant-table-small
+ > .ant-table-content
+ > .ant-table-scroll
+ > .ant-table-body
+ > table
+ > .ant-table-thead
+ > tr
+ > th {
+ border-bottom: 1px solid #90aeff;
+}
- .index-container-ty .ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th{
- border-bottom: 1px solid #90aeff;
- }
+.index-container-ty .ant-table-small {
+ border: 1px solid #90aeff;
+}
- .index-container-ty .ant-table-small{
- border: 1px solid #90aeff;
- }
-
- .index-container-ty .ant-table-placeholder {
- padding: 0
- }
+.index-container-ty .ant-table-placeholder {
+ padding: 0;
+}
</style>
\ No newline at end of file
diff --git a/src/views/dashboard/Monitor.vue b/src/views/dashboard/Monitor.vue
index 144e237..c827145 100644
--- a/src/views/dashboard/Monitor.vue
+++ b/src/views/dashboard/Monitor.vue
@@ -5,11 +5,10 @@
</template>
<script>
- export default {
- name: "Monitor"
- }
+export default {
+ name: "Monitor"
+}
</script>
<style scoped>
-
</style>
\ No newline at end of file
diff --git a/src/views/dashboard/Workplace.vue b/src/views/dashboard/Workplace.vue
index 57d0a06..243b9f9 100644
--- a/src/views/dashboard/Workplace.vue
+++ b/src/views/dashboard/Workplace.vue
@@ -7,37 +7,74 @@
<div slot="extra">
<a-row class="more-info">
<a-col :span="8">
- <head-info title="椤圭洰鏁�" content="56" :center="false" :bordered="false"/>
+ <head-info
+ title="椤圭洰鏁�"
+ content="56"
+ :center="false"
+ :bordered="false"
+ />
</a-col>
<a-col :span="8">
- <head-info title="鍥㈤槦鎺掑悕" content="8/24" :center="false" :bordered="false"/>
+ <head-info
+ title="鍥㈤槦鎺掑悕"
+ content="8/24"
+ :center="false"
+ :bordered="false"
+ />
</a-col>
<a-col :span="8">
- <head-info title="椤圭洰璁块棶" content="2,223" :center="false" />
+ <head-info
+ title="椤圭洰璁块棶"
+ content="2,223"
+ :center="false"
+ />
</a-col>
</a-row>
</div>
<div>
<a-row :gutter="24">
- <a-col :xl="16" :lg="24" :md="24" :sm="24" :xs="24">
+ <a-col
+ :xl="16"
+ :lg="24"
+ :md="24"
+ :sm="24"
+ :xs="24"
+ >
<a-card
class="project-list"
:loading="loading"
style="margin-bottom: 24px;"
:bordered="false"
title="杩涜涓殑椤圭洰"
- :body-style="{ padding: 0 }">
+ :body-style="{ padding: 0 }"
+ >
<a slot="extra">鍏ㄩ儴椤圭洰</a>
<div>
- <a-card-grid class="project-card-grid" :key="i" v-for="(item, i) in projects">
- <a-card :bordered="false" :body-style="{ padding: 0 }">
+ <a-card-grid
+ class="project-card-grid"
+ :key="i"
+ v-for="(item, i) in projects"
+ >
+ <a-card
+ :bordered="false"
+ :body-style="{ padding: 0 }"
+ >
<a-card-meta>
- <div slot="title" class="card-title">
- <a-avatar size="small" :src="item.cover"/>
+ <div
+ slot="title"
+ class="card-title"
+ >
+ <a-avatar
+ size="small"
+ :src="item.cover"
+ />
<a>{{ item.title }}</a>
</div>
- <div slot="description" class="card-description">
+ <div
+ slot="description"
+ class="card-description"
+ >
{{ item.description }}
</div>
</a-card-meta>
@@ -50,11 +87,21 @@
</div>
</a-card>
- <a-card :loading="loading" title="鍔ㄦ��" :bordered="false">
+ <a-card
+ :loading="loading"
+ title="鍔ㄦ��"
+ :bordered="false"
+ >
<a-list>
- <a-list-item :key="index" v-for="(item, index) in activities">
+ <a-list-item
+ :key="index"
+ v-for="(item, index) in activities"
+ >
<a-list-item-meta>
- <a-avatar slot="avatar" :src="item.user.avatar" />
+ <a-avatar
+ slot="avatar"
+ :src="item.user.avatar"
+ />
<div slot="title">
<span>{{ item.user.nickname }}</span>
鍦� <a href="#">{{ item.project.name }}</a>
@@ -73,8 +120,14 @@
:lg="24"
:md="24"
:sm="24"
- :xs="24">
- <a-card title="蹇�熷紑濮� / 渚挎嵎瀵艰埅" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
+ :xs="24"
+ >
+ <a-card
+ title="蹇�熷紑濮� / 渚挎嵎瀵艰埅"
+ style="margin-bottom: 24px"
+ :bordered="false"
+ :body-style="{padding: 0}"
+ >
<div class="item-group">
<a>鎿嶄綔涓�</a>
<a>鎿嶄綔浜�</a>
@@ -82,21 +135,43 @@
<a>鎿嶄綔鍥�</a>
<a>鎿嶄綔浜�</a>
<a>鎿嶄綔鍏�</a>
- <a-button size="small" type="primary" ghost icon="plus">娣诲姞</a-button>
+ <a-button
+ size="small"
+ type="primary"
+ ghost
+ icon="plus"
+ >娣诲姞</a-button>
</div>
</a-card>
- <a-card title="XX 鎸囨暟" style="margin-bottom: 24px" :loading="radarLoading" :bordered="false" :body-style="{ padding: 0 }">
+ <a-card
+ title="XX 鎸囨暟"
+ style="margin-bottom: 24px"
+ :loading="radarLoading"
+ :bordered="false"
+ :body-style="{ padding: 0 }"
+ >
<div style="min-height: 400px;">
<!-- :scale="scale" :axis1Opts="axis1Opts" :axis2Opts="axis2Opts" -->
<radar :data="radarData" />
</div>
</a-card>
- <a-card :loading="loading" title="鍥㈤槦" :bordered="false">
+ <a-card
+ :loading="loading"
+ title="鍥㈤槦"
+ :bordered="false"
+ >
<div class="members">
<a-row>
- <a-col :span="12" v-for="(item, index) in teams" :key="index">
+ <a-col
+ :span="12"
+ v-for="(item, index) in teams"
+ :key="index"
+ >
<a>
- <a-avatar size="small" :src="item.avatar" />
+ <a-avatar
+ size="small"
+ :src="item.avatar"
+ />
<span class="member">{{ item.name }}</span>
</a>
</a-col>
@@ -110,251 +185,247 @@
</template>
<script>
- import { timeFix } from "@/utils/util"
- import {mapGetters} from "vuex"
+import { timeFix } from "@/utils/util"
+import { mapGetters } from "vuex"
- import PageLayout from '@/components/page/PageLayout'
- import HeadInfo from '@/components/tools/HeadInfo'
- import Radar from '@/components/chart/Radar'
- import { getRoleList, getServiceList, getFileAccessHttpUrl } from "@/api/manage"
+import PageLayout from '@/components/page/PageLayout'
+import HeadInfo from '@/components/tools/HeadInfo'
+import Radar from '@/components/chart/Radar'
+import { getRoleList, getServiceList, getFileAccessHttpUrl } from "@/api/manage"
- const DataSet = require('@antv/data-set')
+const DataSet = require('@antv/data-set')
- export default {
- name: "Workplace",
- components: {
- PageLayout,
- HeadInfo,
- Radar
- },
- data() {
- return {
- timeFix: timeFix(),
- avatar: '',
- user: {},
+export default {
+ name: "Workplace",
+ components: {
+ PageLayout,
+ HeadInfo,
+ Radar
+ },
+ data() {
+ return {
+ timeFix: timeFix(),
+ avatar: '',
+ user: {},
- projects: [],
- loading: true,
- radarLoading: true,
- activities: [],
- teams: [],
+ projects: [],
+ loading: true,
+ radarLoading: true,
+ activities: [],
+ teams: [],
- // data
- axis1Opts: {
- dataKey: 'item',
- line: null,
- tickLine: null,
- grid: {
- lineStyle: {
- lineDash: null
- },
- hideFirstLine: false
+ // data
+ axis1Opts: {
+ dataKey: 'item',
+ line: null,
+ tickLine: null,
+ grid: {
+ lineStyle: {
+ lineDash: null
+ },
+ hideFirstLine: false
+ }
+ },
+ axis2Opts: {
+ dataKey: 'score',
+ line: null,
+ tickLine: null,
+ grid: {
+ type: 'polygon',
+ lineStyle: {
+ lineDash: null
}
- },
- axis2Opts: {
- dataKey: 'score',
- line: null,
- tickLine: null,
- grid: {
- type: 'polygon',
- lineStyle: {
- lineDash: null
- }
- }
- },
- scale: [{
- dataKey: 'score',
- min: 0,
- max: 80
- }],
- axisData: [
- { item: '寮曠敤', a: 70, b: 30, c: 40 },
- { item: '鍙ｇ', a: 60, b: 70, c: 40 },
- { item: '浜ч噺', a: 50, b: 60, c: 40 },
- { item: '璐＄尞', a: 40, b: 50, c: 40 },
- { item: '鐑害', a: 60, b: 70, c: 40 },
- { item: '寮曠敤', a: 70, b: 50, c: 40 }
- ],
- radarData: []
- }
- },
- computed: {
- userInfo() {
- return this.$store.getters.userInfo
- }
- },
- created() {
- this.user = this.userInfo
- this.avatar = getFileAccessHttpUrl(this.userInfo.avatar)
- console.log('this.avatar :'+ this.avatar)
-
- getRoleList().then(res => {
- console.log('workplace -> call getRoleList()', res)
- })
-
- getServiceList().then(res => {
- console.log('workplace -> call getServiceList()', res)
- })
- },
- mounted() {
- this.getProjects()
- this.getActivity()
- this.getTeams()
- this.initRadar()
- },
- methods: {
- ...mapGetters(["nickname", "welcome"]),
- getProjects() {
- this.$http.get('/mock/api/list/search/projects')
- .then(res => {
- this.projects = res.result && res.result.data
- this.loading = false
- })
+ }
},
- getActivity() {
- this.$http.get('/mock/api/workplace/activity')
- .then(res => {
- this.activities = res.result
- })
- },
- getTeams() {
- this.$http.get('/mock/api/workplace/teams')
- .then(res => {
- this.teams = res.result
- })
- },
- initRadar() {
- this.radarLoading = true
+ scale: [{
+ dataKey: 'score',
+ min: 0,
+ max: 80
+ }],
+ axisData: [
+ { item: '寮曠敤', a: 70, b: 30, c: 40 },
+ { item: '鍙ｇ', a: 60, b: 70, c: 40 },
+ { item: '浜ч噺', a: 50, b: 60, c: 40 },
+ { item: '璐＄尞', a: 40, b: 50, c: 40 },
+ { item: '鐑害', a: 60, b: 70, c: 40 },
+ { item: '寮曠敤', a: 70, b: 50, c: 40 }
+ ],
+ radarData: []
+ }
+ },
+ computed: {
+ userInfo() {
+ return this.$store.getters.userInfo
+ }
+ },
+ created() {
+ this.user = this.userInfo
+ this.avatar = getFileAccessHttpUrl(this.userInfo.avatar)
+ console.log('this.avatar :' + this.avatar)
- this.$http.get('/mock/api/workplace/radar')
- .then(res => {
+ getRoleList().then(res => {
+ console.log('workplace -> call getRoleList()', res)
+ })
- const dv = new DataSet.View().source(res.result)
- dv.transform({
- type: 'fold',
- fields: ['涓汉', '鍥㈤槦', '閮ㄩ棬'],
- key: 'user',
- value: 'score'
- })
+ getServiceList().then(res => {
+ console.log('workplace -> call getServiceList()', res)
+ })
+ },
+ mounted() {
+ this.getProjects()
+ this.getActivity()
+ this.getTeams()
+ this.initRadar()
+ },
+ methods: {
+ ...mapGetters(["nickname", "welcome"]),
+ getProjects() {
+ this.$http.get('/mock/api/list/search/projects')
+ .then(res => {
+ this.projects = res.result && res.result.data
+ this.loading = false
+ })
+ },
+ getActivity() {
+ this.$http.get('/mock/api/workplace/activity')
+ .then(res => {
+ this.activities = res.result
+ })
+ },
+ getTeams() {
+ this.$http.get('/mock/api/workplace/teams')
+ .then(res => {
+ this.teams = res.result
+ })
+ },
+ initRadar() {
+ this.radarLoading = true
- this.radarData = dv.rows
- this.radarLoading = false
+ this.$http.get('/mock/api/workplace/radar')
+ .then(res => {
+
+ const dv = new DataSet.View().source(res.result)
+ dv.transform({
+ type: 'fold',
+ fields: ['涓汉', '鍥㈤槦', '閮ㄩ棬'],
+ key: 'user',
+ value: 'score'
})
- }
+
+ this.radarData = dv.rows
+ this.radarLoading = false
+ })
}
}
+}
</script>
<style lang="less" scoped>
- .project-list {
-
- .card-title {
- font-size: 0;
-
- a {
- color: rgba(0, 0, 0, 0.85);
- margin-left: 12px;
- line-height: 24px;
- height: 24px;
- display: inline-block;
- vertical-align: top;
- font-size: 14px;
-
- &:hover {
- color: #1890ff;
- }
- }
- }
- .card-description {
- color: rgba(0, 0, 0, 0.45);
- height: 44px;
- line-height: 22px;
- overflow: hidden;
- }
- .project-item {
- display: flex;
- margin-top: 8px;
- overflow: hidden;
- font-size: 12px;
- height: 20px;
- line-height: 20px;
- a {
- color: rgba(0, 0, 0, 0.45);
- display: inline-block;
- flex: 1 1 0;
-
- &:hover {
- color: #1890ff;
- }
- }
- .datetime {
- color: rgba(0, 0, 0, 0.25);
- flex: 0 0 auto;
- float: right;
- }
- }
- .ant-card-meta-description {
- color: rgba(0, 0, 0, 0.45);
- height: 44px;
- line-height: 22px;
- overflow: hidden;
- }
- }
-
- .item-group {
- padding: 20px 0 8px 24px;
+.project-list {
+ .card-title {
font-size: 0;
- a {
- color: rgba(0, 0, 0, 0.65);
- display: inline-block;
- font-size: 14px;
- margin-bottom: 13px;
- width: 25%;
- }
- }
- .members {
a {
- display: block;
- margin: 12px 0;
+ color: rgba(0, 0, 0, 0.85);
+ margin-left: 12px;
line-height: 24px;
height: 24px;
- .member {
- font-size: 14px;
- color: rgba(0, 0, 0, .65);
- line-height: 24px;
- max-width: 100px;
- vertical-align: top;
- margin-left: 12px;
- transition: all 0.3s;
- display: inline-block;
- }
+ display: inline-block;
+ vertical-align: top;
+ font-size: 14px;
+
&:hover {
- span {
- color: #1890ff;
- }
+ color: #1890ff;
}
}
}
+ .card-description {
+ color: rgba(0, 0, 0, 0.45);
+ height: 44px;
+ line-height: 22px;
+ overflow: hidden;
+ }
+ .project-item {
+ display: flex;
+ margin-top: 8px;
+ overflow: hidden;
+ font-size: 12px;
+ height: 20px;
+ line-height: 20px;
+ a {
+ color: rgba(0, 0, 0, 0.45);
+ display: inline-block;
+ flex: 1 1 0;
- .mobile {
-
- .project-list {
-
- .project-card-grid {
- width: 100%;
+ &:hover {
+ color: #1890ff;
}
}
-
- .more-info {
- border: 0;
- padding-top: 16px;
- margin: 16px 0 16px;
+ .datetime {
+ color: rgba(0, 0, 0, 0.25);
+ flex: 0 0 auto;
+ float: right;
}
+ }
+ .ant-card-meta-description {
+ color: rgba(0, 0, 0, 0.45);
+ height: 44px;
+ line-height: 22px;
+ overflow: hidden;
+ }
+}
- .headerContent .title .welcome-text {
- display: none;
+.item-group {
+ padding: 20px 0 8px 24px;
+ font-size: 0;
+ a {
+ color: rgba(0, 0, 0, 0.65);
+ display: inline-block;
+ font-size: 14px;
+ margin-bottom: 13px;
+ width: 25%;
+ }
+}
+
+.members {
+ a {
+ display: block;
+ margin: 12px 0;
+ line-height: 24px;
+ height: 24px;
+ .member {
+ font-size: 14px;
+ color: rgba(0, 0, 0, 0.65);
+ line-height: 24px;
+ max-width: 100px;
+ vertical-align: top;
+ margin-left: 12px;
+ transition: all 0.3s;
+ display: inline-block;
+ }
+ &:hover {
+ span {
+ color: #1890ff;
+ }
+ }
+ }
+}
+
+.mobile {
+ .project-list {
+ .project-card-grid {
+ width: 100%;
}
}
+ .more-info {
+ border: 0;
+ padding-top: 16px;
+ margin: 16px 0 16px;
+ }
+
+ .headerContent .title .welcome-text {
+ display: none;
+ }
+}
</style>
\ No newline at end of file
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 994a4fa..c08a5cc 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -606,7 +606,7 @@
handleOrderExe(record) {
this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
- this.$refs.DailyMaintenanceOrderExeDrawer.title = '鏃ュ父淇濆吇宸ュ崟鎵ц'
+ this.$refs.DailyMaintenanceOrderExeDrawer.title = '涓夌骇淇濆吇宸ュ崟鎵ц'
this.$refs.DailyMaintenanceOrderExeDrawer.handleShow(record)
if (record.status === '3') {
this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
diff --git a/src/views/eam/DailyInspectionOrderList.vue b/src/views/eam/DailyInspectionOrderList.vue
index 7d1fc8d..d94dec3 100644
--- a/src/views/eam/DailyInspectionOrderList.vue
+++ b/src/views/eam/DailyInspectionOrderList.vue
@@ -323,21 +323,21 @@
align: "center",
dataIndex: 'statusName'
},
- {
- title: '鐐规鏃ユ湡',
- align: "center",
- dataIndex: 'inspectionDate',
- customRender: function (text) {
- return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
- }
- },
+ // {
+ // title: '鐐规鏃ユ湡',
+ // align: "center",
+ // dataIndex: 'inspectionDate',
+ // customRender: function (text) {
+ // return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)
+ // }
+ // },
{
title: '鐐规鏃堕棿',
align: "center",
dataIndex: 'inspectionTime',
- customRender: function (text) {
- return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
- }
+ // customRender: function (text) {
+ // return !text ? "" : (text.length > 10 ? text.substr(11, 20) : text)
+ // }
},
{
title: '鎴鏃堕棿',
@@ -369,18 +369,18 @@
align: "center",
dataIndex: 'teamName'
},
- {
- title: '寮�宸ユ潯浠�',
- align: "center",
- dataIndex: 'startWorkCondition',
- customRender: (text) => {
- if (text == '1') {
- return "鏄�";
- } else if (text == '0') {
- return "鍚�";
- }
- },
- },
+ // {
+ // title: '寮�宸ユ潯浠�',
+ // align: "center",
+ // dataIndex: 'startWorkCondition',
+ // customRender: (text) => {
+ // if (text == '1') {
+ // return "鏄�";
+ // } else if (text == '0') {
+ // return "鍚�";
+ // }
+ // },
+ // },
{
title: '鐐规鏍囧噯缂栫爜',
align: "center",
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index d9790a7..3d0edaf 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -503,7 +503,7 @@
handleOrderExe(record) {
this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
- this.$refs.DailyMaintenanceOrderExeDrawer.title = '鏃ュ父淇濆吇宸ュ崟鎵ц'
+ this.$refs.DailyMaintenanceOrderExeDrawer.title = '浜岀骇淇濆吇宸ュ崟鎵ц'
this.$refs.DailyMaintenanceOrderExeDrawer.handleShow(record)
if (record.status === '3') {
this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index ff4aad0..f3dc041 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,12 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
+
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 0b438ca..0187f86 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfEnvProEquipment.vue b/src/views/eam/EquipmentListOfEnvProEquipment.vue
index 2e2f8ff..beb8a05 100644
--- a/src/views/eam/EquipmentListOfEnvProEquipment.vue
+++ b/src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -580,6 +580,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 85900d3..b0026e5 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfPressureVessel.vue b/src/views/eam/EquipmentListOfPressureVessel.vue
index 509ecb2..e980726 100644
--- a/src/views/eam/EquipmentListOfPressureVessel.vue
+++ b/src/views/eam/EquipmentListOfPressureVessel.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index fb42211..f87dcb4 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index d94d750..34b1910 100644
--- a/src/views/eam/EquipmentListOfRide.vue
+++ b/src/views/eam/EquipmentListOfRide.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 7146466..df70aef 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfTruck.vue b/src/views/eam/EquipmentListOfTruck.vue
index ccd1cfa..1afcccc 100644
--- a/src/views/eam/EquipmentListOfTruck.vue
+++ b/src/views/eam/EquipmentListOfTruck.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,11 +104,11 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
- :labelCol="labelCol"
+ :labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-tree-select
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index 58034a4..c33c881 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -577,6 +577,11 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
diff --git a/src/views/eam/InspectionCycleList.vue b/src/views/eam/InspectionCycleList.vue
index 4fa75de..e1d149b 100644
--- a/src/views/eam/InspectionCycleList.vue
+++ b/src/views/eam/InspectionCycleList.vue
@@ -206,16 +206,6 @@
},
},
{
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
- {
title: '鍛ㄦ湡缂栫爜',
align: 'center',
dataIndex: 'code',
@@ -267,35 +257,45 @@
dataIndex: 'unitName',
},
{
- title: '璋冩暣鏂瑰紡',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'arrangeWayName',
+ dataIndex: 'version',
},
{
- title: '寮�宸ユ潯浠�',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'startConditionName',
+ dataIndex: 'versionStatusName',
},
- {
- title: '閫炬湡澶勭悊鏂瑰紡',
- align: 'center',
- dataIndex: 'overdueDisposeModeName',
- },
- {
- title: '渚濇嵁鏃ュ巻',
- align: 'center',
- dataIndex: 'accordingCalendarName',
- },
- {
- title: '鐢熸晥鏃堕棿',
- align: 'center',
- dataIndex: 'takeEffectTime',
- },
- {
- title: '澶辨晥鏃堕棿',
- align: 'center',
- dataIndex: 'loseEfficacyTime',
- },
+ // {
+ // title: '璋冩暣鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'arrangeWayName',
+ // },
+ // {
+ // title: '寮�宸ユ潯浠�',
+ // align: 'center',
+ // dataIndex: 'startConditionName',
+ // },
+ // {
+ // title: '閫炬湡澶勭悊鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'overdueDisposeModeName',
+ // },
+ // {
+ // title: '渚濇嵁鏃ュ巻',
+ // align: 'center',
+ // dataIndex: 'accordingCalendarName',
+ // },
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
title: '鍒涘缓浜�',
align: 'center',
diff --git a/src/views/eam/MaintenanceCycleList.vue b/src/views/eam/MaintenanceCycleList.vue
index 5883675..80c00f5 100644
--- a/src/views/eam/MaintenanceCycleList.vue
+++ b/src/views/eam/MaintenanceCycleList.vue
@@ -191,16 +191,7 @@
return parseInt(index) + 1
},
},
- {
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
+
{
title: '鍛ㄦ湡缂栫爜',
align: 'center',
@@ -252,30 +243,40 @@
align: 'center',
dataIndex: 'unitName',
},
+ // {
+ // title: '璋冩暣鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'arrangeWayName',
+ // },
+ // {
+ // title: '閫炬湡澶勭悊鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'overdueDisposeModeName',
+ // },
+ // {
+ // title: '渚濇嵁鏃ュ巻',
+ // align: 'center',
+ // dataIndex: 'accordingCalendarName',
+ // },
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
- title: '璋冩暣鏂瑰紡',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'arrangeWayName',
+ dataIndex: 'version',
},
{
- title: '閫炬湡澶勭悊鏂瑰紡',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'overdueDisposeModeName',
- },
- {
- title: '渚濇嵁鏃ュ巻',
- align: 'center',
- dataIndex: 'accordingCalendarName',
- },
- {
- title: '鐢熸晥鏃堕棿',
- align: 'center',
- dataIndex: 'takeEffectTime',
- },
- {
- title: '澶辨晥鏃堕棿',
- align: 'center',
- dataIndex: 'loseEfficacyTime',
+ dataIndex: 'versionStatusName',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 0070563..ec52559 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -348,7 +348,7 @@
},
data() {
return {
- title: "鏃ュ父淇濆吇宸ュ崟鎵ц",
+ title: "涓夌骇淇濆吇宸ュ崟鎵ц",
visible: false,
maskClosable: true,
confirmLoading: false,
@@ -422,26 +422,26 @@
// align: 'center',
// dataIndex: 'maintenanceTool',
// },
- {
- title: '瀹夊叏瑕佹眰',
- align: 'center',
- dataIndex: 'maintenanceRequire',
- },
- {
- title: '宸ユ椂瀹氶锛堝皬鏃讹級',
- align: 'center',
- dataIndex: 'workingHourQuota',
- },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: 'center',
+ // dataIndex: 'maintenanceRequire',
+ // },
+ // {
+ // title: '宸ユ椂瀹氶锛堝皬鏃讹級',
+ // align: 'center',
+ // dataIndex: 'workingHourQuota',
+ // },
{
title: '淇濆吇鍛ㄦ湡',
align: 'center',
dataIndex: 'maintenanceCycleName',
},
- {
- title: '缁翠繚涓撲笟',
- align: 'center',
- dataIndex: 'maintenanceSpecialtyName',
- },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: 'center',
+ // dataIndex: 'maintenanceSpecialtyName',
+ // },
{
title: '淇濆吇浜�',
align: 'center',
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index f865e11..35c64b4 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -78,6 +78,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<template
v-for="col in columns"
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue
index e862851..b0e4ef2 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal.vue
@@ -13,6 +13,23 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
+ <a-col
+ hidden
+ :span="24"
+ >
+ <a-form-item
+ label="淇濆吇宸ュ崟缂栧彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏诲伐鍗曠紪鍙�'"
+ v-decorator="['technologyStatusVerificationBill', validatorRules.technologyStatusVerificationBill ]"
+ />
+ </a-form-item>
+ </a-col>
<a-col :span="24">
<a-form-item
label="缁熶竴缂栧彿"
@@ -157,7 +174,7 @@
this.visible = true;
this.disableSubmit = false;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equipmentNum', 'equipmentName', 'equipmentModel', 'specification', 'technologyStatus'))
+ this.form.setFieldsValue(pick(this.model, 'technologyStatusVerificationBill', 'equipmentNum', 'equipmentName', 'equipmentModel', 'specification', 'technologyStatus'))
});
if (record.id) {
this.codeDisable = true;
@@ -182,7 +199,7 @@
if (!this.model.id) {
obj = postAction(this.url.add, formData);
} else {
- obj = requestPut(this.url.edit, { id: this.model.equipmentId, technologyStatus: this.model.technologyStatus, maintenanceOrderId: this.model.id });
+ obj = requestPut(this.url.edit, { id: this.model.equipmentId, technologyStatus: this.model.technologyStatus, maintenanceOrderId: this.model.id, technologyStatusVerificationBill: this.model.technologyStatusVerificationBill });
}
obj.then((res) => {
if (res.success) {
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index e5a0ffc..5658db1 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -129,7 +129,7 @@
:pagination="ipagination"
:loading="loading"
@change="handleTableChange"
- :scroll="{ x: 'calc(1200px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
>
<template
v-for="col in columns"
@@ -159,6 +159,8 @@
<!-- :options="record.inspectionCycles" -->
<a-select-option value="1">姝ｅ父</a-select-option>
<a-select-option value="2">寮傚父</a-select-option>
+ <a-select-option value="3">鏁呴殰鍋滄満</a-select-option>
+ <a-select-option value="4">娌″紑鏈�</a-select-option>
</a-select>
<a-input-number
:value="text"
@@ -361,28 +363,28 @@
align: 'center',
dataIndex: 'detectionStandard',
},
- {
- title: '鍚堟牸鑼冨洿',
- align: 'center',
- dataIndex: 'acceptabilityLimit',
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'inspectionMethod_dictText',
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'inspectionTool',
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit',
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethod_dictText',
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool',
+ // },
{
title: '*鐐规缁撴灉',
align: 'center',
dataIndex: 'inspectionProjectResult',
scopedSlots: { customRender: 'inspectionProjectResult' },
- className: 'red',
},
+ // className: 'red',
{
title: '鍒ゅ畾',
align: 'center',
@@ -411,9 +413,9 @@
title: '*寮傚父澶勭疆',
align: 'center',
dataIndex: 'treatmentMeasure',
- className: 'red',
scopedSlots: { customRender: 'treatmentMeasure' },
},
+ // className: 'red',
],
url: {
list: "/eam/inspectionOrderDetail/list",
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
index a21d64d..ac7eaa1 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -26,7 +26,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="寮�宸ユ潯浠�"
:labelCol="labelCol"
@@ -40,7 +40,7 @@
@change="handle2Switch(model.startWorkCondition)"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
<a-row :gutter="24">
<a-col :span="12">
@@ -386,28 +386,28 @@
{
title: '鐐规椤圭洰',
align: 'center',
- dataIndex: 'inspectionProjectNum'
+ dataIndex: 'inspectionProjectName'
},
{
title: '妫�娴嬫爣鍑�',
align: 'center',
dataIndex: 'detectionStandard'
},
- {
- title: '鍚堟牸鑼冨洿',
- align: 'center',
- dataIndex: 'acceptabilityLimit'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'inspectionMethodName'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'inspectionTool'
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethodName'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool'
+ // },
{
title: '绀烘剰鍥�',
align: "center",
@@ -489,7 +489,8 @@
methods: {
add() {
- this.edit({ startWorkCondition: "1", inspectionOrderDetails: [] })
+ this.edit({ inspectionOrderDetails: [] })
+ // this.edit({ startWorkCondition: "1", inspectionOrderDetails: [] })
this.getSeq()
},
@@ -602,13 +603,13 @@
// }
// },
- handle2Switch(startWorkCondition) {
- if ('1' == startWorkCondition) {
- this.model.startWorkCondition = '0'
- } else {
- this.model.startWorkCondition = '1'
- }
- },
+ // handle2Switch(startWorkCondition) {
+ // if ('1' == startWorkCondition) {
+ // this.model.startWorkCondition = '0'
+ // } else {
+ // this.model.startWorkCondition = '1'
+ // }
+ // },
// handle2Change(val) {
// this.inspectionCycles = [];
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
index 22932f2..71d9fd1 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionStandardList.vue
@@ -160,11 +160,6 @@
dataIndex: 'num',
},
{
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
title: '璁惧缂栫爜',
align: 'center',
dataIndex: 'equipmentNum',
@@ -189,6 +184,11 @@
align: "center",
dataIndex: 'useDepartName'
},
+ {
+ title: '鐗堟湰',
+ align: 'center',
+ dataIndex: 'version',
+ },
],
url: {
list: "/eam/inspectionStandard/findInspectionStandardList",
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue b/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue
index ccdcd82..d9aca3e 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailyInspectionStandardDetail.vue
@@ -127,23 +127,23 @@
dataIndex: 'detectionStandard',
},
- {
- title: '鍚堟牸鑼冨洿',
- align: "center",
- dataIndex: 'acceptabilityLimit',
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: "center",
+ // dataIndex: 'acceptabilityLimit',
- },
- {
- title: '鏂规硶',
- align: "center",
- dataIndex: 'inspectionMethodName',
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: "center",
+ // dataIndex: 'inspectionMethodName',
- },
- {
- title: '宸ュ叿',
- align: "center",
- dataIndex: 'inspectionTool',
- },
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: "center",
+ // dataIndex: 'inspectionTool',
+ // },
{
title: '鍛ㄦ湡',
align: "center",
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index f4cdf85..2100db5 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -201,6 +201,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<template
v-for="col in columns"
diff --git a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
index 85611d4..c5f352f 100644
--- a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
@@ -101,21 +101,21 @@
align: 'center',
dataIndex: 'detectionStandard'
},
- {
- title: '鍚堟牸鑼冨洿',
- align: 'center',
- dataIndex: 'acceptabilityLimit'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'inspectionMethod_dictText'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'inspectionTool'
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethod_dictText'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool'
+ // },
// {
// title: '鍛ㄦ湡',
// align: 'center',
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
index 1e3fb34..bacf158 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -152,7 +152,7 @@
<template
v-for="col in columns"
:slot="col.dataIndex"
- slot-scope='text, record'
+ slot-scope='text, record, index'
>
<div :key="col.dataIndex">
<span
@@ -192,11 +192,39 @@
棰勮
</a> -->
+ <a-input
+ :value="text"
+ v-if="col.dataIndex == 'maintenanceOrderDetailUda1'"
+ @change="(e)=>handleChange(e, record.key, col, index)"
+ placeholder="璇疯緭鍏ヤ繚鍏讳汉"
+ />
+ <a-input
+ :value="text"
+ v-if="col.dataIndex == 'maintenanceOrderDetailUda2'"
+ @change="(e)=>handleChange(e, record.key, col, index)"
+ placeholder="璇疯緭鍏ユ墽琛屾儏鍐�"
+ />
</div>
-
</template>
-
</a-table>
+ <div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
+ <a-row :style="{textAlign:'right'}">
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handleCancel"
+ >
+ 鍙栨秷
+ </a-button>
+ <a-button
+ @click="handleOk()"
+ type="primary"
+ :disabled="this.model.status!='4'"
+ :loading="confirmLoading"
+ >淇濆瓨</a-button>
+ </a-row>
+ <!-- v-has="'dailyMaintenanceOrder:actualWorkHoursSave'" -->
+ <!-- :disabled="false" -->
+ </div>
</div>
</a-tab-pane>
@@ -297,7 +325,7 @@
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { requestPut, getAction, downFile } from '@/api/manage'
+import { requestPut, getAction, downFile, postAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
import { preview } from 'vue-photo-preview'
@@ -327,7 +355,7 @@
},
data() {
return {
- title: "鏃ュ父淇濆吇宸ュ崟鎵ц",
+ title: "浜岀骇淇濆吇宸ュ崟鎵ц",
visible: false,
maskClosable: true,
confirmLoading: false,
@@ -339,6 +367,7 @@
maintenanceStandardId: '-1',
dataSource: [],
model: {},
+ form: this.$form.createForm(this),
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@@ -389,35 +418,49 @@
align: 'center',
dataIndex: 'standard',
},
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethodName',
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool',
- },
- {
- title: '瀹夊叏瑕佹眰',
- align: 'center',
- dataIndex: 'maintenanceRequire',
- },
- {
- title: '宸ユ椂瀹氶锛堝皬鏃讹級',
- align: 'center',
- dataIndex: 'workingHourQuota',
- },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethodName',
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool',
+ // },
+ // {
+ // title: '瀹夊叏瑕佹眰',
+ // align: 'center',
+ // dataIndex: 'maintenanceRequire',
+ // },
+ // {
+ // title: '宸ユ椂瀹氶锛堝皬鏃讹級',
+ // align: 'center',
+ // dataIndex: 'workingHourQuota',
+ // },
{
title: '淇濆吇鍛ㄦ湡',
align: 'center',
dataIndex: 'maintenanceCycleName',
},
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: 'center',
+ // dataIndex: 'maintenanceSpecialtyName',
+ // },
{
- title: '缁翠繚涓撲笟',
+ title: '鎵ц鎯呭喌',
align: 'center',
- dataIndex: 'maintenanceSpecialtyName',
+ dataIndex: 'maintenanceOrderDetailUda2',
+ width: 200,
+ scopedSlots: { customRender: 'maintenanceOrderDetailUda2' },
+ },
+ {
+ title: '淇濆吇浜�',
+ align: 'center',
+ dataIndex: 'maintenanceOrderDetailUda1',
+ width: 200,
+ scopedSlots: { customRender: 'maintenanceOrderDetailUda1' },
},
],
url: {
@@ -427,6 +470,7 @@
editStatus: "/eam/dailyMaintenanceOrder/editStatus",
revocation: "/eam/dailyMaintenanceOrder/revocation",
report: "/eam/dailyMaintenanceOrder/report",
+ edit: "/eam/dailyMaintenanceOrderDetail/edit"
},
}
},
@@ -587,7 +631,46 @@
},
//淇濆瓨
handleOk() {
+ const that = this
+ this.loading = true;
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true
+ let formData = {}
+ formData.dailyMaintenanceOrderDetails = that.dataSource;
+ let obj = obj = postAction(this.url.edit, formData)
+ obj.then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('ok')
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.loadData1();
+ this.loading = false;
+ })
+ }
+ })
+ },
+
+ handleChange(value, key, column, index) {
+ debugger
+ let that = this;
+ const temp = [...that.dataSource];
+ const target = temp[index];
+ if (target) {
+ target[column.dataIndex] = value;
+ if ('maintenanceOrderDetailUda1' == column.dataIndex) {
+ target['maintenanceOrderDetailUda1'] = value.target.value;
+ }
+ if ('maintenanceOrderDetailUda2' == column.dataIndex) {
+ target['maintenanceOrderDetailUda2'] = value.target.value;
+ }
+ that.dataSource = temp;
+ }
},
view(record) {
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
index 13d9c64..ae05671 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
@@ -78,6 +78,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
</a-table>
@@ -190,7 +191,7 @@
{
title: '绫诲瀷',
align: 'center',
- dataIndex: 'maintenanceMethod1'
+ dataIndex: 'maintenanceRole'
},
{
@@ -201,7 +202,7 @@
{
title: '淇濆吇椤圭洰',
align: 'center',
- dataIndex: 'maintenanceProjectNum'
+ dataIndex: 'maintenanceProjectName'
},
{
title: '淇濆吇鏍囧噯',
@@ -211,12 +212,12 @@
{
title: '鎵ц鎯呭喌',
align: 'center',
- dataIndex: 'maintenanceTool1'
+ dataIndex: 'maintenanceOrderDetailUda2'
},
{
title: '鎵ц浜�',
align: 'center',
- dataIndex: 'photo1',
+ dataIndex: 'maintenanceOrderDetailUda1',
},
],
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
index a199f59..59a3e8a 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderModal.vue
@@ -298,6 +298,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<!-- <span
slot="photo"
@@ -431,23 +432,23 @@
{
title: '淇濆吇椤圭洰',
align: 'center',
- dataIndex: 'maintenanceProjectNum'
+ dataIndex: 'maintenanceProjectName'
},
{
title: '淇濆吇鏍囧噯',
align: 'center',
dataIndex: 'standard'
},
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'maintenanceMethod'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethod'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
{
title: '绀烘剰鍥�',
align: 'center',
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
index 07c1959..f8a4047 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardModal.vue
@@ -263,6 +263,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
<template
v-for="col in columns"
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 49b27b5..47d46a5 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -964,7 +964,7 @@
{ required: true, message: '璇烽�夋嫨缁存姢閮ㄩ棬!' },
],
useId: [
- { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬閮ㄩ棬!' },
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
],
specificEquipment: [
{ required: true, message: '璇烽�夋嫨鍏抽敭璁惧鏍囪瘑!' },
@@ -979,7 +979,7 @@
{ required: true, message: '璇烽�夋嫨璁惧浜х嚎!' },
],
factoryModelId: [
- { required: true, message: '璇烽�夋嫨璁惧杞﹂棿!' },
+ { required: true, message: '璇烽�夋嫨宸ュ尯!' },
],
warrantyStart: [
{ required: true, message: '璇烽�夋嫨寮�濮嬫棩鏈�!' },
diff --git a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
index 4ce46b9..fbfa3a4 100644
--- a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
+++ b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
@@ -122,6 +122,20 @@
</a-col>
<a-col :span="24/2">
<a-form-model-item
+ label="鐗堟湰"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="version"
+ >
+ <a-input
+ v-model="model.version"
+ placeholder="璇疯緭鍏ョ増鏈彿"
+ :disabled=true
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <!-- <a-col :span="24/2">
+ <a-form-model-item
label="寮�宸ユ潯浠�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -134,9 +148,9 @@
v-model="model.startCondition"
/>
</a-form-model-item>
- </a-col>
+ </a-col> -->
</a-row>
- <a-row>
+ <!-- <a-row>
<a-col :span="24/2">
<a-form-model-item
label="璋冩暣鏂瑰紡"
@@ -167,9 +181,9 @@
/>
</a-form-model-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row>
- <a-col :span="24/2">
+ <!-- <a-col :span="24/2">
<a-form-model-item
label="渚濇嵁鏃ュ巻"
:labelCol="labelCol"
@@ -183,21 +197,8 @@
v-model="model.accordingCalendar"
/>
</a-form-model-item>
- </a-col>
- <a-col :span="24/2">
- <a-form-model-item
- label="鐗堟湰"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="version"
- >
- <a-input
- v-model="model.version"
- placeholder="璇疯緭鍏ョ増鏈彿"
- :disabled=true
- ></a-input>
- </a-form-model-item>
- </a-col>
+ </a-col> -->
+
</a-row>
<a-row>
diff --git a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
index d03e5f3..ca8060e 100644
--- a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
+++ b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
@@ -121,6 +121,20 @@
</a-col>
<a-col :span="24/2">
<a-form-model-item
+ label="鐗堟湰"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="version"
+ >
+ <a-input
+ v-model="model.version"
+ placeholder="璇疯緭鍏ョ増鏈彿"
+ :disabled=true
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <!-- <a-col :span="24/2">
+ <a-form-model-item
label="璋冩暣鏂瑰紡"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -133,9 +147,9 @@
v-model="model.arrangeWay"
/>
</a-form-model-item>
- </a-col>
+ </a-col> -->
</a-row>
- <a-row>
+ <!-- <a-row>
<a-col :span="24/2">
<a-form-model-item
label="閫炬湡澶勭悊鏂瑰紡"
@@ -166,7 +180,7 @@
/>
</a-form-model-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row>
<a-col :span="24/2">
<a-form-item
@@ -203,20 +217,7 @@
</a-col>
</a-row>
<a-row>
- <a-col :span="24/2">
- <a-form-model-item
- label="鐗堟湰"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="version"
- >
- <a-input
- v-model="model.version"
- placeholder="璇疯緭鍏ョ増鏈彿"
- :disabled=true
- ></a-input>
- </a-form-model-item>
- </a-col>
+
<a-col
v-if=" model.isRevise == true"
:span="24/2"
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index cb70ae8..d6c78cb 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -1,15 +1,32 @@
<template>
<a-row :gutter="10">
- <a-col :md="leftColMd" :sm="24" style="margin-bottom: 20px">
+ <a-col
+ :md="leftColMd"
+ :sm="24"
+ style="margin-bottom: 20px"
+ >
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<!-- 鎼滅储鍖哄煙 -->
- <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
<a-row :gutter="24">
- <a-col :md="12" :sm="8">
- <a-form-item label="瑙掕壊鍚嶇О" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
- <a-input placeholder="" v-model="queryParam.roleName"></a-input>
+ <a-col
+ :md="12"
+ :sm="8"
+ >
+ <a-form-item
+ label="瑙掕壊鍚嶇О"
+ :labelCol="{span: 5}"
+ :wrapperCol="{span: 18, offset: 1}"
+ >
+ <a-input
+ placeholder=""
+ v-model="queryParam.roleName"
+ ></a-input>
</a-form-item>
</a-col>
<!--
@@ -21,29 +38,72 @@
</a-form-item>
</a-col>
-->
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-col :md="12" :sm="24">
- <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
- </a-col>
- </span>
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-col
+ :md="12"
+ :sm="24"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ style="margin-left: 21px"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
+ </a-col>
+ </span>
</a-row>
</a-form>
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator" style="margin: 5px 0 10px 2px">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板缓瑙掕壊</a-button>
+ <div
+ class="table-operator"
+ style="margin: 5px 0 10px 2px"
+ >
+ <a-button
+ @click="handleAdd"
+ type="primary"
+ icon="plus"
+ >鏂板缓瑙掕壊</a-button>
<!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">瑙掕壊缂栬緫</a-button>-->
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
+ <a-upload
+ name="file"
+ :showUploadList="false"
+ :multiple="false"
+ :headers="tokenHeader"
+ :action="importExcelUrl"
+ @change="handleImportExcel"
+ >
+ <a-button
+ type="primary"
+ icon="import"
+ >瀵煎叆</a-button>
</a-upload>
- <a-button type="primary" icon="download" @click="handleExportXls('瑙掕壊绠＄悊')">瀵煎嚭</a-button>
+ <a-button
+ type="primary"
+ icon="download"
+ @click="handleExportXls('瑙掕壊绠＄悊')"
+ >瀵煎嚭</a-button>
</div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <div
+ class="ant-alert ant-alert-info"
+ style="margin-bottom: 16px;"
+ >
<i class="anticon anticon-info-circle ant-alert-icon">
</i> 宸查�夋嫨 <a><b>{{ selectedRowKeys1.length }}</b></a>椤�
- <a style="margin-left: 24px" @click="onClearSelected1">娓呯┖</a>
+ <a
+ style="margin-left: 24px"
+ @click="onClearSelected1"
+ >娓呯┖</a>
</div>
<div style="margin-top: 15px">
@@ -58,86 +118,149 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys1, onChange: onSelectChange1, type:'radio'}"
- @change="handleTableChange">
- <span slot="action" slot-scope="text, record">
- <a @click="handleOpen(record)">鐢ㄦ埛</a>
- <a-divider type="vertical"/>
+ @change="handleTableChange"
+ >
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a @click="handleOpen(record)">鐢ㄦ埛</a>
+ <a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">
- 鏇村 <a-icon type="down"/>
- </a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a @click="handlePerssion(record.id)">鎺堟潈</a>
- </a-menu-item>
- <a-menu-item>
- <a @click="handleEdit(record)">缂栬緫</a>
- </a-menu-item>
- <a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete1(record.id)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
- </span>
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 鏇村 <a-icon type="down" />
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handlePerssion(record.id)">鎺堟潈</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a @click="handleEdit(record)">缂栬緫</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete1(record.id)"
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
</a-table>
</div>
<!-- 鍙充晶鐨勮鑹叉潈闄愰厤缃� -->
- <user-role-modal ref="modalUserRole"></user-role-modal>
- <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+ <!-- <user-role-modal ref="modalUserRole"></user-role-modal> -->
+ <user-role-modal-new ref="modalUserRole"></user-role-modal-new>
+ <role-modal
+ ref="modalForm"
+ @ok="modalFormOk"
+ ></role-modal>
</a-card>
</a-col>
- <a-col :md="rightColMd" :sm="24" v-if="this.rightcolval == 1">
+ <a-col
+ :md="rightColMd"
+ :sm="24"
+ v-if="this.rightcolval == 1"
+ >
<a-card :bordered="false">
<div style="text-align: right;">
- <a-icon type="close-circle" @click="hideUserList" />
+ <a-icon
+ type="close-circle"
+ @click="hideUserList"
+ />
</div>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline">
<a-row :gutter="24">
- <a-col :md="12" :sm="12">
+ <a-col
+ :md="12"
+ :sm="12"
+ >
<a-form-item label="鐢ㄦ埛璐﹀彿">
- <a-input placeholder="" v-model="queryParam2.username"></a-input>
+ <a-input
+ placeholder=""
+ v-model="queryParam2.username"
+ ></a-input>
</a-form-item>
</a-col>
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-col :md="9" :sm="24">
- <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-col
+ :md="9"
+ :sm="24"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery2"
+ icon="search"
+ style="margin-left: 21px"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset2"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
- </a-col>
- </span>
+ </a-col>
+ </span>
</a-row>
</a-form>
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator" :md="24" :sm="24">
- <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">鏂板鐢ㄦ埛</a-button>
+ <div
+ class="table-operator"
+ :md="24"
+ :sm="24"
+ >
+ <a-button
+ @click="handleAdd2"
+ type="primary"
+ icon="plus"
+ style="margin-top: 16px"
+ >鏂板鐢ㄦ埛</a-button>
<!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">鐢ㄦ埛缂栬緫</a-button>-->
- <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">宸叉湁鐢ㄦ埛</a-button>
+ <a-button
+ @click="handleAddUserRole"
+ type="primary"
+ icon="plus"
+ style="margin-top: 16px"
+ >宸叉湁鐢ㄦ埛</a-button>
<a-dropdown v-if="selectedRowKeys2.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel2">
- <a-icon type="delete"/>
+ <a-menu-item
+ key="1"
+ @click="batchDel2"
+ >
+ <a-icon type="delete" />
鍒犻櫎
</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
- <a-icon type="down"/>
+ <a-icon type="down" />
</a-button>
</a-dropdown>
</div>
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <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">{{
selectedRowKeys2.length }}</a>椤�
- <a style="margin-left: 24px" @click="onClearSelected2">娓呯┖</a>
+ <a
+ style="margin-left: 24px"
+ @click="onClearSelected2"
+ >娓呯┖</a>
</div>
<a-table
style="height:500px"
@@ -150,399 +273,417 @@
:pagination="ipagination2"
:loading="loading2"
:rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
- @change="handleTableChange2">
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit2(record)">缂栬緫</a>
- <a-divider type="vertical"/>
- <a-dropdown>
- <a class="ant-dropdown-link">
- 鏇村 <a-icon type="down"/>
- </a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete2(record.id)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
- </span>
+ @change="handleTableChange2"
+ >
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a @click="handleEdit2(record)">缂栬緫</a>
+ <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">
+ 鏇村 <a-icon type="down" />
+ </a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete2(record.id)"
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
</a-table>
</div>
<!-- 琛ㄥ崟鍖哄煙 -->
- <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
- <user-modal ref="modalForm2" @ok="modalFormOk2"></user-modal>
- <Select-User-Modal ref="selectUserModal" @selectFinished="selectOK"></Select-User-Modal>
+ <role-modal
+ ref="modalForm"
+ @ok="modalFormOk"
+ ></role-modal>
+ <user-modal
+ ref="modalForm2"
+ @ok="modalFormOk2"
+ ></user-modal>
+ <Select-User-Modal
+ ref="selectUserModal"
+ @selectFinished="selectOK"
+ ></Select-User-Modal>
</a-card>
</a-col>
</a-row>
</template>
<script>
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import { deleteAction, postAction, getAction } from '@/api/manage'
- import SelectUserModal from './modules/SelectUserModal'
- import RoleModal from './modules/RoleModal'
- import UserModal from './modules/UserModal'
- import { filterObj } from '@/utils/util'
- import UserRoleModal from './modules/UserRoleModal'
- import moment from 'moment'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { deleteAction, postAction, getAction } from '@/api/manage'
+import SelectUserModal from './modules/SelectUserModal'
+import RoleModal from './modules/RoleModal'
+import UserModal from './modules/UserModal'
+import { filterObj } from '@/utils/util'
+import UserRoleModal from './modules/UserRoleModal'
+import moment from 'moment'
+import UserRoleModalNew from './modules/UserRoleModalNew'
- export default {
- name: 'RoleUserList',
- mixins: [JeecgListMixin],
- components: {
- UserRoleModal,
- SelectUserModal,
- RoleModal,
- UserModal,
- moment
- },
- data() {
- return {
- model1: {},
- model2: {},
- currentRoleId: '',
- queryParam1: {},
- queryParam2: {},
- dataSource1: [],
- dataSource2: [],
- ipagination1: {
- current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '30'],
- showTotal: (total, range) => {
- return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+export default {
+ name: 'RoleUserList',
+ mixins: [JeecgListMixin],
+ components: {
+ UserRoleModal,
+ SelectUserModal,
+ RoleModal,
+ UserModal,
+ moment,
+ UserRoleModalNew
+ },
+ data() {
+ return {
+ model1: {},
+ model2: {},
+ currentRoleId: '',
+ queryParam1: {},
+ queryParam2: {},
+ dataSource1: [],
+ dataSource2: [],
+ ipagination1: {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ ipagination2: {
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ isorter1: {
+ column: 'createTime',
+ order: 'desc'
+ },
+ isorter2: {
+ column: 'createTime',
+ order: 'desc'
+ },
+ filters1: {},
+ filters2: {},
+ loading1: false,
+ loading2: false,
+ selectedRowKeys1: [],
+ selectedRowKeys2: [],
+ selectionRows1: [],
+ selectionRows2: [],
+ test: {},
+ rightcolval: 0,
+ columns:
+ [
+ {
+ title: '瑙掕壊缂栫爜',
+ align: 'center',
+ dataIndex: 'roleCode'
},
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0
- },
- ipagination2: {
- current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '30'],
- showTotal: (total, range) => {
- return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+ {
+ title: '瑙掕壊鍚嶇О',
+ align: 'center',
+ dataIndex: 'roleName'
},
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0
- },
- isorter1: {
- column: 'createTime',
- order: 'desc'
- },
- isorter2: {
- column: 'createTime',
- order: 'desc'
- },
- filters1: {},
- filters2: {},
- loading1: false,
- loading2: false,
- selectedRowKeys1: [],
- selectedRowKeys2: [],
- selectionRows1: [],
- selectionRows2: [],
- test:{},
- rightcolval:0,
- columns:
- [
- {
- title: '瑙掕壊缂栫爜',
- align: 'center',
- dataIndex: 'roleCode'
- },
- {
- title: '瑙掕壊鍚嶇О',
- align: 'center',
- dataIndex: 'roleName'
- },
- {
- title: '鍒涘缓鏃堕棿',
- dataIndex: 'createTime',
- align:"center",
- sorter: true,
- customRender: (text) => {
- return moment(text).format('YYYY-MM-DD')
- }
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align: 'center',
- scopedSlots: { customRender: 'action' }
+ {
+ title: '鍒涘缓鏃堕棿',
+ dataIndex: 'createTime',
+ align: "center",
+ sorter: true,
+ customRender: (text) => {
+ return moment(text).format('YYYY-MM-DD')
}
- ],
- columns2: [{
- title: '鐢ㄦ埛璐﹀彿',
- align: 'center',
- dataIndex: 'username',
- width: 120
- },
- {
- title: '鐢ㄦ埛鍚嶇О',
- align: 'center',
- width: 100,
- dataIndex: 'realname'
},
- {
- title: '鐘舵��',
- align: 'center',
- width: 80,
- dataIndex: 'status_dictText'
- },
-
{
title: '鎿嶄綔',
dataIndex: 'action',
- scopedSlots: { customRender: 'action' },
align: 'center',
- width: 120
- }],
-
- // 楂樼骇鏌ヨ鍙傛暟
- superQueryParams2: '',
- // 楂樼骇鏌ヨ鎷兼帴鏉′欢
- superQueryMatchType2: 'and',
- url: {
- list: '/sys/role/list',
- delete: '/sys/role/delete',
- list2: '/sys/user/userRoleList',
- addUserRole: '/sys/user/addSysUserRole',
- delete2: '/sys/user/deleteUserRole',
- deleteBatch2: '/sys/user/deleteUserRoleBatch',
- exportXlsUrl: 'sys/role/exportXls',
- importExcelUrl: 'sys/role/importExcel'
- }
- }
- },
- computed: {
- importExcelUrl: function() {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- },
- leftColMd() {
- return this.selectedRowKeys1.length === 0 ? 24 : 12
- },
- rightColMd() {
- return this.selectedRowKeys1.length === 0 ? 0 : 12
- }
- },
- methods: {
- onSelectChange2(selectedRowKeys, selectionRows) {
- this.selectedRowKeys2 = selectedRowKeys
- this.selectionRows2 = selectionRows
- },
- onClearSelected2() {
- this.selectedRowKeys2 = []
- this.selectionRows2 = []
- },
- onClearSelected1() {
- this.selectedRowKeys1 = []
- this.selectionRows1 = []
- },
- onSelectChange1(selectedRowKeys, selectionRows) {
- this.rightcolval = 1
- this.selectedRowKeys1 = selectedRowKeys
- this.selectionRows1 = selectionRows
- this.model1 = Object.assign({}, selectionRows[0])
- console.log(this.model1)
- this.currentRoleId = selectedRowKeys[0]
- this.loadData2()
- },
- onClearSelected() {
- },
-
- getQueryParams2() {
- //鑾峰彇鏌ヨ鏉′欢
- let sqp = {}
- if (this.superQueryParams2) {
- sqp['superQueryParams'] = encodeURI(this.superQueryParams2)
- sqp['superQueryMatchType'] = this.superQueryMatchType2
- }
- var param = Object.assign(sqp, this.queryParam2, this.isorter2, this.filters2)
- param.field = this.getQueryField2()
- param.pageNo = this.ipagination2.current
- param.pageSize = this.ipagination2.pageSize
- return filterObj(param)
- },
- getQueryField2() {
- //TODO 瀛楁鏉冮檺鎺у埗
- var str = 'id,'
- this.columns2.forEach(function(value) {
- str += ',' + value.dataIndex
- })
- return str
- },
- handleEdit2: function(record) {
- this.$refs.modalForm2.title = '缂栬緫'
- this.$refs.modalForm2.roleDisabled = true
- this.$refs.modalForm2.edit(record)
- },
- handleAdd2: function() {
- if (this.currentRoleId == '') {
- this.$message.error('璇烽�夋嫨涓�涓鑹�!')
- } else {
- this.$refs.modalForm2.roleDisabled = true
- this.$refs.modalForm2.title = '鏂板'
- this.$refs.modalForm2.edit({activitiSync:'1',userIdentity:1,selectedroles:this.currentRoleId})
- }
- },
- modalFormOk2() {
- // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
- this.loadData2()
- },
- loadData2(arg) {
- if (!this.url.list2) {
- this.$message.error('璇疯缃畊rl.list2灞炴��!')
- return
- }
- //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
- if (arg === 1) {
- this.ipagination2.current = 1
- }
- if (this.currentRoleId === '') return
- let params = this.getQueryParams2()//鏌ヨ鏉′欢
- params.roleId = this.currentRoleId
- this.loading2 = true
- getAction(this.url.list2, params).then((res) => {
- if (res.success) {
- this.dataSource2 = res.result.records
- this.ipagination2.total = res.result.total
-
+ scopedSlots: { customRender: 'action' }
}
- this.loading2 = false
- })
+ ],
+ columns2: [{
+ title: '鐢ㄦ埛璐﹀彿',
+ align: 'center',
+ dataIndex: 'username',
+ width: 120
+ },
+ {
+ title: '鐢ㄦ埛鍚嶇О',
+ align: 'center',
+ width: 100,
+ dataIndex: 'realname'
+ },
+ {
+ title: '鐘舵��',
+ align: 'center',
+ width: 80,
+ dataIndex: 'status_dictText'
+ },
- },
- handleDelete1: function(id) {
- this.handleDelete(id)
- this.dataSource2 = []
- this.currentRoleId = ''
- },
- handleDelete2: function(id) {
- if (!this.url.delete2) {
- this.$message.error('璇疯缃畊rl.delete2灞炴��!')
- return
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' },
+ align: 'center',
+ width: 120
+ }],
+
+ // 楂樼骇鏌ヨ鍙傛暟
+ superQueryParams2: '',
+ // 楂樼骇鏌ヨ鎷兼帴鏉′欢
+ superQueryMatchType2: 'and',
+ url: {
+ list: '/sys/role/list',
+ delete: '/sys/role/delete',
+ list2: '/sys/user/userRoleList',
+ addUserRole: '/sys/user/addSysUserRole',
+ delete2: '/sys/user/deleteUserRole',
+ deleteBatch2: '/sys/user/deleteUserRoleBatch',
+ exportXlsUrl: 'sys/role/exportXls',
+ importExcelUrl: 'sys/role/importExcel'
+ }
+ }
+ },
+ computed: {
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ },
+ leftColMd() {
+ return this.selectedRowKeys1.length === 0 ? 24 : 12
+ },
+ rightColMd() {
+ return this.selectedRowKeys1.length === 0 ? 0 : 12
+ }
+ },
+ methods: {
+ onSelectChange2(selectedRowKeys, selectionRows) {
+ this.selectedRowKeys2 = selectedRowKeys
+ this.selectionRows2 = selectionRows
+ },
+ onClearSelected2() {
+ this.selectedRowKeys2 = []
+ this.selectionRows2 = []
+ },
+ onClearSelected1() {
+ this.selectedRowKeys1 = []
+ this.selectionRows1 = []
+ },
+ onSelectChange1(selectedRowKeys, selectionRows) {
+ this.rightcolval = 1
+ this.selectedRowKeys1 = selectedRowKeys
+ this.selectionRows1 = selectionRows
+ this.model1 = Object.assign({}, selectionRows[0])
+ console.log(this.model1)
+ this.currentRoleId = selectedRowKeys[0]
+ this.loadData2()
+ },
+ onClearSelected() {
+ },
+
+ getQueryParams2() {
+ //鑾峰彇鏌ヨ鏉′欢
+ let sqp = {}
+ if (this.superQueryParams2) {
+ sqp['superQueryParams'] = encodeURI(this.superQueryParams2)
+ sqp['superQueryMatchType'] = this.superQueryMatchType2
+ }
+ var param = Object.assign(sqp, this.queryParam2, this.isorter2, this.filters2)
+ param.field = this.getQueryField2()
+ param.pageNo = this.ipagination2.current
+ param.pageSize = this.ipagination2.pageSize
+ return filterObj(param)
+ },
+ getQueryField2() {
+ //TODO 瀛楁鏉冮檺鎺у埗
+ var str = 'id,'
+ this.columns2.forEach(function (value) {
+ str += ',' + value.dataIndex
+ })
+ return str
+ },
+ handleEdit2: function (record) {
+ this.$refs.modalForm2.title = '缂栬緫'
+ this.$refs.modalForm2.roleDisabled = true
+ this.$refs.modalForm2.edit(record)
+ },
+ handleAdd2: function () {
+ if (this.currentRoleId == '') {
+ this.$message.error('璇烽�夋嫨涓�涓鑹�!')
+ } else {
+ this.$refs.modalForm2.roleDisabled = true
+ this.$refs.modalForm2.title = '鏂板'
+ this.$refs.modalForm2.edit({ activitiSync: '1', userIdentity: 1, selectedroles: this.currentRoleId })
+ }
+ },
+ modalFormOk2() {
+ // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
+ this.loadData2()
+ },
+ loadData2(arg) {
+ if (!this.url.list2) {
+ this.$message.error('璇疯缃畊rl.list2灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination2.current = 1
+ }
+ if (this.currentRoleId === '') return
+ let params = this.getQueryParams2()//鏌ヨ鏉′欢
+ params.roleId = this.currentRoleId
+ this.loading2 = true
+ getAction(this.url.list2, params).then((res) => {
+ if (res.success) {
+ this.dataSource2 = res.result.records
+ this.ipagination2.total = res.result.total
+
+ }
+ this.loading2 = false
+ })
+
+ },
+ handleDelete1: function (id) {
+ this.handleDelete(id)
+ this.dataSource2 = []
+ this.currentRoleId = ''
+ },
+ handleDelete2: function (id) {
+ if (!this.url.delete2) {
+ this.$message.error('璇疯缃畊rl.delete2灞炴��!')
+ return
+ }
+ var that = this
+ deleteAction(that.url.delete2, { roleId: this.currentRoleId, userId: id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData2()
+ } else {
+ that.$message.warning(res.message)
+ }
+ })
+ },
+ batchDel2: function () {
+
+ if (!this.url.deleteBatch2) {
+ this.$message.error('璇疯缃畊rl.deleteBatch2灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys2.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: "璇烽�夋嫨涓�鏉¤褰�"
+ });
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys2.length; a++) {
+ ids += this.selectedRowKeys2[a] + ','
}
var that = this
- deleteAction(that.url.delete2, { roleId: this.currentRoleId, userId: id }).then((res) => {
- if (res.success) {
- that.$message.success(res.message)
- that.loadData2()
- } else {
- that.$message.warning(res.message)
+ console.log(this.currentDeptId)
+ this.$confirm({
+ title: '纭鍒犻櫎',
+ content: '鏄惁鍒犻櫎閫変腑鏁版嵁?',
+ onOk: function () {
+ deleteAction(that.url.deleteBatch2, { roleId: that.currentRoleId, userIds: ids }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.loadData2()
+ that.onClearSelected()
+ } else {
+ that.$message.warning(res.message)
+ }
+ })
}
})
- },
- batchDel2: function() {
+ }
+ },
+ selectOK(data) {
+ let params = {}
+ params.roleId = this.currentRoleId
+ params.userIdList = []
+ for (var a = 0; a < data.length; a++) {
+ params.userIdList.push(data[a])
+ }
+ console.log(params)
+ postAction(this.url.addUserRole, params).then((res) => {
+ if (res.success) {
+ this.loadData2()
+ this.$message.success(res.message)
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
- if (!this.url.deleteBatch2) {
- this.$message.error('璇疯缃畊rl.deleteBatch2灞炴��!')
- return
- }
- if (this.selectedRowKeys2.length <= 0) {
- // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
- this.$notification.warning({
- message:'娑堟伅',
- description:"璇烽�夋嫨涓�鏉¤褰�"
- });
- return
- } else {
- var ids = ''
- for (var a = 0; a < this.selectedRowKeys2.length; a++) {
- ids += this.selectedRowKeys2[a] + ','
- }
- var that = this
- console.log(this.currentDeptId)
- this.$confirm({
- title: '纭鍒犻櫎',
- content: '鏄惁鍒犻櫎閫変腑鏁版嵁?',
- onOk: function() {
- deleteAction(that.url.deleteBatch2, { roleId: that.currentRoleId, userIds: ids }).then((res) => {
- if (res.success) {
- that.$message.success(res.message)
- that.loadData2()
- that.onClearSelected()
- } else {
- that.$message.warning(res.message)
- }
- })
- }
- })
- }
- },
- selectOK(data) {
- let params = {}
- params.roleId = this.currentRoleId
- params.userIdList = []
- for (var a = 0; a < data.length; a++) {
- params.userIdList.push(data[a])
- }
- console.log(params)
- postAction(this.url.addUserRole, params).then((res) => {
- if (res.success) {
- this.loadData2()
- this.$message.success(res.message)
- } else {
- this.$message.warning(res.message)
- }
- })
- },
-
- handleAddUserRole() {
- if (this.currentRoleId == '') {
- this.$message.error('璇烽�夋嫨涓�涓鑹�!')
- } else {
- this.$refs.selectUserModal.visible = true
- }
- },
- handleOpen(record) {
- this.rightcolval = 1
- this.selectedRowKeys1 = [record.id]
- this.model1 = Object.assign({}, record)
- this.currentRoleId = record.id
- this.onClearSelected2()
- this.loadData2()
- },
- /*handleEdit: function(record) {
- if (this.currentRoleId == '') {
- this.$message.error('璇烽�夋嫨涓�涓鑹�!')
- } else {
- this.$refs.modalForm.edit(record)
- this.$refs.modalForm.title = '缂栬緫'
- }
- },*/
- searchQuery2() {
- this.loadData2(1)
- },
- searchReset2() {
- this.queryParam2 = {}
- this.loadData2(1)
- },
- handleTableChange2(pagination, filters, sorter) {
- //鍒嗛〉銆佹帓搴忋�佺瓫閫夊彉鍖栨椂瑙﹀彂
- //TODO 绛涢��
- if (Object.keys(sorter).length > 0) {
- this.isorter2.column = sorter.field
- this.isorter2.order = 'ascend' == sorter.order ? 'asc' : 'desc'
- }
- this.ipagination2 = pagination
- this.loadData2()
- },
- hideUserList(){
- //this.rightcolval = 0
- this.selectedRowKeys1 = []
- },
- handlePerssion(roleId){
- this.$refs.modalUserRole.show(roleId);
- },
- }
+ handleAddUserRole() {
+ if (this.currentRoleId == '') {
+ this.$message.error('璇烽�夋嫨涓�涓鑹�!')
+ } else {
+ this.$refs.selectUserModal.visible = true
+ }
+ },
+ handleOpen(record) {
+ this.rightcolval = 1
+ this.selectedRowKeys1 = [record.id]
+ this.model1 = Object.assign({}, record)
+ this.currentRoleId = record.id
+ this.onClearSelected2()
+ this.loadData2()
+ },
+ /*handleEdit: function(record) {
+ if (this.currentRoleId == '') {
+ this.$message.error('璇烽�夋嫨涓�涓鑹�!')
+ } else {
+ this.$refs.modalForm.edit(record)
+ this.$refs.modalForm.title = '缂栬緫'
+ }
+ },*/
+ searchQuery2() {
+ this.loadData2(1)
+ },
+ searchReset2() {
+ this.queryParam2 = {}
+ this.loadData2(1)
+ },
+ handleTableChange2(pagination, filters, sorter) {
+ //鍒嗛〉銆佹帓搴忋�佺瓫閫夊彉鍖栨椂瑙﹀彂
+ //TODO 绛涢��
+ if (Object.keys(sorter).length > 0) {
+ this.isorter2.column = sorter.field
+ this.isorter2.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+ }
+ this.ipagination2 = pagination
+ this.loadData2()
+ },
+ hideUserList() {
+ //this.rightcolval = 0
+ this.selectedRowKeys1 = []
+ },
+ handlePerssion(roleId) {
+ this.$refs.modalUserRole.show(roleId);
+ },
}
+}
</script>
<style scoped>
- /** Button鎸夐挳闂磋窛 */
- .ant-btn {
- margin-left: 8px
- }
+/** Button鎸夐挳闂磋窛 */
+.ant-btn {
+ margin-left: 8px;
+}
</style>
\ No newline at end of file
diff --git a/src/views/system/modules/UserRoleModalNew.vue b/src/views/system/modules/UserRoleModalNew.vue
new file mode 100644
index 0000000..3ecb6ef
--- /dev/null
+++ b/src/views/system/modules/UserRoleModalNew.vue
@@ -0,0 +1,245 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="650"
+ :visible="visible"
+ :maskClosable="false"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ cancelText="鍏抽棴"
+ @cancel="handleCancel"
+ >
+ <a-form>
+ <a-form-item label='鎵�鎷ユ湁鐨勬潈闄�'>
+ <a-tree
+ checkable
+ @check="onCheck"
+ :checkedKeys="checkedKeys"
+ :treeData="treeData"
+ @expand="onExpand"
+ @select="onTreeNodeSelect"
+ :selectedKeys="selectedKeys"
+ :expandedKeys="expandedKeysss"
+ :checkStrictly="checkStrictly"
+ >
+ <span
+ slot="hasDatarule"
+ slot-scope="{slotTitle,ruleFlag}"
+ >
+ {{ slotTitle }}<a-icon
+ v-if="ruleFlag"
+ type="align-left"
+ style="margin-left:5px;color: red;"
+ ></a-icon>
+ </span>
+ </a-tree>
+ </a-form-item>
+ </a-form>
+
+ <div class="drawer-bootom-button">
+ <a-dropdown
+ style="float: left"
+ :trigger="['click']"
+ placement="topCenter"
+ >
+ <a-menu slot="overlay">
+ <a-menu-item
+ key="1"
+ @click="switchCheckStrictly(1)"
+ >鐖跺瓙鍏宠仈</a-menu-item>
+ <a-menu-item
+ key="2"
+ @click="switchCheckStrictly(2)"
+ >鍙栨秷鍏宠仈</a-menu-item>
+ <a-menu-item
+ key="3"
+ @click="checkALL"
+ >鍏ㄩ儴鍕鹃��</a-menu-item>
+ <a-menu-item
+ key="4"
+ @click="cancelCheckALL"
+ >鍙栨秷鍏ㄩ��</a-menu-item>
+ <a-menu-item
+ key="5"
+ @click="expandAll"
+ >灞曞紑鎵�鏈�</a-menu-item>
+ <a-menu-item
+ key="6"
+ @click="closeAll"
+ >鍚堝苟鎵�鏈�</a-menu-item>
+ </a-menu>
+ <a-button>
+ 鏍戞搷浣� <a-icon type="up" />
+ </a-button>
+ </a-dropdown>
+ <a-popconfirm
+ title="纭畾鏀惧純缂栬緫锛�"
+ @confirm="close"
+ okText="纭畾"
+ cancelText="鍙栨秷"
+ >
+ <a-button style="margin-right: .8rem">鍙栨秷</a-button>
+ </a-popconfirm>
+ </div>
+
+ <template slot="footer">
+ <a-button
+ @click="handleSubmit(false)"
+ type="primary"
+ :loading="loading"
+ ghost
+ style="margin-right: 0.8rem"
+ >浠呬繚瀛�</a-button>
+ <a-button
+ @click="handleSubmit(true)"
+ type="primary"
+ :loading="loading"
+ >淇濆瓨骞跺叧闂�</a-button>
+ </template>
+ <role-datarule-modal ref="datarule"></role-datarule-modal>
+ </a-modal>
+
+</template>
+
+<script>
+import { queryTreeListForRole, queryRolePermission, saveRolePermission } from '@/api/api'
+import RoleDataruleModal from './RoleDataruleModal.vue'
+
+export default {
+ name: "RoleModal",
+ components: {
+ RoleDataruleModal
+ },
+ data() {
+ return {
+ roleId: "",
+ treeData: [],
+ defaultCheckedKeys: [],
+ checkedKeys: [],
+ expandedKeysss: [],
+ allTreeKeys: [],
+ autoExpandParent: true,
+ checkStrictly: true,
+ title: "瑙掕壊鏉冮檺閰嶇疆",
+ visible: false,
+ loading: false,
+ selectedKeys: []
+ }
+ },
+ methods: {
+ onTreeNodeSelect(id) {
+ if (id && id.length > 0) {
+ this.selectedKeys = id
+ }
+ this.$refs.datarule.show(this.selectedKeys[0], this.roleId)
+ },
+ onCheck(o) {
+ if (this.checkStrictly) {
+ this.checkedKeys = o.checked;
+ } else {
+ this.checkedKeys = o
+ }
+ },
+ show(roleId) {
+ this.roleId = roleId
+ this.visible = true;
+ },
+ close() {
+ this.reset()
+ this.$emit('close');
+ this.visible = false;
+ },
+ onExpand(expandedKeys) {
+ this.expandedKeysss = expandedKeys;
+ this.autoExpandParent = false
+ },
+ reset() {
+ this.expandedKeysss = []
+ this.checkedKeys = []
+ this.defaultCheckedKeys = []
+ this.loading = false
+ },
+ expandAll() {
+ this.expandedKeysss = this.allTreeKeys
+ },
+ closeAll() {
+ this.expandedKeysss = []
+ },
+ checkALL() {
+ this.checkedKeys = this.allTreeKeys
+ },
+ cancelCheckALL() {
+ //this.checkedKeys = this.defaultCheckedKeys
+ this.checkedKeys = []
+ },
+ switchCheckStrictly(v) {
+ if (v == 1) {
+ this.checkStrictly = false
+ } else if (v == 2) {
+ this.checkStrictly = true
+ }
+ },
+ handleCancel() {
+ this.close()
+ },
+ handleSubmit(exit) {
+ let that = this;
+ let params = {
+ roleId: that.roleId,
+ permissionIds: that.checkedKeys.join(","),
+ lastpermissionIds: that.defaultCheckedKeys.join(","),
+ };
+ that.loading = true;
+ console.log("璇锋眰鍙傛暟锛�", params);
+ saveRolePermission(params).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.loading = false;
+ if (exit) {
+ that.close()
+ }
+ } else {
+ that.$message.error(res.message);
+ that.loading = false;
+ if (exit) {
+ that.close()
+ }
+ }
+ this.loadData();
+ })
+ },
+ loadData() {
+ queryTreeListForRole().then((res) => {
+ this.treeData = res.result.treeList
+ this.allTreeKeys = res.result.ids
+ queryRolePermission({ roleId: this.roleId }).then((res) => {
+ this.checkedKeys = [...res.result];
+ this.defaultCheckedKeys = [...res.result];
+ this.expandedKeysss = this.allTreeKeys;
+ console.log(this.defaultCheckedKeys)
+ })
+ })
+ }
+ },
+ watch: {
+ visible() {
+ if (this.visible) {
+ this.loadData();
+ }
+ }
+ }
+}
+</script>
+<style lang="less" scoped>
+.drawer-bootom-button {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ border-top: 1px solid #e8e8e8;
+ padding: 10px 16px;
+ text-align: right;
+ left: 0;
+ background: #fff;
+ border-radius: 0 0 2px 2px;
+}
+</style>
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 4caaae3..2d2d620 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -45,6 +45,8 @@
import LoginAccount from './LoginAccount'
import LoginPhone from './LoginPhone'
+import store from '@/store'
+import { getAction } from '../../api/manage'
export default {
components: {
@@ -52,7 +54,8 @@
TwoStepCaptcha,
// ThirdLogin,
LoginAccount,
- LoginPhone
+ LoginPhone,
+ store
},
data () {
return {
@@ -65,6 +68,9 @@
key:"",
iv:"",
},
+ url:{
+ getPrimaryInfo:"/sys/sysAnnouncementSend/getPrimaryInfo"
+ }
}
},
created() {
@@ -113,6 +119,18 @@
message: '娆㈣繋',
description: `${timeFix()}锛屾杩庡洖鏉,
});
+ var userId = store.getters.userInfo.id;
+ let that = this;
+ getAction(this.url.getPrimaryInfo,{userId:userId}).then(res=>{
+ if(res.success){
+ for(var i=0;i<res.result.length;i++){
+ that.$notification.success({
+ message: '鏈�鏂版湭璇绘秷鎭��'+res.result[i].msgCategory+'銆�',
+ description:res.result[i].msgContent,
+ });
+ }
+ }
+ })
// this.$refs.loginSelect.show(loginResult)
},
//鐧诲綍鍚庡彴澶辫触
@@ -141,6 +159,7 @@
message: '娆㈣繋',
description: `${timeFix()}锛屾杩庡洖鏉,
});
+
},
stepCaptchaSuccess () {
--
Gitblit v1.9.3