From cc43247a5e03bdfcc41c3e4c6038f78f673f3186 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 15 五月 2024 11:51:34 +0800
Subject: [PATCH] 上片机新增下拉选，保存按钮，状态接口
---
UI-Project/src/lang/LanguageMixin.js | 24 +-
UI-Project/src/views/Returns/returns.vue | 229 ++++++++++++++++++++++++--------
UI-Project/src/lang/i18n.js | 8
UI-Project/src/main.js | 10
UI-Project/src/views/Caching/cachingbefore.vue | 15 +
UI-Project/package-lock.json | 70 +++++-----
UI-Project/package.json | 2
UI-Project/src/views/LoginView.vue | 46 +++---
8 files changed, 261 insertions(+), 143 deletions(-)
diff --git a/UI-Project/package-lock.json b/UI-Project/package-lock.json
index 3a65897..ba2dc0c 100644
--- a/UI-Project/package-lock.json
+++ b/UI-Project/package-lock.json
@@ -18,7 +18,7 @@
"sortablejs": "^1.15.1",
"sweetalert2": "^11.10.7",
"vue": "^3.3.4",
- "vue-i18n": "^9.11.0",
+ "vue-i18n": "^9.13.1",
"vue-router": "^4.2.4",
"vxe-table": "^4.5.15",
"xe-utils": "^3.5.14",
@@ -462,23 +462,23 @@
"integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
},
"node_modules/@intlify/core-base": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.11.0.tgz",
- "integrity": "sha512-cveOqAstjLZIiyatcP/HrzrQ87cZI8ScPQna3yvoM8zjcjcIRK1MRvmxUNlPdg0rTNJMZw7rixPVM58O5aHVPA==",
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.13.1.tgz",
+ "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==",
"dependencies": {
- "@intlify/message-compiler": "9.11.0",
- "@intlify/shared": "9.11.0"
+ "@intlify/message-compiler": "9.13.1",
+ "@intlify/shared": "9.13.1"
},
"engines": {
"node": ">= 16"
}
},
"node_modules/@intlify/message-compiler": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.11.0.tgz",
- "integrity": "sha512-x31Gl7cscnoI4UUY1yaIy8e7vVMVW1VVlTXZz4SIHKqoSEUkfmgqK8NAx1e7RcoHEbICR7uyCbud0ZL1s4OGXQ==",
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.13.1.tgz",
+ "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==",
"dependencies": {
- "@intlify/shared": "9.11.0",
+ "@intlify/shared": "9.13.1",
"source-map-js": "^1.0.2"
},
"engines": {
@@ -486,9 +486,9 @@
}
},
"node_modules/@intlify/shared": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.11.0.tgz",
- "integrity": "sha512-KHSNgi7sRjmSm7aD8QH8WFt9VfKaekJuJ473opbJlkGY3EDnDUU8ikIhG8PbasQbgNvbY3m3tWNGqk2omIdwMA==",
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.13.1.tgz",
+ "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==",
"engines": {
"node": ">= 16"
}
@@ -1649,12 +1649,12 @@
}
},
"node_modules/vue-i18n": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.11.0.tgz",
- "integrity": "sha512-vU4gY6lu8Pdfs9BgKGiDAJmFDf88cceR47KcSB0VW4xJzUrXR/7qwqM7A8dQ2nedhoIDxoOm5Ro4pFd2KvJqbA==",
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.13.1.tgz",
+ "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==",
"dependencies": {
- "@intlify/core-base": "9.11.0",
- "@intlify/shared": "9.11.0",
+ "@intlify/core-base": "9.13.1",
+ "@intlify/shared": "9.13.1",
"@vue/devtools-api": "^6.5.0"
},
"engines": {
@@ -1960,27 +1960,27 @@
"integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
},
"@intlify/core-base": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.11.0.tgz",
- "integrity": "sha512-cveOqAstjLZIiyatcP/HrzrQ87cZI8ScPQna3yvoM8zjcjcIRK1MRvmxUNlPdg0rTNJMZw7rixPVM58O5aHVPA==",
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.13.1.tgz",
+ "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==",
"requires": {
- "@intlify/message-compiler": "9.11.0",
- "@intlify/shared": "9.11.0"
+ "@intlify/message-compiler": "9.13.1",
+ "@intlify/shared": "9.13.1"
}
},
"@intlify/message-compiler": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.11.0.tgz",
- "integrity": "sha512-x31Gl7cscnoI4UUY1yaIy8e7vVMVW1VVlTXZz4SIHKqoSEUkfmgqK8NAx1e7RcoHEbICR7uyCbud0ZL1s4OGXQ==",
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.13.1.tgz",
+ "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==",
"requires": {
- "@intlify/shared": "9.11.0",
+ "@intlify/shared": "9.13.1",
"source-map-js": "^1.0.2"
}
},
"@intlify/shared": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.11.0.tgz",
- "integrity": "sha512-KHSNgi7sRjmSm7aD8QH8WFt9VfKaekJuJ473opbJlkGY3EDnDUU8ikIhG8PbasQbgNvbY3m3tWNGqk2omIdwMA=="
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.13.1.tgz",
+ "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ=="
},
"@jridgewell/sourcemap-codec": {
"version": "1.4.15",
@@ -2771,12 +2771,12 @@
}
},
"vue-i18n": {
- "version": "9.11.0",
- "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.11.0.tgz",
- "integrity": "sha512-vU4gY6lu8Pdfs9BgKGiDAJmFDf88cceR47KcSB0VW4xJzUrXR/7qwqM7A8dQ2nedhoIDxoOm5Ro4pFd2KvJqbA==",
+ "version": "9.13.1",
+ "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.13.1.tgz",
+ "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==",
"requires": {
- "@intlify/core-base": "9.11.0",
- "@intlify/shared": "9.11.0",
+ "@intlify/core-base": "9.13.1",
+ "@intlify/shared": "9.13.1",
"@vue/devtools-api": "^6.5.0"
}
},
diff --git a/UI-Project/package.json b/UI-Project/package.json
index b816c15..6cade56 100644
--- a/UI-Project/package.json
+++ b/UI-Project/package.json
@@ -18,7 +18,7 @@
"sortablejs": "^1.15.1",
"sweetalert2": "^11.10.7",
"vue": "^3.3.4",
- "vue-i18n": "^9.11.0",
+ "vue-i18n": "^9.13.1",
"vue-router": "^4.2.4",
"vxe-table": "^4.5.15",
"xe-utils": "^3.5.14",
diff --git a/UI-Project/src/lang/LanguageMixin.js b/UI-Project/src/lang/LanguageMixin.js
index 39a6488..5a90328 100644
--- a/UI-Project/src/lang/LanguageMixin.js
+++ b/UI-Project/src/lang/LanguageMixin.js
@@ -1,14 +1,14 @@
export default {
- created() {
- const localStorageLang = localStorage.getItem('preferredLanguage');
- if (localStorageLang) {
- this.$i18n.locale = localStorageLang;
- }
- },
- methods: {
- switchLanguage(lang) {
- this.$i18n.locale = lang;
- localStorage.setItem('preferredLanguage', lang);
- }
+ created() {
+ const localStorageLang = localStorage.getItem('preferredLanguage');
+ if (localStorageLang) {
+ this.$i18n.locale = localStorageLang;
}
- }
\ No newline at end of file
+ },
+ methods: {
+ switchLanguage(lang) {
+ this.$i18n.locale = lang;
+ localStorage.setItem('preferredLanguage', lang);
+ }
+ }
+}
\ No newline at end of file
diff --git a/UI-Project/src/lang/i18n.js b/UI-Project/src/lang/i18n.js
index c582ee5..080bd7c 100644
--- a/UI-Project/src/lang/i18n.js
+++ b/UI-Project/src/lang/i18n.js
@@ -1,9 +1,9 @@
// i18n.js
-
+
import { createI18n } from 'vue-i18n'
import zhCn from './lang/locales/zh-CN.json'
import enUs from './lang/locales/en-US.json'
-
+
const i18n = createI18n({
locale: 'zh-CN', // 璁剧疆榛樿璇█
messages: {
@@ -11,5 +11,5 @@
'en-US': enUs
}
})
-
-export default i18n
+
+export default i18n
\ No newline at end of file
diff --git a/UI-Project/src/main.js b/UI-Project/src/main.js
index 41bf9c3..fe656ab 100644
--- a/UI-Project/src/main.js
+++ b/UI-Project/src/main.js
@@ -1,5 +1,5 @@
import './assets/main.css'
-
+
import { createApp } from 'vue'
import { createPinia } from 'pinia'
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
@@ -11,8 +11,8 @@
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'
// import i18n from './lang/i18n'
-
-
+
+
const app = createApp(App)
const pinia = createPinia()
pinia.use(piniaPluginPersistedstate )
@@ -23,5 +23,5 @@
app.use(ElementPlus,{
locale: zhCn,
})
-
-app.mount('#app')
+
+app.mount('#app')
\ No newline at end of file
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 5d9d157..284a33c 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -65,13 +65,18 @@
);
if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- const deleteResponse = await request.post("/cacheGlass/edgStorageCage/edgStorageCageGlass", {
- id: row.id,
+ var url="/cacheGlass/edgStorageCage/edgStorageCageGlass?edgStorageCageId="+row.id;
+ console.log(url);
+ const deleteResponse = await request.post(url, {
esdId: row.esdId
})
- if (response.code == 200) {
- // 鍒犻櫎鎴愬姛锛屾偍鍙互鏍规嵁闇�瑕佸鐞嗘垚鍔熺殑鎯呭喌
- alert('鍒犻櫎鎴愬姛锛�');
+ if (response.code == 200) {
+ // 鍒犻櫎鎴愬姛锛屾偍鍙互鏍规嵁闇�瑕佸鐞嗘垚鍔熺殑鎯呭喌
+ // ElMessage({
+ // type: 'success',
+ // message: '鍒犻櫎鎴愬姛锛�',
+ // })
+ ElMessage.success(response.message);
} else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
diff --git a/UI-Project/src/views/LoginView.vue b/UI-Project/src/views/LoginView.vue
index 366ed5a..40d2d9b 100644
--- a/UI-Project/src/views/LoginView.vue
+++ b/UI-Project/src/views/LoginView.vue
@@ -5,21 +5,21 @@
import {ElMessage} from 'element-plus'
import request from '@/utils/request'
import userInfo from '@/stores/userInfo'
-
+
const store = userInfo()
let ruleFormRef = ref<FormInstance>()
const router = useRouter()
const route = useRoute()
-
+
const userForm = reactive({
userName: '',
password: '',
})
-
+
if (typeof route.query.id != 'undefined') {
userForm.userId = <string>route.query.id
}
-
+
const validateUser = (rule: any, value: any, callback: any) => {
if (value === '') {
callback(new Error('璇疯緭鍏ヤ綘鐨勮处鍙�'))
@@ -27,7 +27,7 @@
callback()
}
}
-
+
const validatePass = (rule: any, value: any, callback: any) => {
if (value === '') {
callback(new Error('璇疯緭鍏ヤ綘鐨勫瘑鐮�'))
@@ -35,12 +35,12 @@
callback()
}
}
-
+
const rules = reactive<FormRules<typeof userForm>>({
userId: [{validator: validateUser, trigger: 'blur'}],
pass: [{validator: validatePass, trigger: 'blur'}],
})
-
+
//鐧婚檰鏂规硶
const submitForm = (formEl: FormInstance | undefined) => {
if (!formEl) return
@@ -54,7 +54,7 @@
if (res['code'] == 200) {
store.$patch({user: res.data})
console.log(res.data)
-
+
router.push('/main')
ElMessage.success(`鐧诲綍鎴愬姛`)
} else {
@@ -77,16 +77,16 @@
}
})
}
-
+
function register() {
router.push({
path: '/register',
})
}
-
+
let loginLoadings = ref(false)
let registerLoadings = ref(false)
-
+
const keyDown = (e) => {
// 鍥炶溅鍒欐墽琛岀櫥褰曟柟娉� enter閿殑ASCII鏄�13
if (e.keyCode == 13 || e.keyCode == 100) {
@@ -100,7 +100,7 @@
window.removeEventListener('keydown', keyDown)
})
</script>
-
+
<template>
<div class="mainDiv">
<div id="main-login">
@@ -155,29 +155,29 @@
@click="register"
plain>娉ㄥ唽
</el-button>
-
+
</el-form-item>
</div>
</el-form>
</div>
</div>
-
+
</div>
</template>
-
+
<style scoped>
.mainDiv {
overflow: hidden;
min-width: 718px;
background-image: url('../../src/assets/background.jpg');
}
-
+
#main-login {
margin: 150px auto 0 auto;
height: 70vh;
width: 80vw;
}
-
+
#img-div {
width: 55%;
height: 100%;
@@ -186,12 +186,12 @@
align-items: center;
float: left;
}
-
+
#img-pic {
max-height: 90%;
max-width: 100%;
}
-
+
#div-login {
margin-top: 5%;
/* margin-top: 20%; */
@@ -204,22 +204,22 @@
border-radius: 4px;
box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0), 0 6px 5px 0 rgba(0, 0, 0, 0.19);
}
-
+
#center {
margin-top: -30px;
}
-
+
.el-form {
width: 60%;
margin: 20% auto auto;
}
-
+
#submitForm {
display: flex;
justify-content: space-evenly;
margin-top: 2rem;
}
-
+
:deep(.el-form-item__content) {
flex: unset;
}
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 49db7d7..3c5e868 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -22,9 +22,9 @@
// import http from "@/http/index";
let ruleForm = ref({
- // engineeringId: '',
+ projectNo: '',
workstationId: '',
- patternHeigth: '',
+ patternHeight: '',
patternWidth: '',
filmsId: '',
patternThickness: '',
@@ -62,16 +62,18 @@
}
};
request.get("/loadGlass/LoadGlass/list").then((res) => {
+ window.localStorage.setItem('patternWidth', res.data.patternWidth)
+ window.localStorage.setItem('workstationId', res.data.workstationId)
if (res.code == 200) {
console.log(res.data);
tableDataa.value = res.data
- window.localStorage.setItem('patternWidth', res.data.patternWidth)
- window.localStorage.setItem('workstationId', res.data.workstationId)
- let workstationIda = window.localStorage.getItem('workstationId')
+ console.log(res.data.patternWidth);
+
+ let workstationId = window.localStorage.getItem('workstationId')
let patternWidth = window.localStorage.getItem('patternWidth')
- if (patternWidth !== '' || workstationIda == '1') {
+ if (patternWidth !== '' || workstationId == '1') {
flake.value = true
- } else if (patternWidth !== '' || workstationIda == '2') {
+ } else if (patternWidth !== '' || workstationId == '2') {
flakea.value = true
}
} else {
@@ -82,6 +84,10 @@
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
processType: [],
+
+})
+const titleSelectJsona = ref({
+ processTypea: [],
})
// const getBasicData = ref({
@@ -108,6 +114,7 @@
};
// 鍝嶅簲寮忔暟鎹�
const selectedProjectNo = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
+const selectedProjectNoa = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
const options = ref<any[]>([]); // 涓嬫媺閫夐」鍒楄〃
// 璋冪敤鎺ュ彛鑾峰彇閫夐」鏁版嵁鐨勫嚱鏁�
@@ -121,12 +128,6 @@
if (response.code == 200) {
titleSelectJson.value.processType = response.data;
-
- // titleSelectJson.value.processType = response.data(item => ({
- // // options.value = response.data.data.map(item => ({
- // value: item.projectNo,
- // // label: item.id // 鍋囪鍚庣杩斿洖鐨勬暟鎹腑鏈� 瀛楁浣滀负鏄剧ず鏍囩
- // }));
console.log(response.data);
} else {
@@ -136,7 +137,22 @@
console.error('Error fetching options:', error);
}
};
-
+ // 寮�濮嬩笂鐗囦笅鎷夐��
+const fetchOptionsa = async (queryString: string) => {
+ try {
+ // 鍙戦�佽姹傚埌鍚庣鎺ュ彛
+ const response = await request.get('/loadGlass/engineering/engineering/selectTask');
+ if (response.code == 200) {
+ titleSelectJsona.value.processTypea = response.data;
+ console.log(response.data);
+
+ } else {
+ ElMessage.warning(response.data);
+ }
+ } catch (error) {
+ console.error('Error fetching options:', error);
+ }
+};
// 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
const handleInputChange = async (value: string) => {
if (value) {
@@ -145,13 +161,23 @@
options.value = []; // 娓呯┖閫夐」鍒楄〃
}
};
-
+ // 澶勭悊鐢ㄦ埛杈撳叆鍙樺寲鐨勬柟娉�
+const handleInputChangea = async (value: string) => {
+ if (value) {
+ await fetchOptionsa(value);
+ } else {
+ options.value = []; // 娓呯┖閫夐」鍒楄〃
+ }
+};
// 鍒濆鍖栧姞杞芥暟鎹紙濡傛灉闇�瑕侊級
onMounted(() => {
// 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級
fetchOptions('');
});
-
+onMounted(() => {
+ // 鍦ㄧ粍浠舵寕杞藉悗璋冪敤 fetchOptions('') 鏉ュ姞杞藉垵濮嬫暟鎹紙濡傛灉闇�瑕侊級
+ fetchOptionsa('');
+});
// const billall = () => {
// request.post("/loadGlass/optimizeProject/listByState", requestData)
// .then((res: any) => {
@@ -164,23 +190,23 @@
// }
const user = ref('');
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
-let titleUploadData = ref({
- projectNo:'',
-})
-// const engineeringId = ref('');
+// let titleUploadData = ref({
+// projectNo:'',
+// })
+const projectNo = ref('');
const workstationId = ref('');
-const patternHeigth = ref('');
+const patternHeight = ref('');
const patternWidth = ref('');
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
-
// 娣诲姞
const handleConfirm = async () => {
try {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ id: workstationId.value,
workstationId: workstationId.value,
- patternHeigth: patternHeigth.value,
+ patternHeight: patternHeight.value,
patternWidth: patternWidth.value,
filmsId: filmsId.value,
patternThickness: patternThickness.value,
@@ -190,6 +216,7 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
+ window.location.reload()
add.value = false;
window.localStorage.setItem('workstationId', response.data.workstationId)
let workstationId = window.localStorage.getItem('workstationId')
@@ -212,7 +239,7 @@
try {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
workstationId: workstationId.value,
- patternHeigth: 0,
+ patternHeight: 0,
patternWidth: 0,
filmsId: "",
patternThickness: 0,
@@ -239,30 +266,20 @@
console.error(error);
}
};
-// 寮�濮嬩笂鐗�
-const handle = async () => {
+// 閫夋嫨宸ョ▼纭
+const handleup = async () => {
try {
- let engineeringId = window.localStorage.getItem('engineeringId')
-console.log(engineeringId);
-if (engineeringId !== '') {
- const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
- engineeringId: engineeringId,
- state: 1,
+ const response = await request.post('/loadGlass/up-patten-usage/saveUpPattenUsage', {
+ engineerId: selectedProjectNo.value,
})
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
- blind.value = false;
+ window.location.reload()
+ dialogFormVisible.value = false;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
- }
- }
- else {
- ElMessage({
- type: 'info',
- message: '宸ョ▼鍙蜂笉鑳戒负绌猴紒',
- })
}
}
catch (error) {
@@ -270,6 +287,58 @@
console.error(error);
}
}
+// 寮�濮嬩笂鐗�
+const handle = async () => {
+ try {
+ const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+ engineerId: selectedProjectNoa.value,
+ state: 1,
+ })
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ window.location.reload()
+ blind.value = false;
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// const handle = async () => {
+// try {
+// let engineeringId = window.localStorage.getItem('engineeringId')
+// console.log(engineeringId);
+// if (engineeringId !== '') {
+// const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
+// engineeringId: engineerId.va,
+// state: 1,
+// })
+// if (response.code == 200) {
+// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+// ElMessage.success(response.message);
+// blind.value = false;
+// } else {
+// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+// ElMessage.error(response.msg);
+// }
+// }
+// else {
+// ElMessage({
+// type: 'info',
+// message: '宸ョ▼鍙蜂笉鑳戒负绌猴紒',
+// })
+// }
+// }
+// catch (error) {
+// // 澶勭悊閿欒
+// console.error(error);
+// }
+// }
// 鏆傚仠
const handlea = async () => {
try {
@@ -283,6 +352,7 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
+ window.location.reload()
blinda.value = false;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -301,7 +371,7 @@
console.error(error);
}
}
-// 寮�濮嬩笂鐗�
+// 鍋滄浠诲姟
const handleb = async () => {
try {
let engineeringId = window.localStorage.getItem('engineeringId')
@@ -314,6 +384,7 @@
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
+ window.location.reload()
blindb.value = false;
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
@@ -333,7 +404,24 @@
}
}
onMounted(fetchTableData);
-
+function getStatusText(state: number) {
+ switch (state) {
+ case 0:
+ return '绛夊緟涓�';
+ case 1:
+ case 2:
+ return '涓婄墖涓�';
+ case 100:
+ return '宸插畬鎴�';
+ default:
+ return '鏈煡鐘舵��';
+ }
+}
+
+function getStatusType(state: number) {
+ // 杩欓噷鍋囪鍙湁100鏃剁被鍨嬩笉鏄痵uccess锛屽叾浠栭兘鏄痵uccess
+ return state === 100 ? 'info' : 'success'; // 鏍规嵁闇�瑕佽皟鏁寸被鍨�
+}
// const open = () => {
// ElMessageBox.confirm(
// '鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -462,15 +550,39 @@
min-width="80"
prop="state"
>
- <template #default="scope">
- <el-tag type="success" >{{ scope.row.state==1?"灏辩华":"鏈氨缁�" }}</el-tag>
- </template>
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.state)">
+ {{ getStatusText(scope.row.state) }}
+ </el-tag>
+ </template>
+ <!-- <template #default="scope">
+ <el-tag type="success" >{{ scope.row.state==0?"绛夊緟涓�":"涓婄墖涓�" }}</el-tag>
+ </template> -->
</el-table-column>
</el-table>
</div>
</el-card>
- <el-dialog v-model="blind" top="30vh" width="25%" title="鏄惁寮�濮嬩笂鐗�?" >
+ <el-dialog v-model="blind" top="24vh" width="30%" title="鏄惁寮�濮嬩笂鐗囷紵" >
+ <div style="margin-left: 50px;margin-bottom: 10px;">
+ <el-form-item label="宸ョ▼鍙凤細" :required="true">
+ <el-select
+ v-model="selectedProjectNoa"
+ filterable
+ clearable
+ placeholder="璇烽�夋嫨宸ョ▼"
+ style="width: 220px"
+ @input="handleInputChangea"
+ >
+ <el-option
+ v-for="item in titleSelectJsona['processTypea']"
+ :key="item.id"
+ :label="item.engineerId"
+ :value="item.engineerId"
+ />
+ </el-select>
+ </el-form-item>
+ </div>
<template #footer>
<div id="dialog-footer">
<el-button type="primary" @click="handle">
@@ -480,6 +592,16 @@
</div>
</template>
</el-dialog>
+ <!-- <el-dialog v-model="blind" top="30vh" width="25%" title="鏄惁寮�濮嬩笂鐗�?" >
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handle">
+ 纭
+ </el-button>
+ <el-button @click="blind = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog> -->
<el-dialog v-model="blinda" top="30vh" width="25%" title="鏄惁鏆傚仠?" >
<template #footer>
<div id="dialog-footer">
@@ -510,7 +632,7 @@
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<el-table-column prop="patternWidth" align="center" label="瀹�" min-width="80" />
- <el-table-column prop="patternHeigth" align="center" label="闀�" min-width="80" />
+ <el-table-column prop="patternHeight" align="center" label="闀�" min-width="80" />
<el-table-column prop="filmsId" align="center" label="鑶滅郴" min-width="80" />
<el-table-column prop="number" align="center" label="鏁伴噺" min-width="80" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="150">
@@ -531,7 +653,7 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item label="闀匡細" :required="true" style="width: 14vw">
- <el-input v-model="patternHeigth" autocomplete="off" />
+ <el-input v-model="patternHeight" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
@@ -611,20 +733,11 @@
:value="item.projectNo"
/>
</el-select>
- <!-- <el-select v-model="getBasicData.projectNo" clearable placeholder="璇烽�夋嫨宸ョ▼" style="width: 220px"
- >
- <el-option
- v-for="item in titleSelectJson['processType']"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
- </el-select> -->
</el-form-item>
</div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="dialogFormVisible = false">
+ <el-button type="primary" @click="handleup">
纭
</el-button>
<el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
--
Gitblit v1.8.0