Lin Qilong hai 1 semana
pai
achega
b185bce07c

+ 4 - 4
src/api/inspect.js

@@ -6,8 +6,8 @@ const appStore = useAppStore()
 const userStore = useUserStore()
 
 /**
- * 获取当前督
- * @param {*} pid 督类型
+ * 获取当前督
+ * @param {*} pid 督类型
  */
 export function getCurrGroup(pid) {
     return request({
@@ -19,7 +19,7 @@ export function getCurrGroup(pid) {
 
 /**
  * 获取历史稽察年份数据
- * @param {*} pid 督类型
+ * @param {*} pid 督类型
  */
 export function getInspBaseByPersid(pid) {
     const ownApp = appStore.ownApp
@@ -75,4 +75,4 @@ export function getTacQuestionById(id) {
         url: `/tac/pblm/info/${id}`,
         method: 'GET',
     })
-}
+}

+ 4 - 4
src/api/inspectDC.js

@@ -6,8 +6,8 @@ const appStore = useAppStore();
 const userStore = useUserStore();
 
 /**
- * 获取当前督
- * @param {*} pid 督类型
+ * 获取当前督
+ * @param {*} pid 督类型
  */
 export function getCurrGroup(pid) {
   return request({
@@ -18,8 +18,8 @@ export function getCurrGroup(pid) {
 }
 
 /**
- * 获取历史督批次数据
- * @param {*} pid 督类型
+ * 获取历史督批次数据
+ * @param {*} pid 督类型
  */
 export function getInspBasegetByPersid(pid) {
   const ownApp = appStore.ownApp;

+ 3 - 3
src/assets/js/base.js

@@ -3,12 +3,12 @@ const baseList = [
 ];
 
 /**
- * 根据督类型获取基础信息
- * @param {督类型} inspectType 
+ * 根据督类型获取基础信息
+ * @param {督类型} inspectType 
  * @returns 
  */
 function getBaseByInspectType(inspectType) {
     return baseList.find(base => base.inspectTypes.includes(inspectType));
 }
 
-export { getBaseByInspectType, }
+export { getBaseByInspectType, }

+ 4 - 4
src/components/card02.vue

@@ -2,7 +2,7 @@
   <div class="card-01-wrapper">
     <!-- <van-icon
       name="delete-o"
-      v-if="props.type == '督察中' || props.type == '未督察'"
+      v-if="props.type == '督查中' || props.type == '未督查'"
       class="cardDelete"
       color="blue"
       size="20"
@@ -19,9 +19,9 @@
           />
           <span class="cardTitle"
             >{{ props.title }}
-            <div v-if="props.state == '未督察'" class="cardText">未督察</div>
-            <div v-if="props.state == '督察中'" class="cardText2">督察中</div>
-            <div v-if="props.state == '已督察'" class="cardText3">已督察</div>
+            <div v-if="props.state == '未督查'" class="cardText">未督查</div>
+            <div v-if="props.state == '督查中'" class="cardText2">督查中</div>
+            <div v-if="props.state == '已督查'" class="cardText3">已督查</div>
           </span>
         </div>
         <div v-if="props.description" class="card-01-description">

+ 3 - 3
src/router/index.js

@@ -49,7 +49,7 @@ const routes = [
         path: "inspectDC/:id/objects",
         name: "inspectDCObjects",
         component: () => import("@/views/InspectDC/Object/index.vue"),
-        meta: { title: "督列表", showBack: true },
+        meta: { title: "督列表", showBack: true },
       },
       {
         path: "inspectDC",
@@ -84,13 +84,13 @@ const routes = [
         path: "InspectDC/:id/object/:objId/problems",
         name: "InspectDCObjectQuestions",
         component: () => import("@/views/InspectDC/Object/Problem/index.vue"),
-        meta: { title: "现场督", showBack: true },
+        meta: { title: "现场督", showBack: true },
       },
       {
         path: "InspectDC/WDCproblems",
         name: "InspectDCWDCproblems",
         component: () => import("@/views/InspectDC/dcdxIndex.vue"),
-        meta: { title: "添加督对象", showBack: true },
+        meta: { title: "添加督对象", showBack: true },
       },
       {
         path: "/wttjIndex",

+ 1 - 1
src/stores/app.js

@@ -4,7 +4,7 @@ import {ref} from 'vue'
 export const useAppStore = defineStore('app', () => {
   // 当前机构
   const currentOrgId = ref('034')
-  // 当前应用 督:1;稽察:2;
+  // 当前应用 督:1;稽察:2;
   const ownApp = ref('1')
 
   function setCurrentOrgId(id) {

+ 4 - 4
src/views/InspectDC/Object/index.vue

@@ -86,11 +86,11 @@ const list1 = ref([]);
 const list2 = ref([]);
 const list3 = ref([]);
 const titleDC = ref({
-  name: "未督",
+  name: "未督",
   num: '',
-  name2: "督中",
+  name2: "督中",
   num2: '',
-  name3: "已督",
+  name3: "已督",
   num3: '',
 });
 const loading = ref(false);
@@ -121,7 +121,7 @@ function getData() {
     loading.value = false;
     console.log(list1.value, list2.value, list3.value);
   });
-  
+
   // list.value = [
   //   {
   //     id: 1,

+ 1 - 1
src/views/InspectDC/current.vue

@@ -30,7 +30,7 @@ import request from "@/utils/request";
 const emits = defineEmits(["onClick"]);
 
 const inspectTypes = [
-  { text: "督类型", value: "008" },
+  { text: "督类型", value: "008" },
   { text: "安标评审(项目法人)", value: "008" },
   { text: "安标评审(管理单位)", value: "008" },
   { text: "安标评审(施工企业)", value: "008" },

+ 1 - 1
src/views/InspectDC/dcdxIndex.vue

@@ -223,7 +223,7 @@ function xzqhFnPX() {
   showPickerPX.value = true;
   pxValue.value = !pxValue.value;
 }
-//打开新增督对象页面
+//打开新增督对象页面
 function xzdcdxFn() {
   jumpPage("/InspectDC/DCxzdcdx");
 }

+ 1 - 1
src/views/InspectDC/history.vue

@@ -29,7 +29,7 @@ import { getInspBaseByPersid } from "@/api/inspect";
 import { jumpPage } from "@/utils/page";
 
 const inspectType = ref('128');
-const inspectTypes = [{ text: "福建通用督", value: '128' }];
+const inspectTypes = [{ text: "福建通用督", value: '128' }];
 
 const baseBatch = ref(null);
 const baseBatchs = ref([]);

+ 1 - 0
src/views/InspectDC/wtxqIndex.vue

@@ -18,6 +18,7 @@
         <div class="wtxqItem">
           详细描述:<span>{{ wtxqValue.xxms }}</span>
         </div>
+        <div class="wtxqItem">问题责任单位:{{ wtxqValue.inspPblmOrgName }}</div>
         <div class="wtxqItem">扣分值:{{ wtxqValue.kfz }}</div>
         <div class="wtxqItem">典型问题:{{ wtxqValue.dxwt }}</div>
         <div class="wtxqItem">经度:{{ wtxqValue.jd }}</div>

+ 2 - 2
src/views/Problem/detail/index.vue

@@ -125,13 +125,13 @@ const objSubjectTypeColumns = computed(function() {
 });
 const objSubjects = ref({});
 // const gwComFileList = computed(() => pblm.value.gwComFileList?.map(i => {
-//   return {url: process.env.VUE_APP_BASE_HOST + process.env.VUE_APP_BASE_API + i.filePath}
+//   return {url: process.env.VUE_APP_BASE_API + i.filePath}
 // }) || []);
 const gwComFileList = computed(function() {
   const fileList = pblm.value && pblm.value.gwComFileList ? pblm.value.gwComFileList : [];
   const mappedList = fileList.map(function(item) {
     return {
-      url: process.env.VUE_APP_BASE_HOST + process.env.VUE_APP_BASE_API + item.filePath
+      url: process.env.VUE_APP_BASE_API + item.filePath
     };
   });
   return mappedList || [];

+ 10 - 10
src/views/Problem/detail/indexDc.vue

@@ -2,7 +2,7 @@
   <div class="pblm-detail-wrapper">
     <van-form @submit="onSubmit">
       <div class="pblm-detail-label">
-        <span>基本信息</span>
+        <span>问题详情</span>
         <!-- <van-button size="mini" type="primary" @click="showTacObjPblmstbPopup()">选择违规事项</van-button> -->
       </div>
       <van-cell-group inset>
@@ -112,7 +112,7 @@ const listType = ref(route.query.inspectType || '1');
 const pblm = ref({});
 const tacObjPblmstb =  ref({
 });
-const url = process.env.VUE_APP_BASE_HOST + process.env.VUE_APP_BASE_API
+const url = process.env.VUE_APP_BASE_API
 const columns = ref([]);
 const columns1 = ref([]);
 const columns2 = ref([]);
@@ -185,7 +185,7 @@ function formatTime(timestamp) {
   const hours = ('0' + date.getHours()).slice(-2);
   const minutes = ('0' + date.getMinutes()).slice(-2);
   const seconds = ('0' + date.getSeconds()).slice(-2);
-  
+
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
 async function getSelection(){
@@ -254,14 +254,14 @@ async function getAuthImageAsBase64(imageUrl) {
                 'X-Token': localStorage.getItem('token') // 根据实际情况调整
             }
         });
-        
+
         if (!response.ok) {
             throw new Error(`HTTP错误: ${response.status}`);
         }
-        
+
         // 2. 获取图片的 ArrayBuffer
         const arrayBuffer = await response.arrayBuffer();
-        
+
         // 3. 转换为 base64
         const base64 = btoa(
             new Uint8Array(arrayBuffer).reduce(
@@ -269,11 +269,11 @@ async function getAuthImageAsBase64(imageUrl) {
                 ''
             )
         );
-        
+
         // 4. 根据图片类型生成 data URL
         const contentType = response.headers.get('content-type') || 'image/png';
         return `data:${contentType};base64,${base64}`;
-        
+
     } catch (error) {
         console.error('获取认证图片失败:', error);
         throw error;
@@ -437,7 +437,7 @@ const uploadFileToServer = async (file, bizId) => {
   try {
     // 构建标准multipart请求体
     const { body, contentType } = await buildMultipartFormData(file);
-    
+
     // 获取token和自定义头(和Axios拦截器一致)
     const appStore = useAppStore();
     const userStore = useUserStore();
@@ -486,7 +486,7 @@ watch(() => fileList.value, (newVal, oldVal) => {
         isAdding.value = true;
         newFile.value = getObjectArrayDiff(newVal, oldVal, 'id').onlyInArr1[0]
         console.log(newFile.value);
-        
+
     }
     else{
         isAdding.value = false;

+ 2 - 1
vue.config.js

@@ -26,7 +26,8 @@ module.exports = defineConfig({
             '/pdcApi': {
                 // target: 'https://app.slt.fujian.gov.cn:', // 你的后端服务器地址
                 changeOrigin: true,
-                target: 'http://39.98.38.2:18089/dc-api/',
+                // target: 'http://39.98.38.2:18089/dc-api/',
+                target: "http://127.0.0.1:8500/",
                 pathRewrite: {
                     '^/pdcApi': '' // 移除路径中的/api18185前缀
                 }