From 1a0b6c69df8bafa8d9c612a5ea04a34be712001c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 24 四月 2024 16:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/api/platform/calculate-report.js | 61 +++
src/views/index.vue | 54 ++
src/views/system/publish/default/index.vue | 2
src/views/system/rule/default/index.vue | 2
src/api/platform/calculate-rule.js | 31 +
src/api/platform/calculate-record.js | 73 ++-
src/api/platform/contract-score.js | 12
src/views/system/result/default/detail.vue | 6
src/router/index.js | 13
src/views/system/calculate/record/index.vue | 12
src/views/system/result/default/index.vue | 2
src/views/system/calculate/duty/index.vue | 4
src/views/system/template/default/index.vue | 2
.env.development | 5
/dev/null | 310 ----------------
src/views/system/contract/index.vue | 428 ++++++++-------------
src/api/platform/calculate-money-rule.js | 44 ++
src/main.js | 3
.env.production | 5
src/api/platform/contract-result.js | 10
src/views/system/calculate/report/index.vue | 24
src/views/system/score/default/index.vue | 2
src/api/platform/contract-publish.js | 12
23 files changed, 448 insertions(+), 669 deletions(-)
diff --git a/.env.development b/.env.development
index 2817527..daabaa2 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鑷础鍏畨澶╃綉杩愮淮骞冲彴
+VUE_APP_TITLE = 杩愮淮鑰冩牳骞冲彴
# 寮�鍙戠幆澧冮厤缃�
ENV = 'development'
@@ -9,3 +9,6 @@
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
+
+# websocket鍦板潃
+VUE_APP_WEB_SOCKET_URL = 'ws://127.0.0.1:8044/ws'
diff --git a/.env.production b/.env.production
index 51f6e77..b796cdc 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,11 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 鑷础鍏畨澶╃綉杩愮淮骞冲彴
+VUE_APP_TITLE = 杩愮淮鑰冩牳骞冲彴
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
+
+# websocket鍦板潃
+VUE_APP_WEB_SOCKET_URL = 'ws://127.0.0.1:8044/ws'
diff --git a/src/api/platform/calculate-money-rule.js b/src/api/platform/calculate-money-rule.js
new file mode 100644
index 0000000..025aebd
--- /dev/null
+++ b/src/api/platform/calculate-money-rule.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+export function listRule(query) {
+ return request({
+ url: '/calculate/money/rule/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ鏍哥畻瑙勫垯璇︾粏
+export function getRule(id) {
+ return request({
+ url: '/calculate/money/rule/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板鏍哥畻瑙勫垯
+export function addRule(data) {
+ return request({
+ url: '/calculate/money/rule',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼鏍哥畻瑙勫垯
+export function updateRule(data) {
+ return request({
+ url: '/calculate/money/rule',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鍒犻櫎鏍哥畻瑙勫垯
+export function delRule(id) {
+ return request({
+ url: '/calculate/money/rule/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/platform/calculate-record.js b/src/api/platform/calculate-record.js
index f31a1e8..195518b 100644
--- a/src/api/platform/calculate-record.js
+++ b/src/api/platform/calculate-record.js
@@ -1,44 +1,61 @@
-import request from '@/utils/request'
+import axios from '@/utils/request';
-// 鏌ヨ鏍哥畻璁板綍鍒楄〃
-export function listRecord(query) {
- return request({
- url: '/calculate/record/list',
- method: 'get',
- params: query
+// 鑾峰彇鏍哥畻璁板綍鍒嗛〉
+export const getCalculateRecords = (params) => {
+ return axios({
+ url: "/calculate-record/page",
+ method: "GET",
+ params: params
})
}
-// 鏌ヨ鏍哥畻璁板綍璇︾粏
-export function getRecord(id) {
- return request({
- url: '/calculate/record/' + id,
- method: 'get'
+// 鑾峰彇鏍哥畻璁板綍鍒楄〃
+export const getCalculateRecordList = () => {
+ return axios({
+ url: "/calculate-record/list",
+ method: "GET"
})
}
-// 鏂板鏍哥畻璁板綍
-export function addRecord(data) {
- return request({
- url: '/calculate/record',
- method: 'post',
- data: data
+// 閫氳繃id鑾峰彇鏍哥畻璁板綍
+export const getCalculateRecordById = (params) => {
+ return axios({
+ url: "/calculate-record/" + params,
+ method: "GET"
+ })
+}
+
+// 閫氳繃id鍒犻櫎鏍哥畻璁板綍
+export const deleteCalculateRecordById = (params) => {
+ return axios({
+ url: "/calculate-record/" + params,
+ method: "DELETE"
+ })
+}
+
+// 鎵归噺鍒犻櫎鏍哥畻璁板綍
+export const deleteCalculateRecordByIds = (params) => {
+ return axios({
+ url: "/calculate-record/batch",
+ method: "DELETE",
+ data: params
})
}
// 淇敼鏍哥畻璁板綍
-export function updateRecord(data) {
- return request({
- url: '/calculate/record',
- method: 'put',
- data: data
+export const editCalculateRecord = (params) => {
+ return axios({
+ url: "/calculate-record/",
+ method: "PUT",
+ data: params
})
}
-// 鍒犻櫎鏍哥畻璁板綍
-export function delRecord(id) {
- return request({
- url: '/calculate/record/' + id,
- method: 'delete'
+// 娣诲姞鏍哥畻璁板綍
+export const addCalculateRecord = (params) => {
+ return axios({
+ url: "/calculate-record/",
+ method: "POST",
+ data: params
})
}
diff --git a/src/api/platform/calculate-report.js b/src/api/platform/calculate-report.js
new file mode 100644
index 0000000..dd5da2e
--- /dev/null
+++ b/src/api/platform/calculate-report.js
@@ -0,0 +1,61 @@
+import axios from '@/utils/request';
+
+// 鑾峰彇鏍哥畻鎶ュ憡鍒嗛〉
+export const getCalculateReports = (params) => {
+ return axios({
+ url: "/calculate-report/page",
+ method: "GET",
+ params: params
+ })
+}
+
+// 鑾峰彇鏍哥畻鎶ュ憡鍒楄〃
+export const getCalculateReportList = () => {
+ return axios({
+ url: "/calculate-report/list",
+ method: "GET"
+ })
+}
+
+// 閫氳繃id鑾峰彇鏍哥畻鎶ュ憡
+export const getCalculateReportById = (params) => {
+ return axios({
+ url: "/calculate-report/" + params,
+ method: "GET"
+ })
+}
+
+// 閫氳繃id鍒犻櫎鏍哥畻鎶ュ憡
+export const deleteCalculateReportById = (params) => {
+ return axios({
+ url: "/calculate-report/" + params,
+ method: "DELETE"
+ })
+}
+
+// 鎵归噺鍒犻櫎鏍哥畻鎶ュ憡
+export const deleteCalculateReportByIds = (params) => {
+ return axios({
+ url: "/calculate-report/batch",
+ method: "DELETE",
+ data: params
+ })
+}
+
+// 淇敼鏍哥畻鎶ュ憡
+export const editCalculateReport = (params) => {
+ return axios({
+ url: "/calculate-report/",
+ method: "PUT",
+ data: params
+ })
+}
+
+// 娣诲姞鏍哥畻鎶ュ憡
+export const addCalculateReport = (params) => {
+ return axios({
+ url: "/calculate-report/",
+ method: "POST",
+ data: params
+ })
+}
diff --git a/src/api/platform/calculate-rule.js b/src/api/platform/calculate-rule.js
index 0f5adc2..fd72c18 100644
--- a/src/api/platform/calculate-rule.js
+++ b/src/api/platform/calculate-rule.js
@@ -1,15 +1,23 @@
import request from '@/utils/request'
-// 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
-export function listRule(query) {
+// 鏌ヨ杩濈害瑙勫垯鍒楄〃
+export function listRule(data) {
return request({
url: '/calculate/rule/list',
method: 'get',
- params: query
+ data: data
})
}
-// 鏌ヨ鏍哥畻瑙勫垯璇︾粏
+// 鏍规嵁鍚堝悓id鏌ヨ杩濈害瑙勫垯鍒楄〃
+export function getRuleListByContractId(data) {
+ return request({
+ url: '/calculate/rule/getRuleListByContractId?contractId=' + data,
+ method: 'get'
+ })
+}
+
+// 鏌ヨ杩濈害瑙勫垯璇︾粏
export function getRule(id) {
return request({
url: '/calculate/rule/' + id,
@@ -17,7 +25,7 @@
})
}
-// 鏂板鏍哥畻瑙勫垯
+// 鏂板杩濈害瑙勫垯
export function addRule(data) {
return request({
url: '/calculate/rule',
@@ -26,7 +34,7 @@
})
}
-// 淇敼鏍哥畻瑙勫垯
+// 淇敼杩濈害瑙勫垯
export function updateRule(data) {
return request({
url: '/calculate/rule',
@@ -35,10 +43,19 @@
})
}
-// 鍒犻櫎鏍哥畻瑙勫垯
+// 鍒犻櫎杩濈害瑙勫垯
export function delRule(id) {
return request({
url: '/calculate/rule/' + id,
method: 'delete'
})
}
+
+// 鍚敤/鍋滅敤杩濈害瑙勫垯
+export function setRule(data) {
+ return request({
+ url: '/calculate/rule/set',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/platform/default-publish.js b/src/api/platform/contract-publish.js
similarity index 79%
rename from src/api/platform/default-publish.js
rename to src/api/platform/contract-publish.js
index 557b219..eb1ca46 100644
--- a/src/api/platform/default-publish.js
+++ b/src/api/platform/contract-publish.js
@@ -3,7 +3,7 @@
// 鏌ヨ鍚堝悓鑰冩牳鍙戝竷鍒楄〃
export function listPublish(query) {
return request({
- url: '/default/publish/list',
+ url: '/contract/publish/list',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@
// 鏌ヨ鍚堝悓鑰冩牳鍙戝竷璇︾粏
export function getPublish(id) {
return request({
- url: '/default/publish/' + id,
+ url: '/contract/publish/' + id,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板鍚堝悓鑰冩牳鍙戝竷
export function addPublish(data) {
return request({
- url: '/default/publish',
+ url: '/contract/publish',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼鍚堝悓鑰冩牳鍙戝竷
export function updatePublish(data) {
return request({
- url: '/default/publish',
+ url: '/contract/publish',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@
// 鍒犻櫎鍚堝悓鑰冩牳鍙戝竷
export function delPublish(id) {
return request({
- url: '/default/publish/' + id,
+ url: '/contract/publish/' + id,
method: 'delete'
})
}
@@ -46,7 +46,7 @@
// 鑾峰彇鍚堝悓鑰冩牳涓嬫媺鍒楄〃
export function publishSelect() {
return request({
- url: '/default/publish/all',
+ url: '/contract/publish/all',
method: 'get'
})
}
diff --git a/src/api/platform/default-result.js b/src/api/platform/contract-result.js
similarity index 79%
rename from src/api/platform/default-result.js
rename to src/api/platform/contract-result.js
index 29598b2..dc5c077 100644
--- a/src/api/platform/default-result.js
+++ b/src/api/platform/contract-result.js
@@ -3,7 +3,7 @@
// 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
export function listResult(query) {
return request({
- url: '/default/result/list',
+ url: '/contract/result/list',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@
// 鏌ヨ鍚堝悓鑰冩牳缁撴灉璇︾粏
export function getResult(id) {
return request({
- url: '/default/result/' + id,
+ url: '/contract/result/' + id,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板鍚堝悓鑰冩牳缁撴灉
export function addResult(data) {
return request({
- url: '/default/result',
+ url: '/contract/result',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼鍚堝悓鑰冩牳缁撴灉
export function updateResult(data) {
return request({
- url: '/default/result',
+ url: '/contract/result',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@
// 鍒犻櫎鍚堝悓鑰冩牳缁撴灉
export function delResult(id) {
return request({
- url: '/default/result/' + id,
+ url: '/contract/result/' + id,
method: 'delete'
})
}
diff --git a/src/api/platform/default-score.js b/src/api/platform/contract-score.js
similarity index 78%
rename from src/api/platform/default-score.js
rename to src/api/platform/contract-score.js
index e5f66bc..d81bd1a 100644
--- a/src/api/platform/default-score.js
+++ b/src/api/platform/contract-score.js
@@ -3,7 +3,7 @@
// 鏌ヨ杩濊瀹℃牳鍒楄〃
export function listAuditing(data) {
return request({
- url: '/default/score/list',
+ url: '/contract/score/list',
method: 'get',
data: data
})
@@ -12,7 +12,7 @@
// 鏌ヨ杩濊瀹℃牳璇︾粏
export function getAuditing(id) {
return request({
- url: '/default/score/' + id,
+ url: '/contract/score/' + id,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板杩濊瀹℃牳
export function addAuditing(data) {
return request({
- url: '/default/score',
+ url: '/contract/score',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼杩濊瀹℃牳
export function updateAuditing(data) {
return request({
- url: '/default/score',
+ url: '/contract/score',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@
// 鍒犻櫎杩濊瀹℃牳
export function delAuditing(id) {
return request({
- url: '/default/score/' + id,
+ url: '/contract/score/' + id,
method: 'delete'
})
}
@@ -46,7 +46,7 @@
// 瀹℃牳
export function auditing(data) {
return request({
- url: '/default/score/auditing',
+ url: '/contract/score/auditing',
method: 'post',
data: data
})
diff --git a/src/api/platform/default-rule.js b/src/api/platform/default-rule.js
deleted file mode 100644
index 3812c7a..0000000
--- a/src/api/platform/default-rule.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ杩濈害瑙勫垯鍒楄〃
-export function listRule(data) {
- return request({
- url: '/default/rule/list',
- method: 'get',
- data: data
- })
-}
-
-// 鏌ヨ杩濈害瑙勫垯璇︾粏
-export function getRule(id) {
- return request({
- url: '/default/rule/' + id,
- method: 'get'
- })
-}
-
-// 鏂板杩濈害瑙勫垯
-export function addRule(data) {
- return request({
- url: '/default/rule',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼杩濈害瑙勫垯
-export function updateRule(data) {
- return request({
- url: '/default/rule',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎杩濈害瑙勫垯
-export function delRule(id) {
- return request({
- url: '/default/rule/' + id,
- method: 'delete'
- })
-}
-
-// 鍚敤/鍋滅敤杩濈害瑙勫垯
-export function setRule(data) {
- return request({
- url: '/default/rule/set',
- method: 'post',
- data: data
- })
-}
diff --git a/src/main.js b/src/main.js
index ba602b0..7baf4cc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -76,6 +76,9 @@
Vue.use(dataV)
DictData.install()
+// websocket
+Vue.prototype.$websocket = null;
+
/**
* If you don't want to use mock-server
* you want to use MockJs for mock api
diff --git a/src/router/index.js b/src/router/index.js
index 0056dd9..b9f2252 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -72,19 +72,6 @@
}
]
},
- // {
- // path: '/contract/score',
- // component: Layout,
- // hidden: true,
- // children: [
- // {
- // path: 'index',
- // name: 'score',
- // component: () => import('@/views/system/score/default/index'),
- // meta: { title: '鍚堝悓绉垎', activeMenu: '/system/score' }
- // }
- // ]
- // },
{
path: '/check-result/contract',
component: Layout,
diff --git a/src/views/index.vue b/src/views/index.vue
index 9821ea7..324df60 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -8,6 +8,7 @@
<script>
import DataView from './home/data-view/index.vue';
import DataWrapper from './home/data-wrapper/index.vue';
+import { getToken } from '@/utils/auth'
export default {
name: "Index",
@@ -20,6 +21,59 @@
};
},
+ methods: {
+ senMsg(msg) {
+ // 鍙戦�佹枃鏈秷鎭�
+ this.$websocket.send(msg);
+ },
+ // 鍙戦�佸績璺虫秷鎭�
+ sendHeartbeat() {
+ if (this.$websocket.readyState === WebSocket.OPEN) {
+ // 鍙戦�佸績璺虫秷鎭紝鍙互鏄换鎰忔牸寮忕殑瀛楃涓诧紝鐢ㄤ簬琛ㄧず蹇冭烦
+ this.senMsg('ping');
+ }
+ },
+ // 寮�濮嬪績璺冲畾鏃跺櫒
+ startHeartbeat() {
+ this.heartbeatInterval = setInterval(() => {
+ this.sendHeartbeat();
+ }, 10000); // 姣� 10 绉掑彂閫佷竴娆″績璺�
+ },
+ // 鍋滄蹇冭烦瀹氭椂鍣�
+ stopHeartbeat() {
+ clearInterval(this.heartbeatInterval);
+ },
+ initWebsocket() {
+ this.$websocket = new WebSocket(process.env.VUE_APP_WEB_SOCKET_URL)
+ // 鐩戝惉 WebSocket 杩炴帴鎴愬姛浜嬩欢
+ this.$websocket.onopen = event => {
+ console.log('WebSocket 杩炴帴鎴愬姛', event);
+ let msg = {
+ "token": getToken()
+ }
+ // 鍙戦�佽韩浠借璇�
+ this.senMsg(JSON.stringify(msg))
+ // 璁剧疆蹇冭烦瀹氭椂鍣紝瀹氭湡鍙戦�佸績璺虫秷鎭�
+ this.startHeartbeat();
+ };
+
+ // 鐩戝惉 WebSocket 鎺ユ敹娑堟伅浜嬩欢
+ this.$websocket.onmessage = event => {
+ const message = event.data;
+ console.log('鎺ユ敹鍒版秷鎭�:', message);
+ };
+
+ // 鐩戝惉 WebSocket 杩炴帴鍏抽棴浜嬩欢
+ this.$websocket.onclose = event => {
+ console.log('WebSocket 杩炴帴鍏抽棴', event);
+ // 娓呴櫎蹇冭烦瀹氭椂鍣�
+ this.stopHeartbeat();
+ };
+ },
+ },
+ mounted() {
+ this.initWebsocket();
+ }
};
</script>
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
deleted file mode 100644
index d2d2ec6..0000000
--- a/src/views/index_v1.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
- <div class="dashboard-editor-container">
-
- <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
- <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
- <line-chart :chart-data="lineChartData" />
- </el-row>
-
- <el-row :gutter="32">
- <el-col :xs="24" :sm="24" :lg="8">
- <div class="chart-wrapper">
- <raddar-chart />
- </div>
- </el-col>
- <el-col :xs="24" :sm="24" :lg="8">
- <div class="chart-wrapper">
- <pie-chart />
- </div>
- </el-col>
- <el-col :xs="24" :sm="24" :lg="8">
- <div class="chart-wrapper">
- <bar-chart />
- </div>
- </el-col>
- </el-row>
-
-
- </div>
-</template>
-
-<script>
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-
-const lineChartData = {
- newVisitis: {
- expectedData: [100, 120, 161, 134, 105, 160, 165],
- actualData: [120, 82, 91, 154, 162, 140, 145]
- },
- messages: {
- expectedData: [200, 192, 120, 144, 160, 130, 140],
- actualData: [180, 160, 151, 106, 145, 150, 130]
- },
- purchases: {
- expectedData: [80, 100, 121, 104, 105, 90, 100],
- actualData: [120, 90, 100, 138, 142, 130, 130]
- },
- shoppings: {
- expectedData: [130, 140, 141, 142, 145, 150, 160],
- actualData: [120, 82, 91, 154, 162, 140, 130]
- }
-}
-
-export default {
- name: 'Index',
- components: {
- PanelGroup,
- LineChart,
- RaddarChart,
- PieChart,
- BarChart
- },
- data() {
- return {
- lineChartData: lineChartData.newVisitis
- }
- },
- methods: {
- handleSetLineChartData(type) {
- this.lineChartData = lineChartData[type]
- }
- }
-}
-</script>
-
-<style lang="scss" scoped>
-.dashboard-editor-container {
- padding: 32px;
- background-color: rgb(240, 242, 245);
- position: relative;
-
- .chart-wrapper {
- background: #fff;
- padding: 16px 16px 0;
- margin-bottom: 32px;
- }
-}
-
-@media (max-width:1024px) {
- .chart-wrapper {
- padding: 8px;
- }
-}
-</style>
diff --git a/src/views/login copy.vue b/src/views/login copy.vue
deleted file mode 100644
index cbe738d..0000000
--- a/src/views/login copy.vue
+++ /dev/null
@@ -1,310 +0,0 @@
-<template>
- <div class="login">
- <div class="title-container">
- <h3 class="title">杩愮淮鑰冩牳骞冲彴</h3>
- </div>
- <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
- <h3 class="title">杩愮淮鑰冩牳骞冲彴</h3>
-
- <el-form-item prop="username">
- <el-input
- v-model="loginForm.username"
- type="text"
- auto-complete="off"
- placeholder="璐﹀彿"
- >
- <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
- </el-input>
- </el-form-item>
- <el-form-item prop="password">
- <el-input
- v-model="loginForm.password"
- type="password"
- auto-complete="off"
- placeholder="瀵嗙爜"
- @keyup.enter.native="handleLogin"
- >
- <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
- </el-input>
- </el-form-item>
- <el-form-item prop="code" v-if="captchaEnabled">
- <el-input
- v-model="loginForm.code"
- auto-complete="off"
- placeholder="楠岃瘉鐮�"
- style="width: 63%"
- @keyup.enter.native="handleLogin"
- >
- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
- </el-input>
- <div class="login-code">
- <img :src="codeUrl" @click="getCode" class="login-code-img"/>
- </div>
- </el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style=" margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
- <el-form-item style="width:100%;">
- <el-button
- :loading="loading"
- size="medium"
- type="primary"
- style="width:100%;"
- @click.native.prevent="handleLogin"
- >
- <span v-if="!loading">鐧� 褰�</span>
- <span v-else>鐧� 褰� 涓�...</span>
- </el-button>
- <div style="float: right;" v-if="register">
- <router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
- </div>
- </el-form-item>
- </el-form>
-
- <el-dialog title="涓轰簡鎮ㄧ殑璐﹀彿瀹夊叏,棣栨鐧婚檰璇蜂慨鏀瑰瘑鐮�" :visible.sync="loginInfo.firstLogin==0">
- <el-form>
- <el-form-item label="鏂板瘑鐮�">
- <el-input v-model="newPassword" autocomplete="off"></el-input>
- </el-form-item>
- <el-form-item label="璇风‘璁ゅ瘑鐮�">
- <el-input v-model="confirmPassword" autocomplete="off"></el-input>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="updatePwd">纭� 瀹�</el-button>
- </div>
- </el-dialog>
- </div>
-
-
-</template>
-
-<script>
-import { getCodeImg ,getInfo} from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-import { updateUserPwd } from "@/api/system/user";
-
-export default {
- //鏂板瀵硅薄銆佸彉閲�
- name: "Login",
- data() {
- const equalToPassword = (rule, value, callback) => {
- if (this.newPassword !== value) {
- callback(new Error("涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"));
- } else {
- callback();
- }
- };
- const validatePassword = (rule, value, callback) => {
- var regex = /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[\W_])/;
- if (value.length < 8 || value.length > 10) {
- callback(new Error('璇疯緭鍏�8-10浣嶅ぇ鍐欏瓧姣�+灏忓啓瀛楁瘝+鏁板瓧+鐗规畩瀛楃'));
- }
- else if (!regex.test(value)) {
- callback(new Error("璇疯緭鍏�8-10浣嶅ぇ鍐欏瓧姣�+灏忓啓瀛楁瘝+鏁板瓧+鐗规畩瀛楃"));
- } else {
- callback();
- }
- };
- return {
- codeUrl: "",
- loginForm: {
- username: "admin",
- password: "admin123",
- rememberMe: false,
- code: "",
- uuid: ""
- },
- loginInfo: {
- firstLogin: 1
- },
- newPassword: undefined,
- confirmPassword: undefined,
- loginRules: {
- username: [
- { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" }
- ],
- password: [
- { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" }
- ],
- code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
- },
- rules: {
- newPassword: [
- { required: true, message: "鏂板瘑鐮佷笉鑳戒负绌�", trigger: "blur" },
- { required: true, validator: validatePassword, trigger: "blur" }
- ],
- confirmPassword: [
- { required: true, message: "纭瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
- { required: true, validator: equalToPassword, trigger: "blur" }
- ]
- },
- loading: false,
- // 楠岃瘉鐮佸紑鍏�
- captchaEnabled: true,
- // 娉ㄥ唽寮�鍏�
- register: false,
- redirect: undefined
- };
- },
- watch: {
- $route: {
- handler: function(route) {
- console.log(route);
- this.redirect = route.query && route.query.redirect;
- },
- immediate: true
- }
- },
- created() {
- this.getCode();
- this.getCookie();
- },
- methods: {
- getCode() {
- getCodeImg().then(res => {
- this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
- if (this.captchaEnabled) {
- this.codeUrl = "data:image/gif;base64," + res.img;
- this.loginForm.uuid = res.uuid;
- }
- });
- },
- getCookie() {
- const username = Cookies.get("username");
- const password = Cookies.get("password");
- const rememberMe = Cookies.get('rememberMe')
- this.loginForm = {
- username: username === undefined ? this.loginForm.username : username,
- password: password === undefined ? this.loginForm.password : decrypt(password),
- rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
- };
- },
- handleLogin() {
- this.$refs.loginForm.validate(valid => {
- if (valid) {
- this.loading = true;
-
- if (this.loginForm.rememberMe) {
- Cookies.set("username", this.loginForm.username, { expires: 30 });
- Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
- Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
- } else {
- Cookies.remove("username");
- Cookies.remove("password");
- Cookies.remove('rememberMe');
- }
-
- this.$store.dispatch("Login", this.loginForm).then((res) => {
- getInfo().then(loginInfo => {
- this.loginInfo = loginInfo.user
- //濡傛灉杩斿洖涓�1姝ｅ父璺宠浆
- if(this.loginInfo.firstLogin == 1){
- this.$router.push({ path: "/" }).catch(()=>{});
- return;
- this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
- } else {
- localStorage.setItem('firstLogin',0)
- }
- }).catch(()=>{})
- }).catch(() => {
- this.loading = false;
- if (this.captchaEnabled) {
- this.getCode();
- }
- });
- }
- });
- },
- // 鏂板淇敼鏂规硶
- updatePwd(){
- updateUserPwd("", this.newPassword, 0).then(response => {
- // 淇敼瀹屾垚灏唂irstLogin鏀逛负1
- localStorage.setItem('firstLogin', 1)
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.$router.push({ path: this.redirect || "/" }).catch(() => {});
- }).catch((e) => {
- console.info(e)
- });
- }
- }
- };
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-$light_gray:#eee;
-.login {
- display: flex;
- justify-content: center;
- align-items: center;
- height: 100%;
- background-image: url("../assets/images/login-background.jpg");
- background-size: cover;
-}
-.title {
-
- margin: 0px auto 30px auto;
- text-align: center;
- color: #707070;
-}
-
-.login-form {
- border-radius: 6px;
- background: #ffffff;
- width: 400px;
- padding: 25px 25px 5px 25px;
- .el-input {
- height: 38px;
- input {
- height: 38px;
- }
- }
- .input-icon {
- height: 39px;
- width: 14px;
- margin-left: 2px;
- }
-}
-.login-tip {
- font-size: 13px;
- text-align: center;
- color: #bfbfbf;
-}
-.login-code {
- width: 33%;
- height: 38px;
- float: right;
- img {
- cursor: pointer;
- vertical-align: middle;
- }
-}
-.el-login-footer {
- height: 40px;
- line-height: 40px;
- position: fixed;
- bottom: 0;
- width: 100%;
- text-align: center;
- color: #fff;
- font-family: Arial;
- font-size: 12px;
- letter-spacing: 1px;
-}
-.login-code-img {
- height: 38px;
-}
-.title-container {
- position: absolute;
- transform: translateY(-400%);
- left: 35%;
- .title {
- font-size: 40px;
- color: $light_gray;
- margin: 0px auto 20px auto;
- text-align: center;
- font-weight: bold;
- letter-spacing: 20px;
- }
-}
-</style>
diff --git a/src/views/system/calculate/duty/index.vue b/src/views/system/calculate/duty/index.vue
index 7432547..6c7a22e 100644
--- a/src/views/system/calculate/duty/index.vue
+++ b/src/views/system/calculate/duty/index.vue
@@ -88,9 +88,9 @@
</template>
<script>
-import { listScore, getScore, delScore, addScore, updateScore } from "@/api/platform/default-score";
+import { listScore, getScore, delScore, addScore, updateScore } from "@/api/platform/contract-score";
import { unitSelect } from "@/api/platform/unit";
-import { publishSelect } from "@/api/platform/default-publish";
+import { publishSelect } from "@/api/platform/contract-publish";
export default {
name: "Score",
diff --git a/src/views/system/calculate/record/index.vue b/src/views/system/calculate/record/index.vue
index 16306e6..a48404b 100644
--- a/src/views/system/calculate/record/index.vue
+++ b/src/views/system/calculate/record/index.vue
@@ -159,7 +159,7 @@
</template>
<script>
-import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/platform/calculate-record";
+import { getCalculateRecords, getCalculateRecordById,deleteCalculateRecordByIds, addCalculateRecord, editCalculateRecord } from "@/api/platform/calculate-record";
import {unitSelect} from "@/api/platform/unit";
export default {
name: "Record",
@@ -218,7 +218,7 @@
/** 鏌ヨ鏍哥畻璁板綍鍒楄〃 */
getList() {
this.loading = true;
- listRecord(this.queryParams).then(response => {
+ getCalculateRecords(this.queryParams).then(response => {
this.recordList = response.rows;
this.total = response.total;
this.loading = false;
@@ -268,7 +268,7 @@
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
- getRecord(id).then(response => {
+ getCalculateRecordById(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "淇敼鏍哥畻璁板綍";
@@ -279,13 +279,13 @@
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
- updateRecord(this.form).then(response => {
+ editCalculateRecord(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
- addRecord(this.form).then(response => {
+ addCalculateRecord(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -298,7 +298,7 @@
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎鏍哥畻璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delRecord(ids);
+ return deleteCalculateRecordByIds(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index 3dab356..3665b14 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -171,7 +171,7 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
+import { getCalculateReports, getCalculateReportById, deleteCalculateReportByIds, addCalculateReport, editCalculateReport } from "@/api/platform/calculate-report";
export default {
name: "CheckResult",
@@ -262,7 +262,7 @@
this.queryParams["start"] = this.daterangeCheckTime[0];
this.queryParams["end"] = this.daterangeCheckTime[1];
}
- listCheckResult(this.queryParams).then(response => {
+ getCalculateReports(this.queryParams).then(response => {
this.checkResultList = response.rows;
this.total = response.total;
this.loading = false;
@@ -299,11 +299,11 @@
this.$modal.msgWarning("璇峰～鍐欏垎鏁�");
return
}
- manualScore(this.manualScoreForm).then(res => {
- this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- this.cancelManualScore();
- this.getList();
- })
+ // manualScore(this.manualScoreForm).then(res => {
+ // this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ // this.cancelManualScore();
+ // this.getList();
+ // })
},
handleDetail(row) {
console.log("row", row)
@@ -317,7 +317,7 @@
let text = row.publish == 1 ? '鍙栨秷鍙戝竷' : '鍙戝竷';
const ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭' + text + '鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return publishCheckResult(ids);
+ // return publishCheckResult(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess(text + "鎴愬姛");
@@ -351,7 +351,7 @@
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
- getCheckResult(id).then(response => {
+ getCalculateReportById(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "淇敼鑰冩牳缁撴灉";
@@ -363,13 +363,13 @@
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
- updateCheckResult(this.form).then(response => {
+ editCalculateReport(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
- addCheckResult(this.form).then(response => {
+ addCalculateReport(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -382,7 +382,7 @@
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCheckResult(ids);
+ return deleteCalculateReportByIds(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index 8df9540..f04da84 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -2,12 +2,15 @@
<div class="app-container">
<el-row>
- <el-col :span="8" v-for="(item) in tableData" :key="o" style="margin: 10px;width: 30%;">
+ <el-col :span="8" v-for="(item) in contractList" :key="item" style="margin: 10px;width: 30%;">
<el-card :body-style="{ padding: '0px' }">
- <el-image style="width: 420px;height: 187px;" :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']" fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"/>
+ <el-image style="width: 420px;height: 187px;"
+ :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']"
+ fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357"
+ class="image" />
<div style="padding: 14px;">
- <span>{{ item.companyName }}</span>
- <span class="time" style="margin-left: 10px;">{{ item.deptName }}</span>
+ <span>{{ item.name }}</span>
+ <span class="time" style="margin-left: 10px;">{{ item.unitName }}</span>
<div class="bottom clearfix">
<time class="time">{{ item.startTime }} 鈥� {{ item.endTime }}</time>
<el-button type="text" class="button" @click="handleDetail(item)">鏌ョ湅璇︽儏</el-button>
@@ -19,172 +22,104 @@
<el-row :gutter="10" class="mb8" style="margin-top: 40px;">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- v-hasPermi="['system:contract:add']"
- @click="handleAdd"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-top"
- size="mini"
- v-hasPermi="['system:contract:import']"
- @click="handleImportPoint"
- >瀵煎叆</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" v-hasPermi="['system:contract:import']"
+ @click="handleImport">鏂板</el-button>
</el-col>
</el-row>
-
-
- <!-- 娣诲姞鎴栦慨鏀广�愯濉啓鍔熻兘鍚嶇О銆戝璇濇 -->
- <el-dialog :title="detailName" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="鍏徃鍚�" prop="companyName">
- <el-select v-model="form.companyName" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in unitList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="閮ㄩ棬鍚嶇О" prop="deptName">
- <el-select v-model="form.deptName" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in deptList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍚堝悓鏃堕棿" prop="timezone">
- <el-date-picker
- :disabled="title === '淇敼鍚堝悓鏃堕棿'"
- @change="dateChange"
- v-model="form.timezone"
- type="daterange"
- align="right"
- unlink-panels
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- >
- </el-date-picker>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
<!-- 鍚堝悓璇︽儏 -->
<el-dialog :title="detailName" :visible.sync="detail" width="800px" append-to-body>
<el-form label-position="left" inline class="table-expand">
<el-collapse v-model="activeNames" @change="handleChange">
- <el-collapse-item title="瑙嗛骞冲潎鍦ㄧ嚎鐜�" name="1">
- <div>鈮�98%锛氫笉鎵ｅ垎</div>
- <div class="inline-input-container">
- 95%鈮よ棰戝钩鍧囧湪绾跨巼锛�98%锛氭墸0.1鍒�
- </div>
- <div class="inline-input-container">
- 90%鈮よ棰戝钩鍧囧湪绾跨巼锛�95%锛氭墸0.5鍒�
- </div>
- <div class="inline-input-container">
- 锛�90%锛� 鎵�1鍒�
- 鑻ユ湁杩炵画涓ゆ鐪佸巺鑰冩牳鍦ㄧ嚎鐜囦綆浜�90%锛屾嫑鏍囦汉鏈夋潈瑙ｉ櫎鍚堝悓銆�
+ <el-collapse-item v-for="(item, index) in ruleData" :key="index" :title="item.ruleName" :name="index">
+ <div class="inline-input-container" v-for="(item, index) in item.children" :key="index">
+ <b>{{ item.ruleDesc }}</b> <br v-if="item.ruleDesc"/>
+ <el-tooltip class="item" effect="dark" :content="item.deductCategory + ' ' + item.calcFraction + (item.calcUnit ? '/' + item.calcUnit : '')" placement="top">
+ <span>{{ item.ruleCondition }}</span>
+ <!-- {{ item.deductCategory }} {{ item.calcFraction }}{{ item.calcUnit ? "/" + item.calcUnit : '' }} -->
+ </el-tooltip>
</div>
</el-collapse-item>
- <el-collapse-item title="鍓嶇鎰熺煡婧愭不鐞嗗伐浣�" name="2">
- <div class="inline-input-container">
- 鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*0.1鍒�
- </div>
- <div class="inline-input-container">
- OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�*0.1鍒�
- </div>
- <div class="inline-input-container">
- 鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*0.1鍒�
- </div>
- </el-collapse-item>
- <el-collapse-item title="鍚庡彴绯荤粺鐨勪繚闅�" name="3">
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵�0.2鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭144灏忔椂浠ュ悗锛屾瘡瓒呭嚭12灏忔椂锛氭墸0.1鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�3娆★細鎵�0.2鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭24灏忔椂涓嶈冻48灏忔椂鐨勶細鎵�0.3鍒�/娆�
- </div>
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵�0.1鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭48灏忔椂浠ュ悗锛氭墸0.5鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�2娆★細鎵�0.5鍒�/娆�
- </div>
- </el-collapse-item>
- <el-collapse-item title="瀛樺偍鏁呴殰" name="4">
- <div class="inline-input-container">
- 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�0.3鍒�/灏忔椂
- </div>
- <div class="inline-input-container">
- 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�0.1鍒�/灏忔椂
- </div>
- <div class="inline-input-container">
- 鍥犺棰戞垨鑰呭浘鐗囦涪澶卞鑷撮噸瑕佹浜嬩欢涓嶈兘鍥炴斁鎴栨煡鐪�,鍚屼竴鐐逛綅瑙嗛鍥惧儚鍚屼竴妗堜欢涓嶇疮璁¤绠楋細鎵�0.1鍒�/娆�
- </div>
- </el-collapse-item>
- <el-collapse-item title="瀵逛簬鍓嶇鐐逛綅寮傚父鎯呭喌鐨勫鐞�" name="5">
- <div class="inline-input-container">
- 24灏忔椂鍚庢湭淇鐨勶細鎵�0.1鍒�*闀滃ご鏁伴噺
- </div>
- <div class="inline-input-container">
- 48灏忔椂鍚庢湭淇锛岀疮璁℃墸鍒嗭細鎵�0.1鍒�*闀滃ご鏁伴噺*澶�
- </div>
- </el-collapse-item>
- <el-form-item label="鍚堝悓闄勪欢" prop="certificates">
- <el-upload>
- <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
- <div slot="tip" class="el-upload__tip">璇蜂笂浼犲ぇ灏忎笉瓒呰繃 5MB 鏍煎紡涓� doc/xls/ppt/txt/pdf/png/jpg 鐨勬枃浠�</div>
- </el-upload>
+ <el-form-item label="鍚堝悓闄勪欢" prop="attachment" class="top">
+ <file-upload v-model="form.attachment"/>
</el-form-item>
- <el-dialog :visible.sync="dialogVisible" append-to-body="false">
- <img width="100%" :src="dialogImageUrl" alt="">
- </el-dialog>
+ <el-link class="top" v-for="item in contractInfo.attachment != null ? contractInfo.attachment.split(',') : contractInfo.attachment" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
<div style="text-align: right; margin-top: 10px;">
- <el-button type="primary" @click="submitForm1(props.row)">鎻愪氦</el-button>
+ <el-button type="primary" @click="submitForm">鎻愪氦</el-button>
</div>
</el-collapse>
</el-form>
</el-dialog>
+ <!-- 鍚堝悓瀵煎叆瀵硅瘽妗� -->
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="550px" append-to-body>
+ <el-form ref="form" :model="upload" :rules="rules" label-width="80px">
+ <el-form-item label="鍚堝悓鍚嶇О" prop="name">
+ <el-input v-model="upload.name" />
+ </el-form-item>
+ <el-form-item label="鍏徃鍚嶇О" prop="unitId">
+ <el-select v-model="upload.unitId" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍚堝悓鏃堕棿" prop="timezone">
+ <el-date-picker :disabled="title === '淇敼鍚堝悓鏃堕棿'" @change="dateChange" v-model="upload.timezone"
+ value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" align="right" unlink-panels range-separator="鑷�"
+ start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+ :action="upload.url + '?unitId=' + upload.unitId + '&startTime=' + upload.startTime + '&endTime=' + upload.endTime + '&name=' + upload.name"
+ :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
+ :auto-upload="false" drag style="text-align: center;">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ <div class="el-upload__tip text-center" slot="tip">
+ <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
+ <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+ @click="importTemplate">涓嬭浇妯℃澘</el-link>
+ </div>
+ </el-upload>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
+ <el-button @click="upload.open = false">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
-import { listContract, getContract, delContract, addContract, updateContract } from "@/api/platform/contract";
-import {unitSelect} from "../../../api/platform/unit";
-import {deptSelect} from "../../../api/system/dept";
+import { listContract, getContract, updateContract } from "@/api/platform/contract";
+import { getRuleListByContractId } from "../../../api/platform/calculate-rule";
+import { unitSelect } from "../../../api/platform/unit";
+import { deptSelect } from "../../../api/system/dept";
+import { getToken } from "@/utils/auth";
export default {
name: "Contract",
data() {
return {
+ contractInfo: {},
+ // 鍚堝悓瀵煎叆鍙傛暟
+ upload: {
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙鍚堝悓瀵煎叆锛�
+ open: false,
+ // 寮瑰嚭灞傛爣棰橈紙鍚堝悓瀵煎叆锛�
+ title: "",
+ // 鏄惁绂佺敤涓婁紶
+ isUploading: false,
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ headers: { Authorization: "Bearer " + getToken() },
+ // 涓婁紶鐨勫湴鍧�
+ url: process.env.VUE_APP_BASE_API + "/system/contract/importData",
+ unitId: '',
+ startTime: '',
+ endTime: ''
+ },
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
@@ -218,49 +153,21 @@
open: false,
// 鏄惁鏄剧ず璇︽儏
detail: false,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- companyId: null,
- companyName: null,
- deptId: null,
- deptName: null,
- detail: null
- },
- tableData: [{
- id: '12987122',
- companyName: '杩愮淮鍏徃鐢�',
- deptName: '鑷础瀵岄『鍏畨灞�',
- startTime: '2023-12-11 10:20:20',
- endTime: '2024-12-11 10:20:20',
- shop: '鐜嬪皬铏庡か濡诲簵',
- shopId: '10333'
- }, {
- id: '12987123',
- companyName: '杩愮淮鍏徃涔�',
- deptName: '鑷础澶у畨鍏畨灞�',
- startTime: '2023-12-11 10:20:20',
- endTime: '2023-12-11 10:20:20',
- shop: '鐜嬪皬铏庡か濡诲簵',
- shopId: '10333'
- }, {
- id: '12987125',
- companyName: '杩愮淮鍏徃涓�',
- deptName: '鑷础鑷祦浜曞叕瀹夊眬',
- startTime: '2023-12-11 10:20:20',
- endTime: '2023-12-11 10:20:20',
- shop: '鐜嬪皬铏庡か濡诲簵',
- shopId: '10333'
- }],
+ ruleData: [],
// 琛ㄥ崟鍙傛暟
form: {
},
// 琛ㄥ崟鏍￠獙
rules: {
- companyId: [
- { required: true, message: "鍏徃id涓嶈兘涓虹┖", trigger: "blur" }
+ name: [
+ { required: true, message: "鍚堝悓鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
+ unitId: [
+ { required: true, message: "杩愮淮鍗曚綅涓嶈兘涓虹┖", trigger: "change" }
+ ],
+ timezone: [
+ { type: "array", required: true, message: "鍚堝悓鏃堕棿涓嶈兘涓虹┖", trigger: "change" }
+ ]
}
};
},
@@ -270,15 +177,61 @@
this.selectDept();
},
methods: {
+ submitForm() {
+ updateContract(this.form).then(response => {
+ if (response.code != 200) {
+ this.$message.error("鎿嶄綔澶辫触");
+ } else {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ }
+ });
+ },
+ /** 瀵煎叆鎸夐挳鎿嶄綔 */
+ handleImport() {
+ this.upload.title = "鍚堝悓瀵煎叆";
+ this.upload.open = true;
+ },
+ /** 涓嬭浇妯℃澘鎿嶄綔 */
+ importTemplate() {
+ this.download('system/contract/importTemplate', {
+ }, `鍚堝悓瀵煎叆妯℃澘.xlsx`)
+ },
+ // 鏂囦欢涓婁紶涓鐞�
+ handleFileUploadProgress(event, file, fileList) {
+ this.upload.isUploading = true;
+ },
+ // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+ handleFileSuccess(response, file, fileList) {
+ this.upload.open = false;
+ this.upload.isUploading = false;
+ this.$refs.upload.clearFiles();
+ if (response.code != 200) {
+ this.$message.warning(response.msg);
+ } else {
+ this.$message.success(response.msg);
+ }
+ this.getList();
+ },
+ // 鎻愪氦涓婁紶鏂囦欢
+ submitFileForm() {
+ let that = this;
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ that.$refs.upload.submit();
+ }
+ })
+ },
+ // 鏃堕棿閫夋嫨鍙戠敓鍙樺寲
+ dateChange() {
+ this.upload.startTime = this.upload.timezone[0];
+ this.upload.endTime = this.upload.timezone[1];
+ },
handleRemove(file) {
console.log(file);
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
- },
- handleDownload(file) {
- console.log(file);
},
// 杩愮淮鍏徃涓嬫媺鏁版嵁
selectUnit() {
@@ -292,53 +245,22 @@
this.deptList = res.data;
})
},
- submitForm1() {
- alert('鎻愪氦鎴愬姛锛�');
- },
- handleChange(val) {
- console.log(val);
- },
/** 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛� */
getList() {
this.loading = true;
listContract(this.queryParams).then(response => {
- this.contractList = response.rows;
+ this.contractList = response;
this.total = response.total;
this.loading = false;
});
},
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- companyId: null,
- companyName: null,
- deptId: null,
- deptName: null,
- detail: null
- };
- this.resetForm("form");
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
+ /** 鑾峰彇鍚堝悓瑙勫垯 */
+ getRuleList(item) {
+ getRuleListByContractId(item.id).then(response => {
+ this.ruleData = response.data;
+ this.form.id = item.id;
+ this.contractInfo = item;
+ });
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
@@ -349,7 +271,8 @@
/** 璇︽儏鎸夐挳鎿嶄綔 */
handleDetail(item) {
this.detail = true;
- this.detailName = item.companyName
+ this.detailName = item.name;
+ this.getRuleList(item);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -361,41 +284,9 @@
this.title = "淇敼鍚堝悓";
});
},
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateContract(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addContract(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戠紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delContract(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/contract/export', {
- ...this.queryParams
- }, `contract_${new Date().getTime()}.xlsx`)
+ /** 涓嬭浇鎸夐挳鎿嶄綔 */
+ handleDownload (data) {
+ this.$download.resource(data);
}
}
};
@@ -405,13 +296,17 @@
.table-expand {
font-size: 0;
}
-.table-expand {
+
+.table-expand {
width: 100%;
color: #99a9bf;
}
+
.inline-input-container {
- white-space: nowrap; /* 闃叉鍐呭鍐呴儴鐨勬崲琛� */
- margin-right: 50px; /* 鍙�夌殑锛岀敤浜庡湪鍏冪礌涔嬮棿娣诲姞涓�浜涢棿璺� */
+ white-space: nowrap;
+ /* 闃叉鍐呭鍐呴儴鐨勬崲琛� */
+ margin-right: 50px;
+ /* 鍙�夌殑锛岀敤浜庡湪鍏冪礌涔嬮棿娣诲姞涓�浜涢棿璺� */
width: 7%;
}
@@ -437,11 +332,16 @@
.clearfix:before,
.clearfix:after {
- display: table;
- content: "";
+ display: table;
+ content: "";
}
.clearfix:after {
- clear: both
+ clear: both
+}
+
+.top {
+ display: block;
+ margin-top: 10px;
}
</style>
diff --git a/src/views/system/publish/default/index.vue b/src/views/system/publish/default/index.vue
index d6d9b6a..eef8be0 100644
--- a/src/views/system/publish/default/index.vue
+++ b/src/views/system/publish/default/index.vue
@@ -326,7 +326,7 @@
</template>
<script>
-import { listPublish, getPublish, delPublish, addPublish, updatePublish } from "@/api/platform/default-publish";
+import { listPublish, getPublish, delPublish, addPublish, updatePublish } from "@/api/platform/contract-publish";
import { templateSelect } from "@/api/platform/check-template";
export default {
name: "Publish",
diff --git a/src/views/system/result/default/detail.vue b/src/views/system/result/default/detail.vue
index f1aafb2..f0f8a47 100644
--- a/src/views/system/result/default/detail.vue
+++ b/src/views/system/result/default/detail.vue
@@ -353,9 +353,9 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/default-result";
-import { listRule, getRule, delRule, addRule, updateRule, setRule } from "@/api/platform/default-rule";
-import { listScore, getScore, delScore, addScore, updateScore } from "@/api/platform/default-score";
+import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/contract-result";
+import { listRule, getRule, delRule, addRule, updateRule, setRule } from "@/api/platform/calculate-rule";
+import { listScore, getScore, delScore, addScore, updateScore } from "@/api/platform/contract-score";
import {unitSelect} from "../../../../api/platform/unit";
import {publishSelect} from "../../../../api/platform/check-publish";
diff --git a/src/views/system/result/default/index.vue b/src/views/system/result/default/index.vue
index 24237f5..ba5be21 100644
--- a/src/views/system/result/default/index.vue
+++ b/src/views/system/result/default/index.vue
@@ -178,7 +178,7 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/default-result";
+import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/contract-result";
export default {
name: "CheckResult",
diff --git a/src/views/system/rule/default/index.vue b/src/views/system/rule/default/index.vue
index 2cf4c33..a7f6741 100644
--- a/src/views/system/rule/default/index.vue
+++ b/src/views/system/rule/default/index.vue
@@ -143,7 +143,7 @@
</template>
<script>
-import { listRule, getRule, delRule, addRule, updateRule } from "@/api/platform/default-rule";
+import { listRule, getRule, delRule, addRule, updateRule } from "@/api/platform/calculate-rule";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
diff --git a/src/views/system/score/default/index.vue b/src/views/system/score/default/index.vue
index 4d9e628..126fd5e 100644
--- a/src/views/system/score/default/index.vue
+++ b/src/views/system/score/default/index.vue
@@ -228,7 +228,7 @@
</template>
<script>
-import { listAuditing, getAuditing, delAuditing, addAuditing, updateAuditing,auditing } from "@/api/platform/default-score";
+import { listAuditing, getAuditing, delAuditing, addAuditing, updateAuditing,auditing } from "@/api/platform/contract-score";
import { unitSelect } from "@/api/platform/unit";
export default {
diff --git a/src/views/system/template/default/index.vue b/src/views/system/template/default/index.vue
index cb16bbf..01773b0 100644
--- a/src/views/system/template/default/index.vue
+++ b/src/views/system/template/default/index.vue
@@ -189,7 +189,7 @@
<script>
import { listTemplate, getTemplate, delTemplate, addTemplate, updateTemplate } from "@/api/platform/default-template";
-// import { ruleSelect } from '@/api/platform/default-rule'
+// import { ruleSelect } from '@/api/platform/calculate-rule'
import { unitSelect } from '@/api/platform/unit'
export default {
--
Gitblit v1.8.0