修改计算器

42182811 · 陆 · adcbf081 · 42182811 · 42182811 · 42182811
--- a/platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
+++ b/platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html
@@ -614,6 +614,7 @@
                    </i-button>
                    <i-button type="success" @click="changeItemsunTop"><i class="fa fa-arrow-up"></i>置顶</i-button>
+                    <i-button type="info" @click=""><i class="fa fa-plus"></i>复制</i-button>
                    #if($shiro.hasPermission("tbcfstationitem:delete"))
                    <i-button type="error" @click="changeItemStatus(0)" :style="`margin-left:100px`"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                    #end
@@ -625,13 +626,13 @@
    </div>
    <Card v-show="!showList">
        <div class="flot-button">
-            <i-button class="fixed-submit preview"
+<!--            <i-button class="fixed-submit preview"-->
-                      @click="copy()" type="success">复制
+<!--                      @click="copy()" type="success">复制-->
-            </i-button>
+<!--            </i-button>-->
-            <i-button class="fixed-submit preview"
+<!--            <i-button class="fixed-submit preview"-->
-                      v-show="show_paste_btn"
+<!--                      v-show="show_paste_btn"-->
-                      @click="paste()"
+<!--                      @click="paste()"-->
-            >粘贴
+<!--            >粘贴-->
            </i-button>
            <i-button class="fixed-submit preview" v-show="tbCfStationItem.itemId"
                      @click="preview(tbCfStationItem.itemId,'pc')" type="primary">预览

--- a/platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfuserinfo.html
+++ b/platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfuserinfo.html
@@ -14,6 +14,67 @@
            padding: 13px;
            vertical-align: middle;
        }
+        .userlistbox{
+            position: fixed;
+            width: 80%;
+            height: 80%;
+            top: 6%;
+            left: 10%;
+            background-color: #00E8D7;
+            border-radius: 10px;
+        }
+        .userlistbox .uboxtitle{
+            width: 100%;
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+            padding: 2% 0;
+        }
+        .userlistbox .uboxtitle>div{
+            width: 14.2%;
+            text-align: center;
+        }
+        .userlistbox .selfbox{
+            width: 100%;
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+            padding: 2% 0;
+            border-bottom: 1px solid gray;
+        }
+        .userlistbox .selfbox>div{
+            width: 14.2%;
+            text-align: center;
+        }
+        .imgbox>img{
+            width: 30px;
+            height: 30px;
+        }
+        .sonbox{
+            width: 100%;
+            height: 72%;
+            background-color: #f0c78a;
+            overflow: auto;
+        }
+        .sonbox .soncell{
+            width: 100%;
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+            padding: 1% 0;
+            border-bottom: 1px solid gray;
+        }
+        .sonbox .soncell>div{
+            width: 14.2%;
+            text-align: center;
+        }
+        .userlistbox .closebtn{
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding: 0.5% 0;
+        }
    </style>
 </head>
 <body>
@@ -37,11 +98,59 @@
                #if($shiro.hasPermission("tbcfuserinfo:delete"))
                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                #end
+                <i-button type="info" @click="takeman"><i class="fa fa-plus"></i>查看下级</i-button>
            </div>
        </Row>
        <div id="speedp"></div>
        <table id="jqGrid"></table>
    </div>
+    <!--    我是下级列表啊！！！-->
+    <div class="userlistbox" v-show="isuserlist">
+<!--        标题-->
+        <div class="uboxtitle">
+            <div>头像</div>
+            <div>账号</div>
+            <div>用户名</div>
+            <div>国家</div>
+            <div>手机号</div>
+            <div>邮箱</div>
+            <div>操作</div>
+        </div>
+        <!--自己-->
+        <div class="selfbox">
+            <div class="imgbox">
+                <img :src="selflist.avatar" alt="">
+            </div>
+            <div class="usertext">{{selflist.account?selflist.account:'暂无'}}</div>
+            <div class="username">{{selflist.nick?selflist.nick:'暂无'}}</div>
+            <div class="country">{{selflist.country?selflist.country:'暂无'}}</div>
+            <div class="phone">{{selflist.phone?selflist.phone:'暂无'}}</div>
+            <div class="email">{{selflist.email?selflist.email:'暂无'}}</div>
+            <div class="operation">
+                <i-button type="warning"><i class="fa fa-pencil-square-o"></i>返回上级</i-button>
+            </div>
+        </div>
+        <!--子集-->
+        <div class="sonbox">
+            <div class="soncell" v-for="(item,index) in sonlist" :key="index">
+                <div class="imgbox">
+                    <img :src="selflist.avatar" alt="">
+                </div>
+                <div class="usertext">{{item.account?item.account:'暂无'}}</div>
+                <div class="username">{{selflist.nick?selflist.nick:'暂无'}}</div>
+                <div class="country">{{selflist.country?selflist.country:'暂无'}}</div>
+                <div class="phone">{{selflist.phone?selflist.phone:'暂无'}}</div>
+                <div class="email">{{selflist.email?selflist.email:'暂无'}}</div>
+                <div class="operation">
+                    <i-button type="info" v-if="selflist.num>=1"><i class="fa fa-pencil-square-o"></i>查看下级</i-button>
+                </div>
+            </div>
+        </div>
+<!--        关闭按钮-->
+        <div class="closebtn">
+            <i-button type="error" @click="closebtn"><i class="fa fa-trash-o"></i>关闭</i-button>
+        </div>
+    </div>
    <Card v-show="!showList">
        <p slot="title">{{title}}</p>

--- a/platform-admin/src/main/webapp/js/sys/tbcfstationitem.js
+++ b/platform-admin/src/main/webapp/js/sys/tbcfstationitem.js
@@ -225,7 +225,7 @@ let vm = new Vue({
                }else if (pic>60 && pic<=100){
                    count = 1-0.70
                }else if (pic>100){
-                    count = 1-0.60
+                    count = 1-0.65
                }
            }

--- a/platform-admin/src/main/webapp/js/sys/tbcfuserinfo.js
+++ b/platform-admin/src/main/webapp/js/sys/tbcfuserinfo.js
@@ -29,7 +29,9 @@ $(function () {
            {label: '邀请用户', name: 'invitedUserId', index: 'invited_user_id', width: 120},
            {label: '邀请人数', name: 'invitedCount', index: 'invited_count', width: 80},
            {label: '是否有效', name: 'enableFlag', index: 'enable_flag', width: 60, formatter: yesOrNoFormat},
-            {label: '邮箱是否已经验证', name: 'emailFlag', index: 'email_flag', width: 80, formatter: yesOrNoFormat}],
+            {label: '邮箱是否已经验证', name: 'emailFlag', index: 'email_flag', width: 80, formatter: yesOrNoFormat},
+            {label: '下线数量', name: 'emailFlag', index: 'email_flag', width: 80, formatter: yesOrNoFormat}],
        shrinkToFit: true,
        datatype: "json",
        rowNum: 15,
@@ -58,7 +60,11 @@ let vm = new Vue({
        },
        q: {
            name: ''
-        }
+        },
+        isuserlist:false,//是否显示
+        userpage:1,//下级页码
+        selflist:[],//自己
+        sonlist:[],//下级列表
    },
    methods: {
        query: function () {
@@ -79,6 +85,31 @@ let vm = new Vue({
            vm.getInfo(userId);
        },
+        // 查看下级
+        takeman:function (){
+            let userId = getSelectedRow("#jqGrid");
+            if (userId == null) {
+                return;
+            }
+            let url = "../tbcfuserinfo/getUserNetwork?_search=falsec&nd=1615534841220&limit=12&page="+vm.userpage+"&sidx=order_time&order=desc&userId="+userId;
+            Ajax.request({
+                url: url,
+                type: "get",
+                contentType: "application/json",
+                successCallback: function (r) {
+                    console.log(r)
+                    if (r.code == 0){
+                        vm.selflist  = r.list.parent
+                        vm.sonlist = r.list.networks.list
+                    }
+                }
+            });
+            vm.isuserlist = true
+        },
+        // 关闭下级列表
+        closebtn:function (){
+            vm.isuserlist = false
+        },
        saveOrUpdate: function (event) {
            let url = vm.tbCfUserInfo.userId == null ? "../tbcfuserinfo/save" : "../tbcfuserinfo/update";
            Ajax.request({