Merge branch 'master' into 'master'

指标增加显示与隐藏功能

See merge request lighter/vue-intergration-platform!129

src/views/target-management/target-comm/targetTree.vue

@@ -10,7 +10,7 @@
                  @node-click="handleNodeClick" :expand-on-click-node="isOkDoor">
           <template #default="{ node, data }" class="custom-tree-node">
                     <span :title="data.label">
-                        {{ data.label.length > 27 ? data.label.slice(0, 27) + '...' : data.label }}
+                        {{ data.label.length > 24 ? data.label.slice(0, 24) + '...' : data.label }}
                     </span>
             <span style="z-index: 100;" v-if="node.isLeaf">
                         <el-button link type="danger" size="small" @click.stop="removeTarget(node, data)">删除</el-button>

src/views/target-management/target-dict/TargetDictConfig.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="layout_container">
     <div class="layout_main layout_container layout-horizontal">
-      <aside style="width: 600px;">
+      <aside style="width: 500px;" v-if="isShowTss">
         <TargetTree v-if="isShowTree" :targetTreeData="targetTreeData" @treeNodeClick="treeNodeClick"/>
       </aside>
       <div class="layout_container layout_overflow_auto">
@@ -14,258 +14,266 @@
           </el-button>
           <el-button type="primary" icon="Refresh" @click="resetForm(ruleFormRef)" style="margin-left: 10px">重置
           </el-button>
+          <el-button type="primary" icon="Expand" @click="bigOrSmall" style="margin-left: 10px">隐藏与显示
+          </el-button>
         </header>
         <div class="layout_main layout_card">
           <el-form ref="ruleFormRef" :model="ruleForm" :rules="rulesForm" label-width="120px" class="demo-ruleForm"
             :size="formSize" status-icon :disabled="isShowForm">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="指标名称" prop="name">
-                  <el-input v-model="ruleForm.name" minlength="1" maxlength="256" show-word-limit />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="指标编码" prop="id">
-                  <el-input v-model="ruleForm.id" minlength="1" maxlength="12" show-word-limit />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="父级编码" prop="pid">
-                  <el-input v-model="ruleForm.pid" minlength="1" maxlength="12" show-word-limit />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="指标序号" prop="sort">
-                  <el-input v-model="ruleForm.sort" maxlength="12" show-word-limit />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="总分" prop="score">
-                  <el-input v-model="ruleForm.score" placeholder="请输入正整数或两位小数" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="所占比率" prop="ratio" :disabled="true">
-                  <el-input v-model="ruleForm.ratio" minlength="0" maxlength="48" show-word-limit />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="对接类型">
-                  <el-select v-model="ruleForm.type" placeholder="请选择类型">
-                    <el-option label="V1" value="0" />
-                    <el-option label="V2" value="1" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6">
-                <el-form-item label="状态" prop="state">
-                  <el-select v-model="ruleForm.state" placeholder="请选择状态">
-                    <el-option label="开启" value="Y" />
-                    <el-option label="关闭" value="N" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="启用时间">
-                  <el-form-item prop="openTime">
-                    <el-date-picker v-model="ruleForm.openTime" type="date" aria-label="选择时间" placeholder="选择时间"
-                      style="width: 100%" />
-                  </el-form-item>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="责任科室" prop="deptCode">
-                  <el-select-v2 ref="deptInfoRef" v-model="ruleForm.deptCode" clearable remote filterable
-                    :remote-method="deptMethod" :options="deptWardList" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="责任人" prop="opId">
-                  <el-select-v2 ref="opInfoRef" v-model="ruleForm.opId" clearable remote filterable
-                    :remote-method="empMethod" :options="empList" />
+            <el-collapse v-model="activeName">
+              <el-collapse-item title="指标信息" name="zbxx">
+                <el-row>
+                  <el-col :span="12">
+                    <el-form-item label="指标名称" prop="name">
+                      <el-input v-model="ruleForm.name" minlength="1" maxlength="256" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="指标编码" prop="id">
+                      <el-input v-model="ruleForm.id" minlength="1" maxlength="12" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="父级编码" prop="pid">
+                      <el-input v-model="ruleForm.pid" minlength="1" maxlength="12" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="指标序号" prop="sort">
+                      <el-input v-model="ruleForm.sort" maxlength="12" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="总分" prop="score">
+                      <el-input v-model="ruleForm.score" placeholder="请输入正整数或两位小数" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="所占比率" prop="ratio" :disabled="true">
+                      <el-input v-model="ruleForm.ratio" minlength="0" maxlength="48" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="对接类型">
+                      <el-select v-model="ruleForm.type" placeholder="请选择类型">
+                        <el-option label="V1" value="0" />
+                        <el-option label="V2" value="1" />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="状态" prop="state">
+                      <el-select v-model="ruleForm.state" placeholder="请选择状态">
+                        <el-option label="开启" value="Y" />
+                        <el-option label="关闭" value="N" />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="启用时间">
+                      <el-form-item prop="openTime">
+                        <el-date-picker v-model="ruleForm.openTime" type="date" aria-label="选择时间" placeholder="选择时间"
+                          style="width: 100%" />
+                      </el-form-item>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="责任科室" prop="deptCode">
+                      <el-select-v2 ref="deptInfoRef" v-model="ruleForm.deptCode" clearable remote filterable
+                        :remote-method="deptMethod" :options="deptWardList" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="责任人" prop="opId">
+                      <el-select-v2 ref="opInfoRef" v-model="ruleForm.opId" clearable remote filterable
+                        :remote-method="empMethod" :options="empList" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="4">
+                    <el-form-item label="是否叶子节点" prop="isLeaf">
+                      <el-switch v-model="ruleForm.isLeaf" active-value="1" inactive-value="0" active-color="#13ce66"
+                        inactive-color="#ff4949" @change='changeNode(ruleFormRef)' />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="10" v-show="ruleForm.isLeaf === '1'">
+                    <el-form-item label="分子" prop="childId">
+                      <el-select v-model="ruleForm.childId" placeholder="请选择报表分子" filterable clearable>
+                        <el-option v-for="item in reportIdOptions" :key="item.code" :label="item.name" :value="item.code">
+                          <span style="float: left">{{ item.code }}</span>
+                          <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px; ">
+                            {{ item.name }}
+                          </span>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="10" v-show="ruleForm.isLeaf === '1'">
+                    <el-form-item label="分母" prop="momId">
+                      <el-select v-model="ruleForm.momId" placeholder="请选择报表分母" filterable clearable>
+                        <el-option v-for="item in reportIdOptions" :key="item.code" :label="item.name" :value="item.code">
+                          <span style="float: left">{{ item.code }}</span>
+                          <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px; ">
+                            {{ item.name }}
+                          </span>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-form-item label="指标定义" prop="definition">
+                  <el-input v-model="ruleForm.definition" type="textarea" />
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4">
-                <el-form-item label="是否叶子节点" prop="isLeaf">
-                  <el-switch v-model="ruleForm.isLeaf" active-value="1" inactive-value="0" active-color="#13ce66"
-                    inactive-color="#ff4949" @change='changeNode(ruleFormRef)' />
+                <el-form-item label="评审方法" prop="method">
+                  <el-input v-model="ruleForm.method" type="textarea" :rows="4" />
                 </el-form-item>
-              </el-col>
-              <el-col :span="10" v-show="ruleForm.isLeaf === '1'">
-                <el-form-item label="分子" prop="childId">
-                  <el-select v-model="ruleForm.childId" placeholder="请选择报表分子" filterable clearable>
-                    <el-option v-for="item in reportIdOptions" :key="item.code" :label="item.name" :value="item.code">
-                      <span style="float: left">{{ item.code }}</span>
-                      <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px; ">
-                        {{ item.name }}
-                      </span>
-                    </el-option>
-                  </el-select>
+                <el-form-item label="计分细则" prop="scoreRule">
+                  <el-input v-model="ruleForm.scoreRule" type="textarea" />
                 </el-form-item>
-              </el-col>
-              <el-col :span="10" v-show="ruleForm.isLeaf === '1'">
-                <el-form-item label="分母" prop="momId">
-                  <el-select v-model="ruleForm.momId" placeholder="请选择报表分母" filterable clearable>
-                    <el-option v-for="item in reportIdOptions" :key="item.code" :label="item.name" :value="item.code">
-                      <span style="float: left">{{ item.code }}</span>
-                      <span style="float: right; color: var(--el-text-color-secondary); font-size: 13px; ">
-                        {{ item.name }}
-                      </span>
-                    </el-option>
-                  </el-select>
+                <el-form-item label="数据来源条件" prop="source">
+                  <el-input v-model="ruleForm.source" type="textarea" placeholder="请描述指标数据来源条件，比如：诊断包含xxx, 诊断编码是xxx等等" />
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="指标定义" prop="definition">
-              <el-input v-model="ruleForm.definition" type="textarea" />
-            </el-form-item>
-            <el-form-item label="评审方法" prop="method">
-              <el-input v-model="ruleForm.method" type="textarea" :rows="4" />
-            </el-form-item>
-            <el-form-item label="计分细则" prop="scoreRule">
-              <el-input v-model="ruleForm.scoreRule" type="textarea" />
-            </el-form-item>
-            <el-form-item label="数据来源条件" prop="source">
-              <el-input v-model="ruleForm.source" type="textarea" placeholder="请描述指标数据来源条件，比如：诊断包含xxx, 诊断编码是xxx等等" />
-            </el-form-item>
-            <el-divider />
-            <el-form ref="upFormRef" label-width="100px" :model="sqlForm" class="demo-ruleForm" :size="formSize">
-              <el-row>
-                <el-col :span="7">
-                  <el-form-item label="年度周期" prop="cycle">
-                    <el-select v-model="cycle" placeholder="请选择年度周期" clearable style="width: 100%" @change="cycleFormat">
-                      <el-option v-for="item in reportCycleList" :key="item.reportCycle"
-                                 :label="item.yearRange" :value="item.reportCycle" selected>
-                        <span style="float: left">{{ item.yearRange }}</span>
-                        <span
-                            style="float: right; padding-left: 4px; color: var(--el-text-color-secondary); font-size: 13px;">{{
-                            item.remark }}</span>
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="开始年份">
-                    <el-form-item prop="startTime">
-                      <el-input v-model="sqlForm.startTime" disabled />
-                    </el-form-item>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="结束年份">
-                    <el-form-item prop="endTime">
-                      <el-input v-model="sqlForm.endTime" disabled />
-                    </el-form-item>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="5">
-                  <el-form-item label="得分填写">
-                    <el-form-item prop="zbScore">
-                      <el-input v-model="zbScore" show-word-limit />
-                    </el-form-item>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-<!--                <el-col :span="4">-->
-<!--                  <el-form-item>-->
-<!--                    <el-button type="primary" @click="sqlEdit(ruleFormRef)"> 指标sql编辑</el-button>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="4">
-                  <el-form-item>
-                    <el-button type="primary" @click="sqlExecute(ruleFormRef)"> 指标运行结果</el-button>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item>
-                    <el-button type="primary" @click="handWrite()"> 结果手动填写</el-button>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item>
-                    <el-button type="primary" @click="saveTargetDictResult()"> 指标结果保存</el-button>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item>
-                    <el-button type="primary" @click="queryTargetReportResult()"> 指标结果查询</el-button>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item>
-                    <el-button type="primary" @click="saveTargetReportScore()"> 指标得分保存</el-button>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <el-form ref="upFormRef" label-width="180px" :model="sqlForm" class="demo-ruleForm" :size="formSize"
-              :disabled="isShowTargetResult" v-show="isShowTargetResult">
-              <el-row v-for="item in resultList">
-                <el-col :span="8">
-                  <el-form-item :label="item.childLabel" :prop="item.childLabel + item.index">
-                    <el-input v-model="item.childResult" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="item.momLabel" :prop="item.momLabel + item.index">
-                    <el-input v-model="item.momResult" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="item.calcLabel" :prop="item.calcLabel + item.index">
-                    <el-input v-model="item.calcResult" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <el-form ref="upFormRef" label-width="120px" :model="sqlForm" class="demo-ruleForm" :size="formSize"
-              v-show="isShowHandWrite">
-              <el-row v-for="e in 4">
-                <el-col :span="6">
-                  <el-form-item :label="'年份' + e" :prop="'year' + e" :rules="[{ type: 'number', message: '年份必须是数字' },]">
-                    <el-input v-model.number="sqlForm['year' + e]" minlength="4" maxlength="4" show-word-limit />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item :label="'分子结果' + e" :prop="'childResult' + e">
-                    <el-input v-model="sqlForm['childResult' + e]" minlength="1" maxlength="12" show-word-limit />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item :label="'分母结果' + e" :prop="'momResult' + e">
-                    <el-input v-model="sqlForm['momResult' + e]" minlength="1" maxlength="12" show-word-limit />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item :label="'分子/分母-结果' + e" :prop="'calcResult' + e">
-                    <el-input v-model="sqlForm['calcResult' + e]" minlength="1" maxlength="12" show-word-limit />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <el-row v-show="isShowQtResult">
-              <el-table :data="QtResultData" stripe border highlight-current-row row-key="childKey" height="200"
-                style="width: 100%">
-                <el-table-column prop="year" label="年份" header-align="center" />
-                <el-table-column prop="dataType" label="数据方式" header-align="center">
-                  <template #default="scope">
-                    {{ scope.row.dataType == '1' ? 'sql统计' : '手动输入' }}
-                  </template>
-                </el-table-column>
-                <el-table-column prop="childResult" label="分子结果" header-align="center" />
-                <el-table-column prop="momResult" label="分母结果" header-align="center" />
-                <el-table-column prop="calcResult" label="计算结果" header-align="center" />
-                <el-table-column prop="op" label="统计人员" header-align="center" />
-                <el-table-column prop="opTime" label="统计时间" header-align="center" width="200" />
-              </el-table>
-            </el-row>
+              </el-collapse-item>
+<!--            <el-divider />-->
+              <el-collapse-item title="指标计算" name="zbjs">
+                <el-form ref="upFormRef" label-width="100px" :model="sqlForm" class="demo-ruleForm" :size="formSize">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-form-item label="年度周期" prop="cycle">
+                        <el-select v-model="cycle" placeholder="请选择年度周期" clearable style="width: 100%" @change="cycleFormat">
+                          <el-option v-for="item in reportCycleList" :key="item.reportCycle"
+                                     :label="item.yearRange" :value="item.reportCycle" selected>
+                            <span style="float: left">{{ item.yearRange }}</span>
+                            <span
+                                style="float: right; padding-left: 4px; color: var(--el-text-color-secondary); font-size: 13px;">{{
+                                item.remark }}</span>
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="开始年份">
+                        <el-form-item prop="startTime">
+                          <el-input v-model="sqlForm.startTime" disabled />
+                        </el-form-item>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="结束年份">
+                        <el-form-item prop="endTime">
+                          <el-input v-model="sqlForm.endTime" disabled />
+                        </el-form-item>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="5">
+                      <el-form-item label="得分填写">
+                        <el-form-item prop="zbScore">
+                          <el-input v-model="zbScore" show-word-limit />
+                        </el-form-item>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+    <!--                <el-col :span="4">-->
+    <!--                  <el-form-item>-->
+    <!--                    <el-button type="primary" @click="sqlEdit(ruleFormRef)"> 指标sql编辑</el-button>-->
+    <!--                  </el-form-item>-->
+    <!--                </el-col>-->
+                    <el-col :span="4">
+                      <el-form-item>
+                        <el-button type="primary" @click="sqlExecute(ruleFormRef)"> 指标运行结果</el-button>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item>
+                        <el-button type="primary" @click="handWrite()"> 结果手动填写</el-button>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item>
+                        <el-button type="primary" @click="saveTargetDictResult()"> 指标结果保存</el-button>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item>
+                        <el-button type="primary" @click="queryTargetReportResult()"> 指标结果查询</el-button>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item>
+                        <el-button type="primary" @click="saveTargetReportScore()"> 指标得分保存</el-button>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+                <el-form ref="upFormRef" label-width="180px" :model="sqlForm" class="demo-ruleForm" :size="formSize"
+                  :disabled="isShowTargetResult" v-show="isShowTargetResult">
+                  <el-row v-for="item in resultList">
+                    <el-col :span="8">
+                      <el-form-item :label="item.childLabel" :prop="item.childLabel + item.index">
+                        <el-input v-model="item.childResult" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item :label="item.momLabel" :prop="item.momLabel + item.index">
+                        <el-input v-model="item.momResult" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item :label="item.calcLabel" :prop="item.calcLabel + item.index">
+                        <el-input v-model="item.calcResult" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+                <el-form ref="upFormRef" label-width="120px" :model="sqlForm" class="demo-ruleForm" :size="formSize"
+                  v-show="isShowHandWrite">
+                  <el-row v-for="e in 4">
+                    <el-col :span="6">
+                      <el-form-item :label="'年份' + e" :prop="'year' + e" :rules="[{ type: 'number', message: '年份必须是数字' },]">
+                        <el-input v-model.number="sqlForm['year' + e]" minlength="4" maxlength="4" show-word-limit />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item :label="'分子结果' + e" :prop="'childResult' + e">
+                        <el-input v-model="sqlForm['childResult' + e]" minlength="1" maxlength="12" show-word-limit />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item :label="'分母结果' + e" :prop="'momResult' + e">
+                        <el-input v-model="sqlForm['momResult' + e]" minlength="1" maxlength="12" show-word-limit />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item :label="'分子/分母-结果' + e" :prop="'calcResult' + e">
+                        <el-input v-model="sqlForm['calcResult' + e]" minlength="1" maxlength="12" show-word-limit />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+                <el-row v-show="isShowQtResult">
+                  <el-table :data="QtResultData" stripe border highlight-current-row row-key="childKey" height="200"
+                    style="width: 100%">
+                    <el-table-column prop="year" label="年份" header-align="center" />
+                    <el-table-column prop="dataType" label="数据方式" header-align="center">
+                      <template #default="scope">
+                        {{ scope.row.dataType == '1' ? 'sql统计' : '手动输入' }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="childResult" label="分子结果" header-align="center" />
+                    <el-table-column prop="momResult" label="分母结果" header-align="center" />
+                    <el-table-column prop="calcResult" label="计算结果" header-align="center" />
+                    <el-table-column prop="op" label="统计人员" header-align="center" />
+                    <el-table-column prop="opTime" label="统计时间" header-align="center" width="200" />
+                  </el-table>
+                </el-row>
+              </el-collapse-item>
+            </el-collapse>
           </el-form>
         </div>
       </div>
@@ -307,6 +315,8 @@ const targetTreeData = ref({
 })
 
 const isShowTree = ref(false)
+const isShowTss = ref(true)
+const activeName = ref(['zbxx', 'zbjs'])
 const isShowForm = ref(false)
 // 是否显示指标sql运行结果
 const isShowTargetResult = ref(false)
@@ -1056,6 +1066,14 @@ const queryTargetReportScore = (params) => {
       }
     });
 }
+// 显示与隐藏指标树
+const bigOrSmall = () => {
+  if(isShowTss.value) {
+    isShowTss.value = false
+  } else {
+    isShowTss.value = true
+  }
+}
 </script>
 <style lang="scss" scoped>
 :deep(.hd-cl) {

src/views/target-management/target-dict/TargetDictScore.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="layout_container">
     <div class="layout_main layout_container layout-horizontal">
-      <aside style="width: 600px;">
+      <aside style="width: 500px;" v-if="isShowTss">
         <TargetTree v-if="isShowTree" :targetTreeData="targetTreeData" @treeNodeClick="treeNodeClick"/>
       </aside>
       <div class="layout_container layout_overflow_auto">
@@ -23,6 +23,8 @@
           </el-select>
           <el-button type="primary" icon="Refresh" @click="resetForm(ruleFormRef)" style="margin-left: 10px">重置
           </el-button>
+          <el-button type="primary" icon="Expand" @click="bigOrSmall" style="margin-left: 10px">隐藏与显示
+          </el-button>
         </header>
         <div class="layout_main layout_card">
           <el-form ref="ruleFormRef" :model="ruleForm" :rules="rulesForm" label-width="120px" class="demo-ruleForm"
@@ -216,6 +218,7 @@ const targetTreeData = ref({
 })
 
 const isShowTree = ref(false)
+const isShowTss = ref(true)
 const isShowForm = ref(false)
 const userInfo = useUserStore().userInfo
 const nowDay = new Date()
@@ -769,6 +772,15 @@ const deptFormat = () => {
       isShowTree.value = true
     });
 }
+
+// 显示与隐藏指标树
+const bigOrSmall = () => {
+  if(isShowTss.value) {
+    isShowTss.value = false
+  } else {
+    isShowTss.value = true
+  }
+}
 </script>
 <style lang="scss" scoped>
 :deep(.hd-cl) {