zhanghao 3 maanden geleden
bovenliggende
commit
75d410af0c

BIN
src/assets/zhang/building/building.png


BIN
src/assets/zhang/logistics/logistics.png


+ 0 - 0
src/assets/zhang/pubicCar/arcBlue.png → src/assets/zhang/publicCar/arcBlue.png


+ 0 - 0
src/assets/zhang/pubicCar/arcBlueEx.png → src/assets/zhang/publicCar/arcBlueEx.png


+ 0 - 0
src/assets/zhang/pubicCar/arcOrange.png → src/assets/zhang/publicCar/arcOrange.png


+ 0 - 0
src/assets/zhang/pubicCar/car.png → src/assets/zhang/publicCar/car.png


+ 0 - 0
src/assets/zhang/pubicCar/carIcon.png → src/assets/zhang/publicCar/carIcon.png


+ 0 - 0
src/assets/zhang/pubicCar/gradientBox.png → src/assets/zhang/publicCar/gradientBox.png


+ 0 - 0
src/assets/zhang/pubicCar/miniCar.png → src/assets/zhang/publicCar/miniCar.png


+ 0 - 0
src/assets/zhang/pubicCar/numBack.png → src/assets/zhang/publicCar/numBack.png


BIN
src/assets/zhang/publicCar/officialCar.png


+ 0 - 0
src/assets/zhang/pubicCar/pentagonCar.png → src/assets/zhang/publicCar/pentagonCar.png


+ 0 - 0
src/assets/zhang/pubicCar/titleBox.png → src/assets/zhang/publicCar/titleBox.png


+ 1 - 0
src/views/screen/building/main.vue

@@ -31,6 +31,7 @@
       </div>
     </div>
     <div class="middle">
+      <img v-if="showMap" src="@/assets/zhang/building/building.png" width="50" style="position: absolute;top: 125px;left: 20px;cursor: pointer">
       <!-- <province v-if="showMap"
         ref="province"
         @mapClick="onMapClick"></province> -->

+ 4 - 4
src/views/screen/logistics/car/carStock.vue

@@ -4,7 +4,7 @@
     <div class="c1_body">
       <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 10px;flex-wrap: wrap">
         <div style="display: flex;width: 100%;align-items: center;justify-content: center;margin-bottom: 10px;">
-          <img src="../../../../assets/zhang/pubicCar/car.png" width="68" style="margin-right: 20px">
+          <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
           <div class="carInstall">
             <div style="width: 90%;display: flex;flex-wrap: wrap">
               <div style="width: 80%;margin-bottom: 10px">公务车终端安装率</div>
@@ -17,7 +17,7 @@
           </div>
         </div>
         <div style="display: flex;width: 100%;align-items: center;justify-content: center">
-          <img src="../../../../assets/zhang/pubicCar/car.png" width="68" style="margin-right: 20px">
+          <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
           <div class="carInstall">
             <div style="width: 90%;display: flex;flex-wrap: wrap">
               <div style="width: 80%;margin-bottom: 10px">公务车终端在线率</div>
@@ -46,7 +46,7 @@
       <div style="width: 50%;">
         <div class="c1_title_halfEx"></div>
         <div style="display: flex;align-items: center">
-          <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
+          <img src="../../../../assets/zhang/publicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
           <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
             <span style="font-family: 'electronicFont'">5566</span>
             <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
@@ -692,7 +692,7 @@ export default {
   width: 403px;
   height: 74px;
   margin-right: 3px;
-  background: url("../../../../assets/zhang/pubicCar/gradientBox.png") no-repeat;
+  background: url("../../../../assets/zhang/publicCar/gradientBox.png") no-repeat;
   color: #CFF8FF;
   font-size: 20px;
   display: flex;

+ 6 - 6
src/views/screen/logistics/car/carStockDialog.vue

@@ -10,7 +10,7 @@
         <div class="c1_body">
           <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 10px;flex-wrap: wrap">
             <div style="display: flex;width: 100%;align-items: center;justify-content: center;margin-bottom: 10px;">
-              <img src="../../../../assets/zhang/pubicCar/car.png" width="68" style="margin-right: 20px">
+              <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
               <div class="carInstall">
                 <div style="width: 90%;display: flex;flex-wrap: wrap">
                   <div style="width: 80%;margin-bottom: 10px">公务车终端安装率</div>
@@ -23,7 +23,7 @@
               </div>
             </div>
             <div style="display: flex;width: 100%;align-items: center;justify-content: center">
-              <img src="../../../../assets/zhang/pubicCar/car.png" width="68" style="margin-right: 20px">
+              <img src="../../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
               <div class="carInstall">
                 <div style="width: 90%;display: flex;flex-wrap: wrap">
                   <div style="width: 80%;margin-bottom: 10px">公务车终端在线率</div>
@@ -57,7 +57,7 @@
               <div style="position: absolute;left: 20px;top: -5px;">未带工单预警数</div>
             </div>
             <div style="display: flex;align-items: center;cursor: pointer" @click="chooseX">
-              <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
+              <img src="../../../../assets/zhang/publicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
                 <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
@@ -70,7 +70,7 @@
               <div style="position: absolute;left: 20px;top: -5px">超速预警数</div>
             </div>
             <div style="display: flex;align-items: center;cursor: pointer" @click="chooseY">
-              <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
+              <img src="../../../../assets/zhang/publicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
                 <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
@@ -83,7 +83,7 @@
               <div style="position: absolute;left: 20px;top: -5px;">节假日预警数</div>
             </div>
             <div style="display: flex;align-items: center;cursor: pointer" @click="chooseZ">
-              <img src="../../../../assets/zhang/pubicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
+              <img src="../../../../assets/zhang/publicCar/pentagonCar.png" width="55" style="margin: 0 5px 0 33px">
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 10px">
                 <span style="font-family: 'electronicFont'">5566</span>
                 <span style="width: 15px;height: 24px;font-size: 14px;align-content: end">辆</span>
@@ -386,7 +386,7 @@ export default {
   width: 403px;
   height: 74px;
   margin-right: 3px;
-  background: url("../../../../assets/zhang/pubicCar/gradientBox.png") no-repeat;
+  background: url("../../../../assets/zhang/publicCar/gradientBox.png") no-repeat;
   color: #CFF8FF;
   font-size: 20px;
   display: flex;

+ 1 - 0
src/views/screen/logistics/main.vue

@@ -39,6 +39,7 @@
           height="900px"
           @mapClick="onMapClick"
         ></asset>
+        <img src="@/assets/zhang/logistics/logistics.png" width="50" style="position: absolute;top: 125px;left: 20px;cursor: pointer">
         <img
           v-if="showLocal"
           class="build"

+ 4 - 3
src/views/screen/map/map.vue

@@ -101,8 +101,9 @@ export default {
               params.seriesType === "scatter"
                   ? `在建项目:${params.data.x}<br/>施工项目:${params.data.y}`
                   : params.name, // 如果是 scatter 图表,显示额外数据,否则显示地区名称
-          backgroundColor: "rgba(5,13,21,0.25)", // 提示框背景颜色(半透明黑色)
-          borderColor: "rgba(0, 0, 0, 0.16)", // 边框颜色
+          backgroundColor: "rgba(66,85,87,0.71)", // 提示框背景颜色(半透明黑色)
+          borderColor: "rgba(56,236,250,0.6)", // 边框颜色
+          borderWidth: 1,
           triggerOn: "mousemove", // 鼠标移动时触发
           enterable: true, // 允许鼠标移动到 tooltip 内部(适用于可点击 tooltip)
           textStyle: {
@@ -110,7 +111,7 @@ export default {
             fontSize: 12, // 字体大小
             overflow: "break", // 文字超出时换行
           },
-          padding: 3, // 提示框内边距
+          padding: [5, 10], // 提示框内边距
         },
 
         // 地理坐标系组件(用于地图绘制)

+ 8 - 7
src/views/screen/map/mapTwo.vue

@@ -76,15 +76,15 @@ export default {
         { name: "吕梁市", appOrg: "1J001" }
       ];
       const points = [
-        { name: "太原市", coordinate: [112.4493, 37.6570], x: "399", y: "2" },
+        { name: "太原市", coordinate: [112.3493, 37.7570], x: "399", y: "2" },
         { name: "大同市", coordinate: [113.3002, 40.0768], x: "399", y: "2" },
         { name: "阳泉市", coordinate: [113.6805, 37.7863], x: "399", y: "2" },
         { name: "长治市", coordinate: [113.1163, 36.1954], x: "399", y: "2" },
         { name: "晋城市", coordinate: [113.1513, 35.5907], x: "399", y: "2" },
         { name: "朔州市", coordinate: [112.4329, 39.5312], x: "399", y: "2" },
-        { name: "晋中市", coordinate: [112.8527, 37.5870], x: "399", y: "2" },
+        { name: "晋中市", coordinate: [113.2527, 37.3870], x: "399", y: "2" },
         { name: "临汾市", coordinate: [111.5186, 35.8582], x: "399", y: "2" },
-        { name: "忻州市", coordinate: [112.7341, 38.4167], x: "399", y: "2" },
+        { name: "忻州市", coordinate: [112.7341, 38.6167], x: "399", y: "2" },
         { name: "运城市", coordinate: [110.9069, 34.9264], x: "399", y: "2" },
         { name: "吕梁市", coordinate: [111.1443, 37.4183], x: "399", y: "2" }
       ];
@@ -159,13 +159,14 @@ export default {
             symbolSize: [20, 30], // 标记大小(宽 30,高 20)
             label: {
               show: true, // 显示数字
-              position: "top", // 数字显示在图标的正上方
+              position: "right", // 数字显示在图标的正上方
               color: "#fff", // 文字颜色(白色)
               fontSize: 14, // 字体大小
-              offset: [0, 10],
               fontWeight: "bold", // 加粗
-              backgroundColor: "rgba(147,245,245,0.35)", // 文字背景色(可选)
-              padding: [2, 5], // 文字内边距(可选)
+              backgroundColor: "rgba(75,117,117,0.59)", // 文字背景色(可选)
+              borderColor: "rgba(56,236,250)", // 边框颜色
+              borderWidth: 1,
+              padding: [6, 7], // 文字内边距(可选)
               borderRadius: 2, // 文字框圆角(可选)
             },
             data: points.map(({ name, coordinate, x, y }) => ({

+ 1 - 1
src/views/screen/official/carWarning.vue

@@ -361,7 +361,7 @@ export default {
   height: 32px;
   margin-left: 35px;
   margin-bottom: 10px;
-  background: url("../../../assets/zhang/pubicCar/titleBox.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/titleBox.png") no-repeat;
   position: relative;
 }
 .flex-container {

+ 2 - 1
src/views/screen/official/main.vue

@@ -37,7 +37,8 @@
         </div>
       </div>
     </div>
-    <div class="middle" style="">
+    <div class="middle">
+      <img src="@/assets/zhang/publicCar/officialCar.png" width="50" style="position: absolute;top: 125px;left: 20px;cursor: pointer">
       <MapTwo></MapTwo>
 <!--      <img
         v-if="showLocal"

+ 8 - 8
src/views/screen/official/terminalData.vue

@@ -3,7 +3,7 @@
     <div class="c1_title"></div>
     <div class="c1_body">
       <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 10px">
-        <img src="../../../assets/zhang/pubicCar/car.png" width="68" style="margin-right: 20px">
+        <img src="../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
         <div class="carNum" style="color: rgba(0,255,255,0.3)">0</div>
         <div class="carNum" style="color: rgba(0,255,255,0.3)">0</div>
         <div class="carNum">2</div>
@@ -15,7 +15,7 @@
       <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 20px">
         <div class="carTypeNumBox" v-for="(it, index) in carTypeNum">
           <div style="display: flex;width: 100%;height: 25px">
-            <img src="../../../assets/zhang/pubicCar/miniCar.png" width="18" style="object-fit: cover">
+            <img src="../../../assets/zhang/publicCar/miniCar.png" width="18" style="object-fit: cover">
             <div style="color: white;font-size: 15px">{{ it.type }}</div>
           </div>
           <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
@@ -30,7 +30,7 @@
           <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
             <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carUseNum">
               <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
+                <img src="../../../assets/zhang/publicCar/miniCar.png" width="30" style="object-fit: cover">
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </div>
               <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
@@ -45,7 +45,7 @@
           <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
             <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carActivationNum">
               <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
+                <img src="../../../assets/zhang/publicCar/miniCar.png" width="30" style="object-fit: cover">
                 <div style="color: white;font-size: 13px">{{ it.type }}</div>
               </div>
               <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
@@ -557,7 +557,7 @@ export default {
   width: 40px;
   height: 58px;
   margin-right: 3px;
-  background: url("../../../assets/zhang/pubicCar/numBack.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/numBack.png") no-repeat;
   color: #00FFFF;
   font-size: 40px;
   display: flex;
@@ -578,7 +578,7 @@ export default {
   height: 32px;
   margin-left: 35px;
   margin-bottom: 10px;
-  background: url("../../../assets/zhang/pubicCar/titleBox.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/titleBox.png") no-repeat;
   position: relative;
 }
 .c1_titleText::after{
@@ -597,7 +597,7 @@ export default {
   height: 32px;
   margin-left: 35px;
   margin-bottom: 10px;
-  background: url("../../../assets/zhang/pubicCar/titleBox.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/titleBox.png") no-repeat;
   position: relative;
 }
 .c1_titleText_half1::after{
@@ -612,7 +612,7 @@ export default {
   height: 32px;
   margin-left: 35px;
   margin-bottom: 10px;
-  background: url("../../../assets/zhang/pubicCar/titleBox.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/titleBox.png") no-repeat;
   position: relative;
 }
 .c1_titleText_half2::after{

+ 12 - 12
src/views/screen/official/terminalDataDialog.vue

@@ -9,7 +9,7 @@
         <div class="c1_title"></div>
         <div class="c1_body">
           <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 10px">
-            <img src="../../../assets/zhang/pubicCar/car.png" width="68" style="margin-right: 20px">
+            <img src="../../../assets/zhang/publicCar/car.png" width="68" style="margin-right: 20px">
             <div class="carNum" style="color: rgba(0,255,255,0.3)">0</div>
             <div class="carNum" style="color: rgba(0,255,255,0.3)">0</div>
             <div class="carNum">2</div>
@@ -21,7 +21,7 @@
           <div style="display: flex;justify-content: center;align-items: center;margin-bottom: 20px">
             <div class="carTypeNumBox" v-for="(it, index) in carTypeNum">
               <div style="display: flex;width: 100%;height: 25px">
-                <img src="../../../assets/zhang/pubicCar/miniCar.png" width="18" style="object-fit: cover">
+                <img src="../../../assets/zhang/publicCar/miniCar.png" width="18" style="object-fit: cover">
                 <div style="color: white;font-size: 15px">{{ it.type }}</div>
               </div>
               <div style="width: 100%;height: 25px;color: #00FFFF;display: flex">
@@ -36,7 +36,7 @@
               <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
                 <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carUseNum">
                   <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                    <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
+                    <img src="../../../assets/zhang/publicCar/miniCar.png" width="30" style="object-fit: cover">
                     <div style="color: white;font-size: 13px">{{ it.type }}</div>
                   </div>
                   <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
@@ -51,7 +51,7 @@
               <div style="display: flex;align-items: center;margin-bottom: 10px;padding-left: 30px">
                 <div style="height: 50px;margin-right: 15px" v-for="(it, index) in carActivationNum">
                   <div style="display: flex;width: 100%;height: 25px;align-items: center">
-                    <img src="../../../assets/zhang/pubicCar/miniCar.png" width="30" style="object-fit: cover">
+                    <img src="../../../assets/zhang/publicCar/miniCar.png" width="30" style="object-fit: cover">
                     <div style="color: white;font-size: 13px">{{ it.type }}</div>
                   </div>
                   <div style="width: 100%;height: 25px;color: #00FFFF;display: flex;margin-left: 10px">
@@ -83,7 +83,7 @@
             </div>
             <div style="display: flex;align-items: center">
               <div style="position: relative">
-                <img src="../../../assets/zhang/pubicCar/arcBlueEx.png" width="90" style="margin: 20px 5px 0 33px">
+                <img src="../../../assets/zhang/publicCar/arcBlueEx.png" width="90" style="margin: 20px 5px 0 33px">
                 <div style="position: absolute;color: #00FFFF;top: 5px;left: 55px;font-size: 34px;font-family: 'electronicFont'">56<span style="font-size: 12px">%</span></div>
               </div>
 
@@ -96,7 +96,7 @@
             </div>
             <div style="display: flex;align-items: center">
               <div style="position: relative">
-                <img src="../../../assets/zhang/pubicCar/arcBlueEx.png" width="90" style="margin: 20px 5px 0 33px">
+                <img src="../../../assets/zhang/publicCar/arcBlueEx.png" width="90" style="margin: 20px 5px 0 33px">
                 <div style="position: absolute;color: #00FFFF;top: 5px;left: 55px;font-size: 34px;font-family: 'electronicFont'">56<span style="font-size: 12px">%</span></div>
               </div>
             </div>
@@ -108,7 +108,7 @@
             </div>
             <div style="display: flex;align-items: center;margin-bottom: 20px">
               <div style="position: relative;cursor: pointer" @click="chooseX">
-                <img src="../../../assets/zhang/pubicCar/arcBlue.png" width="97" style="margin: 10px 5px 0 33px">
+                <img src="../../../assets/zhang/publicCar/arcBlue.png" width="97" style="margin: 10px 5px 0 33px">
                 <div style="position: absolute;width: 48px;color: #00FFFF;top: 5px;left: 55px;font-size: 12px;text-align: center">年度增加车辆数</div>
               </div>
               <div style="width: 108px;height: 24px;color: #00FFFF;font-size: 34px;margin-bottom: 20px">
@@ -118,7 +118,7 @@
             </div>
             <div style="display: flex;align-items: center">
               <div style="position: relative;cursor: pointer" @click="chooseY">
-                <img src="../../../assets/zhang/pubicCar/arcOrange.png" width="97" style="margin: 10px 5px 0 33px">
+                <img src="../../../assets/zhang/publicCar/arcOrange.png" width="97" style="margin: 10px 5px 0 33px">
                 <div style="position: absolute;width: 48px;color: #FEC72F;top: 5px;left: 55px;font-size: 12px;text-align: center">年度减少车辆数</div>
               </div>
               <div style="width: 108px;height: 24px;color: #FEC72F;font-size: 34px;margin-bottom: 20px">
@@ -656,7 +656,7 @@ export default {
   width: 40px;
   height: 58px;
   margin-right: 3px;
-  background: url("../../../assets/zhang/pubicCar/numBack.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/numBack.png") no-repeat;
   color: #00FFFF;
   font-size: 40px;
   display: flex;
@@ -677,7 +677,7 @@ export default {
   height: 32px;
   margin-left: 35px;
   margin-bottom: 10px;
-  background: url("../../../assets/zhang/pubicCar/titleBox.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/titleBox.png") no-repeat;
   position: relative;
 }
 .c1_titleText::after{
@@ -696,7 +696,7 @@ export default {
   height: 32px;
   margin-left: 35px;
   margin-bottom: 10px;
-  background: url("../../../assets/zhang/pubicCar/titleBox.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/titleBox.png") no-repeat;
   position: relative;
 }
 .c1_titleText_half1::after{
@@ -711,7 +711,7 @@ export default {
   height: 32px;
   margin-left: 35px;
   margin-bottom: 10px;
-  background: url("../../../assets/zhang/pubicCar/titleBox.png") no-repeat;
+  background: url("../../../assets/zhang/publicCar/titleBox.png") no-repeat;
   position: relative;
 }
 .c1_titleText_half2::after{