From dda6143d99925035928ef72deb24e9f6193a3560 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 27 九月 2023 16:50:38 +0800
Subject: [PATCH] 使用固定数据基本实现看板设备拖拽功能
---
.env.development | 2 +-
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 22 +++++++++++++---------
src/main.js | 3 +++
src/views/dashboard/Analysis.vue | 6 +++++-
package.json | 3 ++-
src/config/router.config.js | 5 ++++-
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue | 10 +++++-----
7 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/.env.development b/.env.development
index fd85d75..6a7256a 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://127.0.0.1:8080
+VUE_APP_API_BASE_URL=http://192.168.0.95:9999
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/package.json b/package.json
index 9fcfca0..ad615ed 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
"dependencies": {
"@antv/data-set": "^0.11.4",
"@jeecg/antd-online-mini": "3.0.0-RC",
+ "@jiaminghi/data-view": "^2.10.0",
"@tinymce/tinymce-vue": "2.1.0",
"@toast-ui/editor": "^2.1.2",
"ant-design-vue": "^1.7.2",
@@ -47,7 +48,7 @@
"vue-print-nb-jeecg": "^1.0.9",
"vue-router": "^3.0.1",
"vue-splitpane": "^1.0.4",
- "vuedraggable": "^2.20.0",
+ "vuedraggable": "2.20.0",
"vuex": "^3.1.0",
"vxe-table": "2.9.13",
"vxe-table-plugin-antd": "1.8.10",
diff --git a/src/config/router.config.js b/src/config/router.config.js
index c8ef6eb..e41fc6e 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -360,7 +360,6 @@
},
]
},
-
{
path: '/test',
component: BlankLayout,
@@ -374,6 +373,10 @@
]
},
{
+ path:'/testWorkshop',
+ component:()=>import('@/views/TestWorkshop.vue')
+ },
+ {
path: '/404',
component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
},
diff --git a/src/main.js b/src/main.js
index 0f8047f..1d7d559 100644
--- a/src/main.js
+++ b/src/main.js
@@ -68,6 +68,9 @@
right:'100px'
})
+// 灏嗚嚜鍔ㄦ敞鍐屾墍鏈夌粍浠朵负鍏ㄥ眬缁勪欢
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
// import 'echarts-liquidfill'
Vue.prototype.$echarts = echarts
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 577f741..949a625 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -11,6 +11,7 @@
<!--<!–<a-radio :value="3">浠诲姟琛ㄦ牸</a-radio>–>-->
<!--<!–</a-radio-group>–>-->
<!--</div>-->
+ <a-button type="primary" @click="navigateToTestWorkshop">璺宠浆鑷虫祴璇曡溅闂�</a-button>
</div>
</template>
@@ -35,7 +36,10 @@
},
methods: {
-
+ navigateToTestWorkshop(){
+ const url=this.$router.resolve('/testWorkshop').href
+ window.open(url,'_blank')
+ }
}
}
</script>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index 48331f2..77685af 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
@@ -44,20 +44,22 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),minuteStep:5,hideDisabledOptions:true}"
+ <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),hideDisabledOptions:true}"
date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
:disabledDate="disabledDate" class="query-group-cust"
- v-decorator="['startTime', validatorRules.startTime]" :disabledTime="disabledDateTime"></j-date>
+ v-decorator="['startTime', validatorRules.startTime]" :disabledTime="disabledDateTime"
+ :showToday="false"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),minuteStep:5,hideDisabledOptions:true}"
+ <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),hideDisabledOptions:true}"
date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
:disabledDate="disabledDate" class="query-group-cust"
- v-decorator="['endTime', validatorRules.endTime]" :disabledTime="disabledDateTime"></j-date>
+ v-decorator="['endTime', validatorRules.endTime]" :disabledTime="disabledDateTime"
+ :showToday="false"></j-date>
</a-form-item>
</a-col>
</a-row>
@@ -226,7 +228,7 @@
disabledDate(current) {
//Can not slect days before today and today
// return current && current < moment().endOf("day");
- return current < moment().subtract(+2, 'day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
+ return current < moment().subtract(+2, 'day').endOf('day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
},
moment,
// onChange(dates) {
@@ -461,11 +463,11 @@
this.checked = e.target.checked
},
range(start, end) {
- const result = [];
+ const result = []
for (let i = start; i < end; i++) {
- result.push(i);
+ result.push(i)
}
- return result;
+ return result
},
/**
* 绂佺敤鏃ユ湡閫夋嫨鍣ㄤ腑鐨勬椂闂撮�夋嫨
@@ -473,7 +475,7 @@
*/
disabledDateTime() {
return {
- disabledSeconds: () => this.range(1,60)
+ disabledSeconds: () => this.range(1, 60)
}
}
}
@@ -499,4 +501,6 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+
+
</style>
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
index a14070b..adac88d 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
@@ -6,10 +6,10 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{minuteStep:5,hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+ <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨寮�濮嬫椂闂�" :disabledDate="disabledDate"
class="query-group-cust" v-decorator="['startTime', validatorRules.startTime]"
- :disabledTime="disabledDateTime"></j-date>
+ :disabledTime="disabledDateTime" :showToday="false"></j-date>
</a-form-item>
</a-col>
@@ -23,11 +23,11 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{minuteStep:5,hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+ <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
:disabledDate="disabledDate"
class="query-group-cust" v-decorator="['endTime', validatorRules.endTime]"
- :disabledTime="disabledDateTime"></j-date>
+ :disabledTime="disabledDateTime" :showToday="false"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
@@ -171,7 +171,7 @@
disabledDate(current) {
//Can not slect days before today and today
// return current && current < moment().endOf("day");
- return current < moment().subtract(+2, 'day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
+ return current < moment().subtract(+2, 'day').endOf('day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
},
moment,
// onChange(dates) {
--
Gitblit v1.9.3