Jelajahi Sumber

qhse看板证书穿透

yanghao 5 hari lalu
induk
melakukan
a08865f64e

+ 1 - 1
.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.200:48080  https://iot.deepoil.cc:5443  http://172.26.0.56:48080  http://192.168.188.198:48080
-VITE_BASE_URL='https://iot.deepoil.cc:5443'
+VITE_BASE_URL='http://192.168.188.198:48080'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

+ 2 - 4
src/views/iot/commonThing/CommonThingModelForm.vue

@@ -83,6 +83,7 @@
           <v-ace-editor
             v-model:value="formData.service"
             lang="json"
+            theme="monokai"
             class="json-editor"
             :options="editorOptions" />
         </div>
@@ -114,11 +115,8 @@ const formType = ref('')
 const formRef = ref()
 const editorOptions = {
   useWorker: true,
-  tabSize: 2,
-  fontSize: 14,
-  wrap: true,
-  showPrintMargin: false,
   enableBasicAutocompletion: true,
+  enableSnippets: true,
   enableLiveAutocompletion: true
 }
 

+ 20 - 32
src/views/iot/commonThing/index.vue

@@ -9,7 +9,7 @@
       <el-form-item label="功能类型" prop="type">
         <el-select
           v-model="queryParams.type"
-          class="!w-240px"
+          class="!w-150px"
           clearable
           placeholder="请选择功能类型"
           @change="handleQuery">
@@ -23,7 +23,7 @@
       <el-form-item label="功能名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          class="!w-240px"
+          class="!w-150px"
           clearable
           placeholder="请输入功能名称"
           @keyup.enter="handleQuery" />
@@ -31,7 +31,7 @@
       <el-form-item label="功能标识" prop="identifier">
         <el-input
           v-model="queryParams.identifier"
-          class="!w-240px"
+          class="!w-150px"
           clearable
           placeholder="请输入功能标识"
           @keyup.enter="handleQuery" />
@@ -54,49 +54,37 @@
   </ContentWrap>
 
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" label="功能类型" prop="type" width="120">
+    <zm-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <zm-table-column align="center" label="功能类型" prop="type" width="120">
         <template #default="{ row }">
           <dict-tag :type="DICT_TYPE.IOT_THING_MODEL_TYPE" :value="row.type" />
         </template>
-      </el-table-column>
-      <el-table-column align="center" label="功能名称" prop="name" min-width="180" />
-      <el-table-column align="center" label="功能标识" prop="identifier" min-width="180" />
-      <el-table-column align="center" label="描述" prop="description" min-width="220" />
-      <el-table-column align="left" label="属性" min-width="240" show-overflow-tooltip>
+      </zm-table-column>
+      <zm-table-column align="center" label="功能名称" prop="name" min-width="180" />
+      <zm-table-column align="center" label="功能标识" prop="identifier" min-width="180" />
+      <zm-table-column align="center" label="描述" prop="description" min-width="220" />
+      <zm-table-column align="left" label="属性" min-width="240" show-overflow-tooltip>
         <template #default="{ row }">
           {{ row.property || '-' }}
         </template>
-      </el-table-column>
-      <el-table-column align="left" label="事件" min-width="240" show-overflow-tooltip>
+      </zm-table-column>
+      <zm-table-column align="left" label="事件" min-width="240" show-overflow-tooltip>
         <template #default="{ row }">
           {{ row.event || '-' }}
         </template>
-      </el-table-column>
-      <el-table-column align="left" label="服务" min-width="240" show-overflow-tooltip>
+      </zm-table-column>
+      <zm-table-column align="left" label="服务" min-width="240" show-overflow-tooltip>
         <template #default="{ row }">
           {{ row.service || '-' }}
         </template>
-      </el-table-column>
-      <el-table-column align="center" label="操作" width="160" fixed="right">
+      </zm-table-column>
+      <zm-table-column align="center" label="操作" action width="160" fixed="right">
         <template #default="{ row }">
-          <el-button
-            v-hasPermi="['iot:thing-model-common:update']"
-            link
-            type="primary"
-            @click="openForm('update', row.id)">
-            编辑
-          </el-button>
-          <el-button
-            v-hasPermi="['iot:thing-model-common:delete']"
-            link
-            type="danger"
-            @click="handleDelete(row.id)">
-            删除
-          </el-button>
+          <el-button link type="primary" @click="openForm('update', row.id)"> 编辑 </el-button>
+          <el-button link type="danger" @click="handleDelete(row.id)"> 删除 </el-button>
         </template>
-      </el-table-column>
-    </el-table>
+      </zm-table-column>
+    </zm-table>
 
     <Pagination
       v-model:limit="queryParams.pageSize"