Merge branch 'fix_20240123_UAT' into 'master'

Fix 20240123 uat

See merge request laws-foton-slrs/foton-laws-system-front!157

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -15,51 +15,60 @@
               :data="treeList"
               :default-expanded-keys="['1']"
               highlight-current
+              :filter-node-method="filterNode"
               @node-click="treeClick"
-              :filter-node-method="filterNode">
+            >
-                  <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
+              <span
-                        @mouseleave="mouseleave(data)">
+                slot-scope="{ node, data }"
-                        <span
+                class="custom-tree-node"
-                          :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
+                @mouseenter="mouseenter(data)"
-                        <span style="font-size:12px"> {{ node.label }} </span>
+                @mouseleave="mouseleave(data)"
-                        <span>
+              >
-                          <el-button
+                <span
-                            type="text"
+                  :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"
-                            size="mini"
+                />
-                            v-show="data.show"
+                <span style="font-size:12px"> {{ node.label }} </span>
-                            v-btn-permission="'e9e80920563325fa7f6e91213ee98466'"
+                <span>
-                            @click="() => append(data)">
+                  <el-button
-                            新增
+                    v-show="data.show"
-                          </el-button>
+                    v-btn-permission="'e9e80920563325fa7f6e91213ee98466'"
-                          <el-button
+                    type="text"
-                            type="text"
+                    size="mini"
-                            size="mini"
+                    @click="() => append(data)"
-                            v-show="data.show"
+                  >
-                            v-btn-permission="'0b95246d8ad2da6c54381deffa3d0fa2'"
+                    新增
-                            @click="() => update(data)">
+                  </el-button>
-                            编辑
+                  <el-button
-                          </el-button>
+                    v-show="data.show"
-                          <el-button
+                    v-btn-permission="'0b95246d8ad2da6c54381deffa3d0fa2'"
-                            type="text"
+                    type="text"
-                            size="mini"
+                    size="mini"
-                            v-show="data.showDel"
+                    @click="() => update(data)"
-                            v-btn-permission="'07ba9d907841a62a18267198da3873b1'"
+                  >
-                            @click="() => remove(node, data)">
+                    编辑
-                            删除
+                  </el-button>
-                          </el-button>
+                  <el-button
-                        </span>
+                    v-show="data.showDel"
-                    </span>
+                    v-btn-permission="'07ba9d907841a62a18267198da3873b1'"
+                    type="text"
+                    size="mini"
+                    @click="() => remove(node, data)"
+                  >
+                    删除
+                  </el-button>
+                </span>
+              </span>
             </el-tree>
           </el-card>
         </div>
       </div>
-      <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
+      <div class="tree-collapse" :class="{ 'tree-close': sideClose }" @click="treeCollapse">
         <!--切换折叠样式-->
-        <i class="el-icon-arrow-left" v-if="sideClose === false"></i>
+        <i v-if="sideClose === false" class="el-icon-arrow-left" />
-        <i class="el-icon-arrow-right" v-if="sideClose === true"></i>
+        <i v-if="sideClose === true" class="el-icon-arrow-right" />
       </div>
     </div>
-    <div id="resize"></div>
+    <div id="resize" />
     <div id="right" class="tree-right">
       <div class="search-area">
         <el-form :modal="dataCenterSearch" :inline="true">
@@ -69,9 +78,21 @@
             <!--              v-model="dataCenterSearch.dataType"-->
             <!--              placeholder="请输入类型"-->
             <!--            ></el-input>-->
-            <el-select ref="treeSelect" class="tree-select" filterable :filter-method="filterMethod" @focus="onfocus" clearable v-model="dataCenterSearch.dataType" @clear="setValueNull" value-key="id" placeholder="请选择类型">
+            <el-select
+              ref="treeSelect"
+              v-model="dataCenterSearch.dataType"
+              class="tree-select"
+              filterable
+              :filter-method="filterMethod"
+              clearable
+              value-key="id"
+              placeholder="请选择类型"
+              @focus="onfocus"
+              @clear="setValueNull"
+            >
               <el-option class="tree-select-option" :value="dataCenterSearch.dataType" :label="dataCenterSearch.dataType">
-                <el-tree v-if="!fuzzyquery"
+                <el-tree
+                  v-if="!fuzzyquery"
                   ref="tree"
                   node-key="id"
                   class="tree-line"
@@ -81,10 +102,11 @@
                   :data="treeList"
                   :default-expanded-keys="['1']"
                   highlight-current
+                  :filter-node-method="filterNode"
                   @node-click="selectTreeClick2"
-                  :filter-node-method="filterNode">
+                />
-                </el-tree>
+                <el-tree
-                <el-tree v-else
+                  v-else
                   :key="1"
                   ref="tree"
                   node-key="id"
@@ -94,21 +116,21 @@
                   :props="props"
                   :data="treeSearchList"
                   :default-expanded-keys="['1']"
-                         default-expand-all
+                  default-expand-all
                   highlight-current
+                  :filter-node-method="filterNode"
                   @node-click="selectTreeClick2"
-                  :filter-node-method="filterNode">
+                />
-                </el-tree>
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="资料标题:">
             <el-input
-              size="small"
               v-model="dataCenterSearch.dataTitle"
+              size="small"
               placeholder="请输入资料标题"
               clearable
-            ></el-input>
+            />
           </el-form-item>
           <el-form-item label="上传开始时间:">
             <!--            <el-date-picker-->
@@ -126,8 +148,8 @@
               size="small"
               type="date"
               value-format="yyyy-MM-dd"
-              placeholder="请选择上传开始时间">
+              placeholder="请选择上传开始时间"
-            </el-date-picker>
+            />
           </el-form-item>
           <el-form-item label="上传结束时间:">
             <el-date-picker
@@ -135,32 +157,37 @@
               size="small"
               type="date"
               value-format="yyyy-MM-dd"
-              placeholder="请选择上传结束时间">
+              placeholder="请选择上传结束时间"
-            </el-date-picker>
+            />
           </el-form-item>
           <el-form-item>
             <el-button
+              v-btn-permission="'39784f04404cdf50891e9d033f6373c3'"
               type="primary"
               size="mini"
-              v-btn-permission="'39784f04404cdf50891e9d033f6373c3'"
+              @click="searchInfo"
-              @click="searchInfo">
+            >
               查询
             </el-button>
           </el-form-item>
           <el-form-item>
             <el-button
+              size="mini"
               @click="clearSearch"
-              size="mini">清空
+            >
+              清空
             </el-button>
           </el-form-item>
         </el-form>
       </div>
       <div class="operate-area" style="padding: 0 10px 10px 10px">
         <el-button
+          v-btn-permission="'45db41d367f474e10a7ae5dbe8cb0f6e'"
           size="mini"
           type="primary"
-          v-btn-permission="'45db41d367f474e10a7ae5dbe8cb0f6e'"
+          @click="addInfo"
-          @click="addInfo">新增
+        >
+          新增
         </el-button>
       </div>
       <div class="table-area">
@@ -171,13 +198,14 @@
           border
           height="100%"
           :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
+                               fontWeight: 'bold', height: '48px'}"
         >
           <el-table-column
             type="index"
             width="55"
             label="序号"
-            align="center">
+            align="center"
+          >
             <template slot-scope="{scope, column, $index}">
               {{ ($index + 1) + (dataCenterSearch.page - 1) * dataCenterSearch.pageSize }}
             </template>
@@ -187,23 +215,25 @@
             width="250"
             label="类型"
             :show-overflow-tooltip="true"
-            align="center">
+            align="center"
-          </el-table-column>
+          />
           <el-table-column
             prop="dataTitle"
             min-width="250"
             label="资料标题"
             :show-overflow-tooltip="true"
-            align="center">
+            align="center"
+          >
             <template slot-scope="scope">
-              <span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>
+              <span style="cursor:pointer;color: #409eff" @click.stop="toDetail(scope.row)">{{ scope.row.dataTitle }}</span>
             </template>
           </el-table-column>
           <el-table-column
             prop="dataUploadTime"
             width="250"
             label="上传时间"
-            align="center">
+            align="center"
+          >
             <template slot-scope="scope">
               <span>{{ $moment(scope.row.dataUploadTime).format("YYYY-MM-DD HH:mm:ss") }}</span>
             </template>
@@ -211,28 +241,35 @@
           <el-table-column
             label="操作"
             min-width="100"
-            align="center">
+            align="center"
+          >
             <template slot-scope="scope">
               <el-button
+                v-btn-permission="'d9698737e801822ab8f96dbcd47b7d62'"
                 size="mini"
                 type="primary"
-                v-btn-permission="'d9698737e801822ab8f96dbcd47b7d62'"
                 @click="editInfo(scope.row)"
-              >编辑
+              >
+                编辑
               </el-button>
               <el-button
+                v-btn-permission="'1cae70abf414bacc33f3ed794cdfa903'"
                 size="mini"
                 type="danger"
-                v-btn-permission="'1cae70abf414bacc33f3ed794cdfa903'"
                 @click="deleteInfo(scope.row)"
-              >删除
+              >
+                删除
               </el-button>
             </template>
           </el-table-column>
         </el-table>
         <loading :loading="loading">数据获取中</loading>
-        <pagination :page="dataCenterSearch.page" :total="total" @pageChange="pageChange"
+        <pagination
-                    @pageSizeChange="pageSizeChange"></pagination>
+          :page="dataCenterSearch.page"
+          :total="total"
+          @pageChange="pageChange"
+          @pageSizeChange="pageSizeChange"
+        />
       </div>
     </div>
     <!-- 新建树节点抽屉 -->
@@ -245,24 +282,28 @@
       label-width="130px"
     >
       <div class="demo-drawer-content">
-        <el-form :model="productModelAdd"
+        <el-form
-                 ref="productModelAdd"
+          ref="productModelAdd"
-                 :rules="productRules"
+          :model="productModelAdd"
-                 class="label-input-form"
+          :rules="productRules"
-                 label-width="130px">
+          class="label-input-form"
+          label-width="130px"
+        >
           <el-row>
             <el-col>
               <el-form-item label="目录名称" prop="name" class="add-form-item">
-                <el-input v-model.trim="productModelAdd.name" placeholder="请输入目录名称" clearable></el-input>
+                <el-input v-model.trim="productModelAdd.name" placeholder="请输入目录名称" clearable />
               </el-form-item>
             </el-col>
             <el-col>
               <el-form-item label="目录顺序" prop="sort" class="add-form-item">
-                <el-input v-model.number="productModelAdd.sort"
+                <el-input
-                          number
+                  v-model.number="productModelAdd.sort"
-                          placeholder="请输入目录顺序"
+                  number
-                          :maxlength="4"
+                  placeholder="请输入目录顺序"
-                          clearable></el-input>
+                  :maxlength="4"
+                  clearable
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -273,12 +314,16 @@
           class="common-button-primary"
           icon="el-icon-check"
           type="primary"
-          @click="saveProduct('productModelAdd')">提交
+          @click="saveProduct('productModelAdd')"
+        >
+          提交
         </el-button>
         <el-button
           class="common-button-default"
           icon="el-icon-close"
-          @click="closeModal">取消
+          @click="closeModal"
+        >
+          取消
         </el-button>
       </div>
     </el-drawer>
@@ -292,15 +337,21 @@
     >
       <div style="height: 92%;margin-left: 3%">
         <el-form
+          v-if="showInfoModal"
           ref="attributeEO"
           :model="attributeEO"
           :rules="attributeEOFormRules"
           class="label-input-form"
           label-width="130px"
-          v-if="showInfoModal"
         >
           <el-form-item label="所属目录" prop="treeId" class="add-form-item">
-            <el-select ref="treeSelect" class="tree-select" v-model="attributeEO.treeId" value-key="id" placeholder="请选择所属目录">
+            <el-select
+              ref="treeSelect"
+              v-model="attributeEO.treeId"
+              class="tree-select"
+              value-key="id"
+              placeholder="请选择所属目录"
+            >
               <el-option class="tree-select-option" :value="attributeEO.treeId" :label="attributeEO.treeName">
                 <el-tree
                   ref="tree"
@@ -312,9 +363,9 @@
                   :data="treeList"
                   :default-expanded-keys="['1']"
                   highlight-current
+                  :filter-node-method="filterNode"
                   @node-click="selectTreeClick"
-                  :filter-node-method="filterNode">
+                />
-                </el-tree>
               </el-option>
             </el-select>
           </el-form-item>
@@ -323,7 +374,13 @@
             prop="dataType"
             class="add-form-item"
           >
-            <el-select ref="treeSelect" class="tree-select" v-model="attributeEO.dataType" value-key="id" placeholder="请选择类型">
+            <el-select
+              ref="treeSelect"
+              v-model="attributeEO.dataType"
+              class="tree-select"
+              value-key="id"
+              placeholder="请选择类型"
+            >
               <el-option class="tree-select-option" :value="attributeEO.dataType" :label="attributeEO.dataType">
                 <el-tree
                   ref="tree"
@@ -335,16 +392,16 @@
                   :data="treeList"
                   :default-expanded-keys="['1']"
                   highlight-current
+                  :filter-node-method="filterNode"
                   @node-click="selectTreeClick3"
-                  :filter-node-method="filterNode">
+                />
-                </el-tree>
               </el-option>
             </el-select>
-<!--            <el-input-->
+            <!--            <el-input-->
-<!--              v-model="attributeEO.dataType"-->
+            <!--              v-model="attributeEO.dataType"-->
-<!--              placeholder="请输入类型"-->
+            <!--              placeholder="请输入类型"-->
-<!--              clearable-->
+            <!--              clearable-->
-<!--            />-->
+            <!--            />-->
           </el-form-item>
           <el-form-item
             label="资料标题"
@@ -352,8 +409,8 @@
             class="add-form-item"
           >
             <el-input
-              class="dataTitle"
               v-model="attributeEO.dataTitle"
+              class="dataTitle"
               placeholder="请输入资料标题"
               clearable
             />
@@ -364,17 +421,23 @@
             class="add-form-item"
           >
             <el-input
+              v-model="attributeEO.dataExplain"
               type="textarea"
               :autosize="{ minRows: 1, maxRows: 10}"
               resize="none"
               style="width: 95%"
               maxlength="4000"
               show-word-limit
-              v-model="attributeEO.dataExplain"
               placeholder="请输入资料说明"
               clearable
             />
-            <el-button icon="el-icon-delete" circle type="danger" size="mini" @click="attributeEO.dataExplain = ''"></el-button>
+            <el-button
+              icon="el-icon-delete"
+              circle
+              type="danger"
+              size="mini"
+              @click="attributeEO.dataExplain = ''"
+            />
           </el-form-item>
           <el-form-item
             label="附件"
@@ -391,7 +454,8 @@
               :limit="50"
               :on-exceed="handleExceed"
               :on-success="uploadSuccess"
-              :file-list="fileList">
+              :file-list="fileList"
+            >
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -403,19 +467,19 @@
           class="common-button-primary"
           size="mini"
           icon="el-icon-check"
-          @click="saveInfo"
           :loading="submitLoading"
-        >提交
+          @click="saveInfo"
-        </el-button
         >
+          提交
+        </el-button>
         <el-button
           size="mini"
           icon="el-icon-close"
           class="common-button-default"
           @click="cancelModel"
-        >取消
-        </el-button
         >
+          取消
+        </el-button>
       </div>
     </el-drawer>
   </div>
@@ -423,10 +487,10 @@
 
 <script>
 export default {
-  name: "dataCenter",
+  name: 'DataCenter',
-  data() {
+  data () {
     return {
-      fuzzyquery:false,
+      fuzzyquery: false,
       filterText: '', // 国内法规过滤
       props: {
         label: 'name',
@@ -459,16 +523,16 @@ export default {
       },
       attributeEOFormRules: {
         treeId: [
-          {required: true, message: '所属目录不能为空', trigger: 'change'},
+          { required: true, message: '所属目录不能为空', trigger: 'change' },
         ],
         dataType: [
-          {required: true, message: '类型不能为空', trigger: 'change'},
+          { required: true, message: '类型不能为空', trigger: 'change' },
         ],
         dataTitle: [
-          {required: true, message: '资料标题不能为空', trigger: 'change'},
+          { required: true, message: '资料标题不能为空', trigger: 'change' },
         ],
         attachFileId: [
-          {required: true, message: '附件不能为空', trigger: 'change'},
+          { required: true, message: '附件不能为空', trigger: 'change' },
         ]
       },
       dataCenterSearch: {
@@ -489,10 +553,10 @@ export default {
       },
       productRules: {
         name: [
-          {required: true, message: '目录名称不能为空', trigger: 'change'}
+          { required: true, message: '目录名称不能为空', trigger: 'change' }
         ],
         sort: [
-          {required: true, message: '目录顺序不能为空', trigger: 'change'}
+          { required: true, message: '目录顺序不能为空', trigger: 'change' }
         ]
       },
       productModal: false,
@@ -500,23 +564,29 @@ export default {
       treeId: '',
     }
   },
+  async mounted () {
+    this.searchInfo()
+    // 进入页面后查询树形结构目录
+    await this.getTreeAsync()
+    this.dragControllerLR()
+  },
   methods: {
-    onfocus(){
+    onfocus () {
       this.fuzzyquery = false
     },
-    filterMethod(val){
+    filterMethod (val) {
-      if(val === ''){
+      if(val === '') {
         this.fuzzyquery = false
       }else{
         this.fuzzyquery = true
-        this.treeSearchList = this.fuzzyQuery(this.treeList,val)
+        this.treeSearchList = this.fuzzyQuery(this.treeList, val)
       }
     },
-    fuzzyQuery(list,keyWord){
+    fuzzyQuery (list, keyWord) {
-      let newTree = []
+      const newTree = []
       list.forEach(element => {
-        if(element.children && element.children.length>0){
+        if(element.children && element.children.length > 0) {
-          const ab = this.fuzzyQuery(element.children,keyWord);
+          const ab = this.fuzzyQuery(element.children, keyWord);
           const obj = {
             ...element,
             children: ab
@@ -553,24 +623,24 @@ export default {
     // },
     // 左右拖动事件
     dragControllerLR: function () {
-      var resize = document.getElementById("resize");
+      const resize = document.getElementById('resize');
-      var left = document.getElementById("left");
+      const left = document.getElementById('left');
-      var right = document.getElementById("right");
+      const right = document.getElementById('right');
-      var box = document.getElementById("dataCenter");
+      const box = document.getElementById('dataCenter');
       resize.onmousedown = function (e) {
-        var startX = e.clientX;
+        const startX = e.clientX;
         resize.left = resize.offsetLeft;
         document.onmousemove = function (e) {
-          var endX = e.clientX;
+          const endX = e.clientX;
 
-          var moveLen = resize.left + (endX - startX);
+          let moveLen = resize.left + (endX - startX);
-          var maxT = box.clientWidth - resize.offsetWidth;
+          const maxT = box.clientWidth - resize.offsetWidth;
           if (moveLen < 150) moveLen = 150;
           if (moveLen > maxT - 150) moveLen = maxT - 150;
 
           resize.style.left = moveLen;
-          left.style.width = moveLen + "px";
+          left.style.width = moveLen + 'px';
-          right.style.width = (box.clientWidth - moveLen - 5) + "px";
+          right.style.width = (box.clientWidth - moveLen - 5) + 'px';
         }
         document.onmouseup = function (evt) {
           document.onmousemove = null;
@@ -582,11 +652,11 @@ export default {
       }
     },
     // 国内标签过滤
-    filterNode(value, data) {
+    filterNode (value, data) {
       if (!value) return true;
       return data.name.indexOf(value) !== -1;
     },
-    selectMenu1() {
+    selectMenu1 () {
       return new Promise((resolve, reject) => {
         this.$http.get('fileMaterialCenter/zlTree',  {}, {
           _this: this
@@ -596,20 +666,19 @@ export default {
         })
       })
     },
-    async getTreeAsync(){
+    async getTreeAsync () {
-
+      const tsResource = await this.selectMenu1()
-      let tsResource = await this.selectMenu1()
 
       let list1 = []
-      if(tsResource && tsResource.ok && tsResource.data){
+      if(tsResource && tsResource.ok && tsResource.data) {
         list1 = tsResource.data
       }
-      if(list1.length > 0){
+      if(list1.length > 0) {
         this.treeList = list1
         this.treeId = this.treeList[0].id
       }
     },
-    treeClick(treeNode,a,b) {
+    treeClick (treeNode, a, b) {
       this.selectSarMenu = treeNode
       this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
       // this.dataCenterSearch.dataType = treeNode.name
@@ -618,33 +687,30 @@ export default {
       this.searchInfo()
       this.treeId = treeNode.id
     },
-    selectTreeClick(treeNode) {
+    selectTreeClick (treeNode) {
       this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
       this.attributeEO.treeName = treeNode.name
       this.$http.get('fileMaterialCenter/zlTree/queryTree',  {
-        treeId : this.attributeEO.treeId
+        treeId: this.attributeEO.treeId
       }, {
         _this: this
       }, res => {
-        if(res.ok){
+        if(res.ok) {
           // this.attributeEO.dataType = res.data.id
           this.attributeEO.dataType = res.data.name
         }
       })
-
     },
-    selectTreeClick2(treeNode) {
+    selectTreeClick2 (treeNode) {
       // this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
       this.dataCenterSearch.dataType = treeNode.name
-
     },
-    selectTreeClick3(treeNode) {
+    selectTreeClick3 (treeNode) {
       // this.attributeEO.dataType = treeNode.id === '1' ? '' : treeNode.id
       this.attributeEO.dataType = treeNode.name
-
     },
     // 树节点鼠标移入移出
-    mouseenter(data) {
+    mouseenter (data) {
       if (data.name !== '我的收藏') {
         this.$set(data, 'show', true)
         if (data.parentId !== null) {
@@ -652,11 +718,11 @@ export default {
         }
       }
     },
-    mouseleave(data) {
+    mouseleave (data) {
       this.$set(data, 'show', false)
       this.$set(data, 'showDel', false)
     },
-    update(data) {
+    update (data) {
       this.modalType = 2
       this.productModal = true
       this.productModelAdd = JSON.parse(JSON.stringify(data));
@@ -669,7 +735,7 @@ export default {
       // data.children.push(newChild);
     },
 
-    append(data) {
+    append (data) {
       this.modalType = 1
       this.productModal = true
       // 取消所有的选中效果
@@ -678,7 +744,7 @@ export default {
       this.productModelAdd.parentId = data.id
     },
 
-    selectMenu() {
+    selectMenu () {
       this.$http.get('fileMaterialCenter/zlTree',  {}, {
         _this: this
       }, res => {
@@ -687,8 +753,8 @@ export default {
         this.searchInfo()
       })
     },
-    remove(node, data) {
+    remove (node, data) {
-      //通过 stahndinfoList 是否有数据进行判断
+      // 通过 stahndinfoList 是否有数据进行判断
       this.$confirm(data.children.length > 0 ? '该节点下有记录，是否删除？' : '是否删除菜单', '提示', {
         confirmButtonText: '确定',
         confirmButtonClass: 'common-button-primary',
@@ -696,14 +762,14 @@ export default {
         roundButton: true,
         type: 'warning'
       }).then(() => {
-        this.$http.delete("fileMaterialCenter/zlTree", {
+        this.$http.delete('fileMaterialCenter/zlTree', {
           id: data.id
         }, res => {
         }, e => {
           if (e.ok) {
             this.$message({
               type: 'success',
-              message: "删除成功"
+              message: '删除成功'
             })
             this.selectMenu()
             this.getDomesticStandardTable()
@@ -726,7 +792,7 @@ export default {
       // const index = children.findIndex(d => d.id === data.id);
       // children.splice(index, 1);
     },
-    closeDrawer() {
+    closeDrawer () {
       this.$nextTick(() => {
         this.$refs['productModelAdd'].resetFields()
         this.productModelAdd = {
@@ -738,7 +804,7 @@ export default {
       this.productModal = false
     },
     // 提交新增/修改
-    saveProduct(name) {
+    saveProduct (name) {
       this.$refs[name].validate((valid) => {
         if (valid) {
           if (this.modalType === 1) {
@@ -776,30 +842,31 @@ export default {
         }
       })
     },
-    closeModal() {
+    closeModal () {
       this.productModal = false
       this.closeDrawer()
     },
-    treeCollapse() {
+    treeCollapse () {
       this.sideClose = !this.sideClose
     },
-    toDetail(row){
+    toDetail (row) {
-      this.$router.push({
+      const routerUrl = this.$router.resolve({
-        name: "dataCenterDetail",
+        name: 'dataCenterDetail',
         query: {
           id: row.id,
           treeId: this.treeId
         }
       });
+      window.open(routerUrl.href, '_blank');
     },
     beginImportFile (file) {
-      var filename = file.name
+      const filename = file.name
-      var index1 = filename.lastIndexOf('.')
+      const index1 = filename.lastIndexOf('.')
-      var index2 = filename.length
+      const index2 = filename.length
-      var fileSuffix = filename.substring(index1, index2)
+      const fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt' || fileSuffix === '.PPT' || fileSuffix === '.pptx' || fileSuffix === '.PPTX' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
         return true
       } else {
         this.spinShow = false
@@ -816,11 +883,10 @@ export default {
       }
       return true
     },
-    uploadSuccess(response, file, fileList) {
+    uploadSuccess (response, file, fileList) {
-
+      if(response.ok) {
-      if(response.ok){
         const fileIdList = fileList.map(item => {
-          if (item.response){
+          if (item.response) {
             return item.response.data.attId
           }else {
             return item.id
@@ -829,9 +895,9 @@ export default {
         this.attributeEO.attachFileId = fileIdList.join(',')
       }
     },
-    handleRemove(file, fileList) {
+    handleRemove (file, fileList) {
       const fileIdList = fileList.map(item => {
-        if (item.response){
+        if (item.response) {
           return item.response.data.attId
         }else {
           return item.id
@@ -839,25 +905,25 @@ export default {
       })
       this.attributeEO.attachFileId = fileIdList.join(',')
     },
-    handlePreview(file) {
+    handlePreview (file) {
     },
-    setValueNull(){
+    setValueNull () {
       this.dataCenterSearch.dataType = ''
     },
-    handleExceed(files, fileList) {
+    handleExceed (files, fileList) {
       this.$message.warning(`当前限制选择 50 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
-    beforeRemove(file, fileList) {
+    beforeRemove (file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
-    deleteInfo(row) {
+    deleteInfo (row) {
       this.$confirm('您是否确定删除该数据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let deleteId = row.id
+        const deleteId = row.id
-        this.$http.delete('fileMaterialCenter/file-material', {id: deleteId}, {
+        this.$http.delete('fileMaterialCenter/file-material', { id: deleteId }, {
           _this: this
         }, res => {
           if (res.ok) {
@@ -870,16 +936,16 @@ export default {
       }).catch(() => {
       })
     },
-    pageChange(page) {
+    pageChange (page) {
       this.dataCenterSearch.page = page
       this.searchInfo()
     },
-    pageSizeChange(pageSize) {
+    pageSizeChange (pageSize) {
       this.dataCenterSearch.page = 1
       this.dataCenterSearch.pageSize = pageSize
       this.searchInfo()
     },
-    searchInfo() {
+    searchInfo () {
       this.loading = true
       // if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
       //   this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
@@ -888,7 +954,7 @@ export default {
       //   this.dataCenterSearch.startDataUploadTime =''
       //   this.dataCenterSearch.endDataUploadTime = ''
       // }
-      if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){
+      if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime) {
         this.$message.warning('结束时间不能小于开始时间')
         this.loading = false
         return
@@ -907,7 +973,7 @@ export default {
         this.loading = false
       })
     },
-    clearSearch() {
+    clearSearch () {
       this.dataCenterSearch = {
         dataType: '',
         dataTitle: '',
@@ -917,7 +983,7 @@ export default {
       }
       this.searchInfo()
     },
-    addInfo() {
+    addInfo () {
       this.showInfoModal = true
       this.attributeTitle = '新增'
       this.attributeEO = {
@@ -929,13 +995,13 @@ export default {
       }
       this.fileList = []
     },
-    editInfo(row) {
+    editInfo (row) {
       this.showInfoModal = true
       this.attributeTitle = '编辑'
       this.attributeEO = row
       this.fileList = []
       // 请求上传的文件信息
-      this.$http.get("att/attFile/getMultiFileInfos", {
+      this.$http.get('att/attFile/getMultiFileInfos', {
         fileIds: row.attachFileId
       }, {
         _this: this
@@ -959,11 +1025,11 @@ export default {
       // })
       // this.attributeEO.attachFileId = fileIdList.join(',')
     },
-    saveInfo() {
+    saveInfo () {
       this.submitLoading = true
       this.$refs['attributeEO'].validate((valid) => {
         if (valid) {
-          if (this.attributeTitle === '新增'){
+          if (this.attributeTitle === '新增') {
             this.$http.postData(
               'fileMaterialCenter/file-material',
               this.attributeEO,
@@ -1000,9 +1066,8 @@ export default {
           this.submitLoading = false
         }
       })
-
     },
-    cancelModel() {
+    cancelModel () {
       this.$nextTick(() => {
         this.$refs['attributeEO'].resetFields()
         this.attributeEO = {
@@ -1015,12 +1080,6 @@ export default {
       })
       this.showInfoModal = false
     },
-  },
-  async mounted() {
-    this.searchInfo()
-    // 进入页面后查询树形结构目录
-    await this.getTreeAsync()
-    this.dragControllerLR()
   }
 }
 </script>