update

11.txt

@@ -46,4 +46,16 @@ urfhsdkjdwerwnvsojj
       },
     ]
   },
-]
+]
+
+
+
+审批流按钮权限对应显示
+
+文件下载没有后缀
+
+内容管理 右侧按钮浮动错位
+
+只有admin， database担当 ，上传者 可以删除文件。
+
+外部足迹统计误差 两个链接的统计上面

src/api/daikin/base.ts

@@ -1351,7 +1351,30 @@ export async function fetchdbReview(params?: any){
 export async function fetchdbReviewFileList(params?: any){
   return http.get(`/dbAuth/reviewFileList`,{params})
 }
-
+/** 
+ * 获取市况数据列表  https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156
+*/    
+export async function fetchGetHisPage(params?: any){
+  return http.get(`/market/getHisPage`,{params})
+}
+/** 
+ * 删除市况数据  https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156
+*/    
+export async function fetchDelHis(params?: any){
+  return http.get(`/market/delHis`,{params})
+}
+/**
+ * 新增市况数据 https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156
+*/
+export async function fetchSaveHis(data?: any){
+  return http.post(`/market/saveHis`,data)
+}
+/**
+ * 编辑市况数据 https://console-docs.apipost.cn/preview/9ac14c51f96ce4d8/75274687248efb1c?target_id=a11153dc-ab84-41ca-aa1c-45fda68c4156
+*/
+export async function fetchUpdateHis(data?: any){
+  return http.post(`/market/updateHis`,data)
+}
 
 
 

src/router/index.ts

@@ -264,6 +264,12 @@ const router = createRouter({
 							name: 'Market',
 							component: () => import('@/views/home/market/Market.vue')
 						},
+						{
+							path: 'MarketDataModify',
+							name: 'MarketDataModify',
+							meta: { title: '市况数据管理' },
+							component: () => import('@/views/home/market/dataModify.vue')
+						},
 						{
 							path: 'MarketModify',
 							name: 'MarketModify',

src/views/home/database/guize/index.vue

@@ -63,11 +63,11 @@ async function downloads(row:any) {
     message.info("没有访问权限")
     return
   }
-  try{
+  // try{
-    downloadFile(filePath)
+  //   downloadFile(filePath)
-  }catch(error){
+  // }catch(error){
-    window.open(filePath)
+  // }
-  }
+  window.open(filePath)
 }
 const lazyState = computed(() => [pageInfo.currentPage])
   watch(
@@ -131,7 +131,7 @@ function downloadFile(url: any) {
 			const downloadUrl = URL.createObjectURL(blob)
 			const link = document.createElement('a')
 			link.href = downloadUrl
-			link.download = getFileName(url)
+			link.download = getFileNameFromUrl(url)
 			link.click()
 		})
 }
@@ -140,6 +140,15 @@ function getFileName(url: string) {
 	let lastDotIndex = url.lastIndexOf('.')
 	return url.slice(lastSplashIndex + 1, lastDotIndex)
 }
+function getFileNameFromUrl(url: string) {
+  const lastSlashIndex = url.lastIndexOf("/");
+  if (lastSlashIndex !== -1) {
+    return url.substring(lastSlashIndex + 1);
+  } else {
+    return "Invalid URL";
+  }
+}
+
 </script>
 
 <template>

src/views/home/database/modify.vue

@@ -20,9 +20,11 @@
 					</div>
 				</div>
 				<el-tab-pane label="分类管理" name="first">
-					<el-button type="primary" @click="editClickA('add')" class="mb-20px">
+					<div class="h-52px ">
-						新增
+						<el-button type="primary" @click="editClickA('add')" class="mb-20px">
-					</el-button>
+							新增
+						</el-button>
+					</div>
 					<div class="w100% h750px overflow-auto">
 						<el-table
 							:data="tableData"
@@ -85,40 +87,42 @@
 					</div>
 				</el-tab-pane>
 				<el-tab-pane label="内容管理" name="second">
-					<el-button
+					<div class="h-52px ">
-						v-if="hasUpload"
+							<el-button
-						type="primary"
+								v-if="hasUpload"
-						@click="editClickB('add')"
+								type="primary"
-						class="mb-20px"
+								@click="editClickB('add')"
-					>
+								class="mb-20px"
-						新增</el-button
+							>
-					>
+								新增</el-button
-					<el-button
+							>
-						v-if="userCode"
+							<el-button
-						type="primary"
+								v-if="userCode"
-						@click="getAll"
+								type="primary"
-						class="mb-20px"
+								@click="getAll"
-					>
+								class="mb-20px"
-						查看所有</el-button
+							>
-					>
+								查看所有</el-button
-					<el-button
+							>
-						v-if="userCode"
+							<el-button
-						:type="setUpload ? 'success' : 'warning'"
+								v-if="userCode"
-						:icon="setUpload ? 'Check' : ''"
+								:type="setUpload ? 'success' : 'warning'"
-						@click="getUser({ type: 1 })"
+								:icon="setUpload ? 'Check' : ''"
-						class="mb-20px !ml-50px"
+								@click="getUser({ type: 1 })"
-					>
+								class="mb-20px !ml-50px"
-						{{ setUpload ? '已设置上传人员' : '设置上传人员' }}</el-button
+							>
-					>
+								{{ setUpload ? '已设置上传人员' : '设置上传人员' }}</el-button
-					<el-button
+							>
-						v-if="userCode"
+							<el-button
-						:type="setReview ? 'success' : 'warning'"
+								v-if="userCode"
-						:icon="setReview ? 'Check' : ''"
+								:type="setReview ? 'success' : 'warning'"
-						@click="getUser({ type: 2 })"
+								:icon="setReview ? 'Check' : ''"
-						class="mb-20px"
+								@click="getUser({ type: 2 })"
-					>
+								class="mb-20px"
-						{{ setReview ? '已设置审批人员' : '设置审批人员' }}</el-button
+							>
-					>
+								{{ setReview ? '已设置审批人员' : '设置审批人员' }}</el-button
+							>
+					</div>
 					<div class="w100% h750px overflow-auto">
 						<el-table
 							class="tableClass"
@@ -203,6 +207,7 @@
 											编辑</el-button
 										>
 										<el-button
+											v-if="userCode || hasUpload"
 											type="danger"
 											@click="deleteClickB(scope.row)"
 											class="mb-20px w45px"
@@ -357,7 +362,7 @@ const { push } = useRouter();
 const database = databaseld()
 const store = useUserStore()
 const message = useMessage()
-const userCode = ['admin', 'database_dandang', 'tech_service'].includes(
+const userCode = ['admin', 'database_dandang'].includes(
 	store.user.roleCode
 )
 
@@ -628,9 +633,9 @@ const handleChild = async (data: any) => {
 		})
 		if (code == 200) {
 			message.success('设置成功！')
+			getAuth()
 			if (dbAuthType.value) {
 				dbAuthType.value = 0
-				getAuth()
 			}
 		}
 		return
@@ -652,7 +657,7 @@ const CloseThiss = (data: boolean) => {
 	// setUserList.value = []
 	if (dbAuthType.value) {
 		dbAuthType.value = 0
-		getAuth()
+		// getAuth()
 	}
 }
 const getAll = () => {

src/views/home/market/Market.vue

@@ -282,6 +282,7 @@ async function getUser(moduleId: any) {
 
             <AppBlock class="flex-1 box">
                 <div class="box-title">市况</div>
+                <el-button type="primary" v-if="userCode" class="button !mr-30px !mt-[-30px] z-100" @click="push({name:'MarketDataModify'})">数据管理</el-button>
                 <div class="bgStyle mt30px">
                     <div class="mr25px relative w100%">