jwyu 1 年之前
父節點
當前提交
7253fc4dcf

+ 3 - 2
src/views/classify_manage/classifyEnlist.vue

@@ -176,7 +176,7 @@
       <reportVarietyEnSet ref="varietyIns" :checked="checkedVariety" v-if="showSetVariety" />
       </div>
       <div style="text-align:center;padding:10px 0 30px 0">
-        <el-button type="primary" plain @click="showSetVariety=false">取消</el-button>
+        <el-button type="primary" plain @click="showSetVariety=false;checkedVariety=[]">取消</el-button>
         <el-button type="primary" style="margin-left:20px" @click="handleSaveVariety">保存</el-button>
       </div>
     </el-dialog>
@@ -334,8 +334,9 @@ export default {
 
   methods: {
     handleShowSetVariety(item){
+      console.log(item.EnPermissions);
       this.activeItem=item
-      this.checkedVariety=item.EnPermissions||[]
+      this.checkedVariety=item.EnPermissions?JSON.parse(JSON.stringify(item.EnPermissions)):[]
       this.showSetVariety=true
     },
     handleSaveVariety(){

+ 3 - 0
src/views/dataEntry_manage/databaseList.vue

@@ -842,6 +842,9 @@ export default {
 						this.defaultWarn = type=== 'search' ? '未搜索到该指标' : '请在左侧选择指标'
 
 						this.$refs.menuTree.setCurrentKey(null)
+						// 清除当前的label
+						this.deleteLabel({code:this.select_node,id:this.selected_edbid,classifyId:''})
+						
 					}
 					if(type==='refresh') {
 						if(this.$refs.edb_detail_data){

+ 2 - 1
src/views/report_manage/reportEn/reportlist.vue

@@ -15,7 +15,8 @@
           <el-form-item label="">
             <el-button 
               v-permission="permissionBtn.enReportManageBtn.enReport_syncPolicy"
-              type="primary" 
+              type="primary"
+              size="medium"
               :loading="isPull" 
               @click="handlePullReport"
             >同步策略报告</el-button>

+ 1 - 1
src/views/report_manage/reportVariety.vue

@@ -63,7 +63,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="后台排序">
-                        <el-input placeholder="后台排序" v-model="editBreedData.sort" type="number" style="width:400px"></el-input>
+                        <el-input placeholder="后台排序" min="0" v-model="editBreedData.sort" type="number" style="width:400px"></el-input>
                     </el-form-item>
                 </el-form>
                 <div style="text-align: center;margin-top:40px">

+ 2 - 1
src/views/system_manage/enAuthManage.vue

@@ -336,12 +336,13 @@ export default {
       this.handleCheckedChange(selectList)
     },
     handleCheckedChange(val){
+      console.log(val);
       let checkedCount = val.length;
       this.checkAll = checkedCount === this.authOptions.length;
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.authOptions.length;
     },
     handleCheckAllChange(val){
-      this.setAuthData.selectList = val ? this.authOptions : [];
+      this.setAuthData.selectList = val ? this.authOptions.map(item=>item.code) : [];
       this.isIndeterminate = false;
     },
     async saveChange(){