admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat' into jiayu-dev

Browse Source
This commit is contained in:
jiayu 2025-06-10 11:46:40 +08:00
commit a4a5d00232
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/equipmentCenter/tunnelBoringMachine/deviceManage.vue
View File

@ -56,7 +56,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="进洞时间">
<el-date-picker v-model="formData.installationTime" type="date" placeholder="选择日期"> </el-date-picker>
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="formData.installationTime" type="datetime" placeholder="选择日期"> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">

5
src/views/projectFront/aiAnalysis/dealPushManage.vue
View File

@ -634,7 +634,10 @@ export default {
submitDealForm() {
this.$refs["dealForm"].validate((valid) => {
if (valid) {
let params = Object.assign({}, this.dealForm);
let params = Object.assign({}, {
...this.dealForm,
projectSn: this.$store.state.projectSn,
});
if(this.dealForm.fileList.length > 0) {
params.imageUrl = this.dealForm.fileList[0].name;
}