Bladeren bron

问题调整

敲代码的猫 1 maand geleden
bovenliggende
commit
07d1c05c70

+ 1 - 1
src/views/screen/engineering/currentArea.vue

@@ -349,7 +349,7 @@ export default {
       }
     }
     .num{
-      font-size: 26px;
+      font-size: 34px;
       color: #00FFFF;
       font-weight: bold;
       font-family: "electronicFont";

+ 84 - 25
src/views/screen/engineering/issueListDia.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="myDia">
-    <div style="margin-bottom: 26px;display: flex;position: relative;width: 100%">
+    <!-- 日期选择器和其他操作 -->
+    <div style="margin-bottom: 26px;display: flex;position: relative;width: 100%"  class="dataPlicker">
       <el-date-picker
         v-model="value"
         type="date"
@@ -13,6 +14,8 @@
         <img src="../../../assets/zhang/engineer/ownCloseBtn.png">
       </div>
     </div>
+
+    <!-- 表格数据 -->
     <div class="flex-container">
       <div class="header">
         <div class="flex-column" style="width: 15%">时间</div>
@@ -22,11 +25,11 @@
         <div class="flex-column" style="width: 10%">问题状态</div>
         <div class="flex-column" style="width: 15%">操作</div>
       </div>
-      <div class="flex-row" v-for="(item,index) in dataList" :key="index">
-        <div class="flex-column" style="width: 15%">{{item.a}}</div>
-        <div class="flex-column" style="width: 15%">{{item.b}}</div>
-        <div class="flex-column" style="width: 30%">{{item.c}}</div>
-        <div class="flex-column" style="width: 15%">{{item.d}}</div>
+      <div class="flex-row" v-for="(item, index) in paginatedData" :key="index">
+        <div class="flex-column" style="width: 15%">{{ item.a }}</div>
+        <div class="flex-column" style="width: 15%">{{ item.b }}</div>
+        <div class="flex-column" style="width: 30%">{{ item.c }}</div>
+        <div class="flex-column" style="width: 15%">{{ item.d }}</div>
         <div class="flex-column" style="width: 10%">
           <span v-if="item.e === 1"><span style="color: #67C23A">●</span> 已完结</span>
           <span v-if="item.e === 0"><span style="color: #FAAD14">●</span> 处理中</span>
@@ -34,51 +37,88 @@
         <div class="flex-column" style="width: 15%">
           <span v-if="item.e === 1"></span>
           <span v-if="item.e === 0" style="color: #00FFFF;cursor: pointer" @click="deal()">变更状态</span>
+          <div v-if="item.e === 0" class="wanjie">已完结</div>
         </div>
       </div>
     </div>
+
+    <!-- 分页组件 -->
     <div style="width: 100%;display: flex;justify-content: center;align-items: center;margin-top: 10px;">
       <el-pagination
         background
         layout="prev, pager, next"
-        :total="1000">
+        :current-page="currentPage"
+        :page-size="pageSize"
+        :total="total"
+        @current-change="handlePageChange">
       </el-pagination>
     </div>
-
   </div>
 </template>
 
 <script>
-import { getFoodsList } from "@/api/screen/service";
-import pinyin from "../data/pinyin.js";
-
 export default {
   name: "UnitCamera",
   data() {
     return {
-      value:"2020-02-09",
-      dataList:[
-        {a:"2024/12/28",b:"施工整改问题1",c:"施工整改问题具体内容",d:"张三",e:1},
-        {a:"2024/12/28",b:"施工整改问题1",c:"施工整改问题具体内容",d:"张三",e:1},
-        {a:"2024/12/28",b:"施工整改问题1",c:"施工整改问题具体内容",d:"张三",e:0},
-        {a:"2024/12/28",b:"施工整改问题1",c:"施工整改问题具体内容",d:"张三",e:1},
-        {a:"2024/12/28",b:"施工整改问题1",c:"施工整改问题具体内容",d:"张三",e:1},
-      ]
+      value: "2020-02-09",
+      dataList: [
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 0 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 0 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 0 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+        { a: "2024/12/28", b: "施工整改问题1", c: "施工整改问题具体内容", d: "张三", e: 1 },
+      
+      ],
+      currentPage: 1, 
+      pageSize: 10, 
+      total: 0, 
     };
   },
-  mounted() {},
+  computed: {
+    // 计算分页后的数据
+    paginatedData() {
+      const start = (this.currentPage - 1) * this.pageSize;
+      const end = start + this.pageSize;
+      return this.dataList.slice(start, end);
+    },
+  },
+  mounted() {
+    const style = document.createElement('style');
+  style.innerHTML = `
+    .el-picker-panel.el-date-picker {
+      background: #062223 !important;
+    }
+  `;
+  document.head.appendChild(style);
+  this.total = this.dataList.length;
+  },
   methods: {
-    choose(){
+    choose() {
       this.$emit("subIssue");
     },
 
-    deal(){
-      this.$emit("dealIssue");
+    deal() {
+      
+      // this.$emit("dealIssue");
     },
 
     close() {
       this.$emit("close");
     },
+    handlePageChange(page) {
+      this.currentPage = page; // 更新当前页码
+    },
   },
 };
 </script>
@@ -152,11 +192,30 @@ export default {
   display: none;
 }
 .myDia{
-  width: 1221px;
-  height: 739px;
+  width: 1050px;
+  height: 710px;
   padding: 24px 35px ;
   background-image: radial-gradient(circle at 50% 50%, #031417b3 0%, #0C1A1A 84%);
 }
+.myDia ::v-deep .el-picker-panel.el-date-picker {
+    background: #062223 !important;
+}
+.wanjie{
+  position: absolute;
+    /* left: 30px; */
+    margin-left: 75px;
+    top: 25px;
+    width: 120px;
+    height: 60px;
+    background: #0017168f;
+    box-shadow: inset 0 0 17px 0 #05ffff7a;
+    background: #44f1ff1a;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #00F0ff;
+    display: none;
+}
 
 ::v-deep .el-input__inner{
   color: #00ffff;

+ 1 - 1
src/views/screen/engineering/unitAccess.vue

@@ -16,7 +16,7 @@
               <div style="position: absolute;left: 0;height: 100%;width: 10px;border: 1px solid #00FFFF;border-right: none; "></div>
               <div style="width: 294.15px;height: 52.5px;background-image: linear-gradient(270deg, #00ffff00 0%, #00ffff1a 100%);display: flex;justify-content: space-around;align-items: center">
                 <div style="width: 96px;font-family: DingTalk-JinBuTi;font-weight: JinBuTi;font-size: 24px;color: #00FFFF;letter-spacing: 0;line-height: 32.93px;">在建项目</div>
-                <div style="font-size: 30px;letter-spacing: 6px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
+                <div style="font-size: 38px;letter-spacing: 6px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
               </div>
 
 

+ 1 - 1
src/views/screen/engineering/unitAccessDialog.vue

@@ -25,7 +25,7 @@
               <div style="position: absolute;left: 0;height: 100%;width: 10px;border: 1px solid #00FFFF;border-right: none; "></div>
               <div style="width: 294.15px;height: 52.5px;background-image: linear-gradient(270deg, #00ffff00 0%, #00ffff1a 100%);display: flex;justify-content: space-around;align-items: center">
                 <div style="width: 96px;font-family: DingTalk-JinBuTi;font-weight: JinBuTi;font-size: 24px;color: #00FFFF;letter-spacing: 0;line-height: 32.93px;">在建项目</div>
-                <div style="font-size: 30px;letter-spacing: 6px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
+                <div style="font-size: 38px;letter-spacing: 6px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
               </div>
             </div>
 

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

@@ -630,7 +630,7 @@
                 let symbolSize = [10,10];
                 if (childs.value == "10001") {
                   //省公司
-                  symbol = "image://" + require("@/assets/images/mapGif.png");
+                  symbol = "image://" + require("@/assets/images/build.png");
                   symbolSize = [0,0];
                 } else if (childs.value == "1A001" || childs.value == "1A002") {
                   //直属单位
@@ -665,7 +665,7 @@
         });
         //处理太原市 添加太原市图标
         if (name && name.indexOf("太原") != "-1") {
-          let symbol = "image://" + require("@/assets/images/mapGif.png");
+          let symbol = "image://" + require("@/assets/images/build.png");
           let symbolSize = [50,60];
           markers.push({
             name: "山西省公司(本部)",
@@ -756,7 +756,7 @@
                 color: "#fff",
               },
               symbol: this.deep <= 1 
-                ? "image://" + require("@/assets/images/mapGif.png")
+                ? "image://" + require("@/assets/images/build.png")
                 : "",
               symbolSize: this.deep <= 1 ? 40 : 0,
               //点的名称和经纬度

+ 1 - 1
src/views/screen/map/mapTwo.vue

@@ -166,7 +166,7 @@ export default {
             type: "scatter", // 散点图(用于标注特殊位置)
             coordinateSystem: "geo", // 使用 `geo` 作为坐标系
             symbol: "image://" + require("@/assets/zhang/myMap/carPosition.png"), // 自定义标记(图片)
-            symbolSize: [35, 60], // 标记大小(宽 30,高 20)
+            symbolSize: [30, 55], // 标记大小(宽 30,高 20)
             label: {
               show: true, // 显示数字
               position: "right", // 数字显示在图标的正上方