Merge remote-tracking branch 'origin/master'

src/api/port/port/index.js

@@ -1,9 +1,8 @@
 import request from '@/utils/request'
 
-export function getPhonePlace(data) {
+export function getPhonePlace(tel) {
   return request({
-    url: '/mart/list/getPhonePlace',
+    url: '/mart/list/getPhonePlace?tel='+tel,
-    method: 'get',
+    method: 'get'
-    data:data
   })
 }

src/api/task/task.js

@@ -35,4 +35,20 @@ export function deleteByTaskId(id) {
   })
 }
 
+//获得所有数据结构信息
+export function taskInputList() {
+  return request({
+    url: "/task/taskInput/list",
+    method: "GET",
+  })
+}
+
+//获得所有数据结构信息
+export function findByInputId(id) {
+  return request({
+    url: "/task/findByInputId/"+id,
+    method: "POST",
+  })
+}
+
 

src/store/modules/user.js

@@ -69,6 +69,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_ID', user.userId)
+          localStorage.setItem('userId', user.userId)
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
           resolve(res)

src/views/money/pay/index.vue

@@ -0,0 +1,135 @@
+<template>
+  <el-card class="box-card">
+    <ul class="msg-box">
+      <li>
+        <h4>我要支付</h4>
+      </li>
+      <li>
+        <h4 style="margin-bottom: 15px;">支付金额</h4>
+        <el-radio-group v-model="amountVal" @change="amountChange">
+          <el-radio border :label="''+ 100">充值100</el-radio>
+          <el-radio border :label="''+ 500">充值500</el-radio>
+          <el-radio border :label="''+ 1000">充值1000</el-radio>
+          <el-radio border :label="''+ 2000">充值2000</el-radio>
+          <el-radio border :label="''+ 5000">充值5000</el-radio>
+          <el-radio border :label="''">自定义</el-radio>
+        </el-radio-group>
+      </li>
+      <li>
+        <h4 style="margin-bottom: 15px;">支付方式</h4>
+        <el-radio-group v-model="rechargeParams.paymentType" @change="paymentTypeChange">
+          <el-radio border :label="''+ 1">支付宝</el-radio>
+          <el-radio border :label="''+ 0">微信</el-radio>
+        </el-radio-group>
+      </li>
+      <li>
+        <h4 style="margin-bottom: 15px;">支付金额</h4>
+        <el-input :disabled="disabled" clearable v-model="rechargeParams.totalAmt" placeholder="请输入金额" style="width: 150px;"></el-input>
+      </li>
+    </ul>
+    <div style="text-align: center; margin-top: 30px;">
+      <el-button type="primary" @click="surePay">确认支付</el-button>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import { userRecharge } from "@/api/system/user";
+export default {
+  data() {
+    return {
+      amountVal: '',
+      disabled: false,
+      // 同步跳转页面地址
+      returnUrl:'http://localhost:8090/#/entertainment/payment',
+      //充值参数
+      rechargeParams: {
+        "totalAmt": '', //金额
+        "paymentType": "0", //支付方式[0:微信,1:支付宝,2:余额,3:活动]
+        "transType": "0" //交易类型[0:充值,1:消费]
+      }
+    }
+  },
+  methods: {
+    //充值金额
+    amountChange(val) {
+      this.rechargeParams.totalAmt = val;
+      if (val === '') {
+        this.disabled = false
+      } else {
+        this.disabled = true
+      }
+    },
+    //支付方式
+    paymentTypeChange(val) {
+      this.rechargeParams.paymentType = val
+    },
+    //确认支付
+    async surePay() {
+      if (this.rechargeParams.totalAmt === '') {
+        this.$message.warning('请输入金额');
+        return;
+      }
+      if (this.rechargeParams.paymentType === '0') {
+
+      } else if (this.rechargeParams.paymentType === '1') {
+        let praem = {
+          // 生成一个随你的订单号 方便测试
+          outTradeNo:this.getProjectNum() + Math.floor(Math.random() * 10000),
+          // 传递支付金额
+          totalAmount:this.rechargeParams.totalAmt,
+          // 传递同步跳转地址
+          returnUrl:this.returnUrl,
+          // 商品名称
+          subject:'支付金额',
+          // 支付类型
+          productCode:'FAST_INSTANT_TRADE_PAY'
+        }
+        userRecharge(praem).then(code => {
+          if (code.code === 200) {
+            // 支付方式跳转
+            this.$message.success('支付宝支付')
+            const payDiv = document.getElementById('payDiv');
+            if (payDiv) {
+              document.body.removeChild(payDiv);
+            }
+            const div = document.createElement('div');
+            div.id = 'payDiv';
+            div.innerHTML = code.data;
+            document.body.appendChild(div);
+            document.getElementById('payDiv').getElementsByTagName('form')[0].submit();
+          }
+        })
+      }
+    },
+    // 获取当前日期的方法
+    getProjectNum () {
+      const projectTime = new Date() // 当前中国标准时间
+      const Year = projectTime.getFullYear() // 获取当前年份 支持IE和火狐浏览器.
+      const Month = projectTime.getMonth() + 1 // 获取中国区月份
+      const Day = projectTime.getDate() // 获取几号
+      var CurrentDate = Year
+      if (Month >= 10) { // 判断月份和几号是否大于10或者小于10
+        CurrentDate += Month
+      } else {
+        CurrentDate += '0' + Month
+      }
+      if (Day >= 10) {
+        CurrentDate += Day
+      } else {
+        CurrentDate += '0' + Day
+      }
+      return CurrentDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 信息列表样式 */
+.msg-box > li {
+  list-style: none;
+  border-bottom: 1px solid #c5c5c5;
+  padding: 20px 10px;
+}
+</style>

src/views/money/user/index.vue

@@ -1,10 +1,13 @@
 <template>
   <div>
-    <h1>用户余额</h1>
+    <el-card style="margin-top: 50px;">
-    <p>余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
+      <h1>用户余额</h1>
+      <p>余额：{{ userBalanceData.userBalance || '加载中...' }}</p>
+    </el-card>
   </div>
 </template>
 
+
 <script>
 import { userBalance } from "@/api/system/user"; // 假设你的userBalance函数在@/api/money目录下
 
@@ -23,7 +26,7 @@ export default {
     async fetchUserBalance() {
       try {
         const userId = localStorage.getItem('userId');
-        console.log(userId)// 假设你登录后把userId存到了localStorage
+        console.log(userId)// 登录后把userId存到了localStorage
         if (!userId) {
           this.userBalanceData = {userBalance: '未登录'};
           return;

src/views/port/port/index.vue

@@ -1,31 +1,52 @@
 <template>
   <div>
-    <el-card class="box-card">
+    <el-row :gutter="12">
-      <div slot="header" class="clearfix">
+      <el-col :span="8">
-        <span>手机号查询归属地</span>
+        <el-card shadow="hover">
-        <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+          <div slot="header" class="clearfix">
-      </div>
+            <span>手机号查询归属地</span>
-      <el-form  :model="formLabelAlign">
+            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
-        <el-form-item placeholder="请输入手机号">
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
-          <el-input v-model="formLabelAlign.tel"></el-input>
+          </div>
-        </el-form-item>
+        </el-card>
-      </el-form>
+      </el-col>
-      <el-button @click="getPhonePlace">查询</el-button>
+      <el-col :span="8">
-      <span>省份：{{this.formLabelAlign.province}}</span><br>
+        <el-card shadow="hover">
-      <span>城市：{{this.formLabelAlign.city}}</span><br>
+          <div slot="header" class="clearfix">
-      <span>区号：{{this.formLabelAlign.areacode}}</span><br>
+            <span>IP查询归属地</span>
-      <span>邮编：{{this.formLabelAlign.zip}}</span><br>
+            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
-      <span>运营商：{{this.formLabelAlign.company}}</span>
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
-    </el-card>
+          </div>
-    <el-card class="box-card">
+        </el-card>
-      <div slot="header" class="clearfix">
+      </el-col>
-        <span>IP查询归属地</span>
+      <el-col :span="8">
-        <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+        <el-card shadow="hover">
-      </div>
+          <div slot="header" class="clearfix">
-      <div v-for="o in 4" :key="o" class="text item">
+            <span>新闻头条</span>
-        {{'列表内容 ' + o }}
+            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
-      </div>
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
-    </el-card>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card shadow="hover">
+          <div slot="header" class="clearfix">
+            <span>气象预警</span>
+            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card shadow="hover">
+          <div slot="header" class="clearfix">
+            <span>生辰助手</span>
+            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -56,15 +77,7 @@ export default {
   watch: {},
   //方法集合",
   methods: {
-    getPhonePlace(){
+
-      getPhonePlace(this.formLabelAlign.tel).then((res)=>{
-        this.formLabelAlign.province=res.data.province;
-        this.formLabelAlign.city=res.data.city;
-        this.formLabelAlign.areacode=res.data.areacode;
-        this.formLabelAlign.zip=res.data.zip;
-        this.formLabelAlign.company=res.data.company;
-      })
-    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {

src/views/task/task/index.vue

@@ -187,30 +187,30 @@
 <!--    添加任务详情设计-->
     <el-dialog title="添加表" :visible.sync="taskInputAdd">
 
-      <el-form  label-width="80px" :model="taskInputReq" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
+      <el-form  label-width="80px" :model="taskInfo" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="任务id">
-          <el-input v-model="taskInputReq.taskId"></el-input>
+          <el-input v-model="taskInfo.taskId"></el-input>
         </el-form-item>
 
         <el-form-item label="数据库id">
-          <el-input v-model="taskInputReq.databaseId"></el-input>
+          <el-input v-model="taskInfo.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select v-model="taskReq.tableName" placeholder="请选择等级">
+          <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
-            <span v-for="table in tableList">
+            <span v-for="table in taskInfoList">
-              <el-option :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option @select="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>
         <el-form-item label="表别名">
-          <el-input v-model="taskInputReq.tableAsName"></el-input>
+          <el-input v-model="taskInfo.tableAsName"></el-input>
         </el-form-item>
       </el-form>
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="taskInputAdd = false">取 消</el-button>
-        <el-button type="primary" @click="addTaskInput()">下一步</el-button>
+        <el-button type="primary" @click="addTaskInput(taskInfo)">下一步</el-button>
       </div>
 
 
@@ -220,14 +220,12 @@
     <el-dialog title="添加表" :visible.sync="taskInputFieldAdd">
 
       <el-table
-        :data="taskList"
+        :data="structureList"
         style="width: 100%"
 
         @selection-change="handleSelectionChange">
 
 
-
-
         <el-table-column
           type="selection"
           width="55">
@@ -312,7 +310,15 @@ import {selectSourceExport} from "@/api/etl/switch";
 import {connectionTest} from "@/api/etl/switch";
 import {insertAdd} from "@/api/etl/switch";
 import {getInfo} from "@/api/etl/switch";
-import { addTask, deleteById, deleteByTaskId, selectTaskList, updateById } from '@/api/task/task'
+import {
+  addTask,
+  deleteById,
+  deleteByTaskId,
+  findByInputId,
+  selectTaskList,
+  taskInputList,
+  updateById
+} from '@/api/task/task'
 
 export default {
   //import引入的组件需要注入到对象中才能使用"
@@ -333,7 +339,10 @@ export default {
       taskAddReq:{},
       taskInputReq:{},
       taskList:[],
+      taskInfoList:[],
+      taskInfo:{},
       tableList:[],
+      structureList:[],
     };
   },
   //计算属性 类似于data概念",
@@ -342,13 +351,36 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    //选择数据表改变数据
+    changeTableName(row){
+      console.log(row);
+      this.taskInfo = row;
+    },
+
+    //查询字段
+    findByInputId(taskInfo){
+      findByInputId(taskInfo.id).then(res=>{
+        this.structureList = res.data;
+      })
+
+    },
+
+    //数据结构列表
+    taskInputList(){
+      taskInputList().then(res=>{
+        this.taskInfoList = res.data;
+      });
+    },
 
     executeTask(){
       this.taskInputAdd = true;
+      this.taskInputList();
     },
 
-    addTaskInput(){
+
+    addTaskInput(taskInfo){
       this.taskInputAdd = false;
+      this.findByInputId(taskInfo);
       this.taskInputFieldAdd = true;
     },