From e87846bfc7e467836d958632b15a22a901eb51d2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 09 一月 2025 15:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/component/BasicInfo.vue | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
index cd47875..4c29669 100644
--- a/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
+++ b/src/views/projectEngineering/projectLibrary/component/BasicInfo.vue
@@ -14,7 +14,18 @@
</el-form-item>
</el-col>
<el-col :span="12" style="position: relative">
- <div style="width: 150px; position: absolute;"><img alt="" src="../../../../assets/images/s.png"/></div>
+ <div style="width: 100%; height: 100%; position: absolute;">
+ <el-form-item class="item" label="璧嬬爜" label-width="50px" prop="coding">
+ <template slot-scope="scope">
+ <!-- <div class="yellow-dot" v-if="scope.row.coding === 'yellow'"></div>-->
+ <!-- <div class="green-dot" v-if="scope.row.coding === 'green'"></div>-->
+ <!-- <div class="red-dot" v-if="scope.row.coding === 'red'"></div>-->
+ <div class="red-dot"></div>
+ <tag-list></tag-list>
+ </template>
+ </el-form-item>
+ <!-- <img alt="" src="../../../../assets/images/s.png"/>-->
+ </div>
</el-col>
</el-row>
<el-row :gutter="20">
@@ -294,6 +305,7 @@
<script>
// import Upload from '@element-plus/icons-vue/dist/Upload.vue';
import Map from '@/views/components/Map/index.vue';
+import TagList from "./TagList.vue";
// import MapMouseEvent from '@/views/components/Map/types';
// import UploadStandard from '@/components/uploadStandard.vue';
// import { usePlanLibrary } from '@/hooks/detailsInformation';
@@ -304,10 +316,12 @@
import {approvalList} from "@/api/system/dept";
export default {
+ name: 'BasicInfo',
dicts: ['sys_funding_type', 'sys_investment_type', 'sys_project_type', 'sys_project_status', 'sys_competent_department'
, 'sys_administrative_divisions', 'sys_centralized_management', 'sys_approval_type', 'sys_key_categories', 'sys_annual_plan'],
components: {
Map,
+ TagList,
// UploadStandard,
// RemoteSelect
},
@@ -421,6 +435,7 @@
getProject(id).then(res => {
this.projectForm = res.data;
this.$emit('updateIsShow', true);
+
});
},
getApprovalList() {
@@ -428,9 +443,10 @@
this.approvalList = res.data;
});
},
- submit() {
+ submit(usedStatus) {
this.$refs["projectForm"].validate(valid => {
if (valid) {
+ this.projectForm.usedStatus = usedStatus;
if (this.projectForm.id) {
updateProject(this.projectForm).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -508,7 +524,7 @@
this.$message.success('鑾峰彇鍦板潃鎴愬姛');
this.dialogMap = false;
} else {
- this.$message.error('鑾峰彇鍧愭爣澶辫触');
+ this.$message.error('璇峰厛鐐瑰嚮鍦板浘閫夋嫨鍦板潃');
}
},
@@ -530,6 +546,7 @@
this.largeCategory = labels.join(',');
}
}, 1000);
+ this.$emit('basicInfoForm', newVal)
},
deep: true
}
@@ -570,4 +587,28 @@
width: 20px;
}
}
+
+.yellow-dot {
+ width: 10px; /* 鍦嗙偣鐨勫搴� */
+ height: 10px; /* 鍦嗙偣鐨勯珮搴� */
+ background-color: yellow; /* 鍦嗙偣鐨勯鑹� */
+ border-radius: 50%; /* 浣垮厓绱犲彉鎴愬渾褰� */
+ display: inline-block; /* 纭繚鍏冪礌鍙互鍜屽叾浠栧唴鑱斿厓绱犱竴璧锋樉绀� */
+}
+
+.red-dot {
+ width: 10px; /* 鍦嗙偣鐨勫搴� */
+ height: 10px; /* 鍦嗙偣鐨勯珮搴� */
+ background-color: red; /* 鍦嗙偣鐨勯鑹� */
+ border-radius: 50%; /* 浣垮厓绱犲彉鎴愬渾褰� */
+ display: inline-block; /* 纭繚鍏冪礌鍙互鍜屽叾浠栧唴鑱斿厓绱犱竴璧锋樉绀� */
+}
+
+.green-dot {
+ width: 10px; /* 鍦嗙偣鐨勫搴� */
+ height: 10px; /* 鍦嗙偣鐨勯珮搴� */
+ background-color: green; /* 鍦嗙偣鐨勯鑹� */
+ border-radius: 50%; /* 浣垮厓绱犲彉鎴愬渾褰� */
+ display: inline-block; /* 纭繚鍏冪礌鍙互鍜屽叾浠栧唴鑱斿厓绱犱竴璧锋樉绀� */
+}
</style>
--
Gitblit v1.8.0