后管修改

src/api/exctab/excelmodel.js

@@ -287,7 +287,7 @@ export const exctabSort = (ids) => {
     return request({
         url: '/api/blade-manager/exceltab/tab-sort',
         method: 'post',
-        params: {
+        data: {
             ids,
         }
     })

src/api/exctab/exceltab.js

@@ -55,4 +55,13 @@ export const checkParamElement = (params) => {
     method: 'get',
     params:params
   })
+}
+
+//查看模板信息
+export const getExcelInfo = (params) => {
+  return request({
+    url: '/api/blade-manager/exceltab/templateDetail',
+    method: 'get',
+    params:params
+  })
 }

src/views/exctab/ContractSort.vue

@@ -0,0 +1,218 @@
+<template>
+  <el-dialog
+    title="合同段排序"
+    :visible.sync="visible"
+    width="600px"
+    append-to-body
+    @close="handleClose"
+    class="project-dialog"
+  >  
+  <span slot="title">
+            <i class="el-icon-sort" style="color: #2550A2;margin-right: 5px;"></i>{{ title }}
+    </span>
+    <div class="sort-container">
+      <!-- 提示信息 -->
+      <div class="tip-box">
+        <i class="el-icon-info"></i>
+             拖动项目可调整顺序，或者使用箭头按钮、输入序号进行排序
+
+      </div>
+
+      <!-- 排序列表 -->
+      <draggable 
+        v-model="sortList" 
+        class="sort-list"
+        handle=".drag-handle"
+        @end="handleDragEnd"
+      >
+        <div v-for="(item, index) in sortList" 
+          :key="item.id" 
+          class="sort-item"
+        >
+          <i class="el-icon-rank drag-handle"></i>
+          <div class="item-content">
+            <span>{{ item.name }}</span>
+
+            <div class="item-actions">
+                <div class="move-btns">
+                    <el-button 
+                    type="text" 
+                    icon="el-icon-arrow-up"
+                    :disabled="index === 0"
+                    @click="moveItem(index, -1)"
+                    ></el-button>
+                    <el-button 
+                    type="text" 
+                    icon="el-icon-arrow-down"
+                    :disabled="index === sortList.length - 1"
+                    @click="moveItem(index, 1)"
+                    ></el-button>
+                </div>
+                <span>移至</span>
+              <el-input-number 
+              :controls="false"
+                v-model="item.sortNum" 
+                :min="1" 
+                :max="sortList.length"
+                size="mini"
+                style="width: 60px;"
+                @change="handleNumberChange($event, index)"
+              ></el-input-number>
+              <span>位</span>
+              
+            </div>
+          </div>
+        </div>
+      </draggable>
+    </div>
+
+    <div slot="footer" style="text-align: center">
+      <el-button @click="handleClose">取 消</el-button>
+      <el-button type="primary" @click="handleConfirm" style="  background-color: #2550A2;border-color: #2550A2 ;color: white;">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import draggable from 'vuedraggable'
+
+export default {
+  name: 'ContractSort',
+  components: {
+    draggable
+  },
+  props: {
+    // 添加 props
+    title: {
+      type: String,
+      default: '排序'
+    },
+    sortProLoad: { // 接收父组件传递的 sortProLoad 状态
+      type: Boolean,
+      default: false,
+    },
+   
+  },
+  data() {
+    return {
+      sortList: [],
+      visible: false
+    }
+  },
+
+  methods: {
+        // 添加显示方法
+     // 修改显示方法
+  show(contractList) {
+    if(!contractList || !Array.isArray(contractList)) {
+      console.warn('contractList must be an array');
+      return;
+    }
+    // 初始化排序列表
+    this.sortList = contractList.map((item, index) => ({
+      ...item,
+      sortNum: index + 1
+    }));
+    this.visible = true;
+  },    // 添加隐藏方法
+    hide() {
+      this.visible = false;
+    },
+    initSortList() {
+      this.sortList = this.contractList.map((item, index) => ({
+        ...item,
+        sortNum: index + 1
+      }));
+    },
+    handleDragEnd() {
+      // 重新计算序号
+      this.sortList.forEach((item, index) => {
+        item.sortNum = index + 1;
+      });
+    },
+    moveItem(index, direction) {
+      const newIndex = index + direction;
+      const item = this.sortList.splice(index, 1)[0];
+      this.sortList.splice(newIndex, 0, item);
+      this.handleDragEnd();
+    },
+    handleNumberChange(value, index) {
+      const targetIndex = value - 1;
+      if (targetIndex === index) return;
+      
+      const item = this.sortList.splice(index, 1)[0];
+      this.sortList.splice(targetIndex, 0, item);
+      this.handleDragEnd();
+    },
+    handleClose() {
+      this.visible = false;
+    },
+    handleConfirm() {
+      this.$emit('confirm', this.sortList);
+      this.visible = false;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.sort-container {
+  padding: 10px;
+
+  .tip-box {
+    background: #EFF6FF;
+    padding: 10px;
+    margin-bottom: 15px;
+    border-radius: 4px;
+    color: #3271FF;
+    font-size: 13px;
+    
+    .el-icon-info {
+      margin-right: 5px;
+      color: #3271FF;
+    }
+  }
+
+  .sort-list {
+    max-height: 500px;
+    overflow-y: auto;
+    .sort-item {
+      display: flex;
+      align-items: center;
+      padding: 10px;
+      border: 1px solid #EBEEF5;
+      margin-bottom: 10px;
+      border-radius: 4px;
+      
+      &:hover {
+        background: #f5f7fa;
+      }
+
+      .drag-handle {
+        cursor: move;
+        color: #909399;
+        margin-right: 10px;
+        font-size: 18px;
+      }
+
+      .item-content {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .item-actions {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+
+        .move-btns {
+          display: flex;
+        
+        }
+      }
+    }
+  }
+}
+</style>

src/views/exctab/exceltab.vue

@@ -1,5 +1,27 @@
 <template>
   <basic-container>
+    <div class="search-box">
+        <div class="search-box-left">
+            <el-input v-model="query.name" placeholder="请输入名称" style="width: 200px;" class="filter-item" />
+            <el-select v-model="query.projectId" placeholder="项目名称" clearable style="width: 200px" class="filter-item">
+              <el-option v-for="item in projectList" :key="item.id" :label="item.projectAlias" :value="item.id" />
+            </el-select>
+            <el-select v-model="query.tabType" placeholder="模板类型" clearable style="width: 200px" class="filter-item">
+              <el-option v-for="item in tabTypeList"  :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+            </el-select>
+            <el-select v-model="query.tableTemplateType" placeholder="项目类型" clearable style="width: 200px" class="filter-item">
+              <el-option v-for="item in tableTemplateTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+            </el-select>
+            <el-button type="primary" @click="searchClick" class="custom-primary-btn">搜索</el-button>
+            <el-button type="info" @click="clearSearch">清空</el-button>
+        </div>
+        <div class="header-box-right">
+          <el-button type="primary" @click="addClick">新增</el-button>
+          <el-button type="warning" @click="handleSort">排序</el-button>
+          <el-button type="danger"  @click="handleDelete">删除</el-button>
+        </div>
+      
+    </div>
     <avue-crud
       :option="option"
       :table-loading="loading"
@@ -19,8 +41,11 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+       :search.sync="query"
     >
-      <template slot="menuLeft">
+
+  
+      <!-- <template slot="menuLeft">
         <el-button
           type="danger"
           size="small"
@@ -30,12 +55,20 @@
           @click="handleDelete"
         >删 除
         </el-button>
-      </template>
-
+      </template> -->
+      
       <template
         slot-scope="scope"
         slot="menu"
       >
+  
+      <el-button
+          type="text"
+          icon="el-icon-view"
+          size="small"
+          @click.stop="viewInfo(scope.row, scope.index)"
+        >模版信息
+        </el-button>
         <el-button
           type="text"
           icon="el-icon-circle-plus-outline"
@@ -59,16 +92,187 @@
           <i :class="row.source" />
         </div>
       </template>
+       <template
+            slot-scope="{row}"
+            slot="tabType"
+          >
+                <el-tag
+                  size="small"
+                  v-for="item in generateTagItems(row.tabType)"
+                  :key="item.label"
+                  :type="item.type"
+                  effect="dark"
+                  class="mr-3 custom-ellipse-tag"
+                  :class="`custom-tag-type-${item.type}`"
+                  >
+                 
+                  {{ item.label }}
+                </el-tag>
+        
+          </template>
+                  <template slot-scope="{row}" slot="projectInfoList">
+          
+                    <el-tooltip 
+                    v-for="item in row.projectInfoList" 
+                    :key="item.id"
+                    :content="item.projectName"
+                    placement="top"
+                    :disabled="item.projectName.length<20"
+                  >
+                    <el-tag  
+                      size="small" 
+                      type="info"   
+                      class="custom-ellipse-tag1 ellipsis-tag"
+                      
+                    >
+                      {{item.projectName}}
+                    </el-tag>
+                  </el-tooltip>
+          </template>
+
     </avue-crud>
+
+    <!-- 模板信息 -->
+      <el-dialog
+        class="project-dialog"
+        :visible.sync="infoVisible"
+        width="65%"
+        append-to-body
+      >
+        <span slot="title">
+          <i class="el-icon-view" style="color: #2550A2; margin-right: 10px;"></i>模板信息
+        </span>
+
+        <div class="dialog-content">
+          <!-- 模板基本信息 -->
+          <div class="basic-info">
+          <div class="flex">
+                <div class="info-row">
+                  <el-tag
+                    size="small"
+                    v-for="item in generateTagItems(templateInfo.tabType)"
+                    :key="item.label"
+                    :type="item.type"
+                    effect="dark"
+                    class="mr-3 custom-ellipse-tag"
+                    :class="`custom-tag-type-${item.type}`"
+                    >
+                  
+                    {{ item.label }}
+                  </el-tag>
+              </div>
+              <div class="info-row ml-4">
+                <div class="pro-label">{{ templateInfo.name }}</div>
+                <div >{{ templateInfo.tableTemplateTypeName||'项目类型' }}</div>
+                <div class="value">
+                <span> 创建信息：</span>
+                  <span>{{ templateInfo.createUser }}</span>
+                  <span class="ml-4">{{templateInfo.createTime  }}</span>
+                </div>
+                
+              </div>
+            </div>
+         
+            <div class="flex info-row-right">
+                  <div class="info-row">
+                    <div class="value-num">{{ templateInfo.projectUseNumber||0 }}</div>
+                    <div class="label">使用项目数</div>
+                  </div>
+                <div class="info-row">
+                    <span class="value-num">{{ templateInfo.tabCout||0 }}</span>
+                    <span class="label">清表数量</span>
+                </div>
+                <div class="info-row">
+                  <span class="value-num">{{ templateInfo.excelUseNumber||0 }}</span>
+                  <span class="label">清表使用数量</span>
+                </div>
+              </div>
+          </div>
+
+          <!-- 使用项目明细 -->
+          <div class="section-title">使用项目明细</div>
+          <div class="project-tags" v-if="templateInfo.projectInfoList">
+            <el-tag
+              v-for="item in templateInfo.projectInfoList"
+              :key="item.id"
+              size="small"
+              type="info"
+              class="custom-ellipse-tag1 ellipsis-tag"
+            >
+              {{ item.projectName }}
+            </el-tag>
+          </div>
+          <div v-else>暂无数据</div>
+
+          <!-- 模板操作信息 -->
+          <div class="section-title" v-if="false">模板操作信息</div>
+          <el-table
+          v-if="false"
+            :data="templateInfo.operationLogs"
+            border
+            style="width: 100%; margin-top: 10px;"
+            :header-cell-style="{ background: '#f5f7fa', color: '#666' }"
+          >
+            <el-table-column prop="index" label="序号" width="60" align="center">
+              <template slot-scope="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="operationDesc" label="操作描述" min-width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.operationDesc }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="operator" label="操作人" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.operator }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="operateTime" label="操作时间" width="180">
+              <template slot-scope="scope">
+                {{ scope.row.operateTime }}
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <!-- 分页 -->
+          <div class="pagination-container" v-if="templateInfo.total > 0">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="templateInfo.total"
+            />
+          </div>
+        </div>
+      </el-dialog>
+      <!-- 排序 -->
+           <!-- wbs排序弹窗 -->
+        <ContractSort 
+         ref="contractSortRef"
+         title="清表模板排序"
+         :sortProLoad="sortProLoad"
+        @confirm="handleSortConfirm"
+      />
   </basic-container>
 </template>
 
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/exctab/exceltab";
+import { getList, getDetail, add, update, remove,getExcelInfo } from "@/api/exctab/exceltab";
+import { exctabSort } from "@/api/exctab/excelmodel";
 import { mapGetters } from "vuex";
-
+import { getDictionary } from "@/api/system/dict";
+import { getProjectListPage } from "@/api/manager/projectinfo";
+import { getDictionaryBiz } from "@/api/other";
+  import ContractSort from './ContractSort.vue'
 export default {
+  components: {
+    ContractSort
+  },
   data () {
     return {
       form: {},
@@ -79,16 +283,28 @@ export default {
         currentPage: 1,
         total: 0
       },
+      search:{
+        projectId: '',
+        name: '',
+        tabType: '',
+        tableTemplateType:''
+
+      },
       selectionList: [],
       option: {
         height: 'auto',
         calcHeight: 30,
         tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
+        searchShow: false,
+        refreshBtn:false,
+        searchShowBtn: false,
+        columnBtn: false,
+
         border: true,
         index: true,
-        viewBtn: true,
+        viewBtn: false,
+        addBtn: false,
+
         selection: true,
         menuWidth: 400,
         dialogClickModal: false,
@@ -96,7 +312,7 @@ export default {
           {
             label: '创建时间',
             prop: 'createTime',
-            width: 300,
+            width: 150,
             editDisplay: false,
             addDisplay: false,
           },
@@ -111,9 +327,11 @@ export default {
             }]
           },
           {
-              label: "模板类型",
+              label: "项目类型",
               type: "select",
-              search: false,
+               width: 100,
+           
+              search: true,
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=table_template_type",
               props: {
                 label: "dictValue",
@@ -123,7 +341,26 @@ export default {
               prop: "tableTemplateType",
               rules: [{
                 required: true,
-                message: "请选择模板类型",
+                message: "请选择项目类型",
+                trigger: "blur"
+              }]
+            },
+             {
+              label: "模板类型",
+              type: "select",
+               width: 120,
+              slot: true,
+              search: true,
+              dicUrl: "/api/blade-system/dict/dictionary?code=wbs_type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+              dataType: "number",
+              prop: "tabType",
+              rules: [{
+                required: true,
+                message: "请选择项目类型",
                 trigger: "blur"
               }]
             },
@@ -131,17 +368,37 @@ export default {
           {
             label: "表数量",
             prop: "tabCout",
-            width: 300,
+            width: 80,
             editDisplay: false,
             addDisplay: false,
             rules: [{
               message: "请输入表数量",
               trigger: "blur",
             }]
-          }
+          },
+          {
+            label: "项目名称",
+            prop: "projectInfoList",
+            display: false,
+            search: true,
+            slot:true,
+          },
         ]
       },
-      data: []
+      data: [],
+      tableTemplateTypeList: [],
+      projectList:[],
+      infoVisible: false,
+      templateInfo: {
+       
+      },
+      currentPage: 1,
+      pageSize: 20,
+      tabTypeList:[],
+      sortList  : [],
+      sortListAll:[],
+
+      sortProLoad:false
     };
   },
   computed: {
@@ -163,6 +420,64 @@ export default {
     }
   },
   methods: {
+    getTableTemplateTypeList(){
+           let code = "table_template_type";
+            getDictionaryBiz({
+                code,
+            }).then((res) => {
+                    this.tableTemplateTypeList = res.data.data;
+            });
+
+    },
+    getTabTypeList(){
+           let code = "wbs_type";
+            getDictionary({
+                code,
+            }).then((res) => {
+                    this.tabTypeList = res.data.data;
+            });
+
+    },
+    getProjectListPage() {
+      let params = {};
+      params.page = this.currentPage;
+      params.size = this.pageSize;
+      getProjectListPage(params).then((res) => {
+        this.projectList = res.data.data.records;
+      });
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+    },
+
+    generateTagItems(wbsTypes){
+       const typeToLabelMap = {
+        1: '质检',
+        2: '试验',
+        3: '日志',
+        4: '计量',
+        5: '征拆',
+        6: '底层节点',
+       
+    };
+      let tagItems = [];
+         // 如果 wbsTypes 不是数组，则将其转换为数组
+    if (!Array.isArray(wbsTypes)) {
+        wbsTypes = [wbsTypes];
+    }
+      wbsTypes.forEach(type => {
+        // 检查type是否在映射关系中存在
+        if (typeToLabelMap.hasOwnProperty(type)) {
+            // 如果存在，则创建一个新的对象并添加到tagItems数组中
+            tagItems.push({
+                type: type,
+                label: typeToLabelMap[type]
+            });
+        }
+    });
+     return tagItems;
+  },
+
     handleAdd (row) {
       this.$router.push('/excel/excelmodel/' + row.id);
     },
@@ -279,10 +594,193 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
+    },
+    getProjectList () {
+      getProjectListPage({
+        current:1,
+        size:999,
+        ...this.searchForm
+
+      }).then((res) => {
+        this.projectList = res.data.data.records;
+      })
+    },
+    //查看模板信息
+    viewInfo(row,index){
+      this.infoVisible = true;
+      this.getExcelInfoData(row.id)
+      
+
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      // 可重新请求数据
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      // 可重新请求数据
+    },
+    getExcelInfoData(id){
+       getExcelInfo({id:id}).then((res) => {
+             if(res.data.code==200){
+                this.templateInfo = res.data.data;
+            }else{
+                 this.templateInfo = {}
+            }
+    })
+  },
+  searchClick(){
+     this.onLoad(this.page,this.query);
+  },
+  clearSearch () {
+    this.query = {}
+   this.onLoad(this.page,this.query);
+  },
+  addClick(){
+         this.$refs.crud.rowAdd();
+  },
+  //排序
+handleSort(){
+    this.sortProLoad = true;
+      getList(1, 1000,{parentId:0}).then(res => {
+        const data = res.data.data;
+        this.sortListAll = data.records;
+         this.sortList = JSON.parse(JSON.stringify(this.sortListAll));
+  
+
+          this.$nextTick(() => {
+            this.$refs.contractSortRef.show(this.sortList);
+          })
+      }).finally(()=>{
+        this.sortProLoad = false;
+      })
+    
+    
+  },
+   handleSortConfirm(sortedList) {
+      // 这里处理排序后的数据
+      console.log('排序后的列表:', sortedList);
+      // TODO: 调用接口保存排序结果
+      this.sortList = [...sortedList];
+        const ids = this.sortList.map(item => item.id);
+     this.saveSort(ids);
+
+    },
+    saveSort(ids){
+
+      
+        
+        exctabSort(ids).then((res) => {
+                    this.sortProLoad= false;
+                    if(res.data.code==200){
+                        this.$message.success(res.data.msg)
+                      
+                                 this.onLoad(this.page);
+                    }else{
+                        this.$message.error(res.data.msg)
+                    }
+                })
+      
+
+
     }
-  }
+  
+},
+
+  created() { 
+    this.getTableTemplateTypeList()
+    this.getProjectList()
+    this.getTabTypeList()
+  },
 };
 </script>
 
-<style>
+<style scoped lang="scss">
+.ellipsis-tag {
+  max-width:300px; /* 设置最大宽度 */
+  overflow: hidden;
+  margin-right: 4px;
+
+  
+  .el-tag__content {
+    display: inline-block;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+.dialog-content {
+  padding: 20px;
+  font-size: 14px;
+
+  .basic-info {
+    margin-bottom: 20px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .info-row-right{
+      line-height: 30px;
+    }
+    .info-row {
+      display: flex;
+      flex-direction:column ;
+      margin-bottom: 10px;
+      .label {
+        width: 100px;
+        color: #666;
+         text-align: center;
+      }
+      .pro-label{
+        font-weight: bold;
+        font-size: larger;
+      }
+      .value {
+        flex: 1;
+      }
+      .value-num{
+        font-size: larger;
+        font-weight: bold;
+        color: rgba(37, 80, 162, 1);
+        text-align: center;
+      }
+    }
+  }
+
+  .section-title {
+    font-weight: bold;
+    margin: 15px 0 10px;
+    background-color: #E0E0E0;
+    font-size: larger;
+    padding-left: 15px;
+    padding: 5px 0 5px 15px;
+
+    line-height: 30px;
+    color: rgba(118, 118, 118, 1);
+    border-radius: 5px;
+  }
+
+  .project-tags {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    margin-bottom: 20px;
+  }
+
+  .pagination-container {
+    margin-top: 20px;
+    text-align: center;
+  }
+}
+.ml-4{
+  margin-left: 4px;
+}
+.filter-item{
+  margin-right: 10px;
+}
+.search-box{
+  display: flex;
+  justify-content: space-between;
+}
 </style>

src/views/manager/projectinfo/list.vue

@@ -227,7 +227,7 @@
                     :key="item.id"
                     :content="item.contractName"
                     placement="top"
-                    :disabled="item.contractName.length <= 10"
+                    :disabled="true"
                   >
                     <el-tag  
                       size="small" 
@@ -858,7 +858,7 @@ export default {
 }
 
 .info-label {
-  font-weight: bold;
+  //font-weight: bold;
   color: black;
   display: inline-block;
   margin-bottom: 5px;
@@ -898,9 +898,13 @@ export default {
 
 </style>
 <style lang="scss">
-
+/* 自定义按钮样式 */
+.custom-primary-btn {
+  background-color: #2550A2 !important;
+  border-color: #2550A2 !important;
+}
 .ellipsis-tag {
-  max-width:80px; /* 设置最大宽度 */
+  // max-width:220px; /* 设置最大宽度 */
   overflow: hidden;
   margin-right: 4px;
 

src/views/manager/wbsinfo.vue

@@ -116,7 +116,7 @@
                     :key="item.id"
                     :content="item.projectName"
                     placement="top"
-                    :disabled="item.projectName.length <= 10"
+                    :disabled="true"
                   >
                     <el-tag  
                       size="small" 
@@ -261,7 +261,7 @@ export default {
         projectId:''
       },
        wbsTypeList:[],
-       proJectList:[],
+
        sortProLoad:false,
        wbsList:[],
        sortWbsList:[],
@@ -492,7 +492,7 @@ export default {
 
     },
     saveSort(ids){
-     {
+     
         
         sortWbs(ids).then((res) => {
                     this.sortProLoad= false;
@@ -504,7 +504,7 @@ export default {
                         this.$message.error(res.data.msg)
                     }
                 })
-      }
+      
 
 
     }