From c19a9466b3221f9a8eb28e84a09b1406949497dd Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 四月 2024 17:42:02 +0800
Subject: [PATCH] websocket
---
src/api/platform/calculate-report.js | 61 ++++++
src/views/index.vue | 54 +++++
.env.development | 5
/dev/null | 310 -------------------------------
src/main.js | 3
.env.production | 5
src/api/platform/calculate-record.js | 73 ++++--
src/views/system/calculate/record/index.vue | 12
src/views/system/calculate/report/index.vue | 24 +-
9 files changed, 189 insertions(+), 358 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-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/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/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/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("鍒犻櫎鎴愬姛");
--
Gitblit v1.8.0