From b860c6d2daf76b6e7b9c0092be9da14b77431774 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 20 三月 2024 13:48:12 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

---
 src/views/system/data-manage/index.vue |  112 +++++++++++++++++++++++++--
 src/views/system/report/index.vue      |   22 +++++
 src/views/system/work-order/index.vue  |   79 ++++++++++++++++++-
 3 files changed, 193 insertions(+), 20 deletions(-)

diff --git a/src/views/system/data-manage/index.vue b/src/views/system/data-manage/index.vue
index eef8562..f0228ea 100644
--- a/src/views/system/data-manage/index.vue
+++ b/src/views/system/data-manage/index.vue
@@ -3,13 +3,24 @@
     <div class="container">
       <el-row type="flex" justify="center">
         <el-col :span="24">
-          <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">浜鸿劯鏁版嵁寮傚父妫�娴�</h3>
+          <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">瑙嗛杩愯鐩戞帶</h3>
         </el-col>
       </el-row>
 
       <el-row type="flex" justify="center">
-        <el-col :span="6" v-for="(item, index) in faceData" :key="index">
+        <el-col :span="6" v-for="(item, index) in videoData" :key="index">
           <el-link @click="handleDetail(item)">
+            <el-card style="width:150px;height: 150px;text-align: center;">
+              <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+              <div>{{ item.name }}</div>
+            </el-card>
+          </el-link>
+        </el-col>
+      </el-row>
+      <br/>
+      <el-row type="flex" justify="center">
+        <el-col :span="6" v-for="(item, index) in videoData2" :key="index">
+          <el-link @click="handleDetail(item)" :style="item.name == '' ? 'display:none' : ''">
             <el-card style="width:150px;height: 150px;text-align: center;">
               <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
               <div>{{ item.name }}</div>
@@ -22,7 +33,7 @@
     <div class="container">
       <el-row type="flex" justify="center">
         <el-col :span="24">
-          <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">杞︿咯鏁版嵁寮傚父妫�娴�</h3>
+          <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">杞﹁締杩愯鐩戞帶</h3>
         </el-col>
       </el-row>
 
@@ -36,7 +47,49 @@
           </el-link>
         </el-col>
       </el-row>
+      <br/>
+      <el-row type="flex" justify="center">
+        <el-col :span="6" v-for="(item, index) in carData2" :key="index">
+          <el-link @click="handleDetail(item)" :style="item.name == '' ? 'display:none' : ''">
+            <el-card style="width:150px;height: 150px;text-align: center;">
+              <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+              <div>{{ item.name }}</div>
+            </el-card>
+          </el-link>
+        </el-col>
+      </el-row>
     </div>
+
+    <div class="container">
+      <el-row type="flex" justify="center">
+        <el-col :span="24">
+          <h3 style="color: rgb(104,104,103);padding-top: 20px;padding-bottom: 20px;">浜鸿劯杩愯鐩戞帶</h3>
+        </el-col>
+      </el-row>
+
+      <el-row type="flex" justify="center">
+        <el-col :span="6" v-for="(item, index) in faceData" :key="index">
+          <el-link @click="handleDetail(item)">
+            <el-card style="width:150px;height: 150px;text-align: center;">
+              <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+              <div>{{ item.name }}</div>
+            </el-card>
+          </el-link>
+        </el-col>
+      </el-row>
+      <br/>
+      <el-row type="flex" justify="center">
+        <el-col :span="6" v-for="(item, index) in faceData2" :key="index">
+          <el-link @click="handleDetail(item)" :style="item.name == '' ? 'display:none' : ''">
+            <el-card style="width:150px;height: 150px;text-align: center;">
+              <i style="font-size: 40px;padding: 15px;" :class="item.icon"></i>
+              <div>{{ item.name }}</div>
+            </el-card>
+          </el-link>
+        </el-col>
+      </el-row>
+    </div>
+    <br/><br/><br/><br/>
   </div>
 </template>
 
@@ -44,16 +97,53 @@
 export default {
   data() {
     return {
-      faceData: [
-        { name: '浜鸿劯璇嗗埆鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
-        { name: '浜鸿劯鎶撴媿鏁版嵁鐩戞祴', icon: 'el-icon-user', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
-        { name: '浜鸿劯鏁版嵁瓒嬪娍鍒嗘瀽', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
-        { name: '浜鸿劯鎶撴媿璁惧娲昏穬鎬�', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
-        { name: '浜鸿劯鎶撴媿涓婁紶鍙婃椂鎬�', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
-        { name: '浜鸿劯鎶撴媿澶у浘鍙敤鎬�', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+      videoData: [
+        { name: '骞冲彴鍦ㄧ嚎', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '涓�鏈轰竴妗�', icon: 'el-icon-folder', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '鐐逛綅鍦ㄧ嚎', icon: 'el-icon-search', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '褰曞儚鍙敤', icon: 'el-icon-turn-off', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '瑙嗛鏍囨敞', icon: 'el-icon-place', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�', icon: 'el-icon-film', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+      ],
+      videoData2: [
+        { name: '瑙嗛鍥惧儚璧勬簮瀹夊叏绠$悊', icon: 'el-icon-house', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '瑙嗛鍥惧儚璐ㄩ噺', icon: 'el-icon-set-up', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-connection', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
       ],
       carData: [
-        { name: '鍗″彛杩囪溅鏁版嵁涓�鑷存��', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
+        { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��1', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
+      ],
+      carData2: [
+        { name: '杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '杞﹁締鍗″彛璁惧url鍙敤鎬�0.5', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-truck', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' }
+      ],
+      faceData: [
+        { name: '瑙嗗浘搴撳鎺ョǔ瀹氭��', icon: 'el-icon-alarm-clock', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '鐐逛綅鍦ㄧ嚎鐜�', icon: 'el-icon-user', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '鐩綍涓�鑷寸巼', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '璁惧鎶撴媿鍥剧墖鍚堟牸鎬�', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+      ],
+      faceData2: [
+        { name: '鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�', icon: 'el-icon-thumb', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�', icon: 'el-icon-pie-chart', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-data-line', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-timer', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-money', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
+        { name: '', icon: 'el-icon-data-analysis', description: '鎻忚堪淇℃伅', routerUrl: '/car/vehicle-data-monitor/index' },
       ]
     }
   },
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index e78d801..aff69e5 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -81,6 +81,7 @@
       <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
       <el-table-column label="鎶ュ浜哄憳" align="center" prop="peopleName" />
       <el-table-column label="鐐逛綅" align="center" prop="pointName" />
+      <el-table-column label="鎶ュ绫诲瀷" align="center" prop="reportType" />
       <el-table-column label="鎶ュ鍐呭" align="center" prop="reportContent" />
       <el-table-column label="涓婃姤鏉愭枡" align="center" prop="reportMaterials" />
       <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
@@ -144,6 +145,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="鎶ュ绫诲瀷" prop="reportType">
+          <el-select v-model="form.reportType">
+            <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ"/>
+            <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
           <el-select v-model="form.errorType">
             <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
@@ -177,6 +184,9 @@
         <el-form-item label="鎶ュ浜哄憳">
           <el-input v-model="auditingForm.peopleName" disabled />
         </el-form-item>
+        <el-form-item label="鎶ュ绫诲瀷">
+          <el-input v-model="auditingForm.reportType" disabled />
+        </el-form-item>
         <el-form-item label="鏁呴殰绫诲瀷">
           <el-input v-model="auditingForm.errorType" disabled />
         </el-form-item>
@@ -196,6 +206,7 @@
         <el-button @click="auditingCancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
@@ -242,7 +253,8 @@
         errorType: "",
         reportContent: "",
         auditing: "",
-        suggest: ""
+        suggest: "",
+        reportType: "",
       },
       // 鏌ヨ鍙傛暟
       queryParams: {
@@ -273,6 +285,9 @@
         reportMaterials: [
           { required: true, message: "涓婃姤鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
         ],
+        reportType: [
+          { required: true, message: "璇烽�夋嫨鎶ュ绫诲瀷", trigger: "blur" }
+        ],
       }
     };
   },
@@ -291,6 +306,7 @@
       this.auditingForm.peopleName =row.peopleName
       this.auditingForm.errorType =row.errorType
       this.auditingForm.reportContent =row.reportContent
+      this.auditingForm.reportType =row.reportType
     },
     // 杩滅▼鎼滅储鐐逛綅
     remoteGetPoints(query) {
@@ -382,6 +398,8 @@
     },
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
+      // todo 鍒ゆ柇鏄簨鍓嶆姤澶�
+
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -392,7 +410,7 @@
             });
           } else {
             addReport(this.form).then(response => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
               this.open = false;
               this.getList();
             });
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index f27f236..f04eb76 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -78,6 +78,11 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="宸ュ崟鍙�" align="center" prop="workOrderNo" width="170"/>
       <el-table-column label="宸ュ崟鏉ユ簮" align="center" prop="source" width="170"/>
+      <el-table-column label="鏄惁鎶ュ" align="center" width="170">
+        <template slot-scope="scope">
+          <el-tag>宸叉姤澶�(浜嬪墠)</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" width="170"/>
       <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" width="150"/>
       <el-table-column label="杩愮淮浜哄憳" align="center" prop="ywPeopleName" />
@@ -91,13 +96,6 @@
 
       <el-table-column label="鎿嶄綔" fixed="right" width="150"  align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            @click="handleUpdate(scope.row)"-->
-<!--            v-hasPermi="['x:work-order:edit']"-->
-<!--          >淇敼</el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -124,6 +122,11 @@
             type="text"
             @click="handleFlow(scope.row)"
           >杩囩▼鍥�</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleReport(scope.row)"
+          >浜嬪悗鎶ュ</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -135,6 +138,35 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <!-- 浜嬪悗鎶ュ -->
+    <el-dialog title="浜嬪悗鎶ュ" :visible.sync="reportOpen" width="600px" append-to-body>
+      <el-form ref="reportForm" :model="reportForm" :rules="reportFormRules" label-width="80px">
+        <el-form-item label="鐐逛綅" prop="pointId">
+          <el-input v-model="reportForm.pointId" disabled />
+        </el-form-item>
+        <el-form-item label="鎶ュ绫诲瀷">
+          <el-input v-model="reportForm.reportType" disabled />
+        </el-form-item>
+        <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
+          <el-select v-model="reportForm.errorType">
+            <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
+            <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
+            <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鎶ュ鍐呭" prop="reportContent">
+          <editor v-model="reportForm.reportContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="涓婃姤鏉愭枡" prop="reportMaterials">
+          <file-upload v-model="reportForm.reportMaterials"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitReportForm">鎻� 浜�</el-button>
+        <el-button @click="reportOpen = false">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
 
     <el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="500px" append-to-body>
       <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
@@ -420,6 +452,22 @@
   },
   data() {
     return {
+      reportFormRules: {
+        reportContent: [
+          { required: true, message: "鎶ュ鍐呭涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        reportMaterials: [
+          { required: true, message: "涓婃姤鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+      },
+      reportOpen: false,
+      reportForm: {
+        reportType: "浜嬪悗鎶ュ",
+        pointId: "鐞间簬闀�3琛�1鍙锋憚鍍忓ご",
+        errorType: "",
+        reportContent: "",
+        reportMaterials: ""
+      },
       // 杩囩▼鍥�
       flowOpen: false,
       flowForm: {},
@@ -504,6 +552,23 @@
     this.getList();
   },
   methods: {
+    // 鎶ュ
+    submitReportForm() {
+      this.$refs["reportForm"].validate(valid => {
+        if (valid) {
+          addReport(this.form).then(response => {
+            this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    // 浜嬪悗鎶ュ鎸夐挳
+    handleReport(row) {
+      this.reportForm.pointId = row.source;
+      this.reportOpen = true;
+    },
     // 瀹℃牳鎸夐挳
     handleAuditing(row) {
       this.auditingForm = row;

--
Gitblit v1.8.0