拉取最新代码

pages/assign/assign.vue

@@ -186,7 +186,7 @@
       </template>
       <template v-else>
         <button @click="previous" type="default" class="primaryButton btn" v-if="dataInfo.tabActiveValue === 'supplement'">上一步</button>
-        <button @click="goBack" type="default" class="cancelButton btn" v-else>返回</button>
+        <button @click="goBackView" type="default" class="cancelButton btn" v-else>返回</button>
         <button @click="submit" type="default" class="primaryButton btn">提交</button>
       </template>
     </view>
@@ -197,7 +197,7 @@
   import { ref, reactive, computed } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
   import { generateNumberArray } from '@/utils/index.js'
-  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc, api_systemConfiguration, api_sj } from "@/http/api.js"
+  import { api_group, api_incidentDetail, api_getSolution, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc, api_systemConfiguration, api_sj } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -263,7 +263,7 @@
     responseHandleTime: undefined,//补单-接单时间
     handleTime: undefined,//补单-解决时间
     handlingPersonnelUserId: undefined,//补单-处理人
-		introduceCount :0 //引入次数
+		// introduceCount :0 //引入次数
   })
   
   // 是否提交
@@ -299,6 +299,12 @@
     })
   }
   
+	// 返回引用知识库
+	function goBackView(){
+		handlerStore.setHandlerData(dataInfo, 'assign', 'assign');
+		goBack()
+	}
+	
   // 上传处理图片成功
   function handlerImgSuccess(e){
     dataInfo.handlerImgList.forEach(v => {
@@ -509,7 +515,6 @@
     dataInfo.selectType = {};//选择的对象类型
     dataInfo.handleDescription = '';//解决方案
 		solutionId.value = null;//引用知识库id
-		dataInfo.introduceCount = 0;//引用知识库次数
     dataInfo.handleCategory = undefined;//处理方式
     dataInfo.handleCategoryList = [];//处理方式列表
     dataInfo.closecode = undefined;//处理结果
@@ -1199,6 +1204,36 @@
     }
   }
   
+	// 获取知识库数量
+	function getIntroduceCount(categoryId){
+	  uni.showLoading({
+	    title: "加载中",
+	    mask: true,
+	  });
+	  let postData = {
+	    idx: 0,
+	    sum: 9999,
+	    solution: {
+				category:{
+					id:categoryId,
+				},
+				status:{id:72},
+	    }
+	  }
+	  
+	  api_getSolution(postData).then(res => {
+	    uni.hideLoading();
+	    if(res.status == 200){
+				dataInfo.introduceCount = res.totalNum
+	    }else{
+	      uni.showToast({
+	        icon: 'none',
+	        title: res.msg || '请求数据失败！'
+	      });
+	    }
+	  })
+	}
+	
 	// 获取文本内容
 	function getHtml(html) {
 	  const tempDiv = document.createElement('div');
@@ -1237,7 +1272,8 @@
       
       if(dataInfo.category){
          dataInfo.incidentData.category = dataInfo.category;
-        
+				 console.log(111)
+				 getIntroduceCount(dataInfo.category.id)
         // 处理责任科室
         if(dataInfo.category.branchType == 1){
           // 分院区
@@ -1257,11 +1293,12 @@
         }
       }
     }else if(incidentBuildStore.incidentBuild.data){
+			console.log(222)
       // 初始化
       Object.assign(dataInfo.incidentData, incidentBuildStore.incidentBuild.data);
       if(dataInfo.incidentData.category){
         dataInfo.category = dataInfo.incidentData.category;
-        
+        getIntroduceCount(dataInfo.category.id)
         // 处理责任科室
         if(dataInfo.category.branchType == 1){
           // 分院区

pages/repository/repository.vue

@@ -16,10 +16,16 @@
 					<button @click.stop="importData(data)" type="default" class="primaryButton btn">引入</button>
 				</view>
       </view>
+			<view class="back-style" @click="goBack">
+				<text class="newicon newicon-fanhui1"></text>
+			</view>
     </view>
     <view class="zanwu" v-else>
       <text class="newicon newicon-zanwu"></text>
     </view>
+		<view v-if="dataInfo.list.length==0" class="btn-view">
+			<button @click="goBack" type="default" class="primaryButton btn">返回</button>
+		</view>
   </view>
 </template>
 
@@ -214,5 +220,27 @@
     bottom: 0;
     background-color: #fff;
   }
+	.btn-view{
+		position: fixed;
+		bottom: 40rpx;
+		width: 93.5%; 
+		padding: 24rpx 0 0 24rpx;
+	}
+	.back-style{
+		background: #D6D6D6;
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		right: 30rpx;
+		bottom: 30rpx;
+		text{
+			font-size: 50rpx;
+			color: #fff;
+		}
+	}
 }
 </style>

pages/repositoryDetails/repositoryDetails.vue

@@ -12,7 +12,10 @@
 			<view class="file-item" @click="downloadFile(item)">{{item.name}}</view>
 			<text class="newicon newicon-xiazai" @click="downloadFile(item)"></text>
 		</view>
-		<button @click="importData" type="default" class="primaryButton btn btn-style">引入</button>
+		<view class="foot_common_btns btn-style">
+			<button @click="goBack" type="default" class="cancelButton btn">返回</button>
+			<button @click="importData" type="default" class="primaryButton btn ">引入</button>
+		</view>
   </view>
 </template>
 
@@ -53,47 +56,13 @@
   // 下载附件
   function downloadFile(item){
     console.log(666,item)
-		// 下载文件资源到本地
+		let url = location.origin + "/file" + item.relativeFilePath
 		uni.downloadFile({
-			url: item.previewUrl,  // 后端返回的线上文件路径
-			success: function(res) {
+			url: url, //仅为示例，并非真实的资源
+			success: (res) => {
 				if (res.statusCode === 200) {
-					// 文件到本地
-					uni.saveFile({
-						tempFilePath: res.tempFilePath, //临时路径
-						success: function(data) {
-							uni.showToast({
-								icon: 'none',
-								mask: true,
-								title: '保存成功',
-								duration: 2000
-							})
-							//ios手机直接打开文件，手动存储文件到手机，Android手机从根目录创建文件夹，保存文件并改名
-							setTimeout(() => {
-								//打开文档查看
-								uni.openDocument({
-									filePath: data.savedFilePath,
-									success: function(ress) {
-										console.log("成功打开文件")
-									},
-									fail() {
-										console.log("打开文件失败")
-									}
-								})
-							}, 1000)
-						}
-					})
 					console.log('下载成功');
 				}
-			},
-			fail: function(res) {
-				console.log(res.errMsg);
-			},
-			complete: function(res) {
-				console.log(res.statusCode);
-			},
-			progress: function(res) {
-				console.log('下载进度' + res.progress);
 			}
 		});
   }
@@ -199,7 +168,7 @@
 	.content{
 		padding-bottom: 24rpx;
 		border-bottom: 1px solid #eee;
-		overflow-y: scroll;
+		// overflow-y: scroll;
 	}
   .file-list{
     display: flex;
@@ -217,7 +186,8 @@
 	.btn-style{
 		position: fixed;
 		bottom: 40rpx;
-		width: 93%; 
+		width: 93.5%; 
+		padding: 0;
 	}
 }
 </style>

static/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe634;</span>
+                <div class="name">返回</div>
+                <div class="code-name">&amp;#xe634;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe660;</span>
                 <div class="name">上传</div>
                 <div class="code-name">&amp;#xe660;</div>
@@ -222,9 +228,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1718174994993') format('woff2'),
-       url('iconfont.woff?t=1718174994993') format('woff'),
-       url('iconfont.ttf?t=1718174994993') format('truetype');
+  src: url('iconfont.woff2?t=1718344479829') format('woff2'),
+       url('iconfont.woff?t=1718344479829') format('woff'),
+       url('iconfont.ttf?t=1718344479829') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -251,6 +257,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-fanhui1"></span>
+            <div class="name">
+              返回
+            </div>
+            <div class="code-name">.newicon-fanhui1
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-shangchuan"></span>
             <div class="name">
               上传
@@ -504,6 +519,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-fanhui1"></use>
+                </svg>
+                <div class="name">返回</div>
+                <div class="code-name">#newicon-fanhui1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-shangchuan"></use>
                 </svg>
                 <div class="name">上传</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304860 */
-  src: url('iconfont.woff2?t=1718174994993') format('woff2'),
-       url('iconfont.woff?t=1718174994993') format('woff'),
-       url('iconfont.ttf?t=1718174994993') format('truetype');
+  src: url('iconfont.woff2?t=1718344479829') format('woff2'),
+       url('iconfont.woff?t=1718344479829') format('woff'),
+       url('iconfont.ttf?t=1718344479829') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-fanhui1:before {
+  content: "\e634";
+}
+
 .newicon-shangchuan:before {
   content: "\e660";
 }

static/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "9645687",
+      "name": "返回",
+      "font_class": "fanhui1",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
       "icon_id": "1301374",
       "name": "上传",
       "font_class": "shangchuan",