From dd64761e7b1c7d4f894b74df2fb7f9df07f4c848 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 11 十月 2023 15:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/package.json | 2 +-
Source/UBCS-WEB/src/views/wel/Statistic.vue | 6 +++---
Source/UBCS-WEB/src/views/integration/systemInfo.vue | 2 +-
Source/UBCS-WEB/src/views/wel/index.vue | 8 ++++----
Source/UBCS-WEB/src/views/modeling/Version.vue | 20 +++++++++++++-------
5 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/package.json b/Source/UBCS-WEB/package.json
index a168825..8553d6c 100644
--- a/Source/UBCS-WEB/package.json
+++ b/Source/UBCS-WEB/package.json
@@ -24,7 +24,7 @@
"js-pinyin": "^0.2.4",
"mockjs": "^1.0.1-beta3",
"moment": "^2.29.4",
- "node-gyp": "^5.0.6",
+ "node-gyp": "^4.0.0",
"nprogress": "^0.2.0",
"portfinder": "^1.0.23",
"script-loader": "^0.7.2",
diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index ab7958a..5f769cd 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
@@ -386,7 +386,7 @@
type: 'success',
message: '鍒犻櫎鎴愬姛!'
});
- this.getDataList()
+ await this.getDataList()
}
})
},
diff --git a/Source/UBCS-WEB/src/views/modeling/Version.vue b/Source/UBCS-WEB/src/views/modeling/Version.vue
index f1fc3ae..a401e5e 100644
--- a/Source/UBCS-WEB/src/views/modeling/Version.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Version.vue
@@ -182,13 +182,19 @@
})
},
rowUpdate(row, index, done, loading) {
- update(row).then(() => {
- this.$message.success('淇敼鎴愬姛')
- done()
- this.getList();
- }).catch(() => {
- loading()
- })
+ console.log(row);
+ const date = new Date(row.ts);
+ const formattedDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}:${date.getSeconds().toString().padStart(2, '0')}.${date.getMilliseconds().toString().padStart(3, '0')}`;
+ row.ts = formattedDate;
+ update(row)
+ .then(() => {
+ this.$message.success('淇敼鎴愬姛');
+ done();
+ this.getList();
+ })
+ .catch(() => {
+ loading();
+ });
},
rowDel(row) {
this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎, 鏄惁缁х画?', '鎻愮ず', {
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index 0341d74..f9f822f 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -38,11 +38,11 @@
},
{
click: this.handleItemCClick,
- title: '涓婚搴撳畾涔�',
+ title: 'Part',
count: 523,
icon: 'el-icon-setting',
color: 'rgb(117, 56, 199)',
- uiUrl:'/modeling/classifyTree',
+ uiUrl:'/MasterData/items?id=10@@name=Part',
countUrl:'priceIndexController/countNeedFeedbackPlan'
},
{
@@ -72,7 +72,7 @@
this.$router.push({ path: '/MasterData/items?id=renyuan@@name=浜哄憳涓绘暟鎹�'} );
},
handleItemCClick() {
- this.$router.push({ path: '/modeling/classifyTree'} );
+ this.$router.push({ path: '/MasterData/items?id=10@@name=Part'} );
},
handleItemDClick() {
this.$router.push({ path: '/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁'} );
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index b97532d..d08f5a8 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -243,10 +243,10 @@
this.dialogFormVisible = true
}, 1500)
} else if (res.data.data == 0) {
- this.$message({
- type: 'success',
- message: "鎿嶄綔鎴愬姛"
- })
+ // this.$message({
+ // type: 'success',
+ // message: "鎿嶄綔鎴愬姛"
+ // })
}
}).catch(res => {
console.log(res)
--
Gitblit v1.9.3