From c888a51e5be3647485bddf6059d1b8cdbfeda6b8 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Wed, 28 Aug 2024 13:59:07 +0800
Subject: [PATCH 01/20] =?UTF-8?q?refactor(money-detail):=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E5=B8=83=E5=B1=80=E5=B9=B6?=
 =?UTF-8?q?=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整充值明细页面的导出按钮布局，使其在中心对齐，改善页面布局效果。此调整涉及使用`el-row`和`el-col`组件对导出按钮进行重新排布，并确保其在页面上水平居中。
---
 src/api/system/user.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 7bae870..8c29a3b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -30,6 +30,16 @@ export function userRecharge(data) {
   })
 }
 
+
+// 充值用户余额记录
+export function createRechargeRecord(data) {
+  return request({
+    url: '/system/aliyun/pay/records',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询用户余额
 export function userBalance(userId) {
   return request({

From 3328439c072383a4dcf5a1a4b4266dbd09651839 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Wed, 28 Aug 2024 18:44:03 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/port/port/index.js       |  2 +-
 src/views/port/port/employee.vue | 74 +++++++++++++++++++++++++-------
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js
index 9e48cfa..6cf4f3d 100644
--- a/src/api/port/port/index.js
+++ b/src/api/port/port/index.js
@@ -34,6 +34,6 @@ export function updateConnector(data) {
 export function phonePlace(tel) {
   return request({
     url: '/port/list/phonePlace?tel='+tel,
-    method: 'get'
+    method: 'GET'
   })
 }
diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 55e9519..eeb76f5 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row :gutter="50">
-      <el-col :span="7" v-for="connector in connectorList" v-if="connectorList.length !== 0">
+      <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: 500px; height: 600px;" shadow="hover">
           <div slot="header" class="clearfix">
             <h1 style="font-weight: bold">{{connector.connectorName}}</h1>
@@ -14,24 +14,50 @@
           <span style="font-weight: bold;font-size: 20px">价格：</span>
           {{connector.connectorPrice}}/次<br>
 
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="dialogFormVisible=true" v-if="connector.connectorName=='手机号查询归属地'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="buyIP(connector)" v-if="connector.connectorName=='IP查询归属地'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="buyNews(connector)" v-if="connector.connectorName=='新闻头条'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="buyWeather(connector)" v-if="connector.connectorName=='气象预警'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="buyBirthdate(connector)" v-if="connector.connectorName=='生辰助手'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="buyMailbox(connector)" v-if="connector.connectorName=='邮编查询'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testPhone()" v-if="connector.connectorName=='手机号查询归属地'">测试API</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testIP(connector)" v-if="connector.connectorName=='IP查询归属地'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testNews(connector)" v-if="connector.connectorName=='新闻头条'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather(connector)" v-if="connector.connectorName=='气象预警'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testBirthdate(connector)" v-if="connector.connectorName=='生辰助手'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox(connector)" v-if="connector.connectorName=='邮编查询'">测试</el-button>
         </el-card>
       </el-col>
     </el-row>
-
+<!--    手机号查询归属地-->
     <el-dialog title="手机查询归属地" :visible.sync="dialogFormVisible">
       <el-form :model="formInline">
         <el-form-item label="手机号" :label-width="formLabelWidth">
           <el-input v-model="formInline.tel" autocomplete="off"></el-input>
         </el-form-item>
+        <span style="font-weight: bold;font-size: 20px" v-if="formInline.reason==true">
+        省份：{{this.formInline.province}}<br>
+        城市：{{this.formInline.city}}<br>
+        区号：{{this.formInline.areacode}}<br>
+        邮编：{{this.formInline.zip}}<br>
+        运营商：{{this.formInline.company}}<br>
+        </span>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="buyPhone(tel)">测试</el-button>
+        <el-button type="primary" @click="phonePlace()">发起请求</el-button>
+      </div>
+    </el-dialog>
+
+    <!--IP查询归属地-->
+    <el-dialog title="IP查询归属地" :visible.sync="dialogFormVisible1">
+      <el-form :model="formInline">
+        <el-form-item label="IP" :label-width="formLabelWidth">
+          <el-input v-model="formInline.tel" autocomplete="off"></el-input>
+        </el-form-item>
+        <span style="font-weight: bold;font-size: 20px" v-if="formInline.reason==true">
+        省份：{{this.formInline.province}}<br>
+        城市：{{this.formInline.city}}<br>
+        区号：{{this.formInline.areacode}}<br>
+        邮编：{{this.formInline.zip}}<br>
+        运营商：{{this.formInline.company}}<br>
+        </span>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="phonePlace()">发起请求</el-button>
       </div>
     </el-dialog>
   </div>
@@ -53,8 +79,19 @@ export default {
     return {
       connectorList:[],
       form:{},
-      formInline:{},
+      // 手机号查询归属地formInline
+      formInline:{
+        tel:"",
+        province:"",
+        city:"",
+        areacode:"",
+        zip:"",
+        company:"",
+        reason:"",
+      },
+      // IP查询归属地
       dialogFormVisible:false,
+      dialogFormVisible1:false,
     };
   },
   //计算属性 类似于data概念",
@@ -70,13 +107,20 @@ export default {
   watch: {},
   //方法集合",
   methods: {
-    buyPhone(tel){
-      getPhonePlace(tel).then((res)=>{
-        console.log(111);
+    testPhone(tel){
+      this.formInline.tel=tel;
+      this.dialogFormVisible=true;
+    },
+    phonePlace(){
+      phonePlace(this.formInline.tel).then((res)=>{
         console.log(res.data);
-        alert(res.msg);
         if (200==res.code){
-
+          this.formInline.province=res.data.province;
+          this.formInline.city=res.data.city;
+          this.formInline.areacode=res.data.areacode;
+          this.formInline.zip=res.data.zip;
+          this.formInline.company=res.data.company;
+          this.formInline.reason=true;
         }
       })
     },

From b515b8e8bf7a226e425e8badf784b04f5a96a78b Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Wed, 28 Aug 2024 19:36:01 +0800
Subject: [PATCH 03/20] =?UTF-8?q?```feat(money-detail):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8C=89=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E8=A1=A8=E5=8D=95=E5=92=8C=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加了一个新的功能，允许用户通过指定的日期范围搜索充值明细。此外，导出按钮已被重新设计，并放置在新的位置以提高可用性。该改进增强了用户与系统交互的效率和体验。
```
---
 src/views/money/detail/index.vue | 45 +++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/views/money/detail/index.vue b/src/views/money/detail/index.vue
index 29e91b9..e9d236f 100644
--- a/src/views/money/detail/index.vue
+++ b/src/views/money/detail/index.vue
@@ -2,19 +2,32 @@
   <div style="padding: 20px;">
     <h1 style="text-align: center; margin-bottom: 30px;">充值明细</h1>
     <el-divider></el-divider>
+    <el-form  ref="queryForm" :inline="true" :model="queryParams" size="small">
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          end-placeholder="结束日期"
+          range-separator="-"
+          start-placeholder="开始日期"
+          style="width: 240px"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
+      </el-form-item>
+    </el-form>
     <el-row>
-      <el-col :span="50"></el-col>
-      <el-col :span="5" :offset="15">
-        <el-button
-          v-hasPermi="['system:pay:export']"
-          icon="el-icon-download"
-          plain
-          size="mini"
-          type="warning"
-          @click="handleExport"
-        >导出
-        </el-button>
-      </el-col>
+      <el-button
+        v-hasPermi="['system:pay:export']"
+        icon="el-icon-download"
+        plain
+        size="mini"
+        type="warning"
+        @click="handleExport"
+      >导出
+      </el-button>
     </el-row>
 
     <el-table
@@ -79,6 +92,7 @@ export default {
   components: {PanelGroup},
   data() {
     return {
+      dateRange: [],
       listDate: [],
       total: 0,
       queryParams: {
@@ -91,6 +105,11 @@ export default {
     this.getList();
   },
   methods: {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/user/export', {
@@ -98,7 +117,7 @@ export default {
       }, `pay_${new Date().getTime()}.xlsx`)
     },
     getList() {
-      userPayinfo(this.addDateRange(this.queryParams)).then(response => {
+      userPayinfo(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.listDate = response.data.rows;
           this.total = response.data.total;
         }

From b0abc7bcb35962233f8826866586a23b75646fbe Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Wed, 28 Aug 2024 20:34:38 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E6=B5=8B=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engine/engine/list.vue | 282 ++++++++++++++++++++++++-------
 1 file changed, 222 insertions(+), 60 deletions(-)

diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index 73ee2c8..d65d4f6 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -1,90 +1,252 @@
 <template>
   <div>
+    <el-descriptions class="margin-top" :column="2" border :title="maintenance.name">
+
+      <el-descriptions-item>
+
+        <el-button type="primary" @click="handleInsert">版本添加</el-button>
+        <template slot="label">
+          <i class="el-icon-user"></i>
+          操作按钮
+        </template>
+        <el-button type="danger" v-show="maintenance.status=='1'" @click="updStatus(ruleAndVersion.status,ruleAndVersion.id)">开启引擎</el-button>
+        <el-button type="danger" v-show="maintenance.status=='0'"  @click="updStatus(ruleAndVersion.status,ruleAndVersion.id)">关闭引擎</el-button>
+        <el-button type="warning" v-show="maintenance.open=='N' " @click="updOpen(ruleAndVersion.open,ruleAndVersion.id)">激活引擎</el-button>
+        <el-button type="warning" v-show="maintenance.open=='Y'" @click="updOpen(ruleAndVersion.open,ruleAndVersion.id)">禁用引擎</el-button>
+      </el-descriptions-item>
+
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-user"></i>
+          版本名称
+        </template>
+        {{ maintenance.name }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-user"></i>
+          版本编码
+        </template>
+        {{ maintenance.code}}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-user"></i>
+          规则作用域
+        </template>
+
+        <dict-tag :options="maintenance.type.status" :value="maintenance.status"/>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-user"></i>
+          状态
+        </template>
+        <dict-tag :options="maintenance.type.rule_engine_activate_status" :value="maintenance.status"/>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-user"></i>
+          激活状态
+        </template>
+        <dict-tag :options="maintenance.type.rule_engine_activate_status" :value="maintenance.open"/>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-user"></i>
+          版本描述
+        </template>
+        <editor   v-model="maintenance.isActivate" :readOnly="true" :min-height="50"/>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-empty description="暂无规则引擎版本" v-if="maintenance.engineMaintenanceList.length==0"></el-empty>
     <el-row :gutter="10">
-      <el-col :span="8" v-for="customer in scopeList" v-if="scopeList.length !== 0">
+      <el-col :span="8" v-for="version in maintenance.engineMaintenanceList">
         <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span style="font-size: 18px;font-weight: 900">{{ customer.name }}</span>
-            <span style="font-size: 18px;font-weight: 900">{{ customer.versionCode }}</span>
-            <span style="font-size: 18px;font-weight: 900">{{ customer.isActivate }}</span>
-            <span style="font-size: 18px;font-weight: 900">{{ customer.status }}</span>
-            <span style="font-size: 18px;font-weight: 900">{{ customer.testStatus }}</span>
-            <span style="font-size: 18px;font-weight: 900">{{ customer.ruleContent }}</span>
-            <span style="font-size: 18px;font-weight: 900">{{ customer.engineMaintenanceId }}</span>
-            <span style="font-size: 18px;font-weight: 900">{{ customer.description }}</span>
-          </div>
-          <div>
-            <el-descriptions class="margin-top" :column="1" :size="size" border>
-
-              <el-descriptions-item>
-                <template slot="label">
-                  <i class="el-icon-user"></i>版本名称</template>
-                {{ customer.name }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label">
-                  <i class="el-icon-user"></i>版本编码</template>
-                {{ customer.versionClass }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label">
-                  <i class="el-icon-user"></i>是否激活</template>
-                {{ customer.versionCode }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label">
-                  <i class="el-icon-user"></i>版本状态</template>
-                {{ customer.isActivate }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label">
-                  <i class="el-icon-user"></i>版本测试状态</template>
-                {{ customer.status }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label">
-                  <i class="el-icon-user"></i>规则内容</template>
-                {{ customer.testStatus }}
-              </el-descriptions-item><el-descriptions-item>
-              <template slot="label">
-                <i class="el-icon-user"></i>引擎维护编号</template>
-              {{ customer.ruleContent }}
+          <el-descriptions class="margin-top" title="带边框列表" :column="3" :size="size" border>
+            <template slot="extra">
+              <el-button type="primary" size="small">操作</el-button>
+            </template>
+            <el-descriptions-item>
+              <template el-slot="label">
+                <i class="el-icon-user"></i>
+                名称
+              </template>
+              {{ version.name }}
             </el-descriptions-item>
-
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-user"></i>描述</template>
-                {{ customer.engineMaintenanceId }}
-              </el-descriptions-item>
-
-            </el-descriptions>
-            <el-divider content-position="left">规则引擎版本</el-divider>
-          </div>
+            <br>
+            <el-descriptions-item>
+              <template el-slot="label">
+                <i class="el-icon-mobile-phone"></i>
+                类型
+              </template>
+              {{ version.type }}
+            </el-descriptions-item>
+            <br>
+            <el-descriptions-item>
+              <template el-slot="label">
+                <i class="el-icon-location-outline"></i>
+                作用域
+              </template>
+              {{ version.scope }}
+            </el-descriptions-item>
+            <br>
+            <el-descriptions-item>
+              <template el-slot="label">
+                <i class="el-icon-office-building"></i>
+                是否激活
+              </template>
+              {{ version.isActivate }}
+            </el-descriptions-item>
+            <br>
+            <el-descriptions-item>
+              <template el-slot="label">
+                <i class="el-icon-office-building"></i>
+                状态
+              </template>
+              {{ version.status }}
+            </el-descriptions-item>
+            <br>
+          </el-descriptions>
         </el-card>
       </el-col>
     </el-row>
 
+
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="80%">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px"  class="demo-form-inline">
+        <el-form-item label="版本名称" prop="versionName">
+          <el-input v-model="form.name" placeholder="请输入引擎名称" style="width:  40%" />
+        </el-form-item>
+        <el-form-item label="版本类型" prop="versionCode">
+          <el-input v-model="form.type" placeholder="请输入版本编码" style="width:  40%" />
+        </el-form-item>
+        <el-form-item label="作用域" prop="versionDesc">
+          <editor v-model="form.scope" :min-height="192"/>
+        </el-form-item>
+
+        <el-form-item label="是否激活" prop="versionDesc">
+          <editor v-model="form.isActivate" :min-height="192"/>
+        </el-form-item>
+
+        <el-form-item label="状态" prop="versionDesc">
+          <editor v-model="form.status" :min-height="192"/>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
+        </el-form-item>
+      </el-form>
+      <el-button type="primary" @click="generateEngine(form.versionName,form.versionCode)">生成引擎类</el-button>
+
+      <div class="code-edit">
+        <codemirror ref="codeMirror" v-model="form.versionClazz" :value="form.versionClazz" :options="cmOptions"  />
+      </div>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="cancel">取 消</el-button>
+    <el-button type="primary" @click="submitForm">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
+
+    <el-drawer
+      :title="title"
+      :visible.sync="maintenance"
+      size="60%"
+      :direction="direction"
+      :before-close="handleClose">
+      <el-descriptions class="margin-top" :column="1" border>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            版本名称
+          </template>
+          {{ maintenance.name }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            版本编码
+          </template>
+          {{ maintenance.type}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            状态
+          </template>
+          <dict-tag :options="dict.type.rule_engine_activate_status" :value="maintenance.status"/>
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            激活状态
+          </template>
+          <dict-tag :options="dict.type.rule_engine_activate_status" :value="maintenance.open"/>
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            版本描述
+          </template>
+          <editor  v-model="maintenance.status" :readOnly="true"  :min-height="50" aria-readonly="true" />
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            代码操作
+          </template>
+          <codemirror ref="codeMirror" :value="maintenance.isActivate" :options="cmOptions" class="code" v-model="maintenance.scope">
+          </codemirror>
+        </el-descriptions-item>
+      </el-descriptions>
+
+    </el-drawer>
+
   </div>
 </template>
 <script>
 
 import {findById, forbiddenEngine, onEngine} from "@/api/engine/engine";
+import {insert} from "@/api/version/version";
 
 export default {
+  dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
   data() {
     //这里存放数据"
     return {
-      scopeList: [],
-      maintenance:{}
+      direction: 'rtl',
+      maintenance:{
+        engineMaintenanceList: [],
+      },
+      title:"",
+      open:false,
+      handleClose:false,
+      form:{
+
+      }
     }
   },
   methods: {
+    handleInsert(){
+      this.open = true
+      insert(this.maintenance).then(res =>{
+        this.$modal.msgSuccess("新增成功")
+      })
+    },
     List(){
       findById(this.maintenance.id).then(res =>{
-        this.scopeList = res.data;
-        console.log(this.scopeList)
+        this.maintenance = res.data;
+        console.log(this.maintenance)
+        console.log(this.maintenance.engineMaintenanceList)
       })
     },
     handleStatusChange(row){

From f2f3c85b94934fb358fde4953143818488dbdddd Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Wed, 28 Aug 2024 20:38:57 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=E6=B5=8B=E8=AF=951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/engine/engine/list.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index d65d4f6..cab425b 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -59,6 +59,7 @@
         <editor   v-model="maintenance.isActivate" :readOnly="true" :min-height="50"/>
       </el-descriptions-item>
     </el-descriptions>
+    <br>
 
     <el-empty description="暂无规则引擎版本" v-if="maintenance.engineMaintenanceList.length==0"></el-empty>
     <el-row :gutter="10">

From 071a09a40ac6b8b521fdc6190dc448a8de01dc02 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 15:40:28 +0800
Subject: [PATCH 06/20] =?UTF-8?q?```feat(money):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E8=A7=86=E5=9B=BE=E7=BB=84=E4=BB=B6=E5=B9=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9EURL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 创建index.vue文件以支持货币购买功能，包括基础结构设置。
- 更新pay的index.vue中的返回URL，从本地主机到指定的IP地址，以确保在金钱操作后正确重定向用户。
```
---
 src/views/money/buy/index.vue | 11 +++++++++++
 src/views/money/pay/index.vue |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 src/views/money/buy/index.vue

diff --git a/src/views/money/buy/index.vue b/src/views/money/buy/index.vue
new file mode 100644
index 0000000..762e8b7
--- /dev/null
+++ b/src/views/money/buy/index.vue
@@ -0,0 +1,11 @@
+<script setup>
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/money/pay/index.vue b/src/views/money/pay/index.vue
index 06c009a..e9bd4b7 100644
--- a/src/views/money/pay/index.vue
+++ b/src/views/money/pay/index.vue
@@ -44,7 +44,7 @@ export default {
       addSysUser: {},
       disabled: false,
       // 同步跳转页面地址
-      returnUrl:'http://localhost/money/money',
+      returnUrl:'http://172.13.1.1//money/money',
       //充值参数
       rechargeParams: {
         "totalAmt": '', //金额

From aa10c64af757de80878a3b5db150b7e0646b1f59 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 17:17:21 +0800
Subject: [PATCH 07/20] =?UTF-8?q?```plaintextfeat(workbench):=20=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0rate=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

包括余额展示和接口列表的展示。页面使用Element UI的卡片和表格组件，通过调用API获取用户余额和接口列表数据。在创建页面时自动获取数据以显示。布局通过flexbox实现，分为左右两部分。
```
---
 src/views/workbench/rate/index.vue | 96 ++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/views/workbench/rate/index.vue

diff --git a/src/views/workbench/rate/index.vue b/src/views/workbench/rate/index.vue
new file mode 100644
index 0000000..66e4532
--- /dev/null
+++ b/src/views/workbench/rate/index.vue
@@ -0,0 +1,96 @@
+<template>
+  <div>
+  <div class="container">
+    <div class="card left-card">
+      <el-card style="margin-top: 50px;">
+
+      </el-card>
+    </div>
+    <div class="card right-card">
+      <el-card style="margin-top: 50px;">
+        <h3>账户余额</h3>
+        <h1>￥:{{ userBalanceData.userBalance || '加载中...' }}</h1>
+      </el-card>
+    </div>
+  </div>
+    <el-card style="margin-top: 50px;">
+      <h3>接口列表</h3>
+      <el-divider></el-divider>
+      <el-table  :data="tableData">
+        <el-table-column>
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.connectorName }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {userBalance} from "@/api/system/user";
+import {getInfo} from '@/api/login'
+import {findConnectorList} from "@/api/port/port";
+export default {
+  name: 'Cards',
+  data() {
+    return {
+      tableData:[],
+      userBalanceData: {
+        userBalance: '加载中...',
+      },
+    }
+  },
+  created() {
+    this.fetchUserBalance();
+    this.findConnectorList();
+  },
+  methods: {
+    findConnectorList(){
+      findConnectorList(this.form).then((res)=>{
+        this.tableData=res.data;
+      })
+    },
+     async fetchUserBalance() {
+       try {
+         const userId = localStorage.getItem('userId');
+         console.log(userId)// 登录后把userId存到了localStorage
+         if (!userId) {
+           this.userBalanceData = { userBalance: '未登录' };
+           return;
+         }
+         const response = await userBalance(userId);
+         if (response.data ) {
+           console.log(response.data)
+           this.userBalanceData.userBalance = response.data;
+         } else {
+           this.userBalanceData.userBalance = { userBalance: '获取失败' };
+         }
+       } catch (error) {
+         this.userBalanceData = { userBalance: '获取失败' };
+         console.error('Error fetching user balance:', error);
+       }
+     },
+ }
+};
+</script>
+
+<style scoped>
+.container {
+  display: flex;
+}
+
+.card {
+  width: 50%;
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+.left-card {
+  background-color: #f1f1f1;
+}
+
+.right-card {
+  background-color: #e1e1e1;
+}
+</style>

From b4d57778813cd65a9df168a3ece1c049abfaf5e0 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 17:24:11 +0800
Subject: [PATCH 08/20] =?UTF-8?q?```plaintextfeat(workbench):=20=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0rate=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

包括余额展示和接口列表的展示。页面使用Element UI的卡片和表格组件，通过调用API获取用户余额和接口列表数据。在创建页面时自动获取数据以显示。布局通过flexbox实现，分为左右两部分。
```
---
 src/views/workbench/rate/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/workbench/rate/index.vue b/src/views/workbench/rate/index.vue
index 66e4532..7c70d3b 100644
--- a/src/views/workbench/rate/index.vue
+++ b/src/views/workbench/rate/index.vue
@@ -35,6 +35,7 @@ export default {
   name: 'Cards',
   data() {
     return {
+      form:{},
       tableData:[],
       userBalanceData: {
         userBalance: '加载中...',

From 4f722fb288783e280c882b15fab4bfffe49b6116 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 18:36:25 +0800
Subject: [PATCH 09/20] =?UTF-8?q?```plaintextfeat(workbench):=20=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0rate=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

包括余额展示和接口列表的展示。页面使用Element UI的卡片和表格组件，通过调用API获取用户余额和接口列表数据。在创建页面时自动获取数据以显示。布局通过flexbox实现，分为左右两部分。
```
---
 src/views/workbench/rate/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/workbench/rate/index.vue b/src/views/workbench/rate/index.vue
index 7c70d3b..089b9ad 100644
--- a/src/views/workbench/rate/index.vue
+++ b/src/views/workbench/rate/index.vue
@@ -17,7 +17,7 @@
       <h3>接口列表</h3>
       <el-divider></el-divider>
       <el-table  :data="tableData">
-        <el-table-column>
+        <el-table-column label="">
           <template slot-scope="scope">
             <span style="margin-left: 10px">{{ scope.row.connectorName }}</span>
           </template>

From 556ca108aad9575c9b22ed1e3b1b43a7527adfc3 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Thu, 29 Aug 2024 21:50:26 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/engine/engine.js              |  21 +-
 src/api/type/type.js                  |   4 +
 src/api/version/version.js            |  17 +-
 src/views/engine/engine/index.vue     | 417 +++++++++++++++++---
 src/views/engine/engine/list.vue      | 538 +++++++++++++++-----------
 src/views/type/index.vue              |  93 ++++-
 src/views/version/version/version.vue | 183 +++++++--
 7 files changed, 928 insertions(+), 345 deletions(-)

diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js
index 48b9a8f..b601ae6 100644
--- a/src/api/engine/engine.js
+++ b/src/api/engine/engine.js
@@ -9,9 +9,7 @@ export function selectEngineList(data){
   })
 }
 
-
-
-
+//添加规则数据
 export  function insert(data){
   return request({
     url: "/engine/engine/insert",
@@ -20,6 +18,7 @@ export  function insert(data){
   })
 }
 
+//修改规则数据
 export  function update(data){
   return request({
     url: "/engine/engine/update",
@@ -28,8 +27,7 @@ export  function update(data){
   })
 }
 
-
-
+//通过id删除数据
 export  function del(id){
   return request({
     url: "/engine/engine/delete/" + id,
@@ -38,7 +36,6 @@ export  function del(id){
   })
 }
 
-
 //开启
 export  function onEngine(id){
   return request({
@@ -48,7 +45,6 @@ export  function onEngine(id){
   })
 }
 
-
 //禁用
 export  function forbiddenEngine(id){
   return request({
@@ -58,6 +54,7 @@ export  function forbiddenEngine(id){
   })
 }
 
+//查看等级列表信息
 export  function selectLevel(){
   return request({
     url: "/engine/level/selectLevelList",
@@ -73,7 +70,6 @@ export function getRuleEngineInfo(id) {
   })
 }
 
-
 // 通过id查询
 export function findById(id) {
   return request({
@@ -82,4 +78,13 @@ export function findById(id) {
   })
 }
 
+//通过id删除数据
+export function dels(id) {
+  return request({
+    url: '/engine/engine/delete/' + id,
+    method: 'post',
+    data: id
+  })
+}
+
 
diff --git a/src/api/type/type.js b/src/api/type/type.js
index 6261b8c..d309662 100644
--- a/src/api/type/type.js
+++ b/src/api/type/type.js
@@ -8,6 +8,7 @@ export function list(){
   })
 }
 
+//添加类型数据
 export  function insert(data){
   return request({
     url: "/engine/type/add",
@@ -16,6 +17,7 @@ export  function insert(data){
   })
 }
 
+//修改类型数据
 export  function update(data){
   return request({
     url: "/engine/type/update",
@@ -24,6 +26,7 @@ export  function update(data){
   })
 }
 
+//删除类型数据
 export  function del(id){
   return request({
     url: "/engine/type/delete/" + id,
@@ -32,6 +35,7 @@ export  function del(id){
   })
 }
 
+//导出类型数据
 export function exports(data){
   return request({
     url: "/engine/type/export",
diff --git a/src/api/version/version.js b/src/api/version/version.js
index 4f71e50..2f756b7 100644
--- a/src/api/version/version.js
+++ b/src/api/version/version.js
@@ -9,9 +9,7 @@ export function list(data){
   })
 }
 
-
-
-
+//添加规则引擎版本数据
 export  function insert(data){
   return request({
     url: "/engine/version/insert",
@@ -20,16 +18,7 @@ export  function insert(data){
   })
 }
 
-// export  function update(data){
-//   return request({
-//     url: "/engine/engine/update",
-//     method: "post",
-//     data:data
-//   })
-// }
-
-
-
+//删除规则引擎版本信息
 export  function del(id){
   return request({
     url: "/engine/version/delete/" + id,
@@ -38,7 +27,7 @@ export  function del(id){
   })
 }
 
-
+//查看等级列表
 export  function selectLevel(){
   return request({
     url: "/engine/level/selectLevelList",
diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue
index 19e0b53..2b91e06 100644
--- a/src/views/engine/engine/index.vue
+++ b/src/views/engine/engine/index.vue
@@ -1,366 +1,677 @@
 <template>
+
   <div>
-    <el-form  label-width="80px" :model="engineReq"  :inline="true" class="demo-form-inline" size="small">
+
+    <el-form label-width="80px" :model="engineReq" :inline="true" class="demo-form-inline" size="small">
+
       <el-form-item label="规则名称">
+
         <el-input v-model="engineReq.name"></el-input>
+
       </el-form-item>
 
       <el-form-item label="规则类型">
+
         <el-select v-model="engineReq.type" placeholder="请选择类型">
+
           <el-option label="字段类型" value="1"></el-option>
+
           <el-option label="基本类型" value="2"></el-option>
+
           <el-option label="引用类型" value="3"></el-option>
+
           <el-option label="时间类型" value="4"></el-option>
+
           <el-option label="转换类型" value="5"></el-option>
+
         </el-select>
+
       </el-form-item>
 
       <el-form-item label="是否激活">
+
         <el-select v-model="engineReq.isActivate" placeholder="是否激活">
+
           <el-option label="已激活" value="1"></el-option>
+
           <el-option label="未激活" value="2"></el-option>
+
         </el-select>
+
       </el-form-item>
+
       <el-form-item label="规则状态">
+
         <el-select v-model="engineReq.status" placeholder="规则状态">
+
           <el-option label="开启" value="1"></el-option>
+
           <el-option label="关闭" value="2"></el-option>
+
         </el-select>
+
       </el-form-item>
+
       <el-button @click="select()">
+
         查询
       </el-button>
+
       <el-button @click="clears()">
+
         重置
+
       </el-button>
+
     </el-form>
-    <el-button
-      type="warning"
-      plain
-      icon="el-icon-download"
-      size="mini"
-      @click="findSelectSourceExport"
-      v-hasPermi="['source:data:export']"
-    >导出
+
+    <el-button type="warning" plain icon="el-icon-download" size="mini" @click="findSelectSourceExport"
+               v-hasPermi="['source:data:export']">导出
+
     </el-button>
 
     <!--  添加按钮  /-->
-    <el-button
-      type="primary"
-      plain
-      icon="el-icon-plus"
-      size="mini"
-      @click="handleAdd"
-      v-hasPermi="['source:data:add']"
-    >新增
+    <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['source:data:add']">
+      新增
+
     </el-button>
 
     <!-- 添加或修改规则引擎对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
         <el-row>
+
           <el-col :span="12">
+
             <el-form-item label="规则名称" prop="name">
+
               <el-input v-model="form.name" placeholder="请输入规则名称"/>
+
             </el-form-item>
+
           </el-col>
+
           <el-col :span="12">
+
             <el-form-item label="规则编码" prop="engineCode">
+
               <el-input v-model="form.engineCode" placeholder="请输入规则编码"/>
+
             </el-form-item>
+
           </el-col>
+
         </el-row>
+
         <el-row>
+
           <el-col :span="12">
+
             <el-form-item label="规则类型" prop="type">
+
               <el-select v-model="form.type" placeholder="请选择规则类型" style="width: 100%">
+
                 <el-option
+
                   v-for="dict in dict.type.rule_engine_type"
+
                   :key="dict.value"
+
                   :label="dict.label"
+
                   :value="Number(dict.value)"
+
                 ></el-option>
+
               </el-select>
+
             </el-form-item>
+
           </el-col>
+
           <el-col :span="12">
+
             <el-form-item label="规则级别" prop="scope">
+
               <el-select v-model="form.scope" placeholder="请选择规则级别" style="width: 100%">
+
                 <el-option
+
                   v-for="dict in dict.type.rule_engine_level"
+
                   :key="dict.value"
+
                   :label="dict.label"
+
                   :value="Number(dict.value)"
+
                 ></el-option>
+
               </el-select>
+
             </el-form-item>
+
           </el-col>
+
         </el-row>
+
         <el-row>
+
           <el-col :span="12">
+
             <el-form-item label="是否激活" prop="isActivate">
+
               <el-radio-group v-model="form.isActivate">
+
                 <el-radio
+
                   v-for="dict in dict.type.rule_engine_activate_status"
+
                   :key="dict.value"
+
                   :label="dict.value"
+
                 >{{ dict.label }}
+
                 </el-radio>
+
               </el-radio-group>
+
             </el-form-item>
+
           </el-col>
+
           <el-col :span="12">
+
             <el-form-item label="规则状态" prop="status">
+
               <el-radio-group v-model="form.status">
+
                 <el-radio
+
                   v-for="dict in dict.type.sys_normal_disable"
+
                   :key="dict.value"
+
                   :label="dict.value"
+
                 >{{ dict.label }}
+
                 </el-radio>
+
               </el-radio-group>
+
             </el-form-item>
+
           </el-col>
+
         </el-row>
+
         <el-row>
+
           <el-col :span="24">
+
             <el-form-item label="规则描述">
+
               <editor v-model="form.description" :min-height="192"/>
+
             </el-form-item>
+
           </el-col>
+
           <el-col :span="24">
+
             <el-form-item label="备注" prop="remark">
+
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+
             </el-form-item>
+
           </el-col>
+
         </el-row>
+
       </el-form>
+
       <div slot="footer" class="dialog-footer">
+
         <el-button type="primary" @click="submitForm">确 定</el-button>
+
         <el-button @click="cancel">取 消</el-button>
+
       </div>
+
     </el-dialog>
 
     <el-table :data="arr" style="width: 100%">
+
       <el-table-column label="编号" prop="id"></el-table-column>
+
       <el-table-column label="名称" prop="name"></el-table-column>
+
       <el-table-column label="类型" style="color: #13ce66" prop="type">
+
         <template v-slot="scope">
+
           <span v-if="scope.row.type==1">数据字段</span>
+
           <span v-if="scope.row.type==2">基本类型</span>
+
           <span v-if="scope.row.type==3">时间类型</span>
+
           <span v-if="scope.row.type==4">普通类型</span>
+
           <span v-if="scope.row.type==4">介入类型</span>
+
         </template>
+
       </el-table-column>
-      <el-table-column label="作用域"  style="color: blue" prop="scope">
+
+      <el-table-column label="作用域" style="color: blue" prop="scope">
+
         <template v-slot="scope">
+
           <span v-if="scope.row.scope==1">数据字段</span>
+
           <span v-if="scope.row.scope==2">记录</span>
+
           <span v-if="scope.row.scope==3">数据集</span>
+
           <span v-if="scope.row.scope==4">数据类型</span>
+
           <span v-if="scope.row.scope==5">日志</span>
+
         </template>
+
       </el-table-column>
+
       <el-table-column label="引擎编码" prop="engineCode"></el-table-column>
+
       <el-table-column label="是否激活" style="color: red" prop="isActivate">
+
         <template v-slot="scope">
+
           <span v-if="scope.row.isActivate==1">已激活</span>
+
           <span v-if="scope.row.isActivate==2">未激活</span>
+
         </template>
+
       </el-table-column>
-      <el-table-column label="状态"  style="color: #787be8" prop="status">
+
+      <el-table-column label="状态" style="color: #787be8" prop="status">
+
         <template v-slot="scope">
+
           <span v-if="scope.row.status==1">开启</span>
+
           <span v-if="scope.row.status==2">关闭</span>
+
         </template>
+
       </el-table-column>
+
       <el-table-column label="描述" prop="description"></el-table-column>
+
       <el-table-column
+
         align="right">
+
         <template slot-scope="scope">
-          <el-button
-            icon="el-icon-delete"
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row.id)">删除</el-button>
-          <el-button
-            icon="el-icon-service"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)">修改规则配置</el-button>
 
           <el-button
-            icon="el-icon-service"
+
+            icon="el-icon-delete"
+
             size="mini"
+
             type="text"
-            @click="engineRuleMaintenance(scope.row)">规则维护</el-button>
+
+            @click="handleDelete(scope.row.id)">删除
+          </el-button>
+
+          <el-button
+
+            icon="el-icon-service"
+
+            size="mini"
+
+            type="text"
+
+            @click="handleUpdate(scope.row)">修改规则配置
+          </el-button>
+
+          <el-button
+
+            icon="el-icon-service"
+
+            size="mini"
+
+            type="text"
+
+            @click="engineRuleMaintenance(scope.row)">规则维护
+          </el-button>
 
         </template>
+
       </el-table-column>
+
     </el-table>
+
     <!--    分页-->
+
     <el-pagination
+
       @size-change="handleSizeChange"
+
       @current-change="handleCurrentChange"
+
       :current-page="engineReq.pageNum"
+
       :page-sizes="[1, 2, 3, 4, 5]"
+
       :page-size="engineReq.pageSize"
+
       layout="total, sizes, prev, pager, next, jumper"
+
       :total="total">
+
     </el-pagination>
 
   </div>
+
 </template>
 
 <script>
+
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+
 import {del, insert, selectEngineList, update} from "@/api/engine/engine";
 
+
 export default {
+
   name: "maintenance",
+
   dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
+
   //import引入的组件需要注入到对象中才能使用"
+
   components: {},
+
   props: {},
+
   data() {
+
     //这里存放数据"
 
     return {
-      engineReq:{
-        pageNum:1,
-        pageSize:5
-      },
-      engine:{
+
+      engineReq: {
+
+        pageNum: 1,
+
+        pageSize: 5
 
       },
+      engine: {},
+
       title: "",
-      arr:[],
-      dialogFormVisible:false,
-      total:0,
+
+      arr: [],
+
+      dialogFormVisible: false,
+
+      total: 0,
+
       form: {},
-      open:false,
+
+      open: false,
+
       // 表单校验
+
       rules: {
+
         name: [
+
           {required: true, message: "规则名称不能为空", trigger: "blur"}
+
         ],
+
         type: [
+
           {required: true, message: "规则类型不能为空", trigger: "change"}
+
         ],
+
         engineCode: [
+
           {required: true, message: "规则编码不能为空", trigger: "blur"}
+
         ],
+
         isActivate: [
+
           {required: true, message: "是否激活不能为空", trigger: "change"}
+
         ],
+
         status: [
+
           {required: true, message: "规则状态不能为空", trigger: "change"}
+
         ],
+
         createBy: [
+
           {required: true, message: "创建者不能为空", trigger: "blur"}
+
         ],
+
         createTime: [
+
           {required: true, message: "创建时间不能为空", trigger: "blur"}
+
         ],
+
       }
+
     };
+
   },
+
   //计算属性 类似于data概念",
+
   computed: {},
+
   //监控data中的数据变化",
+
   watch: {},
+
   //方法集合",
+
   methods: {
+
     handleSizeChange(val) {
+
       console.log(`每页 ${val} 条`);
+
       this.engineReq.pageSize = val;
+
       this.findSelectSourceList();
+
     },
+
     handleCurrentChange(val) {
+
       console.log(`当前页: ${val}`);
+
       this.engineReq.pageNum = val;
+
       this.findSelectSourceList();
+
     },
-    findSelectSourceList(){
-      selectEngineList(this.engineReq).then(res=>{
-        this.arr=res.data.list;
-        this.total=res.data.total;
+
+    findSelectSourceList() {
+
+      selectEngineList(this.engineReq).then(res => {
+
+        this.arr = res.data.list;
+
+        this.total = res.data.total;
+
       })
+
     },
-    handleDelete(id){
-      if (confirm("是否删除这条数据？")){
-        del(id).then(res =>{
+
+    handleDelete(id) {
+
+      if (confirm("是否删除这条数据？")) {
+
+        del(id).then(res => {
+
           //判断删除是否成功
+
           this.$message.success(res.msg || "删除成功")
+
         })
+
       }
+
     },
-    findSelectSourceExport(){
+
+    findSelectSourceExport() {
+
       this.download('engine/engine/export', {
+
           ...this.engineReq
+
         },
+
         `source_${new Date().getTime()}.xlsx`)
+
     },
-    select(){
+
+    select() {
+
       this.findSelectSourceList();
+
     },
+
     /** 新增按钮操作 */
+
     handleAdd() {
+
       // this.reset();
+
       this.open = true;
+
       this.title = "添加规则引擎";
+
     },
+
     /** 修改按钮操作 */
+
     handleUpdate(row) {
+
       // this.reset();
+
       this.form = row;
+
       this.open = true;
+
       this.title = "修改规则引擎";
+
     },
+
     /** 提交按钮 */
+
     submitForm() {
+
       this.$refs["form"].validate(valid => {
+
         if (valid) {
+
           if (this.form.id != null) {
+
             update(this.form).then(response => {
+
               this.$modal.msgSuccess("修改成功");
+
               this.findSelectSourceList();
+
               this.open = false;
+
             })
+
           } else {
+
             insert(this.form).then(response => {
+
               this.$modal.msgSuccess("新增成功");
+
               this.findSelectSourceList();
+
               this.open = false;
+
             })
+
           }
+
         }
+
       });
+
     },
-    engineRuleMaintenance(row){
+
+    engineRuleMaintenance(row) {
+
       this.$router.push({
-        path:'list',
-        query:{id:row.id}
+
+        path: 'list',
+
+        query: {id: row.id}
+
       })
+
     },
-    clears(){
+
+    clears() {
+
       this.engineReq = {
+
         name: '',
+
         type: '',
+
         isActivate: '',
+
         status: ''
+
       };
+
     }
+
   },
+
   //生命周期 - 创建完成（可以访问当前this实例）",
+
   created() {
+
     this.findSelectSourceList();
+
   },
+
   //生命周期 - 挂载完成（可以访问DOM元素）",
+
   mounted() {
+
   },
+
   beforeCreate() {
+
   }, //生命周期 - 创建之前",
   beforeMount() {
   }, //生命周期 - 挂载之前",
diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index cab425b..6abdd53 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -1,275 +1,375 @@
 <template>
+
   <div>
-    <el-descriptions class="margin-top" :column="2" border :title="maintenance.name">
 
-      <el-descriptions-item>
+    <div style="height: 30px">
 
-        <el-button type="primary" @click="handleInsert">版本添加</el-button>
-        <template slot="label">
-          <i class="el-icon-user"></i>
-          操作按钮
-        </template>
-        <el-button type="danger" v-show="maintenance.status=='1'" @click="updStatus(ruleAndVersion.status,ruleAndVersion.id)">开启引擎</el-button>
-        <el-button type="danger" v-show="maintenance.status=='0'"  @click="updStatus(ruleAndVersion.status,ruleAndVersion.id)">关闭引擎</el-button>
-        <el-button type="warning" v-show="maintenance.open=='N' " @click="updOpen(ruleAndVersion.open,ruleAndVersion.id)">激活引擎</el-button>
-        <el-button type="warning" v-show="maintenance.open=='Y'" @click="updOpen(ruleAndVersion.open,ruleAndVersion.id)">禁用引擎</el-button>
-      </el-descriptions-item>
+      {{ maintenance.name }}<br>
 
-      <el-descriptions-item>
-        <template slot="label">
-          <i class="el-icon-user"></i>
-          版本名称
-        </template>
-        {{ maintenance.name }}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <i class="el-icon-user"></i>
-          版本编码
-        </template>
-        {{ maintenance.code}}
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <i class="el-icon-user"></i>
-          规则作用域
-        </template>
+    </div>
+
+    <div style="height: 50px">
+
+      规则名称:{{ maintenance.name }}<br>
+
+      规则类型:<span v-if="maintenance.type==1">字段类型</span>
+
+      <span v-if="maintenance.type==2">基本类型</span>
+
+      <span v-if="maintenance.type==3">时间类型</span>
+
+      <span v-if="maintenance.type==4">转换类型</span>
+
+      <span v-if="maintenance.type==5">测试类型</span><br>
+
+      作用域:<span v-if="maintenance.scope==1">字段规则</span>
+
+      <span v-if="maintenance.scope==2">基本规则</span>
+
+      <span v-if="maintenance.scope==3">时间规则</span>
+
+      <span v-if="maintenance.scope==4">格式规则</span>
+
+      <span v-if="maintenance.scope==5">自定义规则</span><br>
+
+      引擎编码:{{ maintenance.engineCode }}<br>
+
+      是否激活:<span v-if="maintenance.isActivate==1">开启</span>
+
+      <span v-if="maintenance.isActivate==2">关闭</span><br>
+
+      状态:<span v-if="maintenance.isActivate==1">正常</span>
+
+      <span v-if="maintenance.isActivate==2">异常</span>
+
+      <span v-if="maintenance.isActivate==3">未知</span>
+
+      <span v-if="maintenance.isActivate==4">错误</span>
+
+      <br>
+
+      <button @click="onEngine(maintenance.id)">激活引擎</button>
+
+    </div>
 
-        <dict-tag :options="maintenance.type.status" :value="maintenance.status"/>
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <i class="el-icon-user"></i>
-          状态
-        </template>
-        <dict-tag :options="maintenance.type.rule_engine_activate_status" :value="maintenance.status"/>
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <i class="el-icon-user"></i>
-          激活状态
-        </template>
-        <dict-tag :options="maintenance.type.rule_engine_activate_status" :value="maintenance.open"/>
-      </el-descriptions-item>
-      <el-descriptions-item>
-        <template slot="label">
-          <i class="el-icon-user"></i>
-          版本描述
-        </template>
-        <editor   v-model="maintenance.isActivate" :readOnly="true" :min-height="50"/>
-      </el-descriptions-item>
-    </el-descriptions>
     <br>
 
-    <el-empty description="暂无规则引擎版本" v-if="maintenance.engineMaintenanceList.length==0"></el-empty>
-    <el-row :gutter="10">
-      <el-col :span="8" v-for="version in maintenance.engineMaintenanceList">
-        <el-card class="box-card">
-          <el-descriptions class="margin-top" title="带边框列表" :column="3" :size="size" border>
-            <template slot="extra">
-              <el-button type="primary" size="small">操作</el-button>
-            </template>
-            <el-descriptions-item>
-              <template el-slot="label">
-                <i class="el-icon-user"></i>
-                名称
-              </template>
-              {{ version.name }}
-            </el-descriptions-item>
-            <br>
-            <el-descriptions-item>
-              <template el-slot="label">
-                <i class="el-icon-mobile-phone"></i>
-                类型
-              </template>
-              {{ version.type }}
-            </el-descriptions-item>
-            <br>
-            <el-descriptions-item>
-              <template el-slot="label">
-                <i class="el-icon-location-outline"></i>
-                作用域
-              </template>
-              {{ version.scope }}
-            </el-descriptions-item>
-            <br>
-            <el-descriptions-item>
-              <template el-slot="label">
-                <i class="el-icon-office-building"></i>
-                是否激活
-              </template>
-              {{ version.isActivate }}
-            </el-descriptions-item>
-            <br>
-            <el-descriptions-item>
-              <template el-slot="label">
-                <i class="el-icon-office-building"></i>
-                状态
-              </template>
-              {{ version.status }}
-            </el-descriptions-item>
-            <br>
-          </el-descriptions>
-        </el-card>
-      </el-col>
-    </el-row>
+    <br>
 
+    <br>
+
+    <br>
+
+    <br>
+
+    <br>
+
+    <br>
+
+    <br>
+
+    <el-button type="text" @click="dialogFormVisible = true">新增</el-button>
+
+    <el-dialog title="收货地址" :visible.sync="dialogFormVisible">
+
+      <el-form :model="form">
+
+        <el-form-item label="名称" :label-width="formLabelWidth">
+
+          <el-input v-model="form.name" autocomplete="off"></el-input>
 
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="80%">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px"  class="demo-form-inline">
-        <el-form-item label="版本名称" prop="versionName">
-          <el-input v-model="form.name" placeholder="请输入引擎名称" style="width:  40%" />
-        </el-form-item>
-        <el-form-item label="版本类型" prop="versionCode">
-          <el-input v-model="form.type" placeholder="请输入版本编码" style="width:  40%" />
-        </el-form-item>
-        <el-form-item label="作用域" prop="versionDesc">
-          <editor v-model="form.scope" :min-height="192"/>
         </el-form-item>
 
-        <el-form-item label="是否激活" prop="versionDesc">
-          <editor v-model="form.isActivate" :min-height="192"/>
+        <el-form-item label="类型" :label-width="formLabelWidth">
+
+          <el-input v-model="form.type" autocomplete="off"></el-input>
+
         </el-form-item>
 
-        <el-form-item label="状态" prop="versionDesc">
-          <editor v-model="form.status" :min-height="192"/>
+        <el-form-item label="作用域" :label-width="formLabelWidth">
+
+          <el-input v-model="form.scope" autocomplete="off"></el-input>
+
         </el-form-item>
 
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"/>
+        <el-form-item label="是否激活" :label-width="formLabelWidth">
+
+          <el-input v-model="form.isActivate" autocomplete="off"></el-input>
+
         </el-form-item>
+
+        <el-form-item label="状态" :label-width="formLabelWidth">
+
+          <el-input v-model="form.status" autocomplete="off"></el-input>
+
+        </el-form-item>
+
       </el-form>
-      <el-button type="primary" @click="generateEngine(form.versionName,form.versionCode)">生成引擎类</el-button>
 
-      <div class="code-edit">
-        <codemirror ref="codeMirror" v-model="form.versionClazz" :value="form.versionClazz" :options="cmOptions"  />
+      <div slot="footer" class="dialog-footer">
+
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+
+        <el-button type="primary" @click=handleInsert()>确 定</el-button>
+
       </div>
-      <span slot="footer" class="dialog-footer">
-    <el-button @click="cancel">取 消</el-button>
-    <el-button type="primary" @click="submitForm">确 定</el-button>
-  </span>
+
     </el-dialog>
 
 
+    <el-table :data="maintenance.engineMaintenanceList" style="width: 100%">
 
-    <el-drawer
-      :title="title"
-      :visible.sync="maintenance"
-      size="60%"
-      :direction="direction"
-      :before-close="handleClose">
-      <el-descriptions class="margin-top" :column="1" border>
-        <el-descriptions-item>
-          <template slot="label">
-            <i class="el-icon-user"></i>
-            版本名称
-          </template>
-          {{ maintenance.name }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            <i class="el-icon-user"></i>
-            版本编码
-          </template>
-          {{ maintenance.type}}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            <i class="el-icon-user"></i>
-            状态
-          </template>
-          <dict-tag :options="dict.type.rule_engine_activate_status" :value="maintenance.status"/>
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            <i class="el-icon-user"></i>
-            激活状态
-          </template>
-          <dict-tag :options="dict.type.rule_engine_activate_status" :value="maintenance.open"/>
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            <i class="el-icon-user"></i>
-            版本描述
-          </template>
-          <editor  v-model="maintenance.status" :readOnly="true"  :min-height="50" aria-readonly="true" />
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label">
-            <i class="el-icon-user"></i>
-            代码操作
-          </template>
-          <codemirror ref="codeMirror" :value="maintenance.isActivate" :options="cmOptions" class="code" v-model="maintenance.scope">
-          </codemirror>
-        </el-descriptions-item>
-      </el-descriptions>
+      <el-table-column label="编号" width="180">
 
-    </el-drawer>
+        <template slot-scope="scope">
+
+          <i class="el-icon-time"></i>
+
+          <span style="margin-left: 10px">{{ scope.row.id }}</span>
+
+        </template>
+
+      </el-table-column>
+
+      <el-table-column label="名称" width="180">
+
+        <template slot-scope="scope">
+
+          <i class="el-icon-time"></i>
+
+          <span style="margin-left: 10px">{{ scope.row.name }}</span>
+
+        </template>
+
+      </el-table-column>
+
+      <el-table-column label="类型" width="180">
+
+        <template slot-scope="scope">
+
+          <i class="el-icon-time"></i>
+
+          <span style="margin-left: 10px" v-if="scope.row.type==1">字段类型</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.type==2">基本类型</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.type==3">时间类型</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.type==4">转换类型</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.type==5">测试类型</span>
+
+        </template>
+
+      </el-table-column>
+
+      <el-table-column label="作用域" width="180">
+
+        <template slot-scope="scope">
+
+          <i class="el-icon-time"></i>
+
+          <span style="margin-left: 10px" v-if="scope.row.scope==1">字段规则</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.scope==2">基本规则</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.scope==3">时间规则</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.scope==4">格式规则</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.scope==5">自定义规则</span>
+
+        </template>
+
+      </el-table-column>
+
+      <el-table-column label="是否激活" width="180">
+
+        <template slot-scope="scope">
+
+          <i class="el-icon-time"></i>
+
+          <span style="margin-left: 10px" v-if="scope.row.isActivate==1">激活</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.isActivate==2">禁用</span>
+
+        </template>
+
+      </el-table-column>
+
+      <el-table-column label="状态" width="180">
+
+        <template slot-scope="scope">
+
+          <i class="el-icon-time"></i>
+
+          <span style="margin-left: 10px" v-if="scope.row.status==1">正常</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.status==2">异常</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.status==3">未知</span>
+
+          <span style="margin-left: 10px" v-if="scope.row.status==4">错误</span>
+
+        </template>
+
+      </el-table-column>
+
+
+      <el-table-column label="操作">
+
+        <template slot-scope="scope">
+
+          <el-button size="mini" type="danger" @click="del(scope.row.id)">删除
+
+          </el-button>
+
+          <el-button size="mini" type="danger" @click="onEngine(scope.row.id)">激活规则
+
+          </el-button>
+
+          <el-button size="mini" type="danger" @click="forbiddenEngine(scope.row.id)">禁用规则
+
+          </el-button>
+
+        </template>
+
+      </el-table-column>
+
+    </el-table>
 
   </div>
+
 </template>
+
 <script>
 
-import {findById, forbiddenEngine, onEngine} from "@/api/engine/engine";
+import {dels, findById, onEngine} from "@/api/engine/engine";
+
 import {insert} from "@/api/version/version";
 
 export default {
+
   dicts: ['rule_engine_activate_status', 'rule_engine_type', 'sys_normal_disable', 'rule_engine_level'],
+
   //import引入的组件需要注入到对象中才能使用"
+
   components: {},
+
   props: {},
+
   data() {
+
     //这里存放数据"
+
     return {
+
       direction: 'rtl',
-      maintenance:{
+
+      maintenance: {
+
         engineMaintenanceList: [],
+
       },
-      title:"",
-      open:false,
-      handleClose:false,
-      form:{
+
+      title: "",
+
+      open: false,
+
+      handleClose: false,
+
+      form: {},
+
+      size: '',
+
+      dialogFormVisible: false,
+
+      formLabelWidth: '120px'
+
+    }
+
+  },
+
+  methods: {
+
+    handleInsert() {
+
+      this.maintenance = {}
+
+      this.dialogFormVisible = true
+
+      insert(this.maintenance).then(res => {
+
+        this.$modal.msgSuccess("新增成功")
+
+      })
+      this.dialogFormVisible = false
+
+      this.List();
+
+    },
+    onEngine(id) {
+
+      onEngine(id).then(res => {
+
+        this.$modal.msgSuccess("激活成功")
+
+      })
+
+    },
+    forbiddenEngine(id) {
+
+      onEngine(id).then(res => {
+
+        this.$modal.msgSuccess("禁用成功")
+
+      })
+
+    },
+
+    List() {
+
+      findById(this.maintenance.id).then(res => {
+
+        this.maintenance = res.data;
+
+        console.log(this.maintenance)
+
+        console.log(this.maintenance.engineMaintenanceList)
+
+      })
+
+    },
+
+    del(id) {
+
+      if (confirm("你确定删除吗?")) {
+
+        dels(id).then(res => {
+
+          this.$message.success(res.msg || "删除成功");
+
+        })
 
       }
+
     }
+
   },
-  methods: {
-    handleInsert(){
-      this.open = true
-      insert(this.maintenance).then(res =>{
-        this.$modal.msgSuccess("新增成功")
-      })
-    },
-    List(){
-      findById(this.maintenance.id).then(res =>{
-        this.maintenance = res.data;
-        console.log(this.maintenance)
-        console.log(this.maintenance.engineMaintenanceList)
-      })
-    },
-    handleStatusChange(row){
-      if (row.status === "Y"){
-        onEngine(row.id).then((res)=>{
-          this.$modal.msgSuccess("启用成功")
-          this.getList()
-        })
-      }else {
-        forbiddenEngine(row.id).then((res)=>{
-          this.$modal.msgSuccess("禁用成功")
-          this.getList()
-        })
-      }
-    },
-  },
+
   //生命周期 - 创建完成（可以访问当前this实例）",
+
   created() {
+
     this.maintenance.id = this.$route.query.id
+
     this.List();
+
   }
+
 }
 </script>
+
 <style scoped>
+
 </style>
diff --git a/src/views/type/index.vue b/src/views/type/index.vue
index b5d8568..9ab6206 100644
--- a/src/views/type/index.vue
+++ b/src/views/type/index.vue
@@ -1,4 +1,5 @@
 <template>
+
   <div>
 
     <!-- 添加或修改规则引擎对话框 -->
@@ -15,86 +16,140 @@
         </el-form-item>
 
       </el-form>
+
       <div slot="footer" class="dialog-footer">
+
         <el-button @click="dialogFormVisible = false">取 消</el-button>
+
         <el-button type="primary" @click="submitForm">确 定</el-button>
+
       </div>
+
     </el-dialog>
 
-
-
-
-
     <el-table :data="arr" style="width: 100%">
 
       <el-table-column label="类型编号" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.id }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="类型名称" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.name }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="操作">
+
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="danger"
-            @click="handleDelete(scope.row.id)">删除</el-button>
+
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
+
         </template>
+
       </el-table-column>
 
     </el-table>
   </div>
+
 </template>
+
 <script>
+
 import {del, insert, list} from "@/api/type/type";
 
 export default {
+
   //import引入的组件需要注入到对象中才能使用"
+
   components: {},
+
   props: {},
+
   data() {
+
     //这里存放数据"
+
     return {
-      arr:[],
-      type:{},
+
+      arr: [],
+
+      type: {},
+
       rules: {
+
         name: [{required: true, message: '请输入规则名称', trigger: 'blur'}]
+
       },
-      dialogFormVisible:false,
+
+      dialogFormVisible: false,
+
       formLabelWidth: '120px'
+
     };
+
   },
+
   methods: {
-    List(){
-      list().then(res =>{
+
+    List() {
+
+      list().then(res => {
+
         this.arr = res;
+
       })
+
     },
-    handleDelete(id){
-      if (confirm("你确定删除吗?")){
-        del(id).then(res =>{
+
+    handleDelete(id) {
+
+      if (confirm("你确定删除吗?")) {
+
+        del(id).then(res => {
+
           this.$message.success(res.msg || "删除成功")
+
         })
+
       }
+
     },
-    submitForm(){
-      this.dialogFormVisible=true
-      insert(this.type).then(res =>{
+
+    submitForm() {
+
+      this.dialogFormVisible = true
+
+      insert(this.type).then(res => {
+
         this.$message.success(res.msg || "添加成功")
+
       })
+
       this.dialogFormVisible = false;
+
     }
+
   },
+
   //生命周期 - 创建完成（可以访问当前this实例）",
+
   created() {
+
     this.List();
+
   }
+
 }
 </script>
 <style scoped>
diff --git a/src/views/version/version/version.vue b/src/views/version/version/version.vue
index 0adf58b..13e0a3b 100644
--- a/src/views/version/version/version.vue
+++ b/src/views/version/version/version.vue
@@ -1,27 +1,39 @@
 <template>
+
   <div>
-<!--条件查询-->
-    <el-form :model="version" >
+
+    <!--条件查询-->
+
+    <el-form :model="version">
 
       <el-form-item label="版本编码" prop="pass">
+
         <el-input type="text" v-model="version.versionCode" autocomplete="off"></el-input>
+
       </el-form-item>
 
       <el-form-item label="规则内容" prop="checkPass">
+
         <el-input type="text" v-model="version.ruleContent" autocomplete="off"></el-input>
+
       </el-form-item>
 
       <el-form-item label="引擎维护编号" prop="checkPass">
+
         <el-input type="text" v-model="version.engineMaintenanceId" autocomplete="off"></el-input>
+
       </el-form-item>
 
       <el-form-item>
+
         <el-button type="primary" @click="submitForm">查询</el-button>
+
       </el-form-item>
+
     </el-form>
 
 
-<!--    添加版本信息-->
+    <!--    添加版本信息-->
     <el-button type="text" @click="dialogFormVisible = true">添加版本信息</el-button>
 
     <el-dialog title="添加信息" :visible.sync="dialogFormVisible">
@@ -29,183 +41,290 @@
       <el-form :model="version">
 
         <el-form-item label="版本类名" :label-width="formLabelWidth">
+
           <el-input v-model="version.versionClass" autocomplete="off"></el-input>
+
         </el-form-item>
 
         <el-form-item label="版本名称" :label-width="formLabelWidth">
+
           <el-input v-model="version.name" autocomplete="off"></el-input>
+
         </el-form-item>
 
 
         <el-form-item label="版本编码" :label-width="formLabelWidth">
+
           <el-input v-model="version.versionCode" autocomplete="off"></el-input>
+
         </el-form-item>
 
 
         <el-form-item label="是否激活" :label-width="formLabelWidth">
+
           <el-input v-model="version.isActivate" autocomplete="off"></el-input>
+
         </el-form-item>
 
 
         <el-form-item label="版本状态" :label-width="formLabelWidth">
+
           <el-input v-model="version.status" autocomplete="off"></el-input>
+
         </el-form-item>
 
 
         <el-form-item label="版本测试状态" :label-width="formLabelWidth">
+
           <el-input v-model="version.testStatus" autocomplete="off"></el-input>
+
         </el-form-item>
 
 
         <el-form-item label="规则内容" :label-width="formLabelWidth">
+
           <el-input v-model="version.ruleContent" autocomplete="off"></el-input>
+
         </el-form-item>
 
 
         <el-form-item label="引擎维护编号" :label-width="formLabelWidth">
+
           <el-input v-model="version.engineMaintenanceId" autocomplete="off"></el-input>
+
         </el-form-item>
 
 
         <el-form-item label="描述" :label-width="formLabelWidth">
+
           <el-input v-model="version.description" autocomplete="off"></el-input>
+
         </el-form-item>
 
       </el-form>
+
       <div slot="footer" class="dialog-footer">
+
         <el-button @click="dialogFormVisible = false">取 消</el-button>
+
         <el-button type="primary" @click="insert">确 定</el-button>
+
       </div>
+
     </el-dialog>
 
-
-
-
-<!--    列表-->
+    <!--    列表-->
     <el-table :data="arr" style="width: 100%">
 
       <el-table-column label="编号" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.id }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="版本类名" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.versionClass }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="版本名称" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.name }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="版本编码" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.versionCode }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="是否激活" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.isActivate }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="版本状态" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.status }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="版本测试状态" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.testStatus }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="规则内容" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.ruleContent }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="引擎维护编号" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.engineMaintenanceId }}</span>
+
         </template>
+
       </el-table-column>
 
       <el-table-column label="描述" width="180">
+
         <template slot-scope="scope">
+
           <span style="margin-left: 10px">{{ scope.row.description }}</span>
+
         </template>
+
       </el-table-column>
 
 
       <el-table-column label="操作">
+
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="danger"
-            @click="handleDelete(scope.row.id)">删除</el-button>
+
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除
+
+          </el-button>
+
         </template>
+
       </el-table-column>
 
-
     </el-table>
+
   </div>
+
 </template>
+
 <script>
+
 import {list} from "@/api/version/version";
+
 import {del, insert} from "@/api/version/version";
 
 export default {
-  //import引入的组件需要注入到对象中才能使用"
-  components: {},
-  props: {},
-  data() {
-    //这里存放数据"
-    return {
-      arr:[],
-      version:{
 
-      },
-      dialogFormVisible:false,
+  //import引入的组件需要注入到对象中才能使用"
+
+  components: {},
+
+  props: {},
+
+  data() {
+
+    //这里存放数据"
+
+    return {
+
+      arr: [],
+
+      version: {},
+
+      dialogFormVisible: false,
+
       formLabelWidth: '120px'
+
     };
+
   },
+
   methods: {
-    List(){
-      list(this.version).then(res =>{
+
+    List() {
+
+      list(this.version).then(res => {
+
         this.arr = res.data;
+
         console.log(res)
+
         console.log(this.arr)
+
       })
+
     },
-    submitForm(){
+
+    submitForm() {
+
       this.List();
+
     },
-    insert(){
-      insert(this.version).then(res =>{
+
+    insert() {
+
+      insert(this.version).then(res => {
+
         this.$message.success("添加成功");
+
       })
-      this.dialogFormVisible=false;
+
+      this.dialogFormVisible = false;
+
     },
-    handleDelete(id){
-      if (confirm("你确定删除吗?")){
-        del(id).then(res =>{
-           this.$message.success(res.msg || "删除成功")
+
+    handleDelete(id) {
+
+      if (confirm("你确定删除吗?")) {
+
+        del(id).then(res => {
+
+          this.$message.success(res.msg || "删除成功")
+
         })
+
       }
+
     }
+
   },
+
   //生命周期 - 创建完成（可以访问当前this实例）",
+
   created() {
+
     this.List();
+
   }
+
 }
 </script>
 <style scoped>

From 5f5cce623647f323c90c16428b5c46f5769c51af Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Thu, 29 Aug 2024 21:55:46 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=A4=B4=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/port/port/index.js       | 13 ++++++
 src/views/port/port/employee.vue | 73 ++++++++++++++++++++++++++------
 2 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js
index 6cf4f3d..90d4a0f 100644
--- a/src/api/port/port/index.js
+++ b/src/api/port/port/index.js
@@ -37,3 +37,16 @@ export function phonePlace(tel) {
     method: 'GET'
   })
 }
+
+export function getIpPlace(ip) {
+  return request({
+    url: '/port/list/getIpPlace?ip='+ip,
+    method: 'GET'
+  })
+}
+export function getHeadlines() {
+  return request({
+    url: '/port/list/getHeadlines',
+    method: 'GET'
+  })
+}
diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index eeb76f5..1792b22 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -15,8 +15,8 @@
           {{connector.connectorPrice}}/次<br>
 
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testPhone()" v-if="connector.connectorName=='手机号查询归属地'">测试API</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testIP(connector)" v-if="connector.connectorName=='IP查询归属地'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testNews(connector)" v-if="connector.connectorName=='新闻头条'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testIP()" v-if="connector.connectorName=='IP查询归属地'">测试API</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testNews()" v-if="connector.connectorName=='新闻头条'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather(connector)" v-if="connector.connectorName=='气象预警'">测试</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testBirthdate(connector)" v-if="connector.connectorName=='生辰助手'">测试</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox(connector)" v-if="connector.connectorName=='邮编查询'">测试</el-button>
@@ -27,7 +27,7 @@
     <el-dialog title="手机查询归属地" :visible.sync="dialogFormVisible">
       <el-form :model="formInline">
         <el-form-item label="手机号" :label-width="formLabelWidth">
-          <el-input v-model="formInline.tel" autocomplete="off"></el-input>
+          <el-input v-model="formInline.tel" autocomplete="off" placeholder="请输入手机号"></el-input>
         </el-form-item>
         <span style="font-weight: bold;font-size: 20px" v-if="formInline.reason==true">
         省份：{{this.formInline.province}}<br>
@@ -44,22 +44,30 @@
 
     <!--IP查询归属地-->
     <el-dialog title="IP查询归属地" :visible.sync="dialogFormVisible1">
-      <el-form :model="formInline">
-        <el-form-item label="IP" :label-width="formLabelWidth">
-          <el-input v-model="formInline.tel" autocomplete="off"></el-input>
+      <el-form :model="formIp">
+        <el-form-item label="IP" >
+          <el-input v-model="formIp.ip" autocomplete="off" placeholder="请输入ip"></el-input>
         </el-form-item>
-        <span style="font-weight: bold;font-size: 20px" v-if="formInline.reason==true">
-        省份：{{this.formInline.province}}<br>
-        城市：{{this.formInline.city}}<br>
-        区号：{{this.formInline.areacode}}<br>
-        邮编：{{this.formInline.zip}}<br>
-        运营商：{{this.formInline.company}}<br>
+        <span style="font-weight: bold;font-size: 20px" v-if="formIp.reason==true">
+        国家：{{this.formIp.country}}<br>
+        省份：{{this.formIp.province}}<br>
+        城市：{{this.formIp.city}}<br>
+        运营商：{{this.formIp.isp}}<br>
         </span>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="phonePlace()">发起请求</el-button>
+        <el-button type="primary" @click="getIpPlace()">发起请求</el-button>
       </div>
     </el-dialog>
+<!--    新闻头条-->
+    <el-dialog title="新闻头条" :visible.sync="dialogTableVisible">
+      <el-table :data="gridData">
+        <el-table-column property="title" label="新闻标题" width="150"></el-table-column>
+        <el-table-column property="date" label="新闻时间" width="200"></el-table-column>
+        <el-table-column property="category" label="新闻分类"></el-table-column>
+        <el-table-column property="authorName" label="新闻来源"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -69,6 +77,8 @@
 import {findConnectorList} from "@/api/port/port";
 import index from "vuex";
 import {phonePlace} from "@/api/port/port";
+import {getIpPlace} from "@/api/port/port";
+import {getHeadlines} from "@/api/port/port";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -78,6 +88,7 @@ export default {
 
     return {
       connectorList:[],
+      gridData:[],
       form:{},
       // 手机号查询归属地formInline
       formInline:{
@@ -89,9 +100,23 @@ export default {
         company:"",
         reason:"",
       },
+
+      formIp:{
+        ip:"",
+        country:"",
+        province:"",
+        city:"",
+        isp:"",
+        reason:"",
+      },
+      formNews:{
+        news:"",
+        reason:"",
+      },
       // IP查询归属地
       dialogFormVisible:false,
       dialogFormVisible1:false,
+      dialogTableVisible:false,
     };
   },
   //计算属性 类似于data概念",
@@ -107,6 +132,28 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    testNews(){
+      getHeadlines().then((res)=>{
+        this.gridData=res.data;
+        this.dialogTableVisible=true;
+      })
+    },
+    getIpPlace(){
+      getIpPlace(this.formIp.ip).then((res)=>{
+        console.log(res.data);
+        if (200==res.code){
+          this.formIp.country=res.data.country;
+          this.formIp.province=res.data.province;
+          this.formIp.city=res.data.city;
+          this.formIp.isp=res.data.isp;
+          this.formIp.reason=true;
+        }
+      })
+    },
+    testIP(ip){
+      this.formIp.ip=ip;
+      this.dialogFormVisible1=true;
+    },
     testPhone(tel){
       this.formInline.tel=tel;
       this.dialogFormVisible=true;

From 6121834f856b2b9ea993356479d53816dffc7276 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Fri, 30 Aug 2024 10:06:38 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E7=94=9F=E8=BE=B0=E5=8A=A9=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/port/port/index.js       |   7 ++
 src/views/port/port/employee.vue | 108 ++++++++++++++++++++++++++++++-
 2 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js
index 90d4a0f..fee0964 100644
--- a/src/api/port/port/index.js
+++ b/src/api/port/port/index.js
@@ -50,3 +50,10 @@ export function getHeadlines() {
     method: 'GET'
   })
 }
+export function getBirthday(data) {
+  return request({
+    url: '/port/list/getBirthday',
+    method: 'post',
+    data:data
+  })
+}
diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 1792b22..dff8371 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -17,9 +17,9 @@
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testPhone()" v-if="connector.connectorName=='手机号查询归属地'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testIP()" v-if="connector.connectorName=='IP查询归属地'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testNews()" v-if="connector.connectorName=='新闻头条'">测试API</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather(connector)" v-if="connector.connectorName=='气象预警'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testBirthdate(connector)" v-if="connector.connectorName=='生辰助手'">测试</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox(connector)" v-if="connector.connectorName=='邮编查询'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather()" v-if="connector.connectorName=='气象预警'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testBirthdate()" v-if="connector.connectorName=='生辰助手'">测试API</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox()" v-if="connector.connectorName=='邮编查询'">测试</el-button>
         </el-card>
       </el-col>
     </el-row>
@@ -68,6 +68,51 @@
         <el-table-column property="authorName" label="新闻来源"></el-table-column>
       </el-table>
     </el-dialog>
+
+    <!--生辰助手-->
+    <el-dialog title="生辰助手" :visible.sync="dialogFormVisible2">
+      <el-form :model="formBirthday">
+        <el-form-item label="年" >
+          <el-input v-model="formBirthday.year" autocomplete="off" placeholder="请输入年份"></el-input>
+        </el-form-item>
+
+        <el-form-item label="月" >
+          <el-input v-model="formBirthday.month" autocomplete="off" placeholder="请输入月份"></el-input>
+        </el-form-item>
+
+        <el-form-item label="日" >
+          <el-input v-model="formBirthday.day" autocomplete="off" placeholder="请输入几号"></el-input>
+        </el-form-item>
+
+        <el-form-item label="时" >
+          <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">
+          {{this.formBirthday.years}}<br>
+          {{this.formBirthday.months}}<br>
+          {{this.formBirthday.days}}<br>
+          {{this.formBirthday.animal}}<br>
+          {{this.formBirthday.imonthcn}}<br>
+          {{this.formBirthday.idaycn}}<br>
+          {{this.formBirthday.cyear}}<br>
+          {{this.formBirthday.cmonth}}<br>
+          {{this.formBirthday.cday}}<br>
+          {{this.formBirthday.gzyear}}<br>
+          {{this.formBirthday.gzmonth}}<br>
+          {{this.formBirthday.gzday}}<br>
+          {{this.formBirthday.isleap}}<br>
+          {{this.formBirthday.ncweek}}<br>
+          {{this.formBirthday.isterm}}<br>
+          {{this.formBirthday.term}}<br>
+          {{this.formBirthday.astro}}<br>
+          {{this.formBirthday.eightall}}<br>
+          {{this.formBirthday.fiveall}}
+        </span>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="getBirthday()">发起请求</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -79,6 +124,7 @@ import index from "vuex";
 import {phonePlace} from "@/api/port/port";
 import {getIpPlace} from "@/api/port/port";
 import {getHeadlines} from "@/api/port/port";
+import {getBirthday} from "@/api/port/port";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -109,6 +155,32 @@ export default {
         isp:"",
         reason:"",
       },
+      formBirthday:{
+        year:"",
+        month:"",
+        day:"",
+        hour:"",
+        years:"",
+        months:"",
+        days:"",
+        animal:"",
+        imonthcn:"",
+        idaycn:"",
+        cyear:"",
+        cmonth:"",
+        cday:"",
+        gzyear:"",
+        gzmonth:"",
+        gzday:"",
+        isleap:"",
+        ncweek:"",
+        isterm:"",
+        term:"",
+        astro:"",
+        eightall:"",
+        fiveall:"",
+        reason:"",
+      },
       formNews:{
         news:"",
         reason:"",
@@ -116,6 +188,7 @@ export default {
       // IP查询归属地
       dialogFormVisible:false,
       dialogFormVisible1:false,
+      dialogFormVisible2:false,
       dialogTableVisible:false,
     };
   },
@@ -132,6 +205,35 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    getBirthday(){
+      getBirthday(this.formBirthday).then((res)=>{
+        console.log(res.data);
+        this.formBirthday.reason=true;
+        this.formBirthday.years=res.data.years;
+        this.formBirthday.months=res.data.months;
+        this.formBirthday.days=res.data.days;
+        this.formBirthday.animal=res.data.animal;
+        this.formBirthday.imonthcn=res.data.imonthcn;
+        this.formBirthday.idaycn=res.data.idaycn;
+        this.formBirthday.cyear=res.data.cyear;
+        this.formBirthday.cmonth=res.data.cmonth;
+        this.formBirthday.cday=res.data.cday;
+        this.formBirthday.gzyear=res.data.gzyear;
+        this.formBirthday.gzmonth=res.data.gzmonth;
+        this.formBirthday.gzday=res.data.gzday;
+        this.formBirthday.isleap=res.data.isleap;
+        this.formBirthday.ncweek=res.data.ncweek;
+        this.formBirthday.isterm=res.data.isterm;
+        this.formBirthday.term=res.data.term;
+        this.formBirthday.astro=res.data.astro;
+        // this.formBirthday.eightall=res.data.eightall;
+        // this.formBirthday.fiveall=res.data.fiveall;
+
+      })
+    },
+    testBirthdate(){
+      this.dialogFormVisible2=true;
+    },
     testNews(){
       getHeadlines().then((res)=>{
         this.gridData=res.data;

From 4aeb5a8876d39070fa668d4d2bde8cedb706c84b Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Fri, 30 Aug 2024 19:34:20 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/engine/engine.js         | 15 ++++++++++++++-
 src/views/engine/engine/list.vue | 22 +++++++++-------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js
index b601ae6..f3f361b 100644
--- a/src/api/engine/engine.js
+++ b/src/api/engine/engine.js
@@ -73,7 +73,7 @@ export function getRuleEngineInfo(id) {
 // 通过id查询
 export function findById(id) {
   return request({
-    url: '/engine/engine/findById/' + id,
+    url: '/engine/engine/findByIds/' + id,
     method: 'get'
   })
 }
@@ -88,3 +88,16 @@ export function dels(id) {
 }
 
 
+
+//天机规则数据
+export  function add(data){
+  return request({
+    url: "/engine/version/insert",
+    method: "post",
+    data:data
+  })
+}
+
+
+
+
diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index 6abdd53..89f69cb 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -72,35 +72,35 @@
 
     <el-dialog title="收货地址" :visible.sync="dialogFormVisible">
 
-      <el-form :model="form">
+      <el-form :model="maintenance">
 
         <el-form-item label="名称" :label-width="formLabelWidth">
 
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.name" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="类型" :label-width="formLabelWidth">
 
-          <el-input v-model="form.type" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.type" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="作用域" :label-width="formLabelWidth">
 
-          <el-input v-model="form.scope" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.scope" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="是否激活" :label-width="formLabelWidth">
 
-          <el-input v-model="form.isActivate" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.isActivate" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="状态" :label-width="formLabelWidth">
 
-          <el-input v-model="form.status" autocomplete="off"></el-input>
+          <el-input v-model="maintenance.status" autocomplete="off"></el-input>
 
         </el-form-item>
 
@@ -244,7 +244,7 @@
 
 <script>
 
-import {dels, findById, onEngine} from "@/api/engine/engine";
+import {add, dels, findById, onEngine} from "@/api/engine/engine";
 
 import {insert} from "@/api/version/version";
 
@@ -294,20 +294,16 @@ export default {
 
     handleInsert() {
 
-      this.maintenance = {}
-
       this.dialogFormVisible = true
 
-      insert(this.maintenance).then(res => {
+      add(this.maintenance).then(res => {
 
         this.$modal.msgSuccess("新增成功")
 
       })
-      this.dialogFormVisible = false
-
-      this.List();
 
     },
+
     onEngine(id) {
 
       onEngine(id).then(res => {

From 40d7e928cc725ee52f2001e5746b6905f066fdcb Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Fri, 30 Aug 2024 20:37:15 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index 89f69cb..ddf22c8 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -1,7 +1,6 @@
 <template>
 
   <div>
-
     <div style="height: 30px">
 
       {{ maintenance.name }}<br>
@@ -284,7 +283,8 @@ export default {
 
       dialogFormVisible: false,
 
-      formLabelWidth: '120px'
+      formLabelWidth: '120px',
+
 
     }
 
@@ -329,10 +329,6 @@ export default {
 
         this.maintenance = res.data;
 
-        console.log(this.maintenance)
-
-        console.log(this.maintenance.engineMaintenanceList)
-
       })
 
     },

From 70eb109eb602406345c7a44ff932ddb5db9d629a Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Fri, 30 Aug 2024 22:02:13 +0800
Subject: [PATCH 15/20] =?UTF-8?q?###=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

####1. 增加实名认证功能
在用户余额页面增加实名认证对话框，包括姓名和身份证号输入，取消和确认按钮。实名认证逻辑在`navigateToRecharge`方法中实现，如果用户已实名，则直接跳转至充值页面，否则显示实名认证对话框。

####2. 重构充值按钮逻辑充值按钮现在会根据用户实名认证状态跳转至相应页面。如果用户未实名，将显示实名认证对话框。

####3. 更新用户余额获取逻辑优化`fetchUserBalance`方法，处理用户未登录和用户余额获取失败的情况。

#### 4.暂时注释接口列表代码
在`index.vue`文件中，接口列表的表格代码被注释掉，可能是因为接口列表功能尚未实现或暂时禁用。

#### 5. 新增实名认证API调用
增加新的API调用`checkRealNameAuth`，用于实名认证校验。此方法通过POST请求调用第三方服务，传入用户实名和身份证号数据。

以上修改涉及用户余额页面的增强和实名认证流程的引入，同时对现有API进行扩展以支持新的功能需求。
---
 src/api/system/user.js             | 10 +++++
 src/views/money/user/index.vue     | 72 +++++++++++++++++++++++++++---
 src/views/workbench/rate/index.vue | 15 ++++---
 3 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 8c29a3b..92d0721 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -31,6 +31,16 @@ export function userRecharge(data) {
 }
 
 
+
+// 调用第三方实名认证
+export function checkRealNameAuth(data) {
+  return request({
+    url: '/system/aliyun/pay/doPost',
+    method: 'post',
+    data: data
+  })
+}
+
 // 充值用户余额记录
 export function createRechargeRecord(data) {
   return request({
diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index 0c5f753..1b78607 100644
--- a/src/views/money/user/index.vue
+++ b/src/views/money/user/index.vue
@@ -4,6 +4,25 @@
       <h1>用户余额</h1>
       <p>余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
       <el-button type="primary" @click="navigateToRecharge">充值</el-button>
+      <el-dialog
+        title="实名认证"
+        :visible.sync="dialogVisible"
+        width="30%"
+        @close="handleDialogClose"
+      >
+        <el-form :model="authForm">
+          <el-form-item label="姓名" :label-width="formLabelWidth">
+            <el-input v-model="authForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="身份证号" :label-width="formLabelWidth">
+            <el-input v-model="authForm.idCard"></el-input>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleConfirm">确认</el-button>
+        </div>
+      </el-dialog>
     </el-card>
 
 
@@ -46,17 +65,23 @@
 <script>
 import { userBalance } from "@/api/system/user"; //
 import * as echarts from 'echarts' //引用echarts
+import {checkRealNameAuth} from "@/api/system/user";
 
 export default {
   data() {
     return {
       charts: "",
+      dialogVisible: false,
       dialogFormVisible: false,
       formLabelWidth: '120px',
       opinionData: ["155", "400", "900", "800", "300", "900", "270","684","165","0","300","150"], // 数据
       userBalanceData: {
         userBalance: '加载中...'
       },
+      authForm: {
+        name: '',
+        idCard: ''
+      },
       form:{
 
       }
@@ -69,26 +94,61 @@ export default {
     this.drawLine();
   },
   methods: {
-    navigateToRecharge() {
-      this.$router.push('/money/zfb');
+    handleCancel() {
+      this.dialogVisible = false;
+    },
+    handleDialogClose() {
+      this.authForm.name = '';
+      this.authForm.idCard = '';
+    },
+    async navigateToRecharge() {
+      try {
+        const response = await checkRealNameAuth(this.authForm);
+        if (response.data && response.data.isAuthenticated) {
+          // 如果已实名认证，直接跳转页面
+          this.$router.push('/money/zfb');
+        } else {
+          // 如果未实名认证，显示对话框
+          this.dialogVisible = true;
+        }
+      } catch (error) {
+        this.$message.error('实名认证检查失败，请稍后再试');
+        console.error('实名认证检查失败:', error);
+      }
+    },
+    async handleConfirm() {
+      try {
+        const { name, idCard } = this.authForm;
+        const authResponse = await checkRealNameAuth(this.authForm);
+        if (authResponse.code ==200 ) {
+          this.$message.success('实名认证成功');
+          this.dialogVisible = false;
+          this.$router.push('/money/zfb');
+        } else {
+          this.$message.error('实名认证失败，请检查您的信息');
+        }
+      } catch (error) {
+        this.$message.error('实名认证验证失败，请稍后再试');
+        console.error('实名认证验证失败:', error);
+      }
     },
     async fetchUserBalance() {
       try {
         const userId = localStorage.getItem('userId');
         console.log(userId)// 登录后把userId存到了localStorage
         if (!userId) {
-          this.userBalanceData = {userBalance: '未登录'};
+          this.userBalanceData = { userBalance: '未登录' };
           return;
         }
         const response = await userBalance(userId);
-        if (response.data) {
+        if (response.data ) {
           console.log(response.data)
           this.userBalanceData.userBalance = response.data;
         } else {
-          this.userBalanceData.userBalance = {userBalance: '获取失败'};
+          this.userBalanceData.userBalance = { userBalance: '获取失败' };
         }
       } catch (error) {
-        this.userBalanceData = {userBalance: '获取失败'};
+        this.userBalanceData = { userBalance: '获取失败' };
         console.error('Error fetching user balance:', error);
       }
     },
diff --git a/src/views/workbench/rate/index.vue b/src/views/workbench/rate/index.vue
index 089b9ad..f6cb363 100644
--- a/src/views/workbench/rate/index.vue
+++ b/src/views/workbench/rate/index.vue
@@ -16,15 +16,16 @@
     <el-card style="margin-top: 50px;">
       <h3>接口列表</h3>
       <el-divider></el-divider>
-      <el-table  :data="tableData">
-        <el-table-column label="">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.connectorName }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
+<!--      <el-table  :data="tableData">-->
+<!--        <el-table-column label="">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span style="margin-left: 10px">{{ scope.row.connectorName }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
     </el-card>
   </div>
+
 </template>
 
 <script>

From e609d05e5b4a4deca96604ff9d3d975ed9497844 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Fri, 30 Aug 2024 22:20:11 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81=E5=92=8C?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实名认证功能已进行以下改进：
- 表单字段添加了验证规则，以确保用户输入有效的姓名和身份证号。- 修复了表单提交逻辑，确保只有在通过验证后才会进行实名认证提交。
-调整了实名认证弹窗关闭时的处理逻辑。
- 修正了实名认证成功后的导航路径。
---
 src/views/money/user/index.vue | 60 +++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index 1b78607..00dd18e 100644
--- a/src/views/money/user/index.vue
+++ b/src/views/money/user/index.vue
@@ -10,7 +10,7 @@
         width="30%"
         @close="handleDialogClose"
       >
-        <el-form :model="authForm">
+        <el-form :model="authForm" :rules="rules" ref="authFormRef">
           <el-form-item label="姓名" :label-width="formLabelWidth">
             <el-input v-model="authForm.name"></el-input>
           </el-form-item>
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { userBalance } from "@/api/system/user"; //
+import {userBalance} from "@/api/system/user"; //
 import * as echarts from 'echarts' //引用echarts
 import {checkRealNameAuth} from "@/api/system/user";
 
@@ -74,7 +74,7 @@ export default {
       dialogVisible: false,
       dialogFormVisible: false,
       formLabelWidth: '120px',
-      opinionData: ["155", "400", "900", "800", "300", "900", "270","684","165","0","300","150"], // 数据
+      opinionData: ["155", "400", "900", "800", "300", "900", "270", "684", "165", "0", "300", "150"], // 数据
       userBalanceData: {
         userBalance: '加载中...'
       },
@@ -82,9 +82,17 @@ export default {
         name: '',
         idCard: ''
       },
-      form:{
-
-      }
+      rules: {
+        name: [
+          {required: true, message: '请输入姓名', trigger: 'blur'},
+          {min: 2, max: 10, message: '姓名长度在 2 到 10 个字符', trigger: 'blur'}
+        ],
+        idCard: [
+          {required: true, message: '请输入身份证号', trigger: 'blur'},
+          {pattern: /^\d{17}[\dXx]$/, message: '身份证号格式不正确', trigger: 'blur'}
+        ],
+      },
+      form: {}
     };
   },
   created() {
@@ -117,38 +125,46 @@ export default {
       }
     },
     async handleConfirm() {
-      try {
-        const { name, idCard } = this.authForm;
-        const authResponse = await checkRealNameAuth(this.authForm);
-        if (authResponse.code ==200 ) {
-          this.$message.success('实名认证成功');
-          this.dialogVisible = false;
-          this.$router.push('/money/zfb');
+      this.$refs.authFormRef.validate(async (valid) => {
+        if (valid) {
+          try {
+            const {name, idCard} = this.authForm;
+            const authResponse = await checkRealNameAuth(this.authForm);
+            if (authResponse.code == 200) {
+              this.$message.success('实名认证成功');
+              this.dialogVisible = false;
+              this.$router.push('/money/zfb');
+            } else {
+              this.$message.error('实名认证失败，请检查您的信息');
+            }
+          } catch (error) {
+            this.$message.error('实名认证验证失败，请稍后再试');
+            console.error('实名认证验证失败:', error);
+          }
         } else {
-          this.$message.error('实名认证失败，请检查您的信息');
+          console.log('error submit!!');
+          return false;
         }
-      } catch (error) {
-        this.$message.error('实名认证验证失败，请稍后再试');
-        console.error('实名认证验证失败:', error);
-      }
+      });
+
     },
     async fetchUserBalance() {
       try {
         const userId = localStorage.getItem('userId');
         console.log(userId)// 登录后把userId存到了localStorage
         if (!userId) {
-          this.userBalanceData = { userBalance: '未登录' };
+          this.userBalanceData = {userBalance: '未登录'};
           return;
         }
         const response = await userBalance(userId);
-        if (response.data ) {
+        if (response.data) {
           console.log(response.data)
           this.userBalanceData.userBalance = response.data;
         } else {
-          this.userBalanceData.userBalance = { userBalance: '获取失败' };
+          this.userBalanceData.userBalance = {userBalance: '获取失败'};
         }
       } catch (error) {
-        this.userBalanceData = { userBalance: '获取失败' };
+        this.userBalanceData = {userBalance: '获取失败'};
         console.error('Error fetching user balance:', error);
       }
     },

From e4a178d8786b8466d8afe9569c3c02ffaff35557 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Fri, 30 Aug 2024 22:34:05 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/port/port/index.js       |  13 ++++
 src/views/port/port/employee.vue | 114 ++++++++++++++++++++++++-------
 2 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/src/api/port/port/index.js b/src/api/port/port/index.js
index fee0964..2b74f23 100644
--- a/src/api/port/port/index.js
+++ b/src/api/port/port/index.js
@@ -57,3 +57,16 @@ export function getBirthday(data) {
     data:data
   })
 }
+
+export function getPostcode(code) {
+  return request({
+    url: '/port/list/getPostcode?code='+code,
+    method: 'GET'
+  })
+}
+export function getWeather() {
+  return request({
+    url: '/port/list/getWeather',
+    method: 'GET'
+  })
+}
diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index dff8371..5d0c57a 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -17,9 +17,9 @@
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testPhone()" v-if="connector.connectorName=='手机号查询归属地'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testIP()" v-if="connector.connectorName=='IP查询归属地'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testNews()" v-if="connector.connectorName=='新闻头条'">测试API</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather()" v-if="connector.connectorName=='气象预警'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeather()" v-if="connector.connectorName=='气象预警'">测试API</el-button>
           <el-button type="primary" style="float: right; padding: 10px 10px" @click="testBirthdate()" v-if="connector.connectorName=='生辰助手'">测试API</el-button>
-          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox()" v-if="connector.connectorName=='邮编查询'">测试</el-button>
+          <el-button type="primary" style="float: right; padding: 10px 10px" @click="testMailbox()" v-if="connector.connectorName=='邮编查询'">测试API</el-button>
         </el-card>
       </el-col>
     </el-row>
@@ -88,31 +88,58 @@
           <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">
-          {{this.formBirthday.years}}<br>
-          {{this.formBirthday.months}}<br>
-          {{this.formBirthday.days}}<br>
-          {{this.formBirthday.animal}}<br>
-          {{this.formBirthday.imonthcn}}<br>
-          {{this.formBirthday.idaycn}}<br>
-          {{this.formBirthday.cyear}}<br>
-          {{this.formBirthday.cmonth}}<br>
-          {{this.formBirthday.cday}}<br>
-          {{this.formBirthday.gzyear}}<br>
-          {{this.formBirthday.gzmonth}}<br>
-          {{this.formBirthday.gzday}}<br>
-          {{this.formBirthday.isleap}}<br>
-          {{this.formBirthday.ncweek}}<br>
-          {{this.formBirthday.isterm}}<br>
-          {{this.formBirthday.term}}<br>
-          {{this.formBirthday.astro}}<br>
-          {{this.formBirthday.eightall}}<br>
-          {{this.formBirthday.fiveall}}
+         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>
       </div>
     </el-dialog>
+
+    <!--邮编查询-->
+    <el-dialog title="邮编查询" :visible.sync="dialogFormVisible3">
+      <el-form :model="formPostCode">
+        <el-form-item label="邮编" >
+          <el-input v-model="formPostCode.code" autocomplete="off" placeholder="请输入邮编"></el-input>
+        </el-form-item>
+        <el-table :data="gridData2" v-if="formPostCode.reason==true">
+          <el-table-column property="postNumber" label="邮编" width="150"></el-table-column>
+          <el-table-column property="province" label="省" width="200"></el-table-column>
+          <el-table-column property="city" label="市"></el-table-column>
+          <el-table-column property="district" label="区"></el-table-column>
+          <el-table-column property="address" label="县"></el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="getPostcode()">发起请求</el-button>
+      </div>
+    </el-dialog>
+
+    <!--    气象预警-->
+    <el-dialog title="气象预警" :visible.sync="dialogFormVisible4">
+        <el-aside width="100%">
+          <el-tree :data="data" :props="defaultProps"></el-tree>
+        </el-aside>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -125,6 +152,8 @@ import {phonePlace} from "@/api/port/port";
 import {getIpPlace} from "@/api/port/port";
 import {getHeadlines} from "@/api/port/port";
 import {getBirthday} from "@/api/port/port";
+import {getPostcode} from "@/api/port/port";
+import {getWeather} from "@/api/port/port";
 export default {
   //import引入的组件需要注入到对象中才能使用"
   components: {},
@@ -133,9 +162,26 @@ export default {
     //这里存放数据"
 
     return {
+      formWeather:{},
+      data:[],
+      defaultProps: {
+        children:"citys",
+        label:'provinceName',
+      },
       connectorList:[],
       gridData:[],
+      gridData2:[],
       form:{},
+      // 邮编查询
+      formPostCode:{
+        code:"",
+        // postNumber:"",
+        // province:"",
+        // city:"",
+        // district:"",
+        // address:"",
+        reason:"",
+      },
       // 手机号查询归属地formInline
       formInline:{
         tel:"",
@@ -189,6 +235,8 @@ export default {
       dialogFormVisible:false,
       dialogFormVisible1:false,
       dialogFormVisible2:false,
+      dialogFormVisible3:false,
+      dialogFormVisible4:false,
       dialogTableVisible:false,
     };
   },
@@ -205,6 +253,26 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    // 气象预警
+    testWeather(){
+
+      getWeather().then((res)=>{
+        this.data=res.data;
+
+        this.dialogFormVisible4=true;
+      })
+    },
+    // 邮编查询
+    getPostcode(){
+      getPostcode(this.formPostCode.code).then((res)=>{
+        console.log(res.data);
+        this.gridData2=res.data;
+        this.formPostCode.reason=true;
+      })
+    },
+    testMailbox(){
+      this.dialogFormVisible3=true;
+    },
     getBirthday(){
       getBirthday(this.formBirthday).then((res)=>{
         console.log(res.data);
@@ -226,8 +294,8 @@ export default {
         this.formBirthday.isterm=res.data.isterm;
         this.formBirthday.term=res.data.term;
         this.formBirthday.astro=res.data.astro;
-        // this.formBirthday.eightall=res.data.eightall;
-        // this.formBirthday.fiveall=res.data.fiveall;
+        this.formBirthday.eightall=res.data.eightall;
+        this.formBirthday.fiveall=res.data.fiveall;
 
       })
     },

From a704fa4bb1a63c7e2a58ca76b0a4eac49719450d Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sat, 31 Aug 2024 00:59:14 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/employee.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/port/port/employee.vue b/src/views/port/port/employee.vue
index 5d0c57a..a6897fd 100644
--- a/src/views/port/port/employee.vue
+++ b/src/views/port/port/employee.vue
@@ -136,7 +136,11 @@
     <!--    气象预警-->
     <el-dialog title="气象预警" :visible.sync="dialogFormVisible4">
         <el-aside width="100%">
-          <el-tree :data="data" :props="defaultProps"></el-tree>
+          <el-tree :data="data" :props="defaultProps">
+            <template slot-scope="{data,node}">
+              <span>{{data.provinceName}}{{data.cityName}}--{{data.cityCode}}</span>
+            </template>
+          </el-tree>
         </el-aside>
     </el-dialog>
 

From 51cc9087caad83079e09fc19ecf99034382ec07a Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Sat, 31 Aug 2024 01:13:14 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在实名认证检查中，条件判断从使用`isAuthenticated`改为使用`desc`。这与更新的认证响应格式保持一致。
---
 src/views/money/user/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/money/user/index.vue b/src/views/money/user/index.vue
index 00dd18e..874a1a7 100644
--- a/src/views/money/user/index.vue
+++ b/src/views/money/user/index.vue
@@ -112,7 +112,7 @@ export default {
     async navigateToRecharge() {
       try {
         const response = await checkRealNameAuth(this.authForm);
-        if (response.data && response.data.isAuthenticated) {
+        if (response.data && response.data.desc) {
           // 如果已实名认证，直接跳转页面
           this.$router.push('/money/zfb');
         } else {
@@ -130,7 +130,7 @@ export default {
           try {
             const {name, idCard} = this.authForm;
             const authResponse = await checkRealNameAuth(this.authForm);
-            if (authResponse.code == 200) {
+            if (authResponse.data && authResponse.data.desc) {
               this.$message.success('实名认证成功');
               this.dialogVisible = false;
               this.$router.push('/money/zfb');

From 5f7372c062bc2a4201cacf4053ba7e37129a905c Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Sat, 31 Aug 2024 19:06:53 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/engine/engine.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js
index f3f361b..044a38e 100644
--- a/src/api/engine/engine.js
+++ b/src/api/engine/engine.js
@@ -73,8 +73,8 @@ export function getRuleEngineInfo(id) {
 // 通过id查询
 export function findById(id) {
   return request({
-    url: '/engine/engine/findByIds/' + id,
-    method: 'get'
+    url: '/engine/engine/selectEngineById/' + id,
+    method: 'post'
   })
 }