From b59ae25d7beb191717dc74c0a14880367405697b Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Tue, 3 Sep 2024 21:22:41 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0Oss=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engine/engine/list.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index bb42a99..2d38407 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -383,13 +383,26 @@ export default {
 
       this.versions.status = 1
 
+      console.log(this.versions)
+
+      // generate(this.versions).then(res =>{
+      //
+      //   this.versions.ruleContent=res.ruleContent;
+      //
+      //   console.log(res.ruleContent)
+      //
+      //   this.$message.success(res.msg || "成功");
+      //
+      // })
+
       add(this.versions).then(res => {
 
-        this.$modal.msgSuccess(res.msg || "新增成功")
+
+        this.$message.success(res.msg || "新增成功")
 
       })
 
-      this.findById();
+      this.List();
 
     },
 
@@ -401,7 +414,7 @@ export default {
 
       })
 
-      this.findById();
+      this.List();
 
     },
 
@@ -439,7 +452,8 @@ export default {
 
     del(id) {
 
-      if (confirm("你确定删除吗?")) {
+      if (confirm("你确定" +
+        "删除吗?")) {
 
         dels(id).then(res => {
 

From 93c142f8b17297a43ec960ae3e7f8bd63b7b7f16 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Tue, 3 Sep 2024 21:59:54 +0800
Subject: [PATCH 02/11] =?UTF-8?q?API=E5=B8=83=E5=B1=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/employee.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 1572507..e13eef4 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -6,8 +6,12 @@
           <el-menu-item-group>
             <span style="font-weight: bold;font-size: 25px;">全部类型：</span>
           </el-menu-item-group>
-          <el-menu-item-group v-for="i in connectSort" :key="i.value" :label="i.connectorSort" :value="i.connectorSort" :disabled="item.disabled">>
-            <el-link type="primary" style="font-weight: bold;font-size: 20px;" v-model="connectSort.connectorSort"></el-link>
+          <el-menu-item-group >
+            <el-link type="primary" style="font-weight: bold;font-size: 20px;"  v-for="(connectSort, index) in connectSort"
+                     :key="index"
+                     :href="connectSort.connectorSort">
+              {{ connectSort.connectorSort }}
+            </el-link>
           </el-menu-item-group>
         </el-menu>
       </el-aside>
@@ -23,7 +27,7 @@
           </el-form>
           <el-row :gutter="50">
             <el-col :span="7" v-for="connector in connectorList" :key="connector.connectorId" v-if="connectorList.length !== 0">
-              <el-card class="box-card" style="margin-top: 15px;width: 450px; height: 600px;" shadow="hover">
+              <el-card class="box-card" style="margin-top: 15px;width: 400px; height: 600px;" shadow="hover">
                 <div slot="header" class="clearfix">
                   <h1 style="font-weight: bold">{{connector.connectorName}}</h1>
                   <el-button type="primary" style="float: right; padding: 10px 10px" @click="buy(connector)">购买</el-button>

From 9ca3055f7fd0bfe1b9908c5dac4ba02edf638992 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Tue, 3 Sep 2024 22:37:31 +0800
Subject: [PATCH 03/11] =?UTF-8?q?API=E5=B8=83=E5=B1=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/employee.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index e13eef4..27ab5d3 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -9,7 +9,7 @@
           <el-menu-item-group >
             <el-link type="primary" style="font-weight: bold;font-size: 20px;"  v-for="(connectSort, index) in connectSort"
                      :key="index"
-                     :href="connectSort.connectorSort">
+            @click="findApiList(connectSort.connectorSort)">
               {{ connectSort.connectorSort }}
             </el-link>
           </el-menu-item-group>
@@ -479,7 +479,7 @@ export default {
       })
     },
     findApiList(){
-      findApiList(this.form).then((res)=>{
+      findApiList(this.form,index).then((res)=>{
         this.connectorList=res.data;
         console.log(res.data);
       })

From 267d30ac0f00690d03540266ac8a127f7bfbe4e8 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 4 Sep 2024 00:29:01 +0800
Subject: [PATCH 04/11] =?UTF-8?q?API=E5=B8=83=E5=B1=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/employee.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 27ab5d3..568b276 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -27,7 +27,7 @@
           </el-form>
           <el-row :gutter="50">
             <el-col :span="7" v-for="connector in connectorList" :key="connector.connectorId" v-if="connectorList.length !== 0">
-              <el-card class="box-card" style="margin-top: 15px;width: 400px; height: 600px;" shadow="hover">
+              <el-card class="box-card" style="margin-top: 15px;width: 350px; height: 600px;" shadow="hover">
                 <div slot="header" class="clearfix">
                   <h1 style="font-weight: bold">{{connector.connectorName}}</h1>
                   <el-button type="primary" style="float: right; padding: 10px 10px" @click="buy(connector)">购买</el-button>
@@ -478,7 +478,8 @@ export default {
         }
       })
     },
-    findApiList(){
+    findApiList(connectorSort){
+      this.form.connectorSort = connectorSort;
       findApiList(this.form,index).then((res)=>{
         this.connectorList=res.data;
         console.log(res.data);

From 46d8b2f6e522e02e88cc256ec10e241fa7bf0b6d Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 4 Sep 2024 09:27:37 +0800
Subject: [PATCH 05/11] =?UTF-8?q?API=E5=B8=83=E5=B1=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/employee.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 568b276..25bac4e 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -21,13 +21,13 @@
           <el-form label-width="40px" :model="form">
             <el-form-item>
               <input v-model="form.connectorName" style="padding: 10px 10px;float: initial" placeholder=请输入关键字>
-              <el-button @click="findApiList" style="padding: 10px 10px">查询</el-button>
+              <el-button @click="findApiList()" style="padding: 10px 10px">查询</el-button>
 
             </el-form-item>
           </el-form>
           <el-row :gutter="50">
             <el-col :span="7" v-for="connector in connectorList" :key="connector.connectorId" v-if="connectorList.length !== 0">
-              <el-card class="box-card" style="margin-top: 15px;width: 350px; height: 600px;" shadow="hover">
+              <el-card class="box-card" style="margin-top: 15px;width: 400px; height: 600px;" shadow="hover">
                 <div slot="header" class="clearfix">
                   <h1 style="font-weight: bold">{{connector.connectorName}}</h1>
                   <el-button type="primary" style="float: right; padding: 10px 10px" @click="buy(connector)">购买</el-button>
@@ -257,7 +257,9 @@ export default {
       connectorList:[],
       gridData:[],
       gridData2:[],
-      form:{},
+      form:{
+        connectorSort:"",
+      },
       // 邮编查询
       formPostCode:{
         code:"",
@@ -479,8 +481,8 @@ export default {
       })
     },
     findApiList(connectorSort){
-      this.form.connectorSort = connectorSort;
-      findApiList(this.form,index).then((res)=>{
+      this.form.connectorSort=connectorSort;
+      findApiList(this.form).then((res)=>{
         this.connectorList=res.data;
         console.log(res.data);
       })

From 9d601095e9f119abaab8d46f20b79fd1cbff8080 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Wed, 4 Sep 2024 10:16:03 +0800
Subject: [PATCH 06/11] =?UTF-8?q?.class=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engine/engine/index.vue |  2 --
 src/views/engine/engine/list.vue  | 10 ----------
 2 files changed, 12 deletions(-)

diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue
index 6765d46..af6e7d9 100644
--- a/src/views/engine/engine/index.vue
+++ b/src/views/engine/engine/index.vue
@@ -243,8 +243,6 @@
 
         <el-button type="primary" @click="submitForm">确 定</el-button>
 
-        <el-button @click="cancel">取 消</el-button>
-
       </div>
 
     </el-dialog>
diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index 2d38407..cca1af3 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -385,16 +385,6 @@ export default {
 
       console.log(this.versions)
 
-      // generate(this.versions).then(res =>{
-      //
-      //   this.versions.ruleContent=res.ruleContent;
-      //
-      //   console.log(res.ruleContent)
-      //
-      //   this.$message.success(res.msg || "成功");
-      //
-      // })
-
       add(this.versions).then(res => {
 
 

From 002685ad90533f91a7c8f7e9e05612dfd48aa285 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Wed, 4 Sep 2024 11:45:06 +0800
Subject: [PATCH 07/11] =?UTF-8?q?.class=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/engine/engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js
index e7ce071..7b061ca 100644
--- a/src/api/engine/engine.js
+++ b/src/api/engine/engine.js
@@ -87,7 +87,7 @@ export function dels(id) {
 
 
 
-//天机规则数据
+//添加规则数据
 export  function add(data){
   return request({
     url: "/engine/version/insertVersion",

From 2d811e1fca264207779d09b1713b2aa0688252c6 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Wed, 4 Sep 2024 14:53:47 +0800
Subject: [PATCH 08/11] =?UTF-8?q?.class=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engine/engine/list.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index cca1af3..81a52b8 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -122,11 +122,11 @@
 
         <template slot-scope="scope">
 
-          <el-button v-show="scope.row.isActivate==1" @click="del(scope.row.id)" type="text" size="small">
+<!--          <el-button v-show="scope.row.isActivate==1" @click="del(scope.row.id)" type="text" size="small">-->
 
-            删除引擎
+<!--            删除引擎-->
 
-          </el-button>
+<!--          </el-button>-->
 
           <el-button v-show="scope.row.isActivate==1" @click="forbiddenEngines(scope.row.id)" type="text" size="small">
 

From 3000f74b2d7761e19b94614a814ea88c40dfa89e Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 4 Sep 2024 17:30:43 +0800
Subject: [PATCH 09/11] =?UTF-8?q?API=E5=B8=83=E5=B1=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/assets.vue   | 29 ++++++++++++++++++-----------
 src/views/port/port/employee.vue |  6 +++---
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/views/port/port/assets.vue b/src/views/port/port/assets.vue
index 69f805c..1738349 100644
--- a/src/views/port/port/assets.vue
+++ b/src/views/port/port/assets.vue
@@ -1,5 +1,12 @@
 <template>
   <div>
+    <el-form :model="form" label-width="80px">
+      <el-form-item>
+        <input v-model="form.userName" style="padding: 10px 10px;float: initial;" placeholder=请输入要查询的用户名>
+        <input v-model="form.connectorName" style="padding: 10px 10px;float: initial;margin-left: 20px" placeholder=请输入要查询的接口名称>
+        <el-button @click="findConnectorUserList()" style="padding: 10px 20px;margin-left: 40px">查询</el-button>
+      </el-form-item>
+    </el-form>
     <p style="font-weight: bold;font-size: 20px">余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
     <el-table
       :data="tableData"
@@ -44,17 +51,17 @@
         </template>
       </el-table-column>
 
-<!--      <el-table-column label="操作">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="danger"-->
-<!--            @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>
diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 25bac4e..054fa03 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -20,8 +20,8 @@
         <el-main>
           <el-form label-width="40px" :model="form">
             <el-form-item>
-              <input v-model="form.connectorName" style="padding: 10px 10px;float: initial" placeholder=请输入关键字>
-              <el-button @click="findApiList()" style="padding: 10px 10px">查询</el-button>
+              <input v-model="form.connectorName" style="padding: 10px 10px;float: initial;" placeholder=请输入关键字>
+              <el-button @click="findApiList()" style="padding: 10px 20px;margin-left: 40px">查询</el-button>
 
             </el-form-item>
           </el-form>
@@ -29,7 +29,7 @@
             <el-col :span="7" v-for="connector in connectorList" :key="connector.connectorId" v-if="connectorList.length !== 0">
               <el-card class="box-card" style="margin-top: 15px;width: 400px; height: 600px;" shadow="hover">
                 <div slot="header" class="clearfix">
-                  <h1 style="font-weight: bold">{{connector.connectorName}}</h1>
+                  <span style="font-weight: bold;font-size: 30px">{{connector.connectorName}}</span>
                   <el-button type="primary" style="float: right; padding: 10px 10px" @click="buy(connector)">购买</el-button>
                 </div>
                 <span style="font-weight: bold;font-size: 20px">产品图片:</span><br>

From 07dbfd2b534cafd461d6bef3df8cc7e3e0152af5 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 4 Sep 2024 17:40:03 +0800
Subject: [PATCH 10/11] =?UTF-8?q?API=E5=B8=83=E5=B1=80=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/employee.vue | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 054fa03..6e80399 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -113,26 +113,26 @@
                 <el-input v-model="formBirthday.hour" autocomplete="off" placeholder="请输入几点"></el-input>
               </el-form-item>
               <span style="font-weight: bold;font-size: 20px" v-if="formBirthday.reason==true">
-         years： {{this.formBirthday.years}}<br>
-         months： {{this.formBirthday.months}}<br>
-         days： {{this.formBirthday.days}}<br>
-         animal： {{this.formBirthday.animal}}<br>
-         imonthcn： {{this.formBirthday.imonthcn}}<br>
-         idaycn： {{this.formBirthday.idaycn}}<br>
-         cyear： {{this.formBirthday.cyear}}<br>
-         cmonth： {{this.formBirthday.cmonth}}<br>
-         cday： {{this.formBirthday.cday}}<br>
-         gzyear： {{this.formBirthday.gzyear}}<br>
-         gzmonth： {{this.formBirthday.gzmonth}}<br>
-         gzday： {{this.formBirthday.gzday}}<br>
-         isleap： {{this.formBirthday.isleap}}<br>
-         ncweek： {{this.formBirthday.ncweek}}<br>
-         isterm： {{this.formBirthday.isterm}}<br>
-         term： {{this.formBirthday.term}}<br>
-         astro： {{this.formBirthday.astro}}<br>
-         eightall： {{this.formBirthday.eightall}}<br>
-         fiveall： {{this.formBirthday.fiveall}}
-        </span>
+                   years： {{this.formBirthday.years}}<br>
+                   months： {{this.formBirthday.months}}<br>
+                   days： {{this.formBirthday.days}}<br>
+                   animal： {{this.formBirthday.animal}}<br>
+                   imonthcn： {{this.formBirthday.imonthcn}}<br>
+                   idaycn： {{this.formBirthday.idaycn}}<br>
+                   cyear： {{this.formBirthday.cyear}}<br>
+                   cmonth： {{this.formBirthday.cmonth}}<br>
+                   cday： {{this.formBirthday.cday}}<br>
+                   gzyear： {{this.formBirthday.gzyear}}<br>
+                   gzmonth： {{this.formBirthday.gzmonth}}<br>
+                   gzday： {{this.formBirthday.gzday}}<br>
+                   isleap： {{this.formBirthday.isleap}}<br>
+                   ncweek： {{this.formBirthday.ncweek}}<br>
+                   isterm： {{this.formBirthday.isterm}}<br>
+                   term： {{this.formBirthday.term}}<br>
+                   astro： {{this.formBirthday.astro}}<br>
+                   eightall： {{this.formBirthday.eightall}}<br>
+                   fiveall： {{this.formBirthday.fiveall}}
+              </span>
             </el-form>
             <div slot="footer" class="dialog-footer">
               <el-button type="primary" @click="getBirthday()">发起请求</el-button>

From ed74e2a8869e2454c13bb782a5bfc18ced3ae31a Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Wed, 4 Sep 2024 19:02:40 +0800
Subject: [PATCH 11/11] =?UTF-8?q?.class=E5=B7=A5=E5=85=B7=E7=B1=BB?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engine/engine/list.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index 81a52b8..5f6cbfa 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -208,8 +208,6 @@
 
       <div slot="footer" class="dialog-footer">
 
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-
         <el-button type="primary" @click="back()">确 定</el-button>
 
       </div>