From 6a66b6e4bbd09d98e71cb74709ad0fcf65663062 Mon Sep 17 00:00:00 2001
From: eric777 <wujiahan_vip@163.com>
Date: Fri, 26 Jan 2024 16:56:38 +0800
Subject: [PATCH] =?UTF-8?q?jiahan.wu=20[cr]=20=E8=AE=BE=E5=A4=87=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=AF=BC=E5=85=A5=E6=A8=A1=E5=9D=97=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=201.=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=94=B1=E6=96=87=E6=9C=AC=E6=A1=86=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/tbserverinfo.js              |  8 ++++
 src/views/model/deviceImportInfo/index.vue | 54 ++++++++++++++++------
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/api/model/tbserverinfo.js b/src/api/model/tbserverinfo.js
index 2c8cb1d..d48bb80 100644
--- a/src/api/model/tbserverinfo.js
+++ b/src/api/model/tbserverinfo.js
@@ -50,4 +50,12 @@ export function exportTbserverinfo(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询TB服务信息
+export function queryTbserverinfoList() {
+  return request({
+    url: '/model/dcBusiServerinfo/select/list',
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/src/views/model/deviceImportInfo/index.vue b/src/views/model/deviceImportInfo/index.vue
index 86b7001..0d05e97 100644
--- a/src/views/model/deviceImportInfo/index.vue
+++ b/src/views/model/deviceImportInfo/index.vue
@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="组织编码" prop="orgCode">
         <el-tree-select v-model="queryParams.orgCode" :data="deptOptions"
-                        :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择"
+                        :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择组织编码"
                         check-strictly :default-expand-all="true" />
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
@@ -22,13 +22,17 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="服务配置ID" prop="issServerconfid">
-        <el-input
-                v-model="queryParams.issServerconfid"
-                placeholder="请输入服务配置ID"
-                clearable
-                @keyup.enter="handleQuery"
-        />
+      <el-form-item label="服务配置" prop="issServerconfid">
+        <el-select
+                v-model="queryParams.issServerconfid" placeholder="请选择服务配置"
+        >
+          <el-option
+                  v-for="item in tbOptions"
+                  :key="item.id"
+                  :label="item.seviceName"
+                  :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -63,7 +67,7 @@
       <el-table-column label="记录条数" align="center" prop="recordSize" />
       <el-table-column label="组织名称" align="center" prop="orgName" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
-      <el-table-column label="服务配置ID" align="center" prop="issServerconfid" />
+      <el-table-column label="服务配置" align="center" prop="issServerconfname" />
       <el-table-column label="上传时间" align="center" prop="createTime" />
       <el-table-column label="上传状态" align="center" prop="uploadStatus" :formatter="formatUploadStatus"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -105,8 +109,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="服务配置ID" prop="issServerconfid">
-              <el-input v-model="form.issServerconfid" placeholder="请输入服务配置ID" />
+            <el-form-item label="服务配置" prop="issServerconfid">
+              <el-select
+                      v-model="form.issServerconfname" placeholder="请选择服务配置" @change="tbChange"
+              >
+                <el-option
+                        v-for="item in tbOptions"
+                        :key="item.id"
+                        :label="item.seviceName"
+                        :value="item"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -155,6 +168,7 @@
 <script setup name="Info">
 import { listInfo, delInfo, exportInfo, uploadInfo } from "@/api/model/deviceImportInfo";
 import { deptTreeSelect } from "@/api/system/user";
+import { queryTbserverinfoList } from "@/api/model/tbserverinfo";
 
 const { proxy } = getCurrentInstance();
 
@@ -168,6 +182,7 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const deptOptions = ref(undefined);
+const tbOptions = ref(undefined);
 const fileList = ref([]);
 
 const props = defineProps({
@@ -221,7 +236,7 @@ const data = reactive({
       { required: true, message: "所属组织不能为空", trigger: "change" }
     ],
     issServerconfid: [
-      { required: true, message: "服务配置ID不能为空", trigger: "change" }
+      { required: true, message: "服务配置不能为空", trigger: "change" }
     ],
     file: [
       { required: true, validator:validateFileList, message: "上传文件不能为空", trigger: "change" }
@@ -240,6 +255,12 @@ function getDeptTree() {
     deptOptions.value = response.data;
   });
 };
+/** 查询服务信息下拉列表 */
+function getTbList() {
+  queryTbserverinfoList().then(response => {
+    tbOptions.value = response.data;
+  });
+};
 
 /** 查询设备导入信息列表 */
 function getList() {
@@ -263,7 +284,8 @@ function reset() {
     projectName: null,
     orgCode: null,
     orgName: null,
-    issServerconfid: null
+    issServerconfid: null,
+    issServerconfname: null
   };
   proxy.resetForm("deviceImportRef");
   fileList.value = [];
@@ -412,10 +434,16 @@ function orgNodeClick(data,e) {
   form.value.orgCode = data.value;
   form.value.orgName = data.label;
 }
+function tbChange(data,e) {
+  form.value.issServerconfid = data.id;
+  form.value.issServerconfname = data.seviceName;
+}
+
 function formatUploadStatus(row){
   return row.uploadStatus == true ? "成功" : "失败";
 }
 
 getDeptTree();
+getTbList();
 getList();
 </script>