From a650b7abed765fa321b72477f43ffe6b7acfa7c6 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 14 Sep 2023 00:59:01 +0800
Subject: [PATCH] update code

---
 public/detail.html                           | 40 +++++++++++++++++++
 src/pages/components/ProblemmodifyDetail.vue | 42 +++++++++++---------
 src/pages/detail/mapModle.vue                |  8 +---
 vue.config.js                                |  6 +--
 4 files changed, 67 insertions(+), 29 deletions(-)
 create mode 100644 public/detail.html
diff --git a/public/detail.html b/public/detail.html
new file mode 100644
index 0000000..9fa9015
--- /dev/null
+++ b/public/detail.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title><%= htmlWebpackPlugin.options.title %></title>
+    <link rel="stylesheet" href="https://cdn.makalu.cc/css/element-ui/index.css">
+    <link rel="stylesheet" href="css/largeScreenLayout.css">
+    <link rel="stylesheet" href="css/largeScreenStyle.css">
+    <script type="text/javascript" src="http://api.map.baidu.com/api?type=webgl&v=1.0&ak=qmQNEi1qbFX628WfMt4imhdT87RbCRzK"></script>
+    <script src="https://cdn.makalu.cc/js/vue/vue.js"></script>
+    <script src="https://unpkg.com/element-ui@2.15.13/lib/index.js"></script>
+    <script src="https://cdn.makalu.cc/js/jquery/3.5.1/jquery.min.js"></script>
+    <script src="./js/echarts.min.js"></script>
+    <link rel="stylesheet" href="/cesium/Widgets/widgets.css">
+    <script src="/cesium/jquery-3.0.0.min.js"></script>
+    <script src="/cesium/Cesium.js?v=20230913"></script>
+    <script src="/cesium/BIMGISEngine.js?v=20230913"></script>
+    <script src="/cesium/initApi.js?v=20230913"></script>
+    <script src="./js/mapmodle.js"></script>
+    <!--
+    <script crossorigin="anonymous" integrity="sha384-gb8mitZ44MWVFB3GKzmtx1OCjOh3Cj4mgusyTvNzl1Nu31l0em1FrApJindwVAe0" 
+    src="https://lib.baomitu.com/echarts/4.2.1/echarts.min.js"></script>
+    -->
+    <script src="https://cdn.makalu.cc/js/echarts/china.js"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn"></script>
+    <style type="text/css">
+      #webpack-dev-server-client-overlay{display: none;}
+    </style>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->    
+  </body>
+</html>
diff --git a/src/pages/components/ProblemmodifyDetail.vue b/src/pages/components/ProblemmodifyDetail.vue
index 2a198c2..e7a7bf3 100644
--- a/src/pages/components/ProblemmodifyDetail.vue
+++ b/src/pages/components/ProblemmodifyDetail.vue
@@ -53,6 +53,10 @@
                     <div class="item-right">
                         <div v-if="it.timeout && it.checkState!=4" class="text-timeout">超时</div>
                         <div class="text-state" :class="'state'+it.checkState">{{ getCheckState(it.checkState) }}</div>
+                        <el-col :span="12" class="item-data">
+                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">总包单位:</span>
+                            <div class="div-text">{{ it.deptName }}</div>
+                        </el-col>
                         <el-col :span="12" class="item-data">
                             <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">隐患类型:</span>
                             <div class="div-text">{{ getDangerType(it.dangerType) }}</div>
@@ -71,32 +75,32 @@
                         </el-col>
                         <template v-if="it.checkState==4">
                             <el-col :span="12" class="item-data">
-                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
-                            <div class="div-text">{{ it.createBy }}</div>
-                        </el-col>
-                        <el-col :span="12" class="item-data">
-                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
-                            <div class="div-text">{{ it.createTime | formatDate('YYYY-MM-DD') }}</div>
-                        </el-col>
-                        <el-col :span="12" class="item-data">
-                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">截止时间:</span>
-                            <div class="div-text">{{ it.nickedTime | formatDate('YYYY-MM-DD') }}</div>
-                        </el-col>
-                        <el-col :span="12" class="item-data">
-                            <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">完成时间:</span>
-                            <div class="div-text">{{ it.updateTime | formatDate('YYYY-MM-DD') }}</div>
-                        </el-col>
+                                <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
+                                <div class="div-text">{{ it.createBy }}</div>
+                            </el-col>
+                            <el-col :span="8" class="item-data">
+                                <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
+                                <div class="div-text">{{ it.createTime | formatDate('YYYY-MM-DD') }}</div>
+                            </el-col>
+                            <el-col :span="8" class="item-data">
+                                <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">截止时间:</span>
+                                <div class="div-text">{{ it.nickedTime | formatDate('YYYY-MM-DD') }}</div>
+                            </el-col>
+                            <el-col :span="8" class="item-data">
+                                <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">完成时间:</span>
+                                <div class="div-text">{{ it.updateTime | formatDate('YYYY-MM-DD') }}</div>
+                            </el-col>
                         </template>
                         <template v-else>
-                        <el-col :span="8" class="item-data">
+                        <el-col :span="12" class="item-data">
                             <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交用户:</span>
                             <div class="div-text">{{ it.createBy }}</div>
                         </el-col>
-                        <el-col :span="8" class="item-data">
+                        <el-col :span="12" class="item-data">
                             <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">提交时间:</span>
                             <div class="div-text">{{ it.createTime | formatDate('YYYY-MM-DD') }}</div>
                         </el-col>
-                        <el-col :span="8" class="item-data">
+                        <el-col :span="12" class="item-data">
                             <img src="images/title_icon.png"><span class="sp-lbl sp-lbl2">截止时间:</span>
                             <div class="div-text">{{ it.nickedTime | formatDate('YYYY-MM-DD') }}</div>
                         </el-col>
@@ -205,7 +209,7 @@ export default {
                         }
                     } else {
                         it.timeout = false;
-                    }
+                    }                   
                     return it;
                 });
                 this.elKey++;
diff --git a/src/pages/detail/mapModle.vue b/src/pages/detail/mapModle.vue
index badef17..0703486 100644
--- a/src/pages/detail/mapModle.vue
+++ b/src/pages/detail/mapModle.vue
@@ -27,13 +27,7 @@ export default {
         this.$bus.$on("projectChange", res => {            
             this.project = res;
             this.reloadMap();
-        });
-        this.initScript('CesiumJs', '/cesium/Cesium.js?v=20230910').then(d => {
-            this.initScript('BIMGISEngineJs', '/cesium/BIMGISEngine.js?v=20230910').then(d => {
-                this.initScript('initApiJs', '/cesium/initApi.js?v=202309104');
-            });
-        });
-        this.loadCss("cesium_Widgets_widgets","/cesium/Widgets/widgets.css?v=20230910");
+        });       
     },
 
     methods: {
diff --git a/vue.config.js b/vue.config.js
index ea1f844..36c12fa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,8 +23,8 @@ module.exports = defineConfig({
         }
       },
       '/jhapi':{
-        target: `http://62.234.3.186/jhapi/`,
-        //target: `http://127.0.0.1:8090/jhapi/`,
+        //target: `http://62.234.3.186/jhapi/`,
+        target: `http://127.0.0.1:8090/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'
@@ -48,7 +48,7 @@ module.exports = defineConfig({
     },
     projectDetail:{
         entry:'src/pages/projectDetail.js',
-        template:'public/index.html',
+        template:'public/detail.html',
         title:'项目详情',
         filename:'projectDetail.html'
     },
