From 8486b85b2f8ef6b2d154b0694f220f663f62858b Mon Sep 17 00:00:00 2001
From: ag <2663588772@qq.com>
Date: Fri, 21 Mar 2025 17:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=BD=E6=98=AF=E5=92=8C=E7=8A=B6=E5=86=B5?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=89=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReportBase.js               |  25 +--
 components/materialCard.vue | 377 ++++++++++++++++++++++++++++++++++++
 conditionReport.js          |  16 ++
 equipment.js                |   2 +-
 equipmentType.js            |   2 +-
 package.json                |   3 +-
 6 files changed, 402 insertions(+), 23 deletions(-)
 create mode 100644 components/materialCard.vue

diff --git a/ReportBase.js b/ReportBase.js
index 61c1e78..75fde72 100644
--- a/ReportBase.js
+++ b/ReportBase.js
@@ -26,18 +26,7 @@ class ReportBase {
         this.suggest = params.suggest || null;
         this.environmentTemperature = params.environmentTemperature || null; //不带单位
         this.environmentHumidity = params.environmentHumidity || null; //不带单位
-        this.logo = null;
-        // this.coverLogo = `${window.GLOBAL["BASE_URL"]}/AppTemplate/conditionReport/images/reportLogo.png`;
-        // this.organizationName = params.organizationName;
-        // this.organizationEmail = 'ja.atelier@hotmail.com';
-        // this.organizationPhone = '+86-13911819084 / +33 (0)7.82.15.72.97';
-        // this.signatureInfo = {
-        //     "weChatImg": `${window.GLOBAL["BASE_URL"]}/AppTemplate/conditionReport/images/erm.png`,
-        //     "signer": "Jia Peng",
-        //     "signerInfo":"Conservator - Restorer of the cultural heritage recognized by the Direction of the museums of France (D.M.F)\n" +
-        //         "Professor of Conservation-Restoration & Material research of Art of Guangzhou Academy of Fine Art (GAFA)\n" +
-        //         "Director of Guangdong Provincial Key Laboratory of Conservation-Restoration & Materials Research of Artworks"
-        // }
+        this.equipmentData = []; //科学分析-设备数据关联
     }
 
     setAttribute(reportBase) {
@@ -95,18 +84,10 @@ class ReportBase {
         this.coverImage = imageSrc;
     }
 
-    setConditionTypes(val) {
-        this.conditionTypes = val || [];
-    }
-
     setConditionImageList(fileList) {
         this.conditionImageList = fileList;
     }
 
-    /*  setImagesLegend(imgSrc, legend) {
-    this.conditionMapping["images"] = imgSrc;
-    this.conditionMapping["legend"] = legend;
-  }*/
     setConditionMapping(items) {
         this.conditionMapping = items;
     }
@@ -155,6 +136,10 @@ class ReportBase {
             };
         }
     }
+
+    setEquipmentData(equDataIds) {
+        this.equipmentData = equDataIds;
+    }
 }
 
 export default ReportBase;
diff --git a/components/materialCard.vue b/components/materialCard.vue
new file mode 100644
index 0000000..06f05c8
--- /dev/null
+++ b/components/materialCard.vue
@@ -0,0 +1,377 @@
+<template>
+    <div>
+        <el-card
+            style="width: 200px; position: relative"
+            v-if="materialId">
+            <div
+                v-if="materialId"
+                title="取消"
+                class="icon-button"
+                @click="clear">
+                <el-icon>
+                    <CircleCloseFilled />
+                </el-icon>
+            </div>
+
+            <el-image
+                fit="contain"
+                style="width: 100px; height: 100px"
+                :src="material.imageUrlPreviewPath">
+                <template #error>
+                    <div class="image-slot">暂无图片</div>
+                </template>
+            </el-image>
+            <div>
+                <div
+                    :title="materialType.name"
+                    class="material-type">
+                    类型：{{ materialType.name }}
+                </div>
+                <div
+                    :title="material.name"
+                    class="material-name">
+                    名称：{{ material.name }}
+                </div>
+            </div>
+        </el-card>
+        <el-dialog
+            style="height: 80vh"
+            width="70%"
+            append-to-body
+            lock-scroll
+            :close-on-click-modal="false"
+            v-model="dialogVisible"
+            title="请选择材料">
+            <div
+                class="search-warp"
+                style="margin-bottom: 10px">
+                <el-select
+                    @change="onClickSearch"
+                    v-model="search.type"
+                    @clear="removeSearch"
+                    class="search-item search-input"
+                    clearable
+                    placeholder="选择材料类型">
+                    <el-option
+                        v-for="item in materialTypeList"
+                        :value="item.id"
+                        :label="item.name"></el-option>
+                </el-select>
+                <el-input
+                    class="search-item search-input"
+                    clearable
+                    @keyup.enter.native="onClickSearch"
+                    @clear="removeSearch"
+                    v-model="search.name"
+                    placeholder="请输入名称查询"
+                    suffix-icon="search"></el-input>
+            </div>
+            <div class="div-content">
+                <el-card
+                    v-for="material in materialList"
+                    :class="{ 'is-selected': material.isSelected }"
+                    @click="selectMaterial(material)"
+                    @dblclick="dbSelectMaterial(material)"
+                    :title="material.description">
+                    <el-image
+                        fit="contain"
+                        style="width: 200px; height: 200px"
+                        :src="material.imageUrlPreviewPath">
+                        <template #error>
+                            <div class="image-slot">
+                                &lt;!&ndash;
+                                <el-icon><Picture /></el-icon>
+                                &ndash;&gt; 暂无图片
+                            </div>
+                        </template>
+                    </el-image>
+                    <template #footer>
+                        <div class="card-footer">
+                            <div
+                                :title="materialType.name"
+                                class="title-material-type">
+                                类型：{{ materialType.name }}
+                            </div>
+                            <div
+                                :title="material.name"
+                                class="title-material-name">
+                                名称：{{ material.name }}
+                            </div>
+                        </div>
+                    </template>
+                </el-card>
+            </div>
+            <template #footer>
+                <el-button @click="clickCancel">取消</el-button>
+                <el-button
+                    type="primary"
+                    @click="confirm">
+                    确定
+                </el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import ArtSystem from '../artSystem.js';
+import { CircleClose, CircleCloseFilled } from '@element-plus/icons-vue';
+export default {
+    name: 'materialCard',
+    emits: ['confirm'],
+    components: { CircleCloseFilled, CircleClose },
+    props: {
+        modelValue: Boolean,
+        currentMaterial: Object, //cellsysArt的Material对象
+        materialId: Number,
+    },
+    computed: {
+        dialogVisible: {
+            get() {
+                return this.modelValue;
+            },
+            set(val) {
+                this.$emit('update:modelValue', val);
+            },
+        },
+        materialType() {
+            if (this.material && this.material.materialType) {
+                return this.material.materialType;
+            } else {
+                return {};
+            }
+        },
+    },
+
+    data() {
+        return {
+            listQuery: {
+                total: 0,
+                currPage: 1,
+                pageSize: 10,
+                filter: [],
+                listLoading: false,
+            },
+            search: {
+                name: null,
+                type: null,
+            },
+            materialTypeList: [],
+            materialList: [],
+            material: {},
+            activeName: null,
+        };
+    },
+    created() {
+        if (this.currentMaterial) {
+            this.material = this.currentMaterial;
+        } else {
+            this.queryMaterialList();
+        }
+        this.queryMaterialType();
+    },
+    methods: {
+        clickCancel() {
+            this.material = null;
+            this.dialogVisible = false;
+        },
+        confirm() {
+            if (!this.material) {
+                return this.$message({
+                    type: 'warning',
+                    message: '还未选择材料',
+                });
+            }
+            this.$emit('confirm', this.material.id);
+            this.dialogVisible = false;
+        },
+        clear() {
+            this.material = null;
+            this.$emit('confirm', null);
+        },
+        selectMaterial(material) {
+            // 更新选中状态，这里假设你只想单选
+            this.materialList.forEach((mat) => {
+                mat.isSelected = mat.id === material.id;
+            });
+            this.material = material;
+        },
+        dbSelectMaterial(material) {
+            this.material = material;
+            this.$emit('confirm', this.material.id);
+            this.dialogVisible = false;
+        },
+        onClickSearch() {
+            let filter = [];
+            let { name, type } = this.search;
+            if (name) {
+                filter.push({
+                    name: 'name',
+                    operator: 'like',
+                    value: name,
+                });
+            }
+
+            if (type) {
+                filter.push({
+                    name: 'material_type_id',
+                    operator: '=',
+                    value: type,
+                });
+            }
+            this.listQuery.filter = filter;
+            this.queryMaterialList(filter);
+        },
+        removeSearch() {
+            this.queryMaterialList();
+        },
+
+        queryMaterialType() {
+            let params = {
+                pageInfo: {
+                    pageSize: 0,
+                    currPage: 0,
+                },
+            };
+            ArtSystem.queryMaterialType(params).then((response) => {
+                this.materialTypeList = response.data;
+            });
+        },
+        queryMaterialList(filter) {
+            let params = {
+                pageInfo: {
+                    pageSize: 0,
+                    currPage: 0,
+                },
+                filter: filter,
+                order: { id: 'desc' },
+            };
+            ArtSystem.queryMaterial(params).then((response) => {
+                this.materialList = response.data;
+                if (this.materialId) {
+                    this.material = this.materialList[0];
+                }
+            });
+        },
+    },
+};
+</script>
+<style scoped>
+.icon-button {
+    position: absolute;
+    top: 0;
+    right: 5px;
+    cursor: pointer;
+    font-size: 20px;
+    color: #dd2c00;
+}
+
+.search-warp {
+    display: inline-block;
+    margin-bottom: 7px;
+
+    & .search-item {
+        display: inline-block;
+
+        & + .search-item {
+            margin-left: 15px;
+        }
+    }
+
+    & .search-input {
+        border-radius: 30px;
+        width: 15rem;
+    }
+
+    & .search-input {
+        .el-input__wrapper {
+            border-radius: 30px;
+            width: 100%;
+        }
+
+        .el-select__wrapper {
+            border-radius: 30px;
+            width: 100%;
+        }
+    }
+
+    & .el-range-editor.el-input__wrapper {
+        margin-left: 15px;
+        border-radius: 30px;
+    }
+}
+
+.div-content {
+    height: calc(100% - 44px);
+    display: flex;
+    flex-wrap: wrap;
+    overflow-y: auto;
+    min-height: 40vh;
+}
+
+:deep(.el-tab-pane) {
+    height: 100%;
+}
+
+.el-card {
+    margin: 10px;
+    width: 300px;
+    height: 300px;
+    text-align: center;
+}
+
+/* 添加选中状态的样式 */
+.el-card.is-selected {
+    border-color: #409eff; /* Element UI主题色的蓝色 */
+    box-shadow: 0 0 10px #409eff;
+}
+
+.card-footer {
+    display: flex;
+    justify-content: space-between;
+}
+
+.title-material-type {
+    width: 50%;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1; /* 限制显示的行数 */
+    overflow: hidden;
+}
+
+.title-material-name {
+    width: 50%;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1; /* 限制显示的行数 */
+    overflow: hidden;
+}
+
+.image-slot {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+    background: var(--el-fill-color-light);
+    color: var(--el-text-color-secondary);
+    font-size: 30px;
+}
+
+.material-type {
+    text-align: left;
+    width: 100%;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1; /* 限制显示的行数 */
+    overflow: hidden;
+}
+
+.material-name {
+    text-align: left;
+    width: 100%;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1; /* 限制显示的行数 */
+    overflow: hidden;
+}
+</style>
diff --git a/conditionReport.js b/conditionReport.js
index 9a1897d..5966041 100644
--- a/conditionReport.js
+++ b/conditionReport.js
@@ -2,6 +2,7 @@ import { artApi } from './artApi';
 import { formatterMillisecond } from './utils/date';
 import { Query, QueryTask, EditTask } from './artUtil';
 import CellsysArt from './cellsysArt';
+import ArtSystem from './artSystem';
 
 class ConditionReport {
     constructor(params) {
@@ -104,6 +105,21 @@ class ConditionReport {
         editTask.addParam('_id', params.id);
         return editTask.execute();
     }
+
+    //查询状况检查关联的设备数据记录
+    //查询设备数据
+    queryEquipmentDatas(params = {}) {
+        let { filter, pageInfo } = params;
+        if (!filter) {
+            filter = [];
+        }
+        filter.push({
+            name: 'condition_check_id',
+            operator: '=',
+            value: this.id,
+        });
+        return ArtSystem.viewArtworkEquipmentData({ filter, pageInfo });
+    }
 }
 
 export default ConditionReport;
diff --git a/equipment.js b/equipment.js
index 35d2422..80750f3 100644
--- a/equipment.js
+++ b/equipment.js
@@ -36,7 +36,7 @@ class Equipment {
         editTask.addParam('_manufacture', params.manufacturers);
         editTask.addParam('_number', params.serialNumber);
         editTask.addParam('_model', params.equipmentModel);
-        editTask.addParam('_laboratory_id', params.laboratoryAddress);
+        editTask.addParam('_laboratory_id', params.laboratoryId);
         editTask.addParam('_name', params.name);
 
         return new Promise((resolve, reject) => {
diff --git a/equipmentType.js b/equipmentType.js
index 02a0578..c633c43 100644
--- a/equipmentType.js
+++ b/equipmentType.js
@@ -80,7 +80,7 @@ class ArtworkEquipmentType {
         editTask.addParam('_manufacture', params.manufacturers);
         editTask.addParam('_number', params.serialNumber);
         editTask.addParam('_model', params.equipmentModel);
-        editTask.addParam('_laboratory_id', params.laboratoryAddress);
+        editTask.addParam('_laboratory_id', params.laboratoryId);
         editTask.addParam('_name', params.name);
 
         return new Promise((resolve, reject) => {
diff --git a/package.json b/package.json
index af5fb5e..4e95f60 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@airkoon/cellsysArt",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
@@ -12,6 +12,7 @@
         "axios": "^1.4.0",
         "dayjs": "~1.10.6",
         "element-plus": "^2.3.7",
+        "@element-plus/icons-vue": "^2.3.1",
         "@amap/amap-jsapi-loader": "~1.0.1",
         "vue-signature-pad": "^3.0.2",
         "vue-qrcode": "^2.2.2"