Merge branch 'qhse_person' of shuzhihua/pms-iot-vue into master

src/api/iot/thingmodel/index.ts

@@ -186,7 +186,7 @@ export const ThingModelApi = {
 
   // 新增产品物模型
   createThingModel: async (data: ThingModelData) => {
-    return await request.post({ url: `/iot/thing-model/create`, data })
+    return await request.post({ url: `/iot/thing-model-common/create`, data })
   },
 
   // 修改产品物模型
@@ -299,3 +299,48 @@ export const validateBoolName = (_: any, value: string, callback: any) => {
 
   callback()
 }
+
+// 通用物模型
+export const ThingModelCommon = {
+  // 查询产品物模型分页
+  getCommonThingModelPage: async (params: any) => {
+    return await request.get({ url: `/iot/thing-model-common/page`, params })
+  },
+
+  // 创建通用物模型
+  createCommonThingModel: async (data) => {
+    return await request.post({ url: `/iot/thing-model-common/create`, data })
+  },
+
+  // 删除通用物模型
+  deleteCommonThingModel: async (id: number) => {
+    return await request.delete({ url: `/iot/thing-model-common/delete?id=` + id })
+  },
+
+  // 编辑通用物模型
+  updateCommonThingModel: async (data) => {
+    return await request.put({ url: `/iot/thing-model-common/update`, data })
+  },
+
+  // 查询通用物模型详情
+  getCommonThingModel: async (id: number) => {
+    return await request.get({ url: `/iot/thing-model-common/get?id=` + id })
+  },
+
+  // 导出
+  exportCommonThingModel: async (params: any) => {
+    return await request.get({ url: `/iot/thing-model-common/export`, params })
+  }
+}
+
+/** 通用物模型 */
+export interface CommonThingModelData {
+  id?: number
+  identifier?: string
+  name?: string
+  description?: string
+  type?: number
+  property?: string
+  event?: string
+  service?: string
+}

src/views/iot/thingmodel/ThingModelForm.vue

@@ -6,15 +6,13 @@
       v-loading="formLoading"
       :model="formData"
       :rules="ThingModelFormRules"
-      label-width="100px"
-    >
+      label-width="100px">
       <el-form-item label="功能类型" prop="type">
         <el-radio-group v-model="formData.type">
           <el-radio-button
             v-for="dict in getIntDictOptions(DICT_TYPE.IOT_THING_MODEL_TYPE)"
             :key="dict.value"
-            :value="dict.value"
-          >
+            :value="dict.value">
             {{ dict.label }}
           </el-radio-button>
         </el-radio-group>
@@ -28,26 +26,22 @@
       <!-- 属性配置 -->
       <ThingModelProperty
         v-if="formData.type === IoTThingModelTypeEnum.PROPERTY"
-        v-model="formData.property"
-      />
+        v-model="formData.property" />
       <!-- 服务配置 -->
       <ThingModelService
         v-if="formData.type === IoTThingModelTypeEnum.SERVICE"
-        v-model="formData.service"
-      />
+        v-model="formData.service" />
       <!-- 事件配置 -->
       <ThingModelEvent
         v-if="formData.type === IoTThingModelTypeEnum.EVENT"
-        v-model="formData.event"
-      />
+        v-model="formData.event" />
       <el-form-item label="描述" prop="description">
         <el-input
           v-model="formData.description"
           :maxlength="200"
           :rows="3"
           placeholder="请输入属性描述"
-          type="textarea"
-        />
+          type="textarea" />
       </el-form-item>
     </el-form>
 
@@ -143,8 +137,8 @@ const submitForm = async () => {
   try {
     const data = cloneDeep(formData.value) as ThingModelData
     // 信息补全
-    data.productId = product!.value.id
-    data.productKey = product!.value.productKey
+    // data.productId = product!.value.id
+    // data.productKey = product!.value.productKey
     fillExtraAttributes(data)
     if (formType.value === 'create') {
       await ThingModelApi.createThingModel(data)

src/views/pms/qhse/deviceCert/DeviceCertForm.vue

@@ -57,8 +57,8 @@
 
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="证书编号" prop="certNo">
-            <el-input v-model="formData.certNo" placeholder="请输入证书编号" />
+          <el-form-item label="序列号" prop="certNo">
+            <el-input v-model="formData.certNo" placeholder="请输入序列号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -263,7 +263,7 @@ const formRules = reactive({
   deviceId: [{ required: true, message: '关联设备不能为空', trigger: 'blur' }],
   deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
   deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
-  certNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
+  certNo: [{ required: true, message: '序列号不能为空', trigger: 'blur' }],
   certOrg: [{ required: true, message: '检测单位不能为空', trigger: 'blur' }],
   certTime: [{ required: true, message: '检测日期不能为空', trigger: 'blur' }],
   certExpire: [{ required: true, message: '有效期不能为空', trigger: 'blur' }],

src/views/pms/qhse/deviceCert/index.vue

@@ -38,10 +38,10 @@
                 :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="证书编号" prop="certNo">
+          <el-form-item label="序列号" prop="certNo">
             <el-input
               v-model="queryParams.certNo"
-              placeholder="请输入证书编号"
+              placeholder="请输入序列号"
               clearable
               class="!w-150px" />
           </el-form-item>
@@ -127,7 +127,7 @@
                   <dict-tag :type="DICT_TYPE.QHSE_DEVICE_CERT_TYPE" :value="scope.row.certType" />
                 </template>
               </zm-table-column>
-              <zm-table-column label="证书编号" align="center" prop="certNo" />
+              <zm-table-column label="序列号" align="center" prop="certNo" />
               <zm-table-column label="检测日期" align="center" prop="certTime" width="140">
                 <template #default="scope">
                   <span class="iot-md-date">{{ formatDateCorrectly(scope.row.certTime) }}</span>
@@ -254,6 +254,7 @@ const queryParams = reactive({
   deviceId: undefined,
   deviceName: undefined,
   certNo: undefined,
+
   certOrg: undefined,
   certTime: [],
   certExpire: undefined,