Inicio Explorar Axuda
Rexistro Iniciar sesión
bill
/
public-fuse
1
0
Fork 1
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

修改bug项目中心

tangning hai 1 día
pai
75aa264e2e
achega
20c1b144a2
Modificáronse 8 ficheiros con 14 adicións e 9 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 2 2
      index.html
  2. 1 1
      package.json
  3. 1 1
      src/view/case/draw/selectMapImage.vue
  4. 1 1
      src/view/case/drawMap/creatMap.vue
  5. 1 1
      src/view/newFireCase/newFireDetails/components/creatMap.vue
  6. 1 0
      src/view/newFireCase/newFireDetails/components/siteInspection.vue
  7. 6 2
      src/view/newFireCase/newdispatch/editFire.vue
  8. 1 1
      src/view/newFireCase/newdispatch/quisk.ts

+ 2 - 2
index.html
Ver ficheiro 

@@ -11,10 +11,10 @@
 
 <body>
 
 <body>
 
   <script type="text/javascript">
 
   <script type="text/javascript">
 
     window._AMapSecurityConfig = {
 
     window._AMapSecurityConfig = {
 
-      securityJsCode: "fbf0a0f9d5cf8a65b385822dd98536b8",
 
+      securityJsCode: "83f86b85dc8700d4f38c42423cbebc39",
 
     };
 
     };
 
   </script>
 
   </script>
 
-  <script type="text/javascript" src='//webapi.amap.com/maps?v=2.0&key=9282fa28a0363ba8a7b3c6f7d10ee4b1'></script>
 
+  <script type="text/javascript" src='//webapi.amap.com/maps?v=2.0&key=15ae4f26585b9f111fa6c3f2a0eb1c03'></script>
 
   <script src="//webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
 
   <script src="//webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
 
   <div id="app"></div>
 
   <div id="app"></div>
 
   <script type="module" src="/src/main.ts"></script>
 
   <script type="module" src="/src/main.ts"></script>

+ 1 - 1
package.json
Ver ficheiro 

@@ -4,7 +4,7 @@
 
   "version": "0.0.0",
 
   "version": "0.0.0",
 
   "type": "module",
 
   "type": "module",
 
   "scripts": {
 
   "scripts": {
 
-    "dev": "vite --mode=yunnan",
 
+    "dev": "vite --mode=fire",
 
     "devxm": "vite --mode=xmfire",
 
     "devxm": "vite --mode=xmfire",
 
     "devcjz": "vite --mode=cjzfire",
 
     "devcjz": "vite --mode=cjzfire",
 
     "dev-offline": "vite --mode=offline",
 
     "dev-offline": "vite --mode=offline",

+ 1 - 1
src/view/case/draw/selectMapImage.vue
Ver ficheiro 

@@ -57,7 +57,7 @@ watchEffect(async (onCleanup) => {
 
   AMapLoader.reset()
 
   AMapLoader.reset()
 
   const AMap = await AMapLoader.load({
 
   const AMap = await AMapLoader.load({
 
     plugins: ["AMap.PlaceSearch", "AMap.Event"],
 
     plugins: ["AMap.PlaceSearch", "AMap.Event"],
 
-    key: "9282fa28a0363ba8a7b3c6f7d10ee4b1",
 
+    key: "15ae4f26585b9f111fa6c3f2a0eb1c03",
 
     version: "2.0",
 
     version: "2.0",
 
   });
 
   });

+ 1 - 1
src/view/case/drawMap/creatMap.vue
Ver ficheiro 

@@ -93,7 +93,7 @@ let currentMarker: any = null
 
 let poiPicker: any = null
 
 let poiPicker: any = null
 
 
 
 // 高德地图配置
 
 // 高德地图配置
 
-const AMAP_KEY = '2ae5a7713612a8d5a65cfd54c989c969'
 
+const AMAP_KEY = '15ae4f26585b9f111fa6c3f2a0eb1c03'
 
 const selectedSearchAdress = ref('1')
 
 const selectedSearchAdress = ref('1')
 
 const searchInputValue = ref('')
 
 const searchInputValue = ref('')
 
 // 根基app打开不同地址
 
 // 根基app打开不同地址

+ 1 - 1
src/view/newFireCase/newFireDetails/components/creatMap.vue
Ver ficheiro 

@@ -93,7 +93,7 @@ let currentMarker: any = null
 
 let poiPicker: any = null
 
 let poiPicker: any = null
 
 
 
 // 高德地图配置
 
 // 高德地图配置
 
-const AMAP_KEY = '2ae5a7713612a8d5a65cfd54c989c969'
 
+const AMAP_KEY = '15ae4f26585b9f111fa6c3f2a0eb1c03'
 
 const selectedSearchAdress = ref('1')
 
 const selectedSearchAdress = ref('1')
 
 const searchInputValue = ref('')
 
 const searchInputValue = ref('')
 
 // 根基app打开不同地址
 
 // 根基app打开不同地址

+ 1 - 0
src/view/newFireCase/newFireDetails/components/siteInspection.vue
Ver ficheiro 

@@ -663,6 +663,7 @@ const applyRenameSelected = async (newName: string) => {
 
     file.filesTitle = newName.trim();
 
     file.filesTitle = newName.trim();
 
     const mapToPic = (item: any): PicItem => ({
 
     const mapToPic = (item: any): PicItem => ({
 
       ...file,
 
       ...file,
 
+      ...item,
 
       url: item.listCover || item.filesUrl || item.cover || item.url,
 
       url: item.listCover || item.filesUrl || item.cover || item.url,
 
       name: item.filesTitle || item.title || '未命名',
 
       name: item.filesTitle || item.title || '未命名',
 
     });
 
     });

+ 6 - 2
src/view/newFireCase/newdispatch/editFire.vue
Ver ficheiro 

@@ -68,14 +68,17 @@
 
             </el-table-column>
 
             </el-table-column>
 
             <el-table-column label="所属组织" width="180">
 
             <el-table-column label="所属组织" width="180">
 
               <template #default="{ row }">
 
               <template #default="{ row }">
 
-                {{ user.info.deptId == row.deptId ? '当前组织' : row.deptName }}
 
+                {{ row.deptName }}
 
               </template>
 
               </template>
 
             </el-table-column>
 
             </el-table-column>
 
-            <el-table-column label="拍摄时间" width="200">
 
+            <el-table-column label="拍摄时间" width="160">
 
               <template #default="{ row }">
 
               <template #default="{ row }">
 
               {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
 
               {{ dateFormat(row.createTime, 'yyyy-MM-dd hh:mm') }}
 
               </template>
 
               </template>
 
             </el-table-column>
 
             </el-table-column>
 
+            <el-table-column label="状态" v-slot:default="{ row }: { row: QuoteScene }">
 
+              {{ QuoteSceneStatusDesc[row.status] }}
 
+            </el-table-column>
 
           </el-table>
 
           </el-table>
 
 
 
           <div style="display:flex; justify-content:flex-end; margin-top: 12px;">
 
           <div style="display:flex; justify-content:flex-end; margin-top: 12px;">
 
@@ -198,6 +201,7 @@
 
 import companySelect from "@/components/company-select/index.vue";
 
 import companySelect from "@/components/company-select/index.vue";
 
 import { ref, computed, nextTick, onMounted } from "vue";
 
 import { ref, computed, nextTick, onMounted } from "vue";
 
 import { Fire, setFire, addFire } from "@/app/fire/store/fire";
 
 import { Fire, setFire, addFire } from "@/app/fire/store/fire";
 
+import { QuoteSceneStatusDesc } from "@/constant/scene";
 
 import { reason, place } from "@/app/fire/constant/fire";
 
 import { reason, place } from "@/app/fire/constant/fire";
 
 import { ElMessage } from "element-plus";
 
 import { ElMessage } from "element-plus";
 
 import { dateFormat } from "@/util";
 
 import { dateFormat } from "@/util";

+ 1 - 1
src/view/newFireCase/newdispatch/quisk.ts
Ver ficheiro 

@@ -6,7 +6,7 @@ import { quiskMountFactory } from "@/helper/mount";
 
 
 
 export const addFire = quiskMountFactory(EditFire, {
 
 export const addFire = quiskMountFactory(EditFire, {
 
   title: "新增火调项目",
 
   title: "新增火调项目",
 
-  width: 800,
 
+  width: 840,
 
 });
 
 });
 
 
 
 export const editFire = quiskMountFactory(EditFire, {
 
 export const editFire = quiskMountFactory(EditFire, {