调度

commandCenter/src/assets/css/public-style.scss

@@ -59,4 +59,7 @@ $base_fontSize: 100;
 }
 .mgB20{
   margin-bottom: rem(20);
+}
+.mgR20{
+  margin-right: 20px;
 }

commandCenter/src/components/common/alertModal.vue

@@ -22,6 +22,7 @@
                 <span v-if="modal.hideStar"></span>
                 <span v-else-if="modal.title && !modal.notip"> (<span class="color-danger">*为必填项</span>) </span>
             </div>
+            <div class="mgR20" v-if="modal.showAlarm" @click="open(modal.id)"><i class="zoniot_font zoniot-icon-xiangqing"></i></div>
         </template>
         <div class="content">
             <component :id="modal.id" :is="modal.component" :params="modal.props" :ref="modal.id" @close="close"></component>
@@ -93,6 +94,10 @@ export default {
         submit(id) {
             const component = this.$refs[id];
             component.submit && component.submit();
+        },
+        open(id) {
+            const component = this.$refs[id];
+            component.open && component.open();
         }
     },
     created() {

commandCenter/src/config/env.development.js

@@ -9,7 +9,7 @@ module.exports = {
     edition: 'development',
     Env: 'development', // // 测试环境 dev |  正式环境 prod
 
-    baseUrl: 'http://114.135.61.186:21020/sc-accessControlSystem/', // 项目地址
+    baseUrl: 'http://114.135.61.186:21020/sc-commandCenter/', // 项目地址
 
     baseApi: 'http://192.168.110.4:8082', // 本地api请求地址
     baseMapApi: 'http://114.135.61.187:38082', // arcgis API

commandCenter/src/config/env.production.js

@@ -8,7 +8,7 @@
 module.exports = {
   edition: "production",
   Env: "production", // // 测试环境 dev |  正式环境 prod
-  baseUrl: "http://14.29.248.135:8888/sc-accessControlSystem/", // 项目地址
+  baseUrl: "http://14.29.248.135:8888/sc-commandCenter/", // 项目地址
   baseApi: "http://14.29.248.135:8888", // 本地api请求地址
   baseImgApi: "http://14.29.248.135:8888", // 图片api请求地址
   baseExcelApi: "http://14.29.248.135:8888", // excel请求地址

commandCenter/src/config/env.sit.js

@@ -8,7 +8,7 @@
 module.exports = {
     edition: "production",
     Env: "sit", // 商用环境： prod   |   演示环境： demo
-    baseUrl: "http://114.135.61.186:21020/sc-accessControlSystem/", // 项目地址
+    baseUrl: "http://114.135.61.186:21020/sc-commandCenter/", // 项目地址
     baseApi: "http://114.135.61.186:21020", // 本地api请求地址
     baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
     baseExcelApi: "http://114.135.61.186:21020", // excel请求地址

commandCenter/src/views/commandDispatch/index.vue

@@ -141,6 +141,7 @@ export default {
                     height: height,
                     fullscreen: false,
                     showFooter: true,
+                    showAlarm:true,
                     props: {
                         row,
                         callback: resolve

commandCenter/src/views/commandDispatch/pop/tableList.vue

@@ -1,36 +1,17 @@
 <template>
-    <zz-table
-        :cols="cols"
-        :settings="{ showIndex: true, stripe: true }"
-        :loading="mixins_onQuery"
-        :data="mixins_list"
-        :pageset="mixins_pageset"
-        @page-change="pageChange"
-        @selection-change="selectionChange"
-    >
-        <!-- <template slot-scope="scope" slot="opt">
-            <div class="opt">
-                <el-tooltip effect="light" placement="bottom" content="详情">
-                    <i class="zoniot_font zoniot-icon-xiangqing" @click="lookDetail(scope.row)"></i>
-                </el-tooltip>
-                <el-tooltip effect="light" placement="bottom" content="终止">
-                    <i class="zoniot_font zoniot-icon-zhongzhi redText" v-if="scope.row.adStatus !== 3" @click="Scrap(scope.row.id)"></i>
-                    <i v-else class="zoniot_font zoniot-icon-zhongzhi ashText"></i>
-                </el-tooltip>
-
-                <el-tooltip effect="light" placement="bottom" content="删除">
-                    <i class="zoniot_font zoniot-icon-shanchu redText" @click="deluserbyidFn(scope.row.id)"></i>
-                </el-tooltip>
-            </div>
-        </template> -->
-    </zz-table>
+    <el-table :data="tableData" border style="width: 100%">
+        <el-table-column label="No." type="index" :width="70" align="left"></el-table-column>
+        <el-table-column prop="date" label="告警名称"> </el-table-column>
+        <el-table-column prop="date" label="告警时间" width="180"> </el-table-column>
+        <el-table-column prop="date" label="告警地址" > </el-table-column>
+    </el-table>
 </template>
 <script>
 export default {
     props: ['params'],
     data() {
         return {
-            formData: {}
+             tableData:[]
         };
     },
     methods: {

commandCenter/src/views/commandDispatch/pop/typeHydropower.vue

@@ -44,6 +44,23 @@ export default {
                 })
                 .catch(() => {});
         },
+        open() {
+            new Promise((resolve) => {
+                this.$store.dispatch('addPopup', {
+                    url: `/commandDispatch/pop/tableList.vue`,
+                    title: '告警信息',
+                    notip: true,
+                    width: '4.89rem',
+                    height: '4rem',
+                    props: {
+                        // row,
+                        callback: resolve
+                    }
+                });
+            }).then(() => {
+
+            });
+        },
         typeStatus(val) {
             switch (val) {
                 case 1: