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

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

@@ -1554,8 +1554,8 @@ export default {
 }
 
 .cuticon {
-  width: 1.9em;
-  height: 1.9em;
+  width: 1.2em !important;
+  height: 1.2em !important;
   vertical-align: -0.2em;
   fill: currentColor;
   overflow: hidden;

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

@@ -40,6 +40,8 @@
             <el-form-item :label="$t(`areaManages.createdArea.project`)" class="capacity-box">
               <el-select v-model="formArea.capacityvalue" :placeholder="$t(`areaManages.createdArea.projecthint`)">
                 <el-option v-for="item in formArea.options" :key="item.id" :label="item.name + '——' + item.standardName" :value="item.id">
+                  <el-tag class="mx-1 reminder" effect="dark" style="float: left" size="small">完整</el-tag>
+                  <span>{{ item.name}}</span>——<span>{{item.standardName}}</span>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -2100,6 +2102,10 @@ export default {
   font-size: 12px;
   margin-left: 1%;
 }
+.reminder {
+  margin-top: 5px;
+  margin-right: 5px;
+}
 </style>
 <style>
 .areabox .el-form {