wenhongquan 3 лет назад
Родитель
Сommit
f0888d88bc
4 измененных файлов с 30 добавлено и 13 удалено
  1. 8 0
      .env.zwy
  2. 2 1
      package.json
  3. 15 11
      src/views/IncidentManagementDetail/index.tsx
  4. 5 1
      src/views/WHPDetail/index.vue

+ 8 - 0
.env.zwy

@@ -0,0 +1,8 @@
+# .env.zwy
+
+NODE_ENV = zwy
+
+VITE_API_SERVER = 'http://10.11.230.154:30009'
+VITE_MAP_SERVER = 'http://10.11.230.152:21009'
+VITE_LOGIN_SERVER = 'http://61.147.254.211:9999'
+VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'

+ 2 - 1
package.json

@@ -6,6 +6,7 @@
         "dev": "vite serve --mode dev",
         "build": "vite build --mode test",
         "prod": "vite build --mode prod",
+        "zwy": "vite build --mode zwy",
         "lint": "eslint --fix --ext .ts,.tsx,.json src"
     },
     "dependencies": {
@@ -58,4 +59,4 @@
         "last 2 versions",
         "not dead"
     ]
-}
+}

+ 15 - 11
src/views/IncidentManagementDetail/index.tsx

@@ -110,9 +110,10 @@ export default defineComponent({
                 i.dictValue ===
                 store.incidentDetail?.baseTask?.[idx]?.[0].level?.toString(),
             );
-            const desc = store.incidentDetail?.baseTask?.[idx]?.map(
-              (i) => i.taskDes,
-            );
+            const desc = store.incidentDetail?.baseTask?.[idx]?.map((i) => [
+              i.taskDes,
+              i.taskName,
+            ]);
 
             return {
               ...item,
@@ -123,7 +124,7 @@ export default defineComponent({
             (item) =>
               item.dictValue?.toString() ===
               store.incidentDetail?.baseInfo?.level?.toString(),
-          )?.desc,
+          )?.desc
     );
 
     const currenttaskid = ref('');
@@ -290,10 +291,14 @@ export default defineComponent({
             title="应急预案"
             name="应急预案"
             v-slots={{ icon: <img class="icon-i" src={icon_yjya} /> }}>
+            {console.log(planOptions.value)}
             {planOptions.value?.map((d, index) => (
-              <p>
-                {index + 1}、{d}
-              </p>
+              <div style={"margin-bottom:10px"}>
+                <div style={"color:#333"}>
+                  {index + 1}、{d[0]}
+                </div>
+                <div style={"font-size:10px;padding-left:15px"}>{d[1]}</div>
+              </div>
             ))}
           </CollapseItem>
           <CollapseItem
@@ -370,7 +375,7 @@ export default defineComponent({
                               }>
                               {((ii.pic ?? '') + ',' + (ii.video ?? '') ?? '')
                                 .split(',')
-                                .map((iim,idxq) => {
+                                .map((iim, idxq) => {
                                   iim = iim ?? '';
                                   if (isImage({ fileName: iim, url: iim })) {
                                     return (
@@ -392,7 +397,7 @@ export default defineComponent({
                                         }></img>
                                     );
                                   }
-                                  
+
                                   if (isVideo({ fileName: iim, url: iim })) {
                                     // console.log(iim);
                                     return (
@@ -412,8 +417,7 @@ export default defineComponent({
                                         }></img>
                                     );
                                   }
-                                   return <div></div>;
-                                 
+                                  return <div></div>;
                                 })}
                             </div>
                           </div>

+ 5 - 1
src/views/WHPDetail/index.vue

@@ -2,12 +2,16 @@
   <div>
     <van-nav-bar title="详情" left-arrow placeholder @click-left="goback" :fixed="true" >
     </van-nav-bar>
-     <Editor
+    <div style="width:99vw;">
+      <Editor
             style="height: 100%; overflow-y: hidden;"
             v-model:defaultConfig="editorConfig"
             :mode="mode"
             @onCreated="onCreated"
         />
+
+    </div>
+     
    </div>
 </template>