拉取代码

src/app/share/wang-editor/wang-editor.component.less

@@ -1,10 +1,12 @@
 .wangeditor-box {
-  overflow: auto;
+  overflow-y: auto;
   height: 100%;
-
+	width: 100%;
   #editor{
     height: 300px;
-    width: auto;
+		// max-height: 300px;
+		// overflow-y: auto;
+    // width: 100%;
     border:1px solid #ccc;
 		border-top: none;
   }

src/app/share/wang-editor/wang-editor.component.ts

@@ -130,6 +130,7 @@ export class wangEditorComponent implements OnInit {
 	  // 富文本编辑器内容变化触发方法
 	  editorContentChange = (html) => {
 	    console.log(html);
+			this.changeContent.emit(html)
 	  }
 	
 	  // 编辑器获取到焦点触发事件

src/app/views/repository-manage-add/repository-manage-add.component.html

@@ -1,19 +1,7 @@
 <div class="detail-box">
   <div class="modalBody">
-    <overlay-scrollbars #osComponentRef1 class="content">
+    <!-- <overlay-scrollbars #osComponentRef1 class="content"> -->
      <form nz-form [formGroup]="validateForm" class="addForm">
-<!--     	<nz-form-item class="form-item">
-     	  <nz-form-label nzRequired nzFor="code">编号</nz-form-label>
-     	  <nz-form-control nzErrorTip="请输入编号!">
-     			<input nz-input formControlName="code"  placeholder="请输入编号" nzSize="default" />
-     	  </nz-form-control>
-     	</nz-form-item>
-			<nz-form-item class="form-item">
-			  <nz-form-label nzRequired nzFor="version">版本号</nz-form-label>
-			  <nz-form-control nzErrorTip="请输入版本号!">
-					<input nz-input formControlName="version"  placeholder="请输入版本号" nzSize="default" />
-			  </nz-form-control>
-			</nz-form-item> -->
 			<div class="left-form-box">
 				<nz-form-item class="form-title-box" *ngIf="!add">
 					<div class="form-title">知识库编号：{{solutionNumber}}</div>
@@ -72,12 +60,10 @@
 				<nz-form-item class="form-item" *ngIf="classItem==1">
 				  <nz-form-label nzRequired nzFor="malfunction" [nzSm]="6" [nzXs]="24">关联故障现象</nz-form-label>
 				  <nz-form-control nzErrorTip="请选择关联故障现象!" [nzSm]="16" [nzXs]="24">
-				    <nz-input-group>
-							<nz-cascader [nzOptions]="malfunctionData" 
-								formControlName="malfunction" 
-								nzPlaceHolder="请选择关联故障现象">
-							</nz-cascader>
-						</nz-input-group>
+						<nz-cascader [nzOptions]="malfunctionData" 
+							formControlName="malfunction" 
+							nzPlaceHolder="请选择关联故障现象">
+						</nz-cascader>
 				  </nz-form-control>
 				</nz-form-item>
 				
@@ -102,13 +88,10 @@
 				  <nz-form-control [nzSm]="16" [nzXs]="24">
 						<nz-upload nzFor="file"
 						  class="avatar-uploader"
-						  nzAction="https://jsonplaceholder.typicode.com/posts/"
-							[nzCustomRequest]="customReq"
 						  nzName="file"
 							[(nzFileList)]="fileData"
 							[(nzRemove)]="removeFile"
 						  [nzBeforeUpload]="beforeUpload"
-						  (nzChange)="handleChange($event)"
 						>
 						  <button nz-button><i nz-icon nzType="upload"></i><span>点击上传</span></button>
 							<div class="upload-sign">支持扩展名：PDF、word、ppt、excel、txt...</div>
@@ -118,7 +101,7 @@
 			</div>
 			
      </form>
-    </overlay-scrollbars>
+    <!-- </overlay-scrollbars> -->
  
   </div>
 	<div class="display_flex justify-content_flex-center form-btn">
@@ -134,12 +117,5 @@
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
-	
-<!-- 删除模态框 -->
-  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-    (confirmDelEvent)="confirmDel()" content="您确认要删除发药科室吗？"></app-dialog-delete>
 
-<!-- 单发/箱发 -->
-  <app-dialog-delete [delModal]="delGrantModal" (hideDelModalEvent)="hideGrantModal()" [btnLoading]="btnLoading"
-    (confirmDelEvent)="confirmGrantDel()" [content]="content"></app-dialog-delete>
 

src/app/views/repository-manage-add/repository-manage-add.component.less

@@ -57,6 +57,7 @@ h3{
 	justify-content: center;
 	padding: 20px;
 	position: relative;
+	overflow-x: hidden;
 	.modalBody{
 		height: 100%;
 		position: relative;
@@ -91,6 +92,7 @@ h3{
 		}
 	  .ant-form-item {
 	    margin-bottom: 14px;
+			display: flex;
 	    .ant-form-item-label {
 	      text-align: right;
 	    }

src/app/views/repository-manage-add/repository-manage-add.component.ts

@@ -84,6 +84,7 @@ export class RepositoryManageAddComponent implements OnInit {
   pageIndex: number = 1; //页码
   listLength: number = 10; //总条数
   pageSize: number = 10; //每页条数
+	btnLoading: boolean = false; //确认按钮loading状态
   btnLoading1: boolean = false; //确认按钮loading状态
 	btnLoading2: boolean = false; //确认按钮loading状态
   printLoading: boolean = false; //批量打印按钮loading状态
@@ -98,7 +99,8 @@ export class RepositoryManageAddComponent implements OnInit {
 	malfunctionData: any = []; //故障现象数据
 	productData: any = []; //产品数据
 	typeDic:any = []; //知识库状态字典
-	fileData:any[] = []; //附件数据
+	fileData: UploadFile[] = [];//附件数据
+	fileAllData:any[] = []; //附件数据
 	building:''; //楼栋
 	deptIndex:number; //选中index
   searchParentDeptSubject = new Subject();
@@ -110,8 +112,8 @@ export class RepositoryManageAddComponent implements OnInit {
 	isDeptLoading = false;
 	delGrantModal = false;
 	showInsp = false;
-  changeInp(e, type) {
-    this.searchParentDeptSubject.next([e, type]);
+  changeInp(e) {
+    this.searchParentDeptSubject.next([e]);
   }
 
 	// 获取详情
@@ -136,7 +138,8 @@ export class RepositoryManageAddComponent implements OnInit {
 				this.detailData = data
 				this.solutionNumber = data.solutionNumber
 				this.versionNumber = data.versionNumber
-				this.detailContent = data.content || ''
+				this.detailContent = data.content || null
+				this.editOrData = data.content || null
 				let item = this.dicData.find(i=>i.id == this.detailData.type.id)
 				if(item){
 					this.classItem = item.value
@@ -152,7 +155,6 @@ export class RepositoryManageAddComponent implements OnInit {
 				this.isSpinning = false
 			});
 	}
-	fileAllData=null;
 	getFile(){
 		this.mainService
 			.getPreviewImage('solution', this.detailId)
@@ -187,8 +189,10 @@ export class RepositoryManageAddComponent implements OnInit {
 		this.mainService
 		  .getFetchDataList("data", "assetProduct", postData)
 		  .subscribe((result) => {
-				this.isDeptLoading = false
-				this.productData = result.list;
+				setTimeout(_=>{
+					this.isDeptLoading = false
+					this.productData = result.list;
+				},500)
 		  });
 	}
 	
@@ -206,6 +210,7 @@ export class RepositoryManageAddComponent implements OnInit {
 		  return;
 		};
 		let postData = {
+			hasThird: 'true',
 		  category: {
 		    dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
 		  },
@@ -306,7 +311,7 @@ export class RepositoryManageAddComponent implements OnInit {
 	  let data = {
 			title:this.validateForm.value.title,
 			repairVisible:this.validateForm.value.repairVisible,
-			content:this.editOrData,
+			content:this.editOrData?this.editOrData:null,
 			id:'',
 			hosId:this.hosId,
 			inspectionForm:{
@@ -375,15 +380,15 @@ export class RepositoryManageAddComponent implements OnInit {
 	// 上传图片
 	uploadFile(id){
 		let url = `/service/common/common/uploadAttachment/solution/${id}/${id}`
+		const formData = new FormData()
 		for(let i of this.fileData){//新上传的附件
 			let item = this.fileAllData.find(t=>t.id == i.uid) //之前的附件
 			if(!item){
-				const formData = new FormData();
 				if(i.originFileObj){
 					formData.append('file', i.originFileObj);
 					formData.append('filename', i.originFileObj.name);
 				}else{
-					formData.append('file', i);
+					formData.append('file', i as any);
 					formData.append('filename', i.name);
 				}
 				
@@ -427,42 +432,25 @@ export class RepositoryManageAddComponent implements OnInit {
 		});
   }
 	
-	avatarLoading = false;
-	avatarUrl: string;
-	avatarUrl1: string;
-	beforeUpload = (file: File) => {
+	beforeUpload = (file: UploadFile) => {
 		console.log(888,file)
-	  return new Observable((observer: Observer<boolean>) => {
-			let type = file.name.split('.')
-	    const isPic = (type[1] === 'xlsx' || type[1] === 'pdf' || 
-			type[1] === 'xls' || type[1] === 'ppt' || type[1] === 'txt');
-	    if (!isPic) {
-	      this.message.error('只能上传PDF、word、ppt、excel、txt等文件类型格式!');
-	      observer.complete();
-	      return;
-	    }
-	    const isLt4M = file.size / 1024 / 1024 < 10;
-	    if (!isLt4M) {
-	      this.message.error('图片大小不能大于10MB!');
-	      observer.complete();
-	      return;
-	    }
-	    observer.next(isPic && isLt4M);
-	    observer.complete();
-	  });
+		let type = file.name.split('.')
+		const isPic = (type[1] === 'xlsx' || type[1] === 'pdf' || 
+		type[1] === 'xls' || type[1] === 'ppt' || type[1] === 'txt' ||
+		type[1] === 'doc' || type[1] === 'docx');
+		if (!isPic) {
+			this.message.error('只能上传PDF、word、ppt、excel、txt等文件类型格式!');
+			return;
+		}
+		const isLt4M = file.size / 1024 / 1024 < 10;
+		if (!isLt4M) {
+			this.message.error('图片大小不能大于10MB!');
+			return;
+		} 
+		this.fileData = this.fileData.concat(file);
+		return false;
 	};
 	
-	// 附件上传
-	handleChange(info: { file: UploadFile }): void {
-
-	}
-	
-	private getBase64(img: File, callback: (img: string) => void): void {
-	  const reader = new FileReader();
-	  reader.addEventListener('load', () => callback(reader.result!.toString()));
-	  reader.readAsDataURL(img);
-	}
-	
 	// 删除附件
 	removeFile = (file) =>  {
 		console.log(111,file)
@@ -485,36 +473,6 @@ export class RepositoryManageAddComponent implements OnInit {
 		
 	}
 	
-	// 自定义上传
-	customReq = (item: UploadXHRArgs) => {
-	  const formData = new FormData();
-	  // tslint:disable-next-line:no-any
-	  formData.append('file', item.file as any);
-	  formData.append('filename', item.file.name);
-	  const req = new HttpRequest('POST', item.action!, formData, {
-	    reportProgress: true,
-	    withCredentials: true
-	  });
-	  // Always returns a `Subscription` object. nz-upload would automatically unsubscribe it at correct time.
-	  return this.http.request(req).subscribe(
-	    // tslint:disable-next-line no-any
-	    (event: HttpEvent<any>) => {
-	      if (event.type === HttpEventType.UploadProgress) {
-	        if (event.total! > 0) {
-	          // tslint:disable-next-line:no-any
-	          (event as any).percent = (event.loaded / event.total!) * 100;
-	        }
-	        item.onProgress!(event, item.file!);
-	      } else if (event instanceof HttpResponse) {
-	        item.onSuccess!(event.body, item.file!, event);
-	      }
-	    },
-	    err => {
-	      item.onError!(err, item.file!);
-	    }
-	  );
-	};
-	
 	closeModel(){
 		this.initForm();
 		this.back()

src/app/views/repository-manage/repository-manage.component.html

@@ -90,7 +90,7 @@
 						 <div class="width-180" *ngIf="lookData.type.name=='日常巡检'">关联巡检：{{lookData.inspectionForm?lookData.inspectionForm.name: ''}}</div>
 						 <div>关联产品：{{lookData.assetProduct?lookData.assetProduct.name:''}}</div>
 					 </div>
-					 <div class="content-class" [innerHTML]="richText"></div>
+					 <div class="content-class" *ngIf="richText" [innerHTML]="richText"></div>
 					 <div class="file-box" *ngIf="fileData.length>0">
 						 <div>附件列表：</div>
 						 <div>

src/app/views/repository-manage/repository-manage.component.ts

@@ -185,7 +185,12 @@ export class RepositoryManageComponent implements OnInit {
 		this.vIndex = index
 		this.lookData = data
 		this.stepLength = this.lookData.solutionLogs.length
-		this.richText = this.sanitizer.bypassSecurityTrustHtml(data.content);
+		let content = data.content
+		if(content){
+			this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
+		}else{
+			this.richText = ''
+		}
 	}
 	
 	// 点击附件
@@ -310,7 +315,12 @@ export class RepositoryManageComponent implements OnInit {
 				this.getFile()
 				let data = res.list
 				this.detailData = data
-				this.richText = this.sanitizer.bypassSecurityTrustHtml(data[0].content);
+				let content = data[0].content
+				if(content){
+					this.richText = this.sanitizer.bypassSecurityTrustHtml(content);
+				}else{
+					this.richText = ''
+				}
 				for(let i of data){
 					if(i.solutionLogs.length>0){
 						for(let t of i.solutionLogs){

src/assets/iconfont/demo_index.html

@@ -55,6 +55,30 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe689;</span>
+                <div class="name">快速报修</div>
+                <div class="code-name">&amp;#xe689;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe648;</span>
+                <div class="name">bg-question</div>
+                <div class="code-name">&amp;#xe648;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe610;</span>
+                <div class="name">关闭</div>
+                <div class="code-name">&amp;#xe610;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe622;</span>
+                <div class="name">关闭</div>
+                <div class="code-name">&amp;#xe622;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe611;</span>
                 <div class="name">Icon - 统计分析</div>
                 <div class="code-name">&amp;#xe611;</div>
@@ -780,9 +804,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1721896916365') format('woff2'),
-       url('iconfont.woff?t=1721896916365') format('woff'),
-       url('iconfont.ttf?t=1721896916365') format('truetype');
+  src: url('iconfont.woff2?t=1722576999612') format('woff2'),
+       url('iconfont.woff?t=1722576999612') format('woff'),
+       url('iconfont.ttf?t=1722576999612') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -809,6 +833,42 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-kuaisubaoxiu"></span>
+            <div class="name">
+              快速报修
+            </div>
+            <div class="code-name">.transport-kuaisubaoxiu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-bg-question"></span>
+            <div class="name">
+              bg-question
+            </div>
+            <div class="code-name">.transport-bg-question
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-guanbi2"></span>
+            <div class="name">
+              关闭
+            </div>
+            <div class="code-name">.transport-guanbi2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-guanbi3"></span>
+            <div class="name">
+              关闭
+            </div>
+            <div class="code-name">.transport-guanbi3
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-Icon-tongjifenxi"></span>
             <div class="name">
               Icon - 统计分析
@@ -1899,6 +1959,38 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-kuaisubaoxiu"></use>
+                </svg>
+                <div class="name">快速报修</div>
+                <div class="code-name">#transport-kuaisubaoxiu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-bg-question"></use>
+                </svg>
+                <div class="name">bg-question</div>
+                <div class="code-name">#transport-bg-question</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-guanbi2"></use>
+                </svg>
+                <div class="name">关闭</div>
+                <div class="code-name">#transport-guanbi2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-guanbi3"></use>
+                </svg>
+                <div class="name">关闭</div>
+                <div class="code-name">#transport-guanbi3</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-Icon-tongjifenxi"></use>
                 </svg>
                 <div class="name">Icon - 统计分析</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1721896916365') format('woff2'),
-       url('iconfont.woff?t=1721896916365') format('woff'),
-       url('iconfont.ttf?t=1721896916365') format('truetype');
+  src: url('iconfont.woff2?t=1722576999612') format('woff2'),
+       url('iconfont.woff?t=1722576999612') format('woff'),
+       url('iconfont.ttf?t=1722576999612') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-kuaisubaoxiu:before {
+  content: "\e689";
+}
+
+.transport-bg-question:before {
+  content: "\e648";
+}
+
+.transport-guanbi2:before {
+  content: "\e610";
+}
+
+.transport-guanbi3:before {
+  content: "\e622";
+}
+
 .transport-Icon-tongjifenxi:before {
   content: "\e611";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,34 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "18856229",
+      "name": "快速报修",
+      "font_class": "kuaisubaoxiu",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "11882921",
+      "name": "bg-question",
+      "font_class": "bg-question",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "4880431",
+      "name": "关闭",
+      "font_class": "guanbi2",
+      "unicode": "e610",
+      "unicode_decimal": 58896
+    },
+    {
+      "icon_id": "5712912",
+      "name": "关闭",
+      "font_class": "guanbi3",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
       "icon_id": "6334918",
       "name": "Icon - 统计分析",
       "font_class": "Icon-tongjifenxi",