commit

public/static/css/main.css

@@ -3355,6 +3355,7 @@ button:focus {
 
 .admin_contentBox_bodyPain {
 	margin: 10px;
+	min-width: 600px;
 }
 
 .el-table th {
@@ -3747,15 +3748,17 @@ button:focus {
     left: 10px;
 }
 .listUpdateBtn.editCoverBtn{
-	width: 40px;
-	height: 20px;
-	border-radius: 4px !important;
+    width: 64px;
+    height: 28px;
+    border-radius: 4px !important;
 	border: 0.5px solid rgba(227, 227, 227, 1);
-	line-height: 20px;
-	bottom: 10px;
-	font-size: 12px;
-	background-color: #fff;
-	color: #000;
+	box-sizing: border-box;
+    bottom: 10px;
+    font-size: 14px;
+    background-color: #fff;
+    color: #000;
+    text-align: center;
+    line-height: 28px;
 }
 .listUpdateBtn .webuploader-pick{
 	width: 80px;
@@ -8669,6 +8672,9 @@ h5.dulilabel{
 	position: relative;
 	width: 157px;
 }
+/* .conterpoint:last-child{
+	width: 200px;
+} */
 .worningalert{
 	position: relative;
 	width: 355px;

src/services/industry.js

@@ -1,6 +1,12 @@
-import { fetchApi } from '@/utils/request';
+import { fetchApi, wrapErrorHint } from '@/utils/request';
 
 export async function queryAllIndustry() {
   const res = await fetchApi('industry/queryAllIndustry');
   return res.Data || [];
+}
+
+export async function renameIndustry(params){
+  const res = await fetchApi('industry/renameIndustry',params);
+  return wrapErrorHint(res);
+
 }

src/services/template.js

@@ -147,4 +147,11 @@ export async function createNestedRelevance(params){
 export async function deleteNestedRelevance(params){
   const res = await fetchApi('template/deleteNestedRelevance', params);
   return wrapErrorHint(res);
+}
+/**
+ * 重命名模板名称
+ */
+export async function renameTemplate(params){
+  const res = await fetchApi('template/renameTemplate', params);
+  return wrapErrorHint(res);  
 }

src/views/components_web/projDetail/projDetail.vue

@@ -38,8 +38,9 @@
                 <div class="item-value cover-img-wrap use-relative">
                   <div class="">
                     <img :src="coverSrc | resolveAvator" alt="" class="cover-img"/>
-                    <file-uploader class="edit-cover-btn"
+                    <file-uploader 
                         :on-success="coverUploadSuccess"
+                        class="listUpdateBtn editCoverBtn"
                     >
                       <div>编辑</div>
                     </file-uploader>
@@ -196,6 +197,7 @@
 </template>
 
 <script>
+  import { wrapOssProtocol, getFileUrl } from "@/services/oss";
   import AppHeader from "@/components/app-header";
   import PlainFolderList from './components/plain-folder-list';
   import PeopleItem from './components/people-item';
@@ -206,7 +208,7 @@
   import { cloneDeep } from 'lodash';
   import { fetchApi } from '@/utils/request';
   import { firstCharToLowerCase, firstCharToUpperCase } from '@/utils/tool';
-  import { AssignedWork } from '@/services/project.js';
+  import { AssignedWork, EditProject } from '@/services/project.js';
   import * as prjService from '@/services/project';
   import * as tempalteService from '@/services/template.js'
    import dayjs from 'dayjs';
@@ -455,8 +457,23 @@ import NestTemp from '../project/nestTemp.vue';
         this.listProjProp = [...this.listProjProp];
         this.coverSrc=projectInfoRes.Data.ShowImgUrl;
       },
-      coverUploadSuccess() {
+      async coverUploadSuccess(file) {
+        const filePath = wrapOssProtocol(file.ossUrl);
+        this.coverSrc = filePath;
+        var updateData = {
+          ProjId:sessionStorage.projId,
+          ImgUrl:this.coverSrc,
+        }
+        const res = await EditProject(updateData);
+        if(res.Code == -1){
+          this.$notify({
+            message:'封面修改失败。',
+            type:'success'
+          })
+        }
+        
 
+        //this.newProjData.projectData.showImgUrl=filePath;
       },
       setSystemCoverRandom() {
 

src/views/main_web/workspace/components/workLine.vue

@@ -422,4 +422,7 @@ export default {
   .worklinkBtngroup button {
     flex-shrink: 0;
   }
+  .clearwidth{
+    width: 0px;
+  }
 </style>

src/views/manage_system/customer/index.vue

@@ -212,7 +212,6 @@
                     :rules="companyRules"
                     :show-message="boolEdit"
                     label-width="100px"
-                    label-position="right"
                   >
                     <div class="yiyunTable_list_item">
                       <div class="mlr-10">
@@ -887,10 +886,10 @@ export default {
       listCompanyData: [],
       companyRules:{
         "companyName":[
-          { required: true, message: "请输入企业简称", trigger: "blur" },
+          { required: true, message: "请输入企业简称", trigger: ["blur","change"] },
         ],
         "compAllName": [
-          { required: true, message: "请输入企业全称", trigger: "blur" },
+          { required: true, message: "请输入企业全称", trigger: ["blur","change"] },
         ],
         "proviceName": [
           // { type:'number', required: true, message: "请选择所属省份", trigger:'change' },
@@ -900,25 +899,25 @@ export default {
           { required: true, message: "请选择所属行业", trigger:'change' },
         ],
         "telphone": [
-          { required: true, message: "请输入单位电话", trigger: "blur" },
+          { required: true, message: "请输入单位电话", trigger: ["blur","change"] },
         ],
         "cnName": [
-          { required: true, message: "请输入法人", trigger: "blur" },
+          { required: true, message: "请输入法人", trigger: ["blur","change"] },
         ],
         "sex": [
           { required: true, message: "请选择性别", trigger: 'change' },
         ],
         "phone": [
-          { required: true, message: "请输入手机号", trigger: "blur" },
+          { required: true, message: "请输入手机号", trigger: ["blur","change"] },
         ],  
         "email": [
-          { required: true, message: "请输入邮箱", trigger: "blur" },
+          { required: true, message: "请输入邮箱", trigger: ["blur","change"] },
         ],
         "ipfsApi": [
-          {required: true, message: "请输入64个字数之内的任意字符串", trigger: "blur"},
+          {max: 64, required: true, message: "请输入64个字数之内的任意字符串", trigger: ["blur","change"]},
         ],
         "ipfsBootstrap": [
-          {required: true, message: "请输入1024个字数之内的任意字符串", trigger: "blur"},
+          {max: 1024, required: true, message: "请输入1024个字数之内的任意字符串", trigger: ["blur","change"]},
         ]
       },
       industryOptions: [

src/views/manage_system/template/index.vue

@@ -1725,7 +1725,7 @@
 import Vue from "vue";
 // import fileUploader from "@/components/fileUploader/Index";
 import * as services from "@/services/template";
-import { queryAllIndustry } from "@/services/industry";
+import { queryAllIndustry ,renameIndustry} from "@/services/industry";
 import FileUploader from "@/components/file-uploader";
 import { notify } from "@/utils/tool";
 import { cloneDeep } from "lodash";
@@ -1816,18 +1816,18 @@ export default {
       importXmindName: "", //导入的模板名
       uploadLabel: "选择XMind文件", //上传按钮名
       matrixVerticalName: "", //矩阵竖排名称 右键table显示
-      matrixHorizontalName: "", //矩阵横排名称 右键table显示
+      matrixHorizontalName: "", //矩阵横排名称 右键table显示Temple.DetailIndustryId
       btnMatrixLookInfo: "martixLeaveColor",
       templateRules: {
         "Temple.TempName": [
-          { required: true, message: "请输入模板名称", trigger: "blur" },
+          { required: true, message: "请输入模板名称", trigger: ["blur","change"] },
         ],
         "Temple.FirstIndustryId": [
           { required: true, message: "请选择大行业", trigger: "change" },
         ],
-        "Temple.DetailIndustryId": [
-          { required: true, message: "请选择子行业", trigger: "change" },
-        ],
+        // "Temple.DetailIndustryId": [
+        //   { required: true, message: "请选择子行业", trigger: "change" },
+        // ],
         // xmindname: [ { required: true, message: '请上传模板文件', trigger: 'blur' }]
       },
       editTemplateData: {
@@ -2297,6 +2297,9 @@ export default {
           thisApp.getTemplateData();
           thisApp.getListTemplateClassify();
         } else {
+          this.treeMenuClickData.data.tempName = this.editTemplateData.Temple.TempName;
+          this.treeMenuClickData.label = this.editTemplateData.Temple.TempName;
+          this.templateName = this.editTemplateData.Temple.TempName;
           this.isShowTempInfo = true;
           this.eidtModelpane = false;
           this.currentTemplateData = this.editTemplateData;
@@ -2407,7 +2410,7 @@ export default {
     /**
      * 重命名模板名称
      */
-    reNameTemplate: function () {
+     reNameTemplate () {
       var url = "";
       var thisApp = this;
       var txtName;
@@ -2426,33 +2429,59 @@ export default {
         inputValue: txtName,
         inputErrorMessage: "名称不能为空",
       })
-        .then(({ value }) => {
+        .then(async ({ value }) => {
+
           if (thisApp.treeMenuClickData.isLeaf == true) {
-            url = encodeURI(process.env.API_HOST + "Templates/");
-            thisApp.treeMenuClickData.data.tempName = value;
+              let params ={
+                id:thisApp.treeMenuClickData.id,
+                tempName:value
+              }
+              const res = await services.renameTemplate(params);
+              if(res.Code == 0){
+                this.$notify({
+                  message:'模板重命名成功',
+                  type:'success'
+                })
+                thisApp.treeMenuClickData.data.tempName = value;
+                this.currentTemplateData.Temple.TempName = value;
+                this.templateName = value;
+              }
+            
           } else {
-            url = encodeURI(process.env.API_HOST + "sysinfo/industury");
-            thisApp.treeMenuClickData.data.name = value;
+              let params ={
+                id:thisApp.treeMenuClickData.id,
+                industryName:value
+              }
+              const res = await renameIndustry(params);
+              if(res.Code == 0){
+                this.$notify({
+                  message:'行业重命名成功',
+                  type:'success'
+                })
+                thisApp.treeMenuClickData.data.name = value;
+                thisApp.createIndustryName = value;
+              }
           }
+
           thisApp.treeMenuClickData.label = value;
-          this.$axios({
-            method: "put",
-            url: url,
-            data: thisApp.treeMenuClickData.data,
-          })
-            .then(function (response) {
-              if (response.data.state == 1) {
-                thisApp.$notify({
-                  message: titleName + "成功",
-                  type: ["success"],
-                  offset: 100,
-                  duration: 2500,
-                });
-              }
-            })
-            .catch(function (error) {
-              console.log(error);
-            });
+          // this.$axios({
+          //   method: "put",
+          //   url: url,
+          //   data: thisApp.treeMenuClickData.data,
+          // })
+          //   .then(function (response) {
+          //     if (response.data.state == 1) {
+          //       thisApp.$notify({
+          //         message: titleName + "成功",
+          //         type: ["success"],
+          //         offset: 100,
+          //         duration: 2500,
+          //       });
+          //     }
+          //   })
+          //   .catch(function (error) {
+          //     console.log(error);
+          //   });
         })
         .catch(() => {
           thisApp.$notify.warning({

vue.config.js

@@ -32,14 +32,14 @@ module.exports = {
       proxy: {
         // '/api/pms': {
         //   // target: 'http://www.lockingos.org:8089',
-        //   target:'http://10.240.32.228:8092',
+        //   target:'http://192.168.8.114:8092',
 
         //   changeOrigin: true,
         //   secure: false,
         // },
         '/api': {
           target: 'http://www.lockingos.org:9003',
-          // target: 'http://10.240.32.245:8080',
+          //target: 'http://192.168.8.114:8082',
           changeOrigin: true,
           secure: false,
         }