合并

TEAMModelBI/ClientApp/src/api/index.js

@@ -554,6 +554,10 @@ export default {
     verifyDatainbb(data) {
         return post('https://bb.teammodel.net/ies5/search-cs-school', data)
     },
+    //测试站
+    verifyDatainbbrc(data) {
+        return post('https://bb-rc.teammodel.net/ies5/search-cs-school', data)
+    },
     //创建学校成功，数据回传BB
     successBack(data) {
         return post('https://bb.teammodel.net/ies5/create-cs-school ', data)

TEAMModelBI/ClientApp/src/view/created/created.vue

@@ -1465,7 +1465,7 @@ export default {
       // let data = { regionId: "CN" }
       let data = state === 'name' ? { regionId: "CN", name: searchSchoolvalue.value, nameFuzzy: true } : state === 'code' ? { regionId: "CN", shortCode: searchSchoolvalue.value, shortCodeFuzzy: false } : { regionId: "CN" }
       console.log(data, '查询提交数据')
-      proxy.$api.verifyDatainbb(data).then((res) => {
+      proxy.$api.verifyDatainbbrc(data).then((res) => {
         console.log(res, '成功返回')
         res.length !== 0 ? resultschool.value = res : ''
       }).catch((error) => {
@@ -1606,7 +1606,7 @@ export default {
       }
 
       let datas = { regionId: regionCodeNow, name: verifyData[0].name, nameFuzzy: false, shortCode: verifyData[0].code, shortCodeFuzzy: false }
-      proxy.$api.verifyDatainbb(datas).then((res) => {
+      proxy.$api.verifyDatainbbrc(datas).then((res) => {
         console.log(res.length, '核验数据')
         res.length == 0 ? (verifyForstate.value.state = true, verifyForstate.value.pass = true, ElMessage.success('数据已通过核验，可执行创校')) : (verifyForstate.value.state = false, verifyForstate.value.pass = false, ElMessage.error('数据未通过核验，请检查表单内容'))
       }).catch((error) => {
@@ -1637,7 +1637,7 @@ export default {
         data['regionId'] = (regionList.length == 1) ? regionList[0] : ''
         data['regionIdList'] = (regionList.length > 1) ? regionList : []
       }
-      proxy.$api.verifyDatainbb(data).then((res) => {
+      proxy.$api.verifyDatainbbrc(data).then((res) => {
         res.length == 0 ? (ElMessage.success('数据已通过核验，可执行创校'), batchTablesArr.value = true) : (ElMessage.error('数据未通过核验，请检查表单内容'), batchTablesArr.value = true, verifyState.value = false)
       }).catch((error) => {
         ElMessage.error('API异常，批量数据核验失败')

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

@@ -52,7 +52,7 @@
                 <div class="filtratebox-phase">
                   <span class="filtratebox-phase-title subclass">精准选择：</span>
                   <div class="filtratebox-phase-content precise">
-                    <div v-if="clickNum.subject === 0 || clickNum.subject === 2" class="schoolclass">
+                    <div v-if="(clickNum.subject === 0 || clickNum.subject === 2) && clickNum.filter===0" class="schoolclass">
                       <el-cascader v-model="optionsValue" :options="options" :props="props2" :collapse-tags=true :collapse-tags-tooltip=true filterable :filter-method="keywords">
                       </el-cascader>
                       <div class="addschoolbtn" @click="(adddialog=true,addvalue='',searchInit())">
@@ -177,7 +177,7 @@
       <el-dialog v-model="adddialog" title="学校搜索" width="50%" :close-on-click-modal="false">
         <div class="addschool-box">
           <div>
-            <el-input v-model="addvalue" placeholder="搜索学校简码" class="input-with-select">
+            <el-input v-model="addvalue" placeholder="搜索学校 名称/简码 " class="input-with-select">
               <template #append>
                 <el-button :icon="Search" />
               </template>
@@ -187,7 +187,7 @@
             <!-- <div class="notsearch-box" v-if="!tableData.length =="><img src="@/assets/img/notsearch.png" /></div> -->
             <div class="search-result">
               <p>搜索结果：</p>
-              <div class="result-box">
+              <div class="result-box" v-loading="filterloding" element-loading-text="加载中...">
                 <!-- <p><span>学校名称：</span><span class="result-text">{{addschool.name}}</span></p>
                 <p><span>学校简码：</span><span class="result-text">{{addschool.id}}</span></p>
                 <p><span>学校地址：</span><span class="result-text">{{addschool.region}}{{addschool.province}}{{addschool.city}}{{addschool.dist}}</span></p>
@@ -279,14 +279,14 @@ let showState = ref('default')
 let findValue = ref()
 let test = ref([])
 let columns = ref([
-  // {
-  //   key: "id",
-  //   dataKey: "id",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id
-  //   title: "编号",//显示在单元格表头的文本
-  //   width: 100,//当前列的宽度，必须设置
-  //   fixed: false,//是否固定列
-  //   headerClass: 'header-class',
-  // },
+  {
+    key: "name",
+    dataKey: "name",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id
+    title: "名称",//显示在单元格表头的文本
+    width: 100,//当前列的宽度，必须设置
+    fixed: false,//是否固定列
+    headerClass: 'general',
+  },
   {
     key: "schoolId",
     dataKey: "schoolId",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id
@@ -332,7 +332,7 @@ let columns = ref([
   {
     key: "tGreen",
     dataKey: "tGreen",//需要渲染当前列的数据字段，如{id:9527,name:'Mike'}，则填id
-    title: "T指数",//显示在单元格表头的文本
+    title: "T绿灯",//显示在单元格表头的文本
     width: 100,//当前列的宽度，必须设置
     headerClass: 'general',
   },
@@ -584,6 +584,7 @@ let addschool = ref({
   areaId: '',
   isvirtual: false,
 })
+let filterloding = ref(false)
 function changeState (value) {
   console.log(value)
   showState.value = 'details'
@@ -604,6 +605,7 @@ function dataInit () {
     res.areas.forEach((item) => {
       dataList.push({ id: item.id, name: item.name, province: item.provName, city: item.cityName, children: [] })
     })
+    filterloding.value = true
     proxy.$api.getSchool({}).then((res) => {
       console.log(res, 'schoolList')
       dataSource.value.school = res.scInfos
@@ -620,8 +622,10 @@ function dataInit () {
       dataSource.value.originalSchool = res.scInfos
       tableData.value = res.scInfos
       console.log(dataSource.value.composite, '检查是否是所有学校')
+      filterloding.value = false
     }).catch((err) => {
       ElMessage.error('API异常,基础数据获取异常')
+      filterloding.value = false
     })
   }).catch((err) => {
     ElMessage.error('API异常,基础数据获取异常')
@@ -632,7 +636,7 @@ function serachToresult (startTime, endTime, product, schools, unit) {
   let data = { "dateFrom": startTime, "dateTo": endTime, "prod": product, "schoolIds": schools, "dateUnit": unit }
   proxy.$api.getUseproduct(data).then((res) => {
     console.log(res, 'backPromise')
-    res.state === 200 ? filterdata.value = res.data : ''
+    res.state === 200 ? (res.data.forEach((item) => { item.name = item.school.name ? item.school.name : '暂无' }), filterdata.value = res.data) : ''
   }).catch((err) => {
     ElMessage.error('API异常,数据获取失败')
   })
@@ -1038,7 +1042,7 @@ watch(clickNum, (newv) => {
 .result-box {
   width: 100%;
   height: 45vh;
-  padding: 1% 1% 0% 2%;
+  padding: 1% 1% 0% 1%;
   border-radius: 5px;
   box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
 }