Selaa lähdekoodia

Fix:艺术测评占比UI调整

OnePsycho 2 vuotta sitten
vanhempi
commit
3960e57e31
2 muutettua tiedostoa jossa 28 lisäystä ja 19 poistoa
  1. 27 18
      TEAMModelOS/ClientApp/src/view/art/AreaArtSetting.vue
  2. 1 1
      nuget.config

+ 27 - 18
TEAMModelOS/ClientApp/src/view/art/AreaArtSetting.vue

@@ -6,26 +6,29 @@
         <span class="btn-add-dimension" @click="onAddArtDimension">+ {{ $t('area.addDimension') }}</span>
         <div class="content art-setting-wrap">
           <Collapse simple v-if="artDimensions.length">
-            <Panel v-for="(dimension,index) in artDimensions" color="primary" :name="index+1+''">
+            <Panel v-for="(dimension,index) in artDimensions" :key="index" color="primary" :name="index+1+''">
               <span style="display:inline-flex;align-items: center">
                 <span style="margin-right:10px">{{ dimension.dimension }}</span>
                 <Tag color="purple">{{ getTypeName(dimension.type).join(',') }}</Tag>
                 <Tag color="blue">{{ dimension.subject }}</Tag>
                 <span class="tools">
                   <Icon type="md-create" :title="$t('knowledge.edit')" @click.stop="onEditDimension(dimension,index)" />
-                  <Icon type="md-trash" :title="$t('knowledge.delete')" @click.stop="onDeleteDimension(dimension,index)" />
+                  <Icon type="md-trash" :title="$t('knowledge.delete')"
+                    @click.stop="onDeleteDimension(dimension,index)" />
                 </span>
               </span>
               <template #content>
                 <p class="part-title">{{ $t('knowledge.block') }}</p>
                 <div class="dimension-blocks">
-                  <Tag class="dimension-item" size="medium" v-for="(item,index) in dimension.blocks" color="geekblue">{{ item }}</Tag>
+                  <Tag class="dimension-item" size="medium" v-for="(item,index) in dimension.blocks" :key="index"
+                    color="geekblue">{{ item }}</Tag>
                 </div>
                 <p class="part-title">{{ $t('area.dimensionDesc') }}</p>
-                <div v-for="(desc,descIndex) in dimension.descs" style="padding:5px 0;margin-left: 10px;">
+                <div v-for="(desc,descIndex) in dimension.descs" :key="descIndex"
+                  style="padding:5px 0;margin-left: 10px;">
                   <span class="desc-grade">【{{ desc.grades.join(',') }} {{ $t('lessonRecord.grade') }}】</span>
                   <div>
-                    <p v-for="(item,index) in desc.contents" class="desc-item">{{ item }}</p>
+                    <p v-for="(item,index) in desc.contents" :key="index" class="desc-item">{{ item }}</p>
                   </div>
                 </div>
               </template>
@@ -34,26 +37,34 @@
         </div>
       </div>
       <div class="setting-block">
-        <p class="title">{{ $t('area.artRateSetting') }}</p>
+        <p class="title">{{ $t('area.artRateSetting') }}<Icon type="md-create" size="16"
+            style="margin-left:10px;cursor: pointer;" color="#ccc" @click.stop="onNodeClick()"></Icon>
+        </p>
         <div class="content art-setting-wrap">
           <el-tree :data="quotas" :props="defaultProps" class="tree" node-key="id" ref="tree">
             <span class="custom-tree-node" slot-scope="{ node, data }">
               <span>【{{ node.level }} {{ $t('area.level') }}】</span>
               <span>{{ data.name }}</span>
               <span style="color:red;margin-left:10px">{{ $t('area.rate') }} {{ data.percent }}%</span>
-              <Icon type="md-create" size="16" style="margin-left:10px" color="#ccc" @click.stop="onNodeClick(node,data)"></Icon>
+              <Icon v-if="node.level < 3" type="md-create" size="16" style="margin-left:10px" color="#ccc"
+                @click.stop="onNodeClick(node,data)"></Icon>
             </span>
           </el-tree>
         </div>
       </div>
     </div>
-    <Modal v-model="addArtDimensionModal" :title="isEditDimensional ? $t('area.editQuota') : $t('area.addQuota')" footer-hide width="700px">
-      <BaseDimensionForm :dimension="dimensionInfo" v-if="addArtDimensionModal" @onFinish="onDimensionEditFinish"></BaseDimensionForm>
+    <Modal v-model="addArtDimensionModal" :title="isEditDimensional ? $t('area.editQuota') : $t('area.addQuota')"
+      footer-hide width="700px">
+      <BaseDimensionForm :dimension="dimensionInfo" v-if="addArtDimensionModal" @onFinish="onDimensionEditFinish">
+      </BaseDimensionForm>
     </Modal>
     <Modal v-model="setRateModal" :title="$t('area.rateSetting')" width="700px">
-      <div v-for="item in rateArr">
-        <span>{{ item.name }}</span>
-        <Slider v-model="item.percent" :min="0" :max="100" show-input></Slider>
+      <p style="margin-bottom:20px;font-weight:bold;font-size: 16px;">【{{parentName}}】下指标占比情况</p>
+      <div v-for="(item,index) in rateArr" :key="index" style="display: inline-block;">
+        <span style="margin:0 10px;">{{ item.name }}</span>
+        <!-- <Slider v-model="item.percent" :min="0" :max="100" show-input></Slider> -->
+        <InputNumber v-model="item.percent" :min="0" :max="100" :step="1"></InputNumber> 
+        <span style="margin:0 5px">% <span style="font-size: 16px;margin: 0 5px;" v-if="index !== rateArr.length - 1">+</span> </span>
       </div>
       <div slot="footer">
         <Button type="text" @click="setRateModal = false">{{ $t('knowledge.cancel') }}</Button>
@@ -71,6 +82,7 @@ export default {
   },
   data() {
     return {
+      parentName:'艺术评测考核',
       setRateModal: false,
       defaultProps: {
         children: 'children',
@@ -94,12 +106,9 @@ export default {
   },
   methods: {
     /* 节点点击事件 */
-    onNodeClick(node) {
-      if (node.level === 1) {
-        this.rateArr = this.quotas
-      } else {
-        this.rateArr = node.parent.data.children
-      }
+    onNodeClick(node,data) {
+      this.parentName = node ? data.name : '艺术评测考核'
+      this.rateArr = node ? data.children : this.quotas
       this.setRateModal = true
     },
     /* 确认保存占比调整 */

+ 1 - 1
nuget.config

@@ -4,7 +4,7 @@
 
 
 
-<add key="habook" value="http://cs.habook.com.tw:30000/v3/index.json" />
+<add key="habook" value="http://cdhabook.teammodel.cn:20000/v3/index.json" />
 
 
 </packageSources>