chenrui  2 жил өмнө
parent
commit
f3e00bd213

+ 2 - 1
public/config.js

@@ -4,4 +4,5 @@ PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // http请求地址
 PLATFROM_CONFIG.appSecret = "9inu7zpllz1folzsljm498dcpi0lsog1"; //appSecret
 PLATFROM_CONFIG.appId = "q7kdjmmaf0kerwpf"; //appid
 // PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:9114";
-PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";
+// PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";
+PLATFROM_CONFIG.baseURLCA = "http://ts.free.idcfengye.com";

+ 31 - 13
src/views/systemSettings/views/queryTemplate/queryTemplate.vue

@@ -30,10 +30,10 @@
                 <el-tooltip
                   class="item"
                   effect="dark"
-                  :content="item.typeName"
+                  :content="item.queryTemplateName"
                   placement="bottom"
                 >
-                  <div class="title">{{ item.typeName }}</div>
+                  <div class="title">{{ item.queryTemplateName }}</div>
                 </el-tooltip>
                 <!-- <div class="title">{{ item.typeName }}</div> -->
                 <div @click="airEdit(item)" class="edit_log"></div>
@@ -45,7 +45,7 @@
                 ></span>
               </div>
             </div>
-            <div class="list desc">{{ item.typeCode }}</div>
+            <div class="list desc">{{ item.queryTemplateDescribe }}</div>
           </div>
         </el-col>
       </el-row>
@@ -85,6 +85,7 @@ import Dialog from "@/layout/components/Dialog/index.vue";
 import { findarrays } from "@/utils/validate";
 import { AirlinesInquiry } from "@/api/SystemSettings";
 import { exceptiontype, exceptionadd, exceptiondel } from "@/api/acquisition";
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
 export default {
   name: "AirportInfo",
   components: { Search, Dialog },
@@ -130,6 +131,7 @@ export default {
     };
   },
   created() {
+    this.getAirlines();
     // this.exceptionlist();
   },
   computed: {
@@ -178,10 +180,19 @@ export default {
       };
     },
     airEdit(item) {
-      this.modid = item;
-      this.EditForm.name = item.typeName;
-      this.EditForm.fullName = item.typeCode;
-      this.$router.push("/systemSettings/queryTemplate/queryTemplateedit");
+      // this.modid = item;
+      // this.EditForm.name = item.typeName;
+      // this.EditForm.fullName = item.typeCode;
+      this.$router.push({
+        path: "/systemSettings/queryTemplate/queryTemplateedit",
+        query: {
+          queryTemplateName: item.queryTemplateName,
+          protocolID: item.protocolID,
+          queryTemplateDescribe: item.queryTemplateDescribe,
+          queryTemplatetConfig: item.queryTemplatetConfig,
+          queryTemplate: item.queryTemplate,
+        },
+      });
       // this.EditForm.code = item.code2;
       // this.EditFlag = true;
     },
@@ -213,13 +224,20 @@ export default {
     closeForm() {
       this.$refs.ruleForm.resetFields();
     },
-    //获取航司信息列表
+    //获取模板列表
     async getAirlines() {
-      const result = await AirlinesInquiry({});
-      if (result.code === 0) {
-        this.arr = result.returnData;
-      } else {
-        this.$message.error.message;
+      try {
+        const res = await Query({
+          id: 77,
+          dataContent: [],
+        });
+        if (res.code === "0") {
+          this.arr = res.returnData;
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
       }
     },
 

+ 49 - 20
src/views/systemSettings/views/queryTemplate/queryTemplateadd.vue

@@ -2,12 +2,11 @@
   <div class="queryTemplate">
     <Search title="新增查询模板" :isSearch="false">
       <button class="btnAner">测试</button>
-      <button class="btnAn">保存</button>
+      <button class="btnAn" @click="addSubmit">保存</button>
     </Search>
     <el-form
       style="margin-top: 10px"
       :inline="true"
-      :rules="infoRules"
       :model="ruleForm"
       label-width="auto"
       ref="ruleForm"
@@ -15,7 +14,7 @@
     >
       <el-row :gutter="24" class="b24">
         <el-col :span="5">
-          <el-form-item label="查询模板名称" prop="name">
+          <el-form-item label="查询模板名称" prop="queryTemplateName">
             <el-input
               size="medium"
               placeholder="暂无数据"
@@ -24,8 +23,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="查询协议" prop="agreement">
-            <el-select v-model="ruleForm.agreement" placeholder="暂无数据">
+          <el-form-item label="查询协议" prop="protocolID">
+            <el-select
+              v-model="ruleForm.protocolID"
+              placeholder="暂无数据"
+              :disabled="true"
+            >
               <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -37,18 +40,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item label="查询模板描述" prop="describe">
+          <el-form-item label="查询模板描述" prop="queryTemplateDescribe">
             <el-input
               size="medium"
               placeholder="暂无数据"
-              v-model="ruleForm.describe"
+              v-model="ruleForm.queryTemplateDescribe"
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="查询配置" prop="desc" style="margin-bottom: 24px">
+      <el-form-item
+        label="查询配置"
+        prop="queryTemplatetConfig"
+        style="margin-bottom: 24px"
+      >
         <el-input
-          v-model="ruleForm.desc"
+          v-model="ruleForm.queryTemplatetConfig"
           class="desc"
           type="textarea"
           resize="none"
@@ -57,9 +64,9 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="查询语句" prop="desc">
+      <el-form-item label="查询语句" prop="queryTemplate">
         <el-input
-          v-model="ruleForm.sentence"
+          v-model="ruleForm.queryTemplate"
           class="desc"
           type="textarea"
           resize="none"
@@ -73,33 +80,55 @@
 </template>
 <script>
 import Search from "@/layout/components/Search/index.vue";
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
 export default {
   data() {
     return {
       ruleForm: {
-        name: "",
-        agreement: "",
-        describe: "",
-        desc: "",
+        queryTemplateName: "",
+        protocolID: 1,
+        queryTemplateDescribe: "",
+        queryTemplatetConfig: "",
+        queryTemplate: "",
       },
       options: [],
       rules: {
-        name: [
+        queryTemplateName: [
           { required: true, message: "请输入查询模板名称", trigger: "blur" },
         ],
-        agreement: [
+        protocolID: [
           { required: true, message: "请输入查询协议", trigger: "blur" },
         ],
-        agreement: [
+        queryTemplateDescribe: [
           { required: true, message: "请输入查询模板描述", trigger: "blur" },
         ],
-        desc: [{ required: true, message: "请选查询配置", trigger: "change" }],
-        sentence: [
+        queryTemplatetConfig: [
+          { required: true, message: "请选查询配置", trigger: "change" },
+        ],
+        queryTemplate: [
           { required: true, message: "请选择查询语句", trigger: "change" },
         ],
       },
     };
   },
+  methods: {
+    async addSubmit() {
+      try {
+        const res = await GeneralDataReception({
+          serviceId: "20",
+          dataContent: JSON.stringify(this.ruleForm),
+        });
+        if (res.code === "0") {
+          this.$message.success(res.message ?? "成功");
+          this.$router.push("/systemSettings/queryTemplate");
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
+      }
+    },
+  },
   components: {
     Search,
   },

+ 52 - 20
src/views/systemSettings/views/queryTemplate/queryTemplateedit.vue

@@ -7,7 +7,6 @@
     <el-form
       style="margin-top: 10px"
       :inline="true"
-      :rules="infoRules"
       :model="ruleForm"
       label-width="auto"
       ref="ruleForm"
@@ -15,17 +14,21 @@
     >
       <el-row :gutter="24" class="b24">
         <el-col :span="5">
-          <el-form-item label="查询模板名称" prop="name">
+          <el-form-item label="查询模板名称" prop="queryTemplateName">
             <el-input
               size="medium"
               placeholder="暂无数据"
-              v-model="ruleForm.name"
+              v-model="ruleForm.queryTemplateName"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="查询协议" prop="agreement">
-            <el-select v-model="ruleForm.agreement" placeholder="暂无数据">
+          <el-form-item label="查询协议" prop="protocolID">
+            <el-select
+              v-model="ruleForm.protocolID"
+              placeholder="暂无数据"
+              :disabled="true"
+            >
               <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -37,18 +40,22 @@
           </el-form-item>
         </el-col>
         <el-col :span="14">
-          <el-form-item label="查询模板描述" prop="describe">
+          <el-form-item label="查询模板描述" prop="queryTemplateDescribe">
             <el-input
               size="medium"
               placeholder="暂无数据"
-              v-model="ruleForm.describe"
+              v-model="ruleForm.queryTemplateDescribe"
             ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="查询配置" prop="desc" style="margin-bottom: 24px">
+      <el-form-item
+        label="查询配置"
+        prop="queryTemplatetConfig"
+        style="margin-bottom: 24px"
+      >
         <el-input
-          v-model="ruleForm.desc"
+          v-model="ruleForm.queryTemplatetConfig"
           class="desc"
           type="textarea"
           resize="none"
@@ -57,9 +64,9 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="查询语句" prop="desc">
+      <el-form-item label="查询语句" prop="queryTemplate">
         <el-input
-          v-model="ruleForm.sentence"
+          v-model="ruleForm.queryTemplate"
           class="desc"
           type="textarea"
           resize="none"
@@ -77,29 +84,54 @@ export default {
   data() {
     return {
       ruleForm: {
-        name: "",
-        agreement: "",
-        describe: "",
-        desc: "",
+        queryTemplateName: "",
+        protocolID: 1,
+        queryTemplateDescribe: "",
+        queryTemplatetConfig: "",
+        queryTemplate: "",
       },
       options: [],
       rules: {
-        name: [
+        queryTemplateName: [
           { required: true, message: "请输入查询模板名称", trigger: "blur" },
         ],
-        agreement: [
+        protocolID: [
           { required: true, message: "请输入查询协议", trigger: "blur" },
         ],
-        agreement: [
+        queryTemplateDescribe: [
           { required: true, message: "请输入查询模板描述", trigger: "blur" },
         ],
-        desc: [{ required: true, message: "请选查询配置", trigger: "change" }],
-        sentence: [
+        queryTemplatetConfig: [
+          { required: true, message: "请选查询配置", trigger: "change" },
+        ],
+        queryTemplate: [
           { required: true, message: "请选择查询语句", trigger: "change" },
         ],
       },
     };
   },
+  created() {
+    console.log(this.$route.query);
+    this.ruleForm = this.$route.query;
+  },
+  methods: {
+    async addSubmit() {
+      try {
+        const res = await GeneralDataReception({
+          serviceId: "20",
+          dataContent: JSON.stringify(this.ruleForm),
+        });
+        if (res.code === "0") {
+          this.$message.success(res.message ?? "成功");
+          this.$router.push("/systemSettings/queryTemplate");
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
+      }
+    },
+  },
   components: {
     Search,
   },