Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-common/src/main/java/com/dsk/common/utils/file/FileUtils.java

@@ -265,11 +265,11 @@ public class FileUtils
             for (File directory : files) {
                 // 如果是文件夹则递归调用此方法
                 if (directory.isDirectory()) {
-                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(directory.lastModified())));
+                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(directory.lastModified())));
                     getAllFiles(directory.getPath());
                 } else {
                     // 如果是文件则直接输出路径
-                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(directory.lastModified())));
+                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(directory.lastModified())));
                 }
             }
             return fileList;
@@ -301,7 +301,7 @@ public class FileUtils
                 tempFile = new File(path + File.separator + fileName);
             }
             if (tempFile.isFile()) {
-                fileList.add(new BusinessFileVo(tempFile.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(tempFile.lastModified())));
+                fileList.add(new BusinessFileVo(tempFile.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tempFile.lastModified())));
             }
             if (tempFile.isDirectory()) {
                 List<BusinessFileVo> allFiles = getAllFileNames(tempFile.getAbsolutePath());

dsk-operate-ui/src/assets/styles/public.css

@@ -739,7 +739,7 @@ select {
 
 .checkbox {
 	display: flex;
-	align-items: center;
+	align-items: flex-start;
 }
 
 .checkbox .checkbox-titel {
@@ -751,7 +751,7 @@ select {
 
 .checkbox .checkbox-content {
 	display: flex;
-	align-items: center;
+	align-items: flex-start;
 }
 
 .checkbox .el-checkbox__label {

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -345,7 +345,7 @@ export default {
       getCustomerList(this.searchParam).then(result=>{
         this.tableData = result
         this.tableData.rows.forEach(item=>{
-          item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
+          item.registerCapital = item.registerCapital == null?null: item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
           if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
             item.mainBusiness1 = item.mainBusiness.substring(0,81)
             item.sq1 = true

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -961,7 +961,7 @@ export default {
 	   .content_item{
 		   padding-top:20px;
 		   display: flex;
-		   align-items: center;
+		   align-items: flex-start;
 	       .label{
 	           width: 84px;
 			   font-size: 14px;

dsk-operate-ui/src/views/macro/economies/component/comparison.vue

@@ -123,8 +123,8 @@ export default {
           label: 'GDP（亿元）',
         },
         {
-          prop: 'gdpAddValue',
-          label: 'GDP增速',
+          prop: 'gdpGrowth',
+          label: 'GDP增速（%）',
         },
         {
           prop: 'gdpPerCapita',

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -30,7 +30,7 @@
               <!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
             <!--</template>-->
             <template slot-scope="scope">
-              <span @click="childMethod(scope.row)" class="a-link" style="cursor: pointer;">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</span>
+              <span @click="childMethod(scope.row)" class="a-link" style="cursor: pointer;">{{scope.row.area ? scope.row.area: scope.row.city ? scope.row.city : scope.row.province}}</span>
             </template>
 
           </el-table-column>

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -124,8 +124,8 @@ export default {
           label: 'GDP（亿元）',
         },
         {
-          prop: 'gdpAddValue',
-          label: 'GDP增速',
+          prop: 'gdpGrowth',
+          label: 'GDP增速（%）',
         },
         {
           prop: 'gdpPerCapita',

dsk-operate-ui/src/views/macro/economies/index.vue

@@ -66,7 +66,8 @@ export default {
     //   params.provinceId=this.dataQuery.provinceId
     // }
     if(this.dataQuery.provinceId){
-      this.province=this.dataQuery.province[this.dataQuery.province.length-1];
+      this.province=this.dataQuery.province;
+      this.dataQuery.province=[this.dataQuery.province]
       this.provinceId.push(this.dataQuery.provinceId)
     }else {
       location({}).then(res => {

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -53,10 +53,20 @@
           <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="公路业绩" prop="roadConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
           <el-table-column label="水利业绩" prop="waterConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="常合作业主" prop="topCustomer" width="150" :formatter="formatStatus"/>
+          <el-table-column label="常合作业主" prop="topCustomer" width="150" :formatter="formatStatus">
+            <template slot-scope="scope">
+              <router-link v-if="scope.row.topCustomerId"  :to="`/company/${encodeStr(scope.row.topCustomerId)}`" tag="a" class="a-link" v-html="scope.row.topCustomer" ></router-link>
+              <span v-else v-html="scope.row.topCustomer" ></span>
+            </template>
+          </el-table-column>
           <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="150" :formatter="formatStatus"/>
-          <el-table-column label="常合作供应商" prop="topSupplier" width="200" :formatter="formatStatus"/>
+          <el-table-column label="常合作供应商" prop="topSupplier" width="200" :formatter="formatStatus">
+            <template slot-scope="scope">
+              <router-link v-if="scope.row.topSupplierId"  :to="`/company/${encodeStr(scope.row.topSupplierId)}`" tag="a" class="a-link" v-html="scope.row.topSupplier" ></router-link>
+              <span v-else v-html="scope.row.topSupplier" ></span>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="empty" v-if="tableDataTotal === 0">
           <img class="img" src="@/assets/images/project/empty.png">

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -136,7 +136,7 @@
     <div class="content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
-          <span class="common-title">主要指标</span>
+          <span class="common-title">城投平台列表</span>
         </div>
         <div class="flex-box query-ability">
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
@@ -681,7 +681,7 @@ export default {
             position: absolute;
             top: 25px;
             left: 0;
-            z-index: 9999;
+            z-index: 999;
             .item{
               margin-bottom: 5px;
               /*display: flex;*/

dsk-operate-ui/src/views/project/projectList/component/gjjl.vue

 <template>
   <div>
     <el-card class="box-card noborder">
-      <div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div>
-      <div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>
+      <div class="cardtitles">{{indexname}}</div>
+      <!--<div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>-->
       <div class="records">
         <div class="writeIn" v-if="isDisableds == false">
           <div class="default" v-if="isEdit == false" @click="getEdit">
@@ -87,6 +87,13 @@
         </div>
         <div class="recordlist" v-if="showtype=='gjjl' || showtype == 'projectgjdt' && recordlist.total>0">
           <div class="rec_detail" v-for="(item,index) in recordlist.rows">
+            <div class="delform" v-if="isdel && delID == item.id">
+              <div class="words">是否删除该条记录</div>
+              <div>
+                <div class="btnsmall btn_primary h28" @click="delele">确定</div>
+                <div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
+              </div>
+            </div>
 
             <div class="rec_time">
               <i class="el-icon-time"></i>
@@ -151,6 +158,7 @@
     name: 'gjjl',
     data(){
       return{
+        indexname:'跟进记录',
         showtype:'',
         isEdit:false,
         value:'',
@@ -174,6 +182,7 @@
         userId:this.$store.state.user.userId,//当前用户id
         projectList:[],//关联项目
         isDisableds:this.isDisabled,
+        keys:1,
       }
     },
     computed: {
@@ -186,6 +195,7 @@
       this.showtype = this.types
       //客户管理跟进动态
       if(this.showtype == 'gjdt'){
+        this.indexname = '跟进动态'
         this.isDisableds = false
         getUserList().then(result=>{
           this.glqylist = result.data
@@ -198,6 +208,7 @@
       }
       //项目管理跟进动态
       if(this.showtype == 'projectgjdt'){
+        this.indexname = '跟进动态'
         this.isDisableds = false
         this.projectId = null//项目id暂时清空，必须手选id
         relateProject(this.userId).then(res=>{
@@ -270,6 +281,7 @@
       delRecord(id){
         this.isdel = true
         this.delID = id
+        this.keys++;
       },
       delele(){
         if(this.types == 'gjdt') {
@@ -381,6 +393,9 @@
 </script>
 
 <style lang="scss" scoped>
+  .app-main{
+    overflow: initial !important;
+  }
   .el-card{
     overflow: initial;
   }

dsk-operate-ui/src/views/project/projectList/component/gzdb.vue

@@ -109,8 +109,8 @@
         this.value = ""
       },
       add(){
-        if(this.queryParam.task == '')
-          return false
+        if(this.queryParam.task == '' || this.queryParam.finishTime == '')
+          return this.$message.warning('时间和内容需填写完整！')
         addGZDB(this.queryParam).then(result=>{
           if(result.code == 200){
             this.$message.success("添加成功！")

dsk-operate-ui/src/views/project/trends/index.vue

@@ -21,5 +21,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>