提交代码

src/views/AssessmentArea/index.vue

@@ -5,7 +5,6 @@
         v-model="userId"
         placeholder="请选择"
         clearable
-        @change="queryAssessUser"
       >
         <el-option
           v-for="item in options"
@@ -23,8 +22,9 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         value-format='yyyy-MM-dd hh:mm'
-        :default-time="['12:00:00', '08:00:00']"
+        :default-time="['00:00:00', '23:59:59']"
       >
+        >
       </el-date-picker>
       <el-button
         type="primary"
@@ -118,9 +118,6 @@ export default {
     }
   },
   methods: {
-    queryAssessUser () {
-      this.queryUserAssessmentPage();
-    },
     //#region 分页
     handleSizeChange (val) {//
       this.pagesize = val
@@ -158,7 +155,7 @@ export default {
     //#region 接口
     async queryUserAssessmentPage () {//分页获取
       let times = []
-      if (this.time.length > 0) {
+      if (this.time) {
         times = this.time
       }
       const { data: res } = await queryUserAssessmentPage({

src/views/certificate/lists/addList.vue

@@ -107,6 +107,7 @@
         v-if="form.certificateType==1"
       >
         <el-select
+          filterable
           v-model="form.certificateUserId"
           style="width:400px;"
           placeholder="请选择"
@@ -248,7 +249,7 @@
 </template>
 
 <script>
-import { save, getById, findUserByName, queryRole, queryProjectAndContract, addFileInfo, update , findPfxType} from "@/api/certificate/list";
+import { save, getById, findUserByName, queryRole, queryProjectAndContract, addFileInfo, update, findPfxType } from "@/api/certificate/list";
 export default {
   data () {
     return {
@@ -396,7 +397,7 @@ export default {
       const { data: res } = await getById({ id: this.$route.query.id })
       if (res.code == 200) {
         this.form = res.data
-        this.form.certificateFileUrl = [{ raw: res.data.certificateFileUrl, name: this.form.certificateFileName}]
+        this.form.certificateFileUrl = [{ raw: res.data.certificateFileUrl, name: this.form.certificateFileName }]
         this.form.signatureFileUrl = [{ raw: res.data.signatureFileUrl, name: this.form.signatureFileName }]
       }
     },
@@ -428,11 +429,11 @@ export default {
         this.projectMeiju = res.data
       }
     },
-    async findPfxType(){
-        const {data: res} = await findPfxType({typeOrStatus : 'pfx_type'})
-        if(res.code == 200){
-          this.pfxType = res.data;
-        }
+    async findPfxType () {
+      const { data: res } = await findPfxType({ typeOrStatus: 'pfx_type' })
+      if (res.code == 200) {
+        this.pfxType = res.data;
+      }
     },
     async addFileInfo (file) {//上传图片
       let fromData = new FormData();

src/views/certificate/managements/see.vue

@@ -6,7 +6,7 @@
     <basic-container class="see">
       <el-row
         :gutter="20"
-        :style="{'height':heights-80+'px'}"
+        :style="{'height':heights-90+'px'}"
       >
         <el-col :span="6">
           <el-select
@@ -25,44 +25,40 @@
             >
             </el-option>
           </el-select>
-          <el-menu
-            class="el-menu-vertical-demo"
-            :default-active="defaultActive"
-            :style="{'height':heights-160+'px',overflow:'auto'}"
-          >
-            <el-empty
-              description="该目录为根目录没有数据"
-              v-show="!menuData.length==0"
-            ></el-empty>
-            <div
-              v-show="menuData.length>0"
-              style="border-right:1px solid #EDEDED;"
-              v-for="(item,keys) in menuData"
-              :key='keys'
+          <div style="border-right:1px solid #EDEDED;;">
+            <el-menu
+              class="el-menu-vertical-demo"
+              :style="{'height':heights-140+'px',overflow:'auto'}"
             >
-              <el-submenu :index="item.roleId">
-                <template slot="title">
-                  <i class="el-icon-location"></i>
-                  <span>{{item.roleName}}</span>
-                </template>
-                <el-menu-item-group
-                  v-for="(val,k) in item.childRoleList"
-                  :key='k'
-                >
-                  <el-menu-item
-                    :index="val.roleId"
-                    @click="dakairight(val.signPfxFileList)"
-                  >{{val.roleName}}</el-menu-item>
-                </el-menu-item-group>
-              </el-submenu>
-            </div>
-          </el-menu>
+              <div
+                v-for="(item,keys) in menuData"
+                :key='keys'
+              >
+                <el-submenu :index="item.roleId">
+                  <template slot="title">
+                    <i class="el-icon-location"></i>
+                    <span>{{item.roleName}}</span>
+                  </template>
+                  <el-menu-item-group
+                    v-for="(val,k) in item.childRoleList"
+                    :key='k'
+                  >
+                    <el-menu-item
+                      :index="val.roleId"
+                      @click="dakairight(val)"
+                    >{{val.roleName}}</el-menu-item>
+                  </el-menu-item-group>
+                </el-submenu>
+              </div>
+            </el-menu>
+          </div>
         </el-col>
         <el-col
           :span="18"
           class="martop20"
         >
           <div
+            v-show="!rightData.length==0"
             class="martop20"
             v-for="(item,key) in rightData"
             :key='key'
@@ -95,12 +91,16 @@
               </div>
               <el-button
                 size="mini"
-                @click="deleteAutograph(item.id)"
+                @click="deleteAutograph(item.id,key)"
               >删除签名配置</el-button>
             </div>
             <el-divider></el-divider>
           </div>
-
+          <el-empty
+            :style="{'height':heights-100+'px'}"
+            description="该目录没有数据"
+            v-show="rightData.length==0"
+          ></el-empty>
         </el-col>
       </el-row>
     </basic-container>
@@ -113,7 +113,6 @@ import { queryAllRoleList, queryContractList } from "@/api/certificate/managemen
 export default {
   data () {
     return {
-      defaultActive: '',
       heights: '',
       options: [],
       value: '',
@@ -124,7 +123,7 @@ export default {
   methods: {
     //#region 左侧菜单
     dakairight (signPfxFileList) {
-      this.rightData = signPfxFileList
+      this.rightData = signPfxFileList.signPfxFileList
     },
     changePosition () {//下拉框change事件
       // if (this.value && this.options.length > 0) {
@@ -158,6 +157,7 @@ export default {
       console.log(res);
       if (res.code == 200) {
         this.menuData = res.data
+
       }
     },
     async queryContractList (contractId) {
@@ -167,7 +167,7 @@ export default {
         this.options = res.data
       }
     },
-    async remove (ids) {
+    async remove (ids, key) {
       const { data: res } = await remove({ ids })
       console.log(res);
       if (res.code == 200) {
@@ -175,10 +175,8 @@ export default {
           type: 'success',
           message: '删除成功!'
         });
-        this.value = ''
-        this.$nextTick(() => {
-          this.value = this.$route.query.contractId
-        })
+        this.queryAllRoleList(this.value)
+        this.rightData.splice(key, 1)
       }
     },
     //#endregion
@@ -208,11 +206,8 @@ export default {
   },
   mounted () {
     this.heights = this.$refs.heights.clientHeight
-    console.log(this.heights);
   },
 }
 </script>
 <style lang="scss" scoped>
-.see {
-}
 </style>

src/views/exctab/excelmodel/excelmodel.vue

@@ -26,8 +26,8 @@
             <span
               class="custom-tree-node"
               slot-scope="{ data ,node }"
-              @mouseover="mouseOver(data)"
-              @mouseleave="mouseLeave(data)"
+              @mouseover.self="mouseOver(data)"
+              @mouseleave.self="mouseLeave(data)"
               style="box-sizing: border-box;width:100%;"
             >
               <div>
@@ -43,7 +43,7 @@
                   <!-- 编辑 -->
                   <i
                     class="el-icon-edit marleft10"
-                    @click.stop="editExcel(data,node)"
+                    @click.stop="editExcel(data)"
                     v-if="data.fileType!=1"
                   ></i>
                   <!-- 删除 -->
@@ -57,7 +57,7 @@
             </span>
           </el-tree>
           <div
-            style="border-left:8px solid rgba(255,255,255,0);z-index:999"
+            style="border-left:8px solid rgba(255,255,255,0);z-index:999;cursor: e-resize;"
             @mousedown="mousedown1()"
           ></div>
         </div>
@@ -469,10 +469,8 @@ export default {
         }
         let das = await this.tabLazytree(ids, this.$route.params.id)//获取清表树
         if (wbsExclTabParmVO.id) {
-          console.log('编辑');
           this.treeNode.name = wbsExclTabParmVO.nodeName
         } else {
-          console.log('添加');
           this.$refs.trees.updateKeyChildren(this.treeNode.id, das)
         }
         this.dialogTap = false
@@ -487,6 +485,7 @@ export default {
           type: 'success'
         })
         this.detailExcel(this.from.id)
+        this.from.checkd = true
       }
       this.fileList = []
     },
@@ -550,15 +549,12 @@ export default {
       }
     },
     async treeLoad (node, resolve) {
-      if (node.level !== 0) {
-        if (node.data.hasChildren) {
-          return resolve(await this.tabLazytree(node.data.id, this.$route.params.id))
-        } else {
-          return resolve([])
-        }
-      } else {
-        return resolve(await this.tabLazytree(0, this.$route.params.id))
+      let id = node.data.id
+      if (node.level == 0) {
+        id = 0
       }
+      let das = await this.tabLazytree(id, this.$route.params.id)
+      return resolve(das)
     },
     nodeClick (data) {//外层树结构
       if (data.hasChildren == false || data.fileType == 3) {
@@ -577,9 +573,8 @@ export default {
         }
       }
     },
-    async editExcel (data, node) {//编辑
+    async editExcel (data) {//编辑
       this.dialogTapType = '编辑'
-      console.log(data, node);
       if (data.fileType != 3 && data.hasChildren) {
         this.wbsmiddle = false
       } else {

src/views/manager/archivetree.vue

@@ -14,10 +14,11 @@
         <div>
           <h2>归档目录树</h2>
           <el-tree
-            v-if="leftTree"
+            ref="trees1"
             :props="props"
             :load="loadNode"
             :data="data"
+            node-key="id"
             lazy
           >
             <span
@@ -45,7 +46,7 @@
                   v-if="node.level!=1"
                 ></i>
                 <i
-                  @click.stop='deletetree(data)'
+                  @click.stop='deletetree(node)'
                   class="el-icon-delete marleft5"
                   style="fontSize:18px;"
                   v-if="node.level!=1"
@@ -320,7 +321,8 @@ export default {
   data () {
     return {
       //#region 左侧树
-      leftTree: true,
+      treeNode: {},
+      nodeNames: '',
       token: '',
       props: {
         label: 'title',
@@ -480,16 +482,16 @@ export default {
     },
     mouseLeave (data) {
       if (data.moreShow) {
-        console.log(this.$set(data, 'moreShow', false));
+        this.$set(data, 'moreShow', false)
       }
     },
     mouseOver (data) {
       if (!data.moreShow) {
-        console.log(this.$set(data, 'moreShow', true));
+        this.$set(data, 'moreShow', true)
       }
-
     },
     addtree (data) {//添加树
+      console.log(data);
       if (this.JobTypeList.length == 0) {
         this.roletree()
       }
@@ -499,12 +501,12 @@ export default {
       if (this.displayHierarchyList.length == 0) {
         this.display_hierarchy()//显示层级
       }
+      this.form.postType = data.postType
       this.form.id = ''
       this.form.parentId = data.id
       this.treeTap = true
     },
     async edittree (data) {//编辑树
-      console.log(data);
       if (this.JobTypeList.length == 0) {
         this.roletree()
       }
@@ -514,19 +516,23 @@ export default {
       if (this.displayHierarchyList.length == 0) {
         this.display_hierarchy()//显示层级
       }
-      await this.archiveTreeDetail(data.id)
+      await this.archiveTreeDetail(data)
       this.form.id = data.id
       this.form.parentId = ''
+      this.treeNode = data
       this.treeTap = true
     },
-    deletetree (data) {//删除树
+    deletetree (node) {//删除树
+      console.log(node);
+      let _that = this
       this.$confirm('是否删除此数据', '提示', {
         distinguishCancelAndClose: true,
         confirmButtonText: '确认',
         cancelButtonText: '取消'
       })
         .then(() => {
-          this.remove(data.id)
+          this.remove(node.data.id)
+          _that.$refs.trees1.remove(node) //删除界面上的节点
         })
         .catch(() => {
 
@@ -540,15 +546,11 @@ export default {
           type: 'success',
           message: '删除成功'
         })
-        this.data = []
-        this.leftTree = false
-        this.$nextTick(() => {
-          this.leftTree = true
-        })
       }
     },
-    async archiveTreeDetail (id) {//详情接口
-      const { data: res } = await archiveTreeDetail({ id })
+    async archiveTreeDetail (data) {//详情接口
+      console.log(data);
+      const { data: res } = await archiveTreeDetail({ id: data.id })
       console.log(res);
       if (res.code == 200) {
         this.form.nodeName = res.data.fullName  //节点名称
@@ -688,6 +690,7 @@ export default {
       }
     },
     async archiveTreeSave (da) {//新增
+      console.log(da);
       const { data: res } = await archiveTreeSave(da)
       console.log(res);
       if (res.code == 200) {
@@ -696,11 +699,9 @@ export default {
           message: '新增成功'
         })
         this.treeTap = false
-        this.data = []
-        this.leftTree = false
-        this.$nextTick(() => {
-          this.leftTree = true
-        })
+        let das = await this.lazyTree(da.parentId)
+        this.$refs.trees1.updateKeyChildren(da.parentId, das)
+
       }
     },
     async archiveTreeUpdate (da) {//编辑
@@ -712,11 +713,7 @@ export default {
           message: '编辑成功'
         })
         this.treeTap = false
-        this.data = []
-        this.leftTree = false
-        this.$nextTick(() => {
-          this.leftTree = true
-        })
+        this.treeNode.title = da.nodeName
       }
     },
     //#endregion

src/views/manager/projectinfo/editElement/editElement.vue

@@ -54,6 +54,21 @@
           >保存</el-button>
         </div>
       </el-col>
+      <el-col
+        :span="8"
+        v-show="AddNewElementField == ''"
+      >
+        <div
+          class="flexEnd"
+          style="margin-top:120%;"
+        >
+          <el-button
+            type="info"
+            @click="returns()"
+          >返回</el-button>
+          <el-button type="primary">保存</el-button>
+        </div>
+      </el-col>
     </el-row>
     <!-- 弹框 -->
     <div
@@ -315,6 +330,9 @@ export default {
         this.dataType = res.data
       }
     },
+    returns () {
+      this.$router.go(-1)
+    },
     //#region 左侧替换元素
     cancelReplace () {//替换元素取消按钮
       this.AddNewElementField = ''
@@ -453,6 +471,7 @@ export default {
 
 <style lang="scss" scoped>
 .editElement {
+  padding-bottom: 40px !important;
   .header {
     color: rgb(240, 114, 10);
   }

src/views/manager/projectinfo/treeTemplate/template/setInputTPT.vue

@@ -174,6 +174,7 @@ export default {
       const { data: res } = await saveInput(da)
       console.log(res);
       if (res.code == 200) {
+        this.setInputTable = []
         this.disabled = false
         this.getExcelHtml()
       }

src/views/news/news.vue

@@ -35,7 +35,7 @@
         <el-button
           size="small"
           @click="changeProgres(scope.row)"
-          v-show="!scope.row.isCurrent && scope.row.operation"
+          v-show="!scope.row.isCurrent"
         >提交进度</el-button>
       </template>
       <!-- 处理状态 -->
@@ -78,8 +78,14 @@
           />
         </el-select>
       </div>
-      <div class="flex jc-al-c" v-show="operation.show">
-        <span class="mg-r-20" style="font-size: 25px">预计处理截止时间</span>
+      <div
+        class="flex jc-al-c"
+        v-show="operation.show"
+      >
+        <span
+          class="mg-r-20"
+          style="font-size: 25px"
+        >预计处理截止时间</span>
         <el-date-picker
           v-model="operation.manageTime"
           type="date"
@@ -111,7 +117,7 @@ export default {
       activeIndex: "1",
       curRow: {},
       dialogVisible: false,
-      operation:{
+      operation: {
         manageTime: '',
         show: false
       },
@@ -200,9 +206,9 @@ export default {
     init () {
       this.queryBusinessUserOpinionList()
     },
-    operationMethods(){
+    operationMethods () {
       this.operation.show = this.curRow.currentLink == 2;
-      if(!this.operation.show){
+      if (!this.operation.show) {
         this.operation.manageTime = '';
       }
     },

vue.config.js

@@ -28,8 +28,8 @@ module.exports = {
                 //本地服务接口地址
                 // target: 'http://localhost',
                 // target: 'http://192.168.4.6',
-                // target: 'http://47.110.251.215:8090',
-                target: 'http://192.168.4.12',
+                target: 'http://47.110.251.215:8090',
+                // target: 'http://192.168.4.12',
                 // target: 'http://192.168.4.44',
                 //远程演示服务地址,可用于直接启动项目
                 //target: 'https://saber.bladex.vip/api',