Merge remote-tracking branch 'origin/master'

src/api/version/version.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 export function list(data){
   return request({
     url: "/engine/version/list",
-    method: "post",
+    method: "get",
     data:data
   })
 }
@@ -14,25 +14,25 @@ export function list(data){
 
 export  function insert(data){
   return request({
-    url: "/engine/engine/insert",
+    url: "/engine/version/insert",
     method: "post",
     data:data
   })
 }
 
-export  function update(data){
+// export  function update(data){
-  return request({
+//   return request({
-    url: "/engine/engine/update",
+//     url: "/engine/engine/update",
-    method: "post",
+//     method: "post",
-    data:data
+//     data:data
-  })
+//   })
-}
+// }
 
 
 
 export  function del(id){
   return request({
-    url: "/engine/engine/delete/" + id,
+    url: "/engine/version/delete/" + id,
     method: "post",
     data:id
   })

src/views/engine/engine/index.vue

@@ -323,7 +323,7 @@ export default {
     },
     engineRuleMaintenance(row){
       this.$router.push({
-        path:'getRuleEngineInfo',
+        path:'list',
         query:{id:row.id}
       })
     }

src/views/engine/engine/list.vue

@@ -1,6 +1,113 @@
 <template>
 <div>
-  {{scopeList}}
+  <el-table :data="scopeList" style="width: 100%">
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+    <el-table-column label="日期" width="180">
+
+      <template slot-scope="scope">
+        <span style="margin-left: 10px">{{ scope.row.date }}</span>
+      </template>
+
+    </el-table-column>
+
+
+<!--    <el-table-column label="操作">-->
+<!--      <template slot-scope="scope">-->
+<!--        <el-button-->
+<!--          size="mini"-->
+<!--          @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
+<!--        <el-button-->
+<!--          size="mini"-->
+<!--          type="danger"-->
+<!--          @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
+<!--      </template>-->
+<!--    </el-table-column>-->
+<!--    -->
+
+
+
+
+  </el-table>
 </div>
 </template>
 <script>
@@ -13,7 +120,8 @@ export default {
   data() {
     //这里存放数据"
     return {
-      scopeList: []
+      scopeList: [],
+      maintenance:{}
     }
   },
   methods: {
@@ -25,8 +133,8 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
+    this.scopeList.id = this.$route.query.id
     this.List();
-    this.scopeList.id = this.$router.query.id
   }
 }
 </script>

src/views/money/user/index.vue

@@ -7,6 +7,32 @@
     </el-card>
 
 
+    <el-card style="margin-top: 50px">
+      <!-- Form -->
+      <h1>余额预警</h1>
+      <el-button type="text" @click="dialogFormVisible = true">开启</el-button>
+      <el-dialog title="添加预警号码" :visible.sync="dialogFormVisible">
+        <el-divider style="color: #00afff">
+          <el-tag content-position="right" type="warning">
+            账户可用余额小于该值时,每天短信通知一次(最多连续提醒5天)
+          </el-tag>
+        </el-divider>
+        <el-form :model="form">
+          <el-form-item label="预警阈值：" :label-width="formLabelWidth">
+            <el-input v-model="form.name" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="预警号码：" :label-width="formLabelWidth">
+            <el-input v-model="form.phone" 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="dialogFormVisible = false">确 定</el-button>
+        </div>
+      </el-dialog>
+    </el-card>
+
+
     <el-card style="margin-top: 50px">
       <div>
         <!-- 装ECharts的容器 -->
@@ -25,9 +51,14 @@ export default {
   data() {
     return {
       charts: "",
-      opinionData: ["155", "400", "900", "800", "300", "900", "270", "684", "165", "0", "300", "150"], // 数据
+      dialogFormVisible: false,
+      formLabelWidth: '120px',
+      opinionData: ["155", "400", "900", "800", "300", "900", "270","684","165","0","300","150"], // 数据
       userBalanceData: {
         userBalance: '加载中...'
+      },
+      form:{
+
       }
     };
   },

src/views/version/version/version.vue

@@ -1,10 +1,166 @@
 <template>
   <div>
-    {{arr}}
+<!--条件查询-->
+    <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">
+
+      <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>
+        </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引入的组件需要注入到对象中才能使用"
@@ -16,14 +172,34 @@ export default {
       arr:[],
       version:{
 
-      }
+      },
+      dialogFormVisible:false,
+      formLabelWidth: '120px'
     };
   },
   methods: {
     List(){
       list(this.version).then(res =>{
         this.arr = res.data;
+        console.log(res)
+        console.log(this.arr)
       })
+    },
+    submitForm(){
+      this.List();
+    },
+    insert(){
+      insert(this.version).then(res =>{
+        this.$message.success("添加成功");
+      })
+      this.dialogFormVisible=false;
+    },
+    handleDelete(id){
+      if (confirm("你确定删除吗?")){
+        del(id).then(res =>{
+           this.$message.success(res.msg || "删除成功")
+        })
+      }
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",