Merge branch 'cmy/develop-bi' into develop

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

@@ -768,15 +768,18 @@ export default {
       loadingCreatedArea.value = true;
       //获取最后一位的名字，生成名字
       let newstandard = formArea.value.options[formArea.value.options.length - 1].standard.substring(formArea.value.options[formArea.value.options.length - 1].standard.indexOf('standard') + 8)
-      let newname = 'standard' + (Number(newstandard) + 1)
+      let newname = 'standard' + (Number(newstandard) + 2)
+      console.log(newstandard, newname, '学区标准名')
       //查找选中的名字
-      let selectName = formArea.value.options.filter((item) => {
-        return item.id === formArea.value.capacityvalue
-      })
-      let users = JSON.parse(localStorage.getItem('userData'))
-      console.log(formArea.value.options)
+      console.log(formArea.value.capacityvalue, '选择名字')
       let names = ''
-      formArea.value.options.forEach((item) => { item.standard === selectName[0].standard ? names = item.name : '' })
+      let users = JSON.parse(localStorage.getItem('userData'))
+      if (formArea.value.capacityvalue) {
+        let selectName = formArea.value.options.filter((item) => {
+          return item.id === formArea.value.capacityvalue
+        })
+        formArea.value.options.forEach((item) => { item.standard === selectName[0].standard ? names = item.name : '' })
+      }
       let createdParame = {
         name: formArea.value.areaname.value,
         provCode: !formArea.value.areaselect.state ? formArea.value.areaselect.provincevalue : '',
@@ -788,9 +791,9 @@ export default {
         standard: newname,
         standardName: formArea.value.areaname.value,
         institution: formArea.value.institution,
-        oldId: formArea.value.capacityvalue,
-        oldStandard: selectName[0].standard,
-        oldName: names,
+        oldId: formArea.value.capacityvalue ? formArea.value.capacityvalue : '',
+        oldStandard: formArea.value.capacityvalue ? selectName[0].standard : '',
+        oldName: formArea.value.capacityvalue ? names : '',
         areaAdmin: formArea.value.areaAdmin,
         tmdId: users.tmdId,
         tmdName: users.tmdName,

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

@@ -3244,13 +3244,13 @@ export default {
   background: url("../../assets/img/bg-index.jpg") no-repeat;
   background-size: 100% 100%;
   position: relative;
-  height: 100%;
+  /* height: 100%; */
 }
 .statisticsbox,
 .statisticsbox-all {
   width: 100%;
   height: 100%;
-  padding: 0.5% 0%;
+  padding: 0% 0%;
   line-height: 20px;
   position: relative;
   /* margin-top: 35px; */

TEAMModelBI/ClientApp/src/view/teachermanage/traitmanage.vue

@@ -54,6 +54,10 @@
                   <p class="source">{{ $t(`abilityManages.source`) }}：<span class="source-title">{{ item.name}}</span></p>
                   <p class="source">{{ $t(`abilityManages.area`) }}：<span class="source-title">{{item.provName}}{{ item.cityName }}</span></p>
                   <p class="source">{{ $t(`abilityManages.affiliation`) }}：<span class="source-title">{{item.institution}}</span></p>
+                  <p class="source">引用标准：
+                    <span class="source-title" v-if="item.quotename" :title="item.quotename">{{item.quotename}}</span>
+                    <span class="source-title available" v-else>暂无</span>
+                  </p>
                 </div>
               </el-card>
               <!-- <div class="signboard" v-show="item.id==='bde5c011-2ae4-461a-b46c-5483ba72ae45'" title="即时同步" @click="synchronize">
@@ -87,14 +91,13 @@
                   </div>
                 </template>
                 <div class="information-box">
-                  <p class="source">{{ $t(`abilityManages.source`) }}：<span class="source-title">{{ item.name
-                            }}</span></p>
-                  <p class="source">{{ $t(`abilityManages.area`) }}：<span class="source-title">{{
-                                    item.provName
-                            }}{{ item.cityName }}</span></p>
-                  <p class="source">{{ $t(`abilityManages.affiliation`) }}：<span class="source-title">{{
-                                    item.institution
-                            }}</span></p>
+                  <p class="source">{{ $t(`abilityManages.source`) }}：<span class="source-title">{{ item.name}}</span></p>
+                  <p class="source">{{ $t(`abilityManages.area`) }}：<span class="source-title">{{item.provName}}{{ item.cityName }}</span></p>
+                  <p class="source">{{ $t(`abilityManages.affiliation`) }}：<span class="source-title">{{item.institution}}</span></p>
+                  <p class="source">引用标准：
+                    <span class="source-title" v-if="item.quotename" :title="item.quotename">{{item.quotename}}</span>
+                    <span class="source-title available" v-else>暂无</span>
+                  </p>
                 </div>
               </el-card>
             </div>
@@ -885,11 +888,18 @@ export default {
             item.id === 'bde5c011-2ae4-461a-b46c-5483ba72ae45' ? res.areas.unshift(res.areas.splice(index, 1)[0]) : ''
           })
           for (let i in res.areas) {
+            let quote = res.areas[i].quoteId
+            res.areas[i].quotename = ''
             i < 4 ? abilityProject.push(res.areas[i]) : citeAbility.value.push(res.areas[i])
+            for (let e in res.areas) {
+              console.log(res.areas[e].id, quote, '999999999999999')
+              res.areas[e].id === quote && quote !== null ? res.areas[i].quotename = res.areas[e].name + '—' + res.areas[e].institution : ''
+            }
           }
           store.commit('getPoint', res.areas)
           loadingData.value.preinstall = false
           loadingData.value.cite = false
+          console.log(res.areas)
         }
       }).catch((error) => {
         ElMessage.error('微能力获取异常')
@@ -1003,7 +1013,7 @@ export default {
 .cardbox {
   width: 19%;
   display: inline-block;
-  padding: 5px 10px;
+  padding: 0px 10px;
   margin-top: 10px;
   position: relative;
   cursor: pointer;
@@ -1062,7 +1072,7 @@ export default {
   font-size: 14px;
   color: #909399;
   text-align: left;
-  line-height: 45px;
+  line-height: 35px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -1709,6 +1719,9 @@ export default {
 .intact-right:hover {
   background-color: rgba(99, 110, 114, 1) !important;
 }
+.available {
+  color: #909399 !important;
+}
 @keyframes mymove {
   0% {
     top: -35px;