Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelBI/ClientApp/src/api/index.js

@@ -565,5 +565,10 @@ export default {
     //创建学校成功，数据回传BB
     successBack(data) {
         return post('https://bb.teammodel.net/ies5/create-cs-school ', data)
-    }
+    },
+
+    /*ID查询 相关*/
+    getUserdatas(data) {
+        return post('/tmid/get-tmidstics',data)
+     }
 }

TEAMModelBI/ClientApp/src/until/http.js

@@ -22,7 +22,7 @@ axios.interceptors.request.use(
             config.url.indexOf('paper') != -1 ||
             config.url.indexOf('notice') != -1 ||
             config.url.indexOf('bizuser') != -1 ||
-            config.url.indexOf('prodanalysis') != -1
+            config.url.indexOf('prodanalysis') != -1 
         ) {
             config.headers = {
                 'Content-Type': 'application/json',
@@ -33,7 +33,7 @@ axios.interceptors.request.use(
                 'Content-Type': 'application/json',
                 // 'site': 'china'
             }
-        } else if (config.url.indexOf('ies5') != -1) {
+        } else if (config.url.indexOf('ies5') != -1 || config.url.indexOf('tmidstics') != -1) {
             config.headers = {
                 'Content-Type': 'application/json',
                 'authorization': 'Bearer ' + JSON.parse(localStorage.access_token)

TEAMModelBI/ClientApp/src/view/userInquire/index.vue

@@ -9,13 +9,19 @@
             </div>
             <el-divider border-style="dashed" />
             <div class="searchbox-item">
-                <el-input v-model="searchvalue" placeholder="输入手机号码/醍摩豆账号 进行搜索" class="input-with-select" size="large">
+                <el-input v-model="searchvalue" placeholder="输入手机号码/醍摩豆账号 进行搜索" class="input-with-select">
+                <template #prepend>
+                    <el-select v-model="selecttypes" placeholder="Select" style="width: 120px">
+                    <el-option label="精准查询" value="precise" />
+                    <el-option label="批量查询/操作" value="batch" />
+                    </el-select>
+                </template>
                 <template #append>
-                    <el-button :icon="Search" @click="pageShow='details'"/>
+                    <el-button :icon="Search" @click="seachSole()"/>
                 </template>
                 </el-input>
             </div>
-            <div class="recordbox">
+            <div class="recordbox" v-if="selecttypes==='precise'">
                 <p>搜索记录：</p>
                 <div class="recordbox-item">
                     <el-tag v-for="tag in tags" :key="tag.name" class="mx-1" closable :type="tag.type">
@@ -23,6 +29,9 @@
                     </el-tag>
                 </div>
             </div>
+            <div class="recordbox" v-else="selecttypes ==='batch'">
+                <p>搜索结果：</p>
+            </div>
         </div>
     </div>
     <div class="inquirebox-details" v-else-if="pageShow ==='details'">
@@ -31,8 +40,10 @@
 </template>
 <script setup>
 import { ref, getCurrentInstance, watch, h, nextTick } from 'vue'
+import { ElMessage, ElLoading } from 'element-plus'
 import { Search } from '@element-plus/icons'
 import Detailsbox from './details.vue'
+let { proxy } = getCurrentInstance()
 let tags = ref([
   { name: 'Tag 1', type: '' },
   { name: 'Tag 2', type: 'success' },
@@ -42,6 +53,16 @@ let tags = ref([
 ])
 let pageShow = ref('default')
 let searchvalue=ref('')
+let selecttypes=ref('precise')
+function seachSole(datavalue) {
+    let data = {'tmids':['1595321354']}
+    proxy.$api.getUserdatas(data).then((res) => { 
+        console.log(res, 'user back')
+    }).catch((err) => {
+        ElMessage.error('API异常，查询失败')
+    })
+    //pageShow.value='details'
+ }
 </script>
 <style scoped>
 .inquirebox{
@@ -83,6 +104,7 @@ let searchvalue=ref('')
 .searchbox-item{
     width:100%;
     padding: 2% 10%;
+    position: relative;
 }
 .recordbox{
     width:100%;
@@ -106,4 +128,10 @@ let searchvalue=ref('')
     overflow: hidden;
     overflow-y: auto;
 }
+.searchbox-type{
+    position:absolute;
+    top:-5%;
+    font-size:14px;
+    display: flex;
+}
 </style>

TEAMModelBI/ClientApp/src/view/userInquire/ticket.vue

@@ -13,10 +13,11 @@
                     <div class="ticket-total">
                         <div :class="[item.type ==='use' ? 'usebox':'','ticket-total-item']" v-for="item in ticketlist" :key="item.code">
                             <div class="ticket-total-item-title">
-                                <div class="ticket-subhead">票卷码</div>
+                                <div class="ticket-subhead">兑换券</div>
                                 <div class="ticket-code">{{item.code}}</div>
                             </div>
                             <div class="ticket-total-item-content">
+                                <p class="ticket-total-title">授权</p>
                                 <div class="ticket-total-item-scope">
                                     {{item.scope}}
                                 </div>
@@ -42,7 +43,7 @@
                     <div class="ticket-total">
                         <div :class="[item.type ==='use' ? 'usebox':'','ticket-total-item']" v-for="item in usedata" :key="item.code">
                             <div class="ticket-total-item-title">
-                                <div class="ticket-subhead">票卷码</div>
+                                <div class="ticket-subhead">兑换券</div>
                                 <div class="ticket-code">{{item.code}}</div>
                             </div>
                             <div class="ticket-total-item-content">
@@ -68,10 +69,11 @@
                     <div class="ticket-total">
                         <div :class="[item.type ==='use' ? 'usebox':'','ticket-total-item']" v-for="item in gaindata" :key="item.code">
                             <div class="ticket-total-item-title">
-                                <div class="ticket-subhead">票卷码</div>
+                                <div class="ticket-subhead">兑换券</div>
                                 <div class="ticket-code">{{item.code}}</div>
                             </div>
                             <div class="ticket-total-item-content">
+                                <p>授权</p>
                                 <div class="ticket-total-item-scope">
                                     {{item.scope}}
                                 </div>
@@ -150,39 +152,45 @@ let gaindata = computed(() => {
     background-size: 100% 100%;
     width:100%;
     height:100px;
-    line-height: 20px;
+    line-height: 16px;
     padding: 10px 10px;
     margin:10px 1px;
     align-items: center;
-    transition: transform 0.3s ease;
+    transition: transform 0.2s ease;
     position: relative;
 }
-.ticket-total-item:hover{
-    transform: scale(1.05)
-}
+/* .ticket-total-item:hover{
+    transform: scale(1.03)
+} */
 .ticket-total-item-title{
-    width:50%;
+    width:55%;
     display: flex;
     flex-direction: column;
+    padding: 0% 3%;
 }
 .ticket-subhead{
-    font-size:14px;
+    font-size:18px;
     font-weight: bold;
     margin:5px 0px;
 }
 .ticket-code{
-    font-size:16px;
-    font-weight: bold;
+    font-size:14px;
+    /* font-weight: bold; */
+    margin-top:5px;
 }
 .ticket-total-item-scope{
-    font-size:14px;
+    font-size:12px;
+    font-weight: bold;
+    color:#fff;
+    margin-bottom: 10px;
 }
 .ticket-total-item-content{
-    width:50%;
+    width:44%;
+    padding-left:3%;
 }
 .ticket-total-item-time,.ticket-total-item-type{
-    font-size:12px;
-    color:#bbbecd;
+    font-size:10px;
+    color:rgba(255,255,255,.6);
 }
 .ticket-total-item-usetime{
     font-size:12px;
@@ -204,7 +212,13 @@ let gaindata = computed(() => {
   margin-left: 0px;
   z-index:999999;
 }
-.usebox{
-    color:#bbbecd !important;
+.ticket-total-title{
+    font-size:14px;
+    color:#fff;
+    margin-bottom: 4px;
 }
+/* .usebox{
+    color:rgba(255,255,255,.9) !important;
+} */
+
 </style>

TEAMModelBI/Controllers/BITmid/TmidController.cs

@@ -67,7 +67,7 @@ namespace TEAMModelBI.Controllers.BITmid
                 Dictionary<string, TmidStics> tmidDic = new();
 
                 QueryDefinition query =
-                       new QueryDefinition(@"SELECT c.id, c.name, c.mobile, c.mail FROM c WHERE (ARRAY_CONTAINS(@key, c.id))")
+                       new QueryDefinition(@"SELECT c.id, c.name, c.mobile, c.mail FROM c WHERE (ARRAY_CONTAINS(@key, c.id) OR ARRAY_CONTAINS(@key, c.mobile))")
                        .WithParameter("@key", tmids);
                 await foreach (var item in cosmosClientCsv2
                             .GetContainer("Core", "ID2")
@@ -79,6 +79,7 @@ namespace TEAMModelBI.Controllers.BITmid
                         foreach (var doc in json.RootElement.GetProperty("Documents").EnumerateArray())
                         {
                             string id = doc.GetProperty("id").GetString();
+                            if(!tmids.Contains(id)) tmids.Add(id);
                             //基本資料
                             TmidStics tmidStics = (tmidDic.ContainsKey(id)) ? tmidDic[id] : new() { id = id };
                             string tmidName = doc.GetProperty("name").GetString();
@@ -112,9 +113,9 @@ namespace TEAMModelBI.Controllers.BITmid
 
                             //積分
                             var usersPoints = tablePointsClient.Get("Points", id);
-                            tmidStics.points.points = usersPoints.Properties["Points"].Int32Value.Value;
-                            tmidStics.points.level = usersPoints.Properties["Level"].Int32Value.Value;
-                            tmidStics.points.balance = usersPoints.Properties["Balance"].Int32Value.Value;
+                            tmidStics.points.points = (usersPoints != null) ? usersPoints.Properties["Points"].Int32Value.Value : 0;
+                            tmidStics.points.level = (usersPoints != null) ? usersPoints.Properties["Level"].Int32Value.Value : 0;
+                            tmidStics.points.balance = (usersPoints != null) ? usersPoints.Properties["Balance"].Int32Value.Value : 0;
                             //個人服務授權
                             tmidStics.prod = await getTMIDAuthService(cosmosClientCsv2, id, "", true);
 
@@ -124,7 +125,7 @@ namespace TEAMModelBI.Controllers.BITmid
                 }
 
                 //ID進階資料
-                QueryDefinition queryex = new QueryDefinition(@"SELECT c.id, c.name, c.mobile, c.mail, c.country, c.province, c.city, c.schoolCode, c.schoolCodeW FROM c WHERE (ARRAY_CONTAINS(@key, c.id))")
+                QueryDefinition queryex = new QueryDefinition(@"SELECT c.id, c.name, c.mobile, c.mail, c.country, c.province, c.city, c.schoolCode, c.schoolCodeW FROM c WHERE (ARRAY_CONTAINS(@key, c.id) OR ARRAY_CONTAINS(@key, c.mobile))")
                        .WithParameter("@key", tmids);
                 await foreach (var item in cosmosClientCsv2
                             .GetContainer("Core", "ID2")