Merge branch 'cmy/develop-bi' into develop

TEAMModelBI/ClientApp/src/view/areaServe/areamanage.vue

@@ -717,12 +717,14 @@ export default {
       console.log(addSchoolitem.value, '当前要添加的')
     }
     //地区选择
-    function areaSelctChange (value, model) {
+    function areaSelctChange (values, model) {
       console.log(originalDatas.value)
+      // let value = values.indexOf('省') !== -1 && model === 'province' ? values.slice(0, values.indexOf('省')) : values
       let data = option
       if (model === 'province') {
         //传输下一级的数据给select
         let cityData = data.filter((item) => {
+          // let names = item.name.indexOf('省') !== -1 ? item.name.slice(0, item.name.indexOf('省')) : item.name
           return item.name === value
         })
         cityOptions.value.cityInfo = cityData[0].children

TEAMModelBI/ClientApp/src/view/schoolServe/school.vue

@@ -55,7 +55,7 @@
       </div>
     </div>
     <div class="school-list">
-      <el-table :data="tableData" :ref="tablesInfo" id="tablescroll" style="width: 100%" height="75vh" v-loading="loading" element-loading-text="加载中..." @selection-change="selectChange">
+      <el-table :data="tableData" :ref="tablesInfo" id="tablescroll" style="width: 100%" height="75vh" v-loading="loading" element-loading-text="加载中..." empty-text="暂无数据" @selection-change="selectChange">
         <el-table-column type="selection" width="55" v-if="PowerShow" />
         <el-table-column prop="index" :label="$t(`schoolManages.tables.serialnum`)" type="index" sortable align="center" />
         <el-table-column :label="$t(`schoolManages.tables.badge`)" width="150" align="center">
@@ -510,9 +510,11 @@ export default {
       }
     }
     //地区选择
-    function areaSelctChange (value, model) {
+    function areaSelctChange (values, model) {
       loading.value = true
-      console.log(value)
+      let textState = (values.includes('自治区') || values.includes('市')) && model === 'province' ? true : false
+      let value = values.indexOf('省') === -1 && model === 'province' && textState === false ? values + '省' : values
+      console.log(values, value, model, '调用的select')
       let data = option
       if (model === 'province') {
         //传输下一级的数据给select
@@ -522,7 +524,10 @@ export default {
         cityOptions.value.cityInfo = cityData[0].children
         //遍历list
         let schoolData = originalData.value.filter((items) => {
-          return items.province === value
+          console.log(items, '下面')
+          let provinceState = (items.province.includes('自治区') || items.province.includes('市')) ? true : false
+          let names = provinceState === false && !items.province.includes('省') ? items.province + '省' : items.province
+          return names === value
         })
         tableData.value = schoolData
         console.log(schoolData, tableData.value)