fix指标库bug

src/routes/modules/chartRoutes.js

@@ -55,7 +55,7 @@ export default [
 			{
 				path: 'database',
 				component: () => import('@/views/dataEntry_manage/databaseList.vue'),
-				name: '指标库',
+				name: '指标加工',
 				hidden: false,
 				meta:{
 					name_en:'Indics'
@@ -64,7 +64,7 @@ export default [
 			{
 				path: 'edbBasicbase',
 				component: () => import('@/views/dataEntry_manage/databaseList.vue'),
-				name: '指标库',
+				name: '数据查看',
 				hidden: false,
 				meta:{
 					name_en:'Indics'

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -46,203 +46,203 @@
 
                     <!-- 超级季节性 -->
                     <template v-if="computedType==35">
-                    <el-form-item required :label="$t('EtaBasePage.label_n_val')" style="width:280px">
-                        <el-input v-model="formData.nNum" :placeholder="$t('Edb.InputHolderAll.input_n_value')" type="number" style="width:200px"></el-input>
-                    </el-form-item>
-                    <el-form-item :label="$t('EtaBasePage.label_calendar')"  style="width:180px">
-                        <el-select v-model="formData.calendarType" style="width:120px">
-                            <el-option :label="$t('Chart.calendar_gre')" value="公历"></el-option>
-                            <el-option :label="$t('Chart.calendar_lunar_text')" value="农历"></el-option>
-                        </el-select>
-                    </el-form-item>
+                        <el-form-item required :label="$t('EtaBasePage.label_n_val')" style="width:280px">
+                            <el-input v-model="formData.nNum" :placeholder="$t('Edb.InputHolderAll.input_n_value')" type="number" style="width:200px"></el-input>
+                        </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.label_calendar')"  style="width:180px">
+                            <el-select v-model="formData.calendarType" style="width:120px">
+                                <el-option :label="$t('Chart.calendar_gre')" value="公历"></el-option>
+                                <el-option :label="$t('Chart.calendar_lunar_text')" value="农历"></el-option>
+                            </el-select>
+                        </el-form-item>
                     </template>
 
                     <!-- 降频 -->
                     <template v-if="computedType==51">
-                    <el-form-item required :label="$t('Edb.Detail.e_fre')" style="width:180px">
-                        <el-select v-model="formData.frequency" style="width:120px">
-                            <el-option v-for="opt in frequencyArr" :key="opt.value" :label="opt.label" :value="opt.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item :label="$t('EtaBasePage.label_val_type')"  style="width:200px">
-                        <el-select v-model="formData.valueType" style="width:120px">
-                            <el-option key="期末值" :label="$t('EtaBasePage.val_type_end')" value="期末值"/>
-							<el-option key="平均值" :label="$t('EtaBasePage.val_type_average')" value="平均值"/>
-                        </el-select>
-                    </el-form-item>
+                        <el-form-item required :label="$t('Edb.Detail.e_fre')" style="width:180px">
+                            <el-select v-model="formData.frequency" style="width:120px">
+                                <el-option v-for="opt in frequencyArr" :key="opt.value" :label="opt.label" :value="opt.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.label_val_type')"  style="width:200px">
+                            <el-select v-model="formData.valueType" style="width:120px">
+                                <el-option key="期末值" :label="$t('EtaBasePage.val_type_end')" value="期末值"/>
+                                <el-option key="平均值" :label="$t('EtaBasePage.val_type_average')" value="平均值"/>
+                            </el-select>
+                        </el-form-item>
                     </template>
 
                     <!-- 累计值 -->
                     <template v-if="computedType=='accumulate'">
-                    <el-form-item>
-                        <el-radio v-model="subComputedType" :label="62">
-                            <!-- 累计值 -->
-                            {{$t('Edb.CalculatesAll.cumulate')}}
-                        </el-radio>
-                    </el-form-item>
-                    <el-form-item required :label="$t('Edb.Detail.e_fre')" style="width:180px" v-if="subComputedType==62">
-                        <el-select v-model="formData.frequency" style="width:120px">
-                            <el-option v-for="opt in frequencyArr" :key="opt.value" :label="opt.label" :value="opt.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item :label="$t('Edb.CalculatesAll.latest_processing')"  style="width:210px" v-if="subComputedType==62">
-                        <el-select v-model="formData.newValue" style="width:120px">
-                            <el-option :label="$t('EtaBasePage.default_select_text')" :value="0"/>
-							<el-option :label="$t('EtaBasePage.mean_imputation_select_text')" :value="1"/>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-radio v-model="subComputedType" :label="63">
-                            <!-- /* '年初至今累计值' */ -->
-                            {{$t('Edb.CalculatesAll.cumulate_oneyear')}}
-                        </el-radio>
-                    </el-form-item>
+                        <el-form-item>
+                            <el-radio v-model="subComputedType" :label="62">
+                                <!-- 累计值 -->
+                                {{$t('Edb.CalculatesAll.cumulate')}}
+                            </el-radio>
+                        </el-form-item>
+                        <el-form-item required :label="$t('Edb.Detail.e_fre')" style="width:180px" v-if="subComputedType==62">
+                            <el-select v-model="formData.frequency" style="width:120px">
+                                <el-option v-for="opt in frequencyArr" :key="opt.value" :label="opt.label" :value="opt.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="$t('Edb.CalculatesAll.latest_processing')"  style="width:210px" v-if="subComputedType==62">
+                            <el-select v-model="formData.newValue" style="width:120px">
+                                <el-option :label="$t('EtaBasePage.default_select_text')" :value="0"/>
+                                <el-option :label="$t('EtaBasePage.mean_imputation_select_text')" :value="1"/>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-radio v-model="subComputedType" :label="63">
+                                <!-- /* '年初至今累计值' */ -->
+                                {{$t('Edb.CalculatesAll.cumulate_oneyear')}}
+                            </el-radio>
+                        </el-form-item>
                     </template>
 
                     <!-- 指数修匀 -->
                     <template v-if="computedType==72">
-                    <el-form-item required :label="$t('EtaBasePage.alpha_value_lable')" style="width:220px">
-                        <el-input v-model.trim="formData.alphaValue" style="width:140px" :placeholder="$t('Edb.InputHolderAll.input_alpha_val')"></el-input>
-                    </el-form-item>
-                    </template>
+                        <el-form-item required :label="$t('EtaBasePage.alpha_value_lable')" style="width:220px">
+                            <el-input v-model.trim="formData.alphaValue" style="width:140px" :placeholder="$t('Edb.InputHolderAll.input_alpha_val')"></el-input>
+                        </el-form-item>
+                        </template>
 
-                    <!-- 与常数计算 -->
-                    <template v-if="computedType=='withNum'">
-                    <el-form-item required :label="$t('EtaBasePage.formula_lable')">
-                        <el-input v-model="formData.formula" :placeholder="$t('EtaBasePage.input_formula_msg')" clearable style="width: 200px"/>
-                        <span>
-                            <!-- 公式示例：A+100，或A*2 -->
-                            {{$t('EtaBasePage.formula_example_text')}}
-                        </span>
-                    </el-form-item>
+                        <!-- 与常数计算 -->
+                        <template v-if="computedType=='withNum'">
+                        <el-form-item required :label="$t('EtaBasePage.formula_lable')">
+                            <el-input v-model="formData.formula" :placeholder="$t('EtaBasePage.input_formula_msg')" clearable style="width: 200px"/>
+                            <span>
+                                <!-- 公式示例：A+100，或A*2 -->
+                                {{$t('EtaBasePage.formula_example_text')}}
+                            </span>
+                        </el-form-item>
                     </template>
 
                     <!-- 与单指标计算 -->
                     <template v-if="computedType=='withEDB'">
-                    <el-form-item required :label="$t('EtaBasePage.metric_label_b')">
-                        <el-select
-                            v-model="select_target"
-                            v-loadMore="searchLoad"
-                            :filterable="!select_target"
-                            clearable
-                            :placeholder="$t('Edb.InputHolderAll.input_name')"
-                            style="width: 250px"
-                            remote
-                            :remote-method="getTarget"
-                            @click.native="inputFocusHandle"
-                            @change="chooseTarget"
-                            @blur="search_have_more = false"
-                        >
-                            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-                            <el-option
-                                v-for="item in searchOptions"
-                                :key="item.EdbInfoId"
-                                :label="$parent.currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
-                                :value="item.EdbInfoId"
-                                :disabled="!item.HaveOperaAuth"
+                        <el-form-item required :label="$t('EtaBasePage.metric_label_b')">
+                            <el-select
+                                v-model="select_target"
+                                v-loadMore="searchLoad"
+                                :filterable="!select_target"
+                                clearable
+                                :placeholder="$t('Edb.InputHolderAll.input_name')"
+                                style="width: 250px"
+                                remote
+                                :remote-method="getTarget"
+                                @click.native="inputFocusHandle"
+                                @change="chooseTarget"
+                                @blur="search_have_more = false"
                             >
-                                <div>
-									<img 
-										:src="$icons.lock_ico2" 
-										width="18" 
-										height="18" 
-										style="vertical-align:middle" 
-										v-if="!item.HaveOperaAuth"
-									/>
-									{{$parent.currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
-								</div>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item required :label="$t('EtaBasePage.formula_lable')">
-                        <el-input v-model="formData.formula" :placeholder="$t('EtaBasePage.input_formula_msg')" clearable style="width: 200px"/>
-                        <span>
-                            <!-- 公式示例：A+B，或A/B，A/(A+B) -->
-                         {{$t('EtaBasePage.formula_example_text_a_b')}}
-                        </span>
-                    </el-form-item>
-                    <el-form-item :label="$t('EtaBasePage.create_edb_time_index')">
-                        <el-cascader
-							v-model="formData.timeSeriesVal"
-							style="width:180px"
-							:options="timeSeriesOpt"
-							:props="{emitPath:false}"
-							:show-all-levels="false"
-							:placeholder="$t('Edb.please_select')"
-						></el-cascader>
-                    </el-form-item>
-                    <el-form-item :label="$t('EtaBasePage.null_val_deal')">
-                        <el-select
-							v-model="formData.nullValueWay"
-							:placeholder="$t('Edb.please_select')"
-                            style="width:180px"
-						>
-							<el-option
-								v-for="item in nullWayOptions"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"
-							>
-							</el-option>
-						</el-select>
-                    </el-form-item>
-                    <el-form-item :label="$t('EtaBasePage.max_null_val')" v-if="showMaxNullDeal">
-                        <el-select
-							v-model="formData.maxNullWay"
-							:placeholder="$t('Edb.please_select')"
-						>
-							<el-option :label="$t('EtaBasePage.equal_zeto')" :value="1" />
-							<el-option label="跳过空值" :value="2" />
-						</el-select>
-                    </el-form-item>
+                                <i slot="prefix" class="el-input__icon el-icon-search"></i>
+                                <el-option
+                                    v-for="item in searchOptions"
+                                    :key="item.EdbInfoId"
+                                    :label="$parent.currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
+                                    :value="item.EdbInfoId"
+                                    :disabled="!item.HaveOperaAuth"
+                                >
+                                    <div>
+                                        <img 
+                                            :src="$icons.lock_ico2" 
+                                            width="18" 
+                                            height="18" 
+                                            style="vertical-align:middle" 
+                                            v-if="!item.HaveOperaAuth"
+                                        />
+                                        {{$parent.currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
+                                    </div>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item required :label="$t('EtaBasePage.formula_lable')">
+                            <el-input v-model="formData.formula" :placeholder="$t('EtaBasePage.input_formula_msg')" clearable style="width: 200px"/>
+                            <span>
+                                <!-- 公式示例：A+B，或A/B，A/(A+B) -->
+                            {{$t('EtaBasePage.formula_example_text_a_b')}}
+                            </span>
+                        </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.create_edb_time_index')">
+                            <el-cascader
+                                v-model="formData.timeSeriesVal"
+                                style="width:180px"
+                                :options="timeSeriesOpt"
+                                :props="{emitPath:false}"
+                                :show-all-levels="false"
+                                :placeholder="$t('Edb.please_select')"
+                            ></el-cascader>
+                        </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.null_val_deal')">
+                            <el-select
+                                v-model="formData.nullValueWay"
+                                :placeholder="$t('Edb.please_select')"
+                                style="width:180px"
+                            >
+                                <el-option
+                                    v-for="item in nullWayOptions"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.max_null_val')" v-if="showMaxNullDeal">
+                            <el-select
+                                v-model="formData.maxNullWay"
+                                :placeholder="$t('Edb.please_select')"
+                            >
+                                <el-option :label="$t('EtaBasePage.equal_zeto')" :value="1" />
+                                <el-option label="跳过空值" :value="2" />
+                            </el-select>
+                        </el-form-item>
                     </template>
 
                     <!-- 多指标求和/平均 -->
                     <template v-if="computedType=='multipleEDB'">
-                    <el-form-item style="margin-right:30px">
-                    <el-radio-group :disabled="isEdit" v-model="subComputedType">
-                        <el-radio :label="81"><!--  -->{{$t('EtaBasePage.sum_radio_label')}}</el-radio>
-                        <el-radio :label="82"><!-- 求平均 -->{{$t('EtaBasePage.average_radio_label')}}</el-radio>
-                    </el-radio-group>
-                    </el-form-item>
-                    <el-form-item :label="$t('EtaBasePage.create_edb_time_index')">
-                        <el-cascader
-							v-model="formData.timeSeriesVal"
-							style="width:180px"
-							:options="timeSeriesOpt"
-							:props="{emitPath:false}"
-							:show-all-levels="false"
-							:placeholder="$t('Edb.please_select')"
-						></el-cascader>
-                    </el-form-item>
-                    <el-form-item :label="$t('EtaBasePage.null_val_deal')">
-                        <el-select
-							v-model="formData.nullValueWay"
-							:placeholder="$t('Edb.please_select')"
-                            style="width:180px"
-						>
-							<el-option
-								v-for="item in nullWayOptions"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"
-							>
-							</el-option>
-						</el-select>
-                    </el-form-item>
+                        <el-form-item style="margin-right:30px">
+                        <el-radio-group :disabled="isEdit" v-model="subComputedType">
+                            <el-radio :label="81"><!--  -->{{$t('EtaBasePage.sum_radio_label')}}</el-radio>
+                            <el-radio :label="82"><!-- 求平均 -->{{$t('EtaBasePage.average_radio_label')}}</el-radio>
+                        </el-radio-group>
+                        </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.create_edb_time_index')">
+                            <el-cascader
+                                v-model="formData.timeSeriesVal"
+                                style="width:180px"
+                                :options="timeSeriesOpt"
+                                :props="{emitPath:false}"
+                                :show-all-levels="false"
+                                :placeholder="$t('Edb.please_select')"
+                            ></el-cascader>
+                        </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.null_val_deal')">
+                            <el-select
+                                v-model="formData.nullValueWay"
+                                :placeholder="$t('Edb.please_select')"
+                                style="width:180px"
+                            >
+                                <el-option
+                                    v-for="item in nullWayOptions"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
                     </template>
 
                     <!-- 升频 -->
                     <template v-if="computedType==14">
-                    <el-form-item :label="$t('EtaBasePage.null_val_deal')" prop="emptyType">
-                        <el-select
-                            v-model="formData.emptyType"
-                            :placeholder="$t('Edb.InputHolderAll.input_fre')"
-                        >
-                            <el-option :label="$t('EtaBasePage.null_val_deal_2')" :value="0"></el-option>
-                            <el-option :label="$t('EtaBasePage.null_val_deal_3')" :value="3"></el-option>
-                        </el-select>
-				    </el-form-item>
+                        <el-form-item :label="$t('EtaBasePage.null_val_deal')" prop="emptyType">
+                            <el-select
+                                v-model="formData.emptyType"
+                                :placeholder="$t('Edb.InputHolderAll.input_fre')"
+                            >
+                                <el-option :label="$t('EtaBasePage.null_val_deal_2')" :value="0"></el-option>
+                                <el-option :label="$t('EtaBasePage.null_val_deal_3')" :value="3"></el-option>
+                            </el-select>
+                        </el-form-item>
                     </template>
 
                 </div>
@@ -884,7 +884,7 @@ export default {
 		},
         // 获取指标分类
         async getClassifyOpt(){
-            const res=await dataBaseInterface.menuListV3({ClassifyType:2})
+            const res=await dataBaseInterface.menuListV3()
             if (res.Ret !== 200) return
             this.filterNodes(res.Data.AllNodes||[]);
 			this.classifyOpt = res.Data.AllNodes || [];

src/views/dataEntry_manage/databaseComponents/collectEdbMenu.vue

@@ -4,7 +4,7 @@
         class="catalog-tree other-tree"
         empty-text="暂无图库"
         :data="data"
-        node-key="UniqueCode"
+        node-key="ClassifyId"
         :expand-on-click-node="false"
         @current-change="(data,node)=>{$parent.nodeChange(data,node)}"
         >
@@ -37,7 +37,7 @@ export default {
   props: {
     data: {
       type: Object
-    },
+    }
   },
   data() {
     return {
@@ -59,6 +59,13 @@ export default {
         this.$emit('change')
       })
       
+    },
+
+    initSelect(id) {
+      console.log(id)
+      this.$nextTick(() => {
+        this.$refs.catalogTree.setCurrentKey(id);
+      })
     }
   }
 }

src/views/dataEntry_manage/databaseComponents/dataAssociateChart.vue

@@ -22,48 +22,15 @@
                         :style="{background: `no-repeat top/cover url('${!chart.HaveOperaAuth ? $icons.lock_big : chart.ChartImage}')`}"></div>
                     <div class="chart-item-bottom">
                         <span>{{$t('Chart.list_chart_time')}}: {{ chart.CreateTime.slice(0,10) }}</span>
-                        <span class="join_txt" @click="addMychartHandle(chart)" v-if="chart.HaveOperaAuth">
+                        <!-- <span class="join_txt" @click="addMychartHandle(chart)" v-if="chart.HaveOperaAuth">
                             <img :src="$icons.chart_join_ico"
                                 style="width: 13px; height: 12px; vertical-align: middle"/>
-                            <!-- 加入我的图库 -->
                             {{$t('Chart.chart_addmy_btn')}}
-                        </span>
+                        </span> -->
                     </div>
                 </div>
 
             </div>
-            <!-- <el-col
-                :span="6"
-                style="margin-bottom: 20px; padding-right: 20px"
-                v-for="chart in list"
-                :key="chart.ChartInfoId"
-            >
-                <el-card class="public-chart-item">
-                    <div slot="header" class="item-top">
-                        <span class="text_oneLine">{{ chart.ChartName }}</span>
-                    </div>
-                    <img
-                        :src="chart.ChartImage"
-                        alt=""
-                        class="chart-img"
-                        @click="detailShowHandle(chart)"
-                    />
-                    <div class="item-bottom">
-                        <span>创建时间: {{ chart.CreateTime.slice(0,10) }}</span>
-                        <span
-                            class="join_txt"
-                            @click="addMychartHandle(chart)"
-                        >
-                            <img
-                                :src="$icons.chart_join_ico"
-                                alt=""
-                                style="width: 13px; height: 12px; vertical-align: middle"
-                            />
-                            加入我的图库
-                        </span>
-                    </div>
-                </el-card>
-            </el-col> -->
         </div>
         </template>
 

src/views/dataEntry_manage/databaseList.vue

@@ -148,7 +148,7 @@
 									@dblclick.stop="editNodeLabel(node, data)" 
 									v-else 
 									class="text_oneLine node_label" 
-									:style="`width:${(select_node === data.UniqueCode && node.Nodewidth) || ''}`"
+									:style="`width:${(select_node === data.UniqueCode ? '40%' :'90%') || ''}`"
 									:id="`node${data.UniqueCode}`"
 								>
 									<img 
@@ -176,7 +176,7 @@
 										alt=""
 										style="width: 14px; height: 14px; margin-right: 8px"
 										@click.stop="addNode(node,data)"
-										v-if="data.Button.AddButton&&isEdbBtnShow('editCatalog')&&node.level<6"
+										v-if="data.Button.AddButton&&isEdbBtnShow('editCatalog')&&node.level<9"
 									/>
 									<!-- 编辑节点 如果是分类，判断data.Button.OpButton不变；如果是指标，不显示(ETA1.0.3) -->
 									<img
@@ -205,6 +205,7 @@
 							v-else
 							:data="treeData"
 							@change="getTreeData"
+							ref="collectEdbMenuRef"
 						/>
 					</div>
 
@@ -229,7 +230,7 @@
 						</div>
 					</template>
 				</div>
-				<span class="move-btn resize" v-drag id="resize" @mousemove="dynamicNode&&resetNodeStyle(dynamicNode)">
+				<span class="move-btn resize" v-drag id="resize" >
 				</span>
 				<span
 					v-show="isMainLeftShow"
@@ -300,6 +301,7 @@
 							<el-button 
 								v-if="isBasicBase&&isEdbBtnShow('edbData_edbCollect_collect')"
 								type="text"
+								:style="classifyShowType==='own'?'color:#D54941':''"
 								@click="classifyShowType==='own'?handleRemoveCollect():handleCollectEdb()" 
 							>{{classifyShowType==='own'?'移出':'收藏'}}</el-button>
 							<el-button 
@@ -1070,9 +1072,11 @@ export default {
 						!params && this.select_node && this.$refs.menuTree.setCurrentKey(this.select_node);
 					}else {
 						this.treeData = res.Data||[]
-						this.select_classify =
-							this.select_classify ||
+						this.select_classifyId =
+							this.select_classifyId ||
 							(this.treeData.length ? this.treeData[0].ClassifyId:0);
+
+						this.$refs.collectEdbMenuRef&&this.$refs.collectEdbMenuRef.initSelect(this.select_classifyId)
 					}
 		},
 		/* 获取最新的指标 默认展示 */
@@ -1142,8 +1146,7 @@ export default {
 					}
 					this.$refs.menuTree&&this.$nextTick(()=>{
 						const _node = this.$refs.menuTree.getNode(this.select_node)
-						this.dynamicNode = _node;
-						this.dynamicNode&&this.resetNodeStyle(this.dynamicNode)
+						// this.dynamicNode = _node;
 						//滚动到高亮位置
 						setTimeout(() => {
 							let node = document.getElementById(`node${this.select_node}`)||{}
@@ -1337,24 +1340,11 @@ export default {
 			this.select_classifyId = !data.EdbInfoId?data.ClassifyId:0;
 			this.select_node = data.UniqueCode;
 			this.selected_edbid = data.EdbInfoId;
-			this.resetNodeStyle(node);
-			this.dynamicNode = node;
+			// this.dynamicNode = node;
 			this.showAssociateChart=false
 			this.showAssociateComputeData=false
 		},
-		resetNodeStyle: _.debounce(function(node) {
-			const tree = $('.target_tree')[0];
-			let width = tree.offsetWidth;
-			console.log(width)
-			// let label_wid = width > 500 ? 'auto' : (width <= 300 && width < 360) ?  100 : 0.7*width;
-			let label_wid =
-				width > 500
-					? 'auto'
-					: width <= 260
-					? 80
-					: 0.4 * width;
-			this.$set(node, 'Nodewidth', label_wid + 'px');
-		},200),
+
 		/* 双击label出现input修改框 */
 		editNodeLabel(node, data) {
 			//目录名称可以双击修改 指标不能
@@ -1736,7 +1726,8 @@ export default {
 				PrevClassifyId,
 				NextClassifyId,
 				PrevEdbInfoId,
-				NextEdbInfoId
+				NextEdbInfoId,
+				ClassifyType: this.isBasicBase ? 0 : 2
 			}
 			console.log(params);
 			dataBaseInterface.classifyMoveSort(params).then(res=>{
@@ -2166,11 +2157,11 @@ export default {
 		},
 		changeTreeNode(){
 			this.$refs.menuTree.setCurrentKey(this.select_node);
-			this.$nextTick(()=>{
-				const _node = this.$refs.menuTree.getCurrentNode()
-				this.dynamicNode = _node;
-				this.dynamicNode&&this.resetNodeStyle(this.dynamicNode)
-			})
+			// this.$nextTick(()=>{
+			// 	const _node = this.$refs.menuTree.getCurrentNode()
+			// 	this.dynamicNode = _node;
+			// 	this.dynamicNode&&this.resetNodeStyle(this.dynamicNode)
+			// })
 		},
 		//只看我的
 		onlyMeHandler(){
@@ -2236,7 +2227,7 @@ export default {
 				classifyId:ClassifyId
 			};
 			this.selectCurrentNode(params);
-			this.select_classifyId = 0;
+			if(this.classifyShowType==='public') this.select_classifyId = 0;
 		},
 		// 添加wind wsd指标成功
 		addTargetSuccess(params){
@@ -2260,7 +2251,7 @@ export default {
 			this.search_txt = '';
 			this.searchCollectWord = '';
 			this.getTreeData()
-			this.getEdbChartList()
+			this.classifyShowType==='public'&&this.getEdbChartList()
 		},
 
 		/* 收藏指标 */
@@ -2276,7 +2267,10 @@ export default {
 
 			if(res.Ret !== 200) return 
 			this.$message.success('取消收藏成功')
-			this.getTreeData()
+			if(this.selected_edbid) {
+				this.chartList = []
+				this.selected_edbid = 0
+			}
 			this.getEdbChartList()
 		},
 
@@ -2384,7 +2378,7 @@ export default {
 		} */
 		.main-left {
 			width: 400px;
-			min-width: 300px;
+			min-width: 400px;
 			background: #fff;
 			margin-right: 20px;
 			border: 1px solid #ececec;
@@ -2413,6 +2407,7 @@ export default {
 					align-items: center;
 					display: block;
 					flex: 1;
+					max-width: 92%;
 					.node_label {
 						margin-right: 2px;
 					}

src/views/system_manage/dataOperaAuth.vue

@@ -449,8 +449,8 @@ export default {
       }).then(res => {
         if(res.Ret == 200){
           this.classifyOption = res.Data.List || []
-          //如果是三级分类,去掉最后一级分类的child
-          if([3,4,5,6].includes(this.default_tab)){
+          //如果是多级分类,去掉最后一级分类的child
+          if([3,4,5,6,7].includes(this.default_tab)){
             this.filterNodes(this.classifyOption)
           }
           ++this.classifysOptKey;