更改界面

industry-admin/src/views/collector/index.vue

@@ -196,7 +196,7 @@
           <el-table-column key="itemGroupId" label="数据组" align="left" prop="itemGroupId" show-overflow-tooltip>
             <template slot-scope="scope">
               <span v-for="item in itemGroupSelect" :key="item.id"
-                v-if="item.id === scope.row.itemGroupId">{{ item.groupName }}</span>
+                >{{ item.groupName }}</span>
             </template>
           </el-table-column>
           <el-table-column key="interval" label="采集间隔" align="left" prop="interval" show-overflow-tooltip />

industry-admin/src/views/report/reportTable/reportDetail.vue

@@ -41,7 +41,7 @@ export default {
                 this.sendMsg({
                     cmd: 'show',
                     data: {
-                        reportId: this.$route.query.id
+                        reportId: this.$route.query.id,
                     }
                 })
             }
@@ -50,6 +50,7 @@ export default {
     data() {
         return {
             reportId: this.$route.query.id,
+            type:'',
             iframeSrc: process.env.VUE_APP_BASE_API + '/reportSheet/report-history.html',
         }
     },
@@ -61,7 +62,8 @@ export default {
                 data: {
                     token: getToken(),
                     url: process.env.VUE_APP_BASE_API,
-                    reportId: this.reportId
+                    reportId: this.reportId,
+                    type:this.type
                 }
             })
             window.addEventListener('message', function (event) {
@@ -78,7 +80,8 @@ export default {
 
       },
       printReport(){
-
+        this.type="print"
+        this.sendToken();
       },
     },
     destroyed() {

industry-admin/src/views/report/reportTablePolicy/chooseItem.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :title="title" width="60%" custom-class="dialog-addItem" top="5vh" center :before-close="handleClose"
+    <el-dialog :title="title" width="50%" custom-class="dialog-addItem" top="5vh" center :before-close="handleClose"
         :visible.sync="visible" @open="handleOpen" @close="handleClose">
         <el-row>
             <el-col :span="10">
@@ -12,11 +12,11 @@
         </el-row>
         <el-row>
             <el-col :span="10">
-                <el-divider content-position="left">数据项</el-divider>
+                <el-divider content-position="left">点位</el-divider>
                 <div class="cy-line">
                     <el-checkbox v-model="isSelectAllGroupItem" @change="selectAllGroupItem"
                         style="margin-left: 10px">全选</el-checkbox>
-                    <div style="height: 60vh; overflow: auto">
+                    <div style="height: 40vh; overflow: auto">
                         <p-virtual-check ref="groupItem" :data-sources="groupItemList"
                             @check-change-all="checkChangeAllGroupItem" @check-change="checkChangeGroupItem">
                         </p-virtual-check>
@@ -37,11 +37,11 @@
                 </div>
             </el-col>
             <el-col :span="10">
-                <el-divider content-position="left">已选择数据项({{ selectedItemList.length }})</el-divider>
+                <el-divider content-position="left">已选择点位({{ selectedItemList.length }})</el-divider>
                 <div class="cy-line">
                     <el-checkbox v-model="isSelectAllSelectedItem" @change="selectAllSelectedItem"
                         style="margin-left: 10px">全选</el-checkbox>
-                    <div style="height: 60vh; overflow: auto">
+                    <div style="height: 40vh; overflow: auto">
                         <p-virtual-check ref="selectedItem" :data-sources="selectedItemList"
                             @check-change-all="checkChangeAllSelectedItem" @check-change="checkChangeSelectedItem">
                         </p-virtual-check>
@@ -49,9 +49,9 @@
                 </div>
             </el-col>
         </el-row>
-        <div style="width: 100%; text-align: center;margin-bottom: 5px;">
-            <el-button type="primary" @click="addItemEvent">确定</el-button>
-            <el-button @click="handleClose">取消</el-button>
+        <div style="width: 100%; text-align: right;margin-top: 10px;">
+            <el-button type="primary" @click="addItemEvent" size="small">确定</el-button>
+            <el-button @click="handleClose" size="small">取消</el-button>
         </div>
     </el-dialog>
 </template>
@@ -66,7 +66,7 @@ export default {
     },
     data() {
         return {
-            title: '选择数据项',
+            title: '选择点位',
             visible: false,
             itemGroupId: null,
             itemGroupName: '',
@@ -136,7 +136,7 @@ export default {
             let currentChooseItemListF = []
             if (this.currentChooseItemList.length == 0) {
                 this.$message({
-                    message: '请选择数据项！',
+                    message: '请选择点位！',
                     type: 'warning'
                 });
                 return;
@@ -178,7 +178,7 @@ export default {
                 }
                 if (status) {
                     this.$message({
-                        message: '请注意，选择的数据项中含有重复的项',
+                        message: '请注意，选择的点位中含有重复的项',
                         type: 'warning'
                     });
                 }
@@ -217,7 +217,7 @@ export default {
         addItemEvent() {
             if (this.selectedItemList.length == 0) {
                 this.$message({
-                    message: '请选择数据项！',
+                    message: '请选择点位！',
                     type: 'warning'
                 });
                 return;
@@ -231,10 +231,10 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dialog-addItem {
-    height: 80vh;
+    height: 50vh;
 
     .el-dialog__body {
-        height: 70vh;
+        height: 50vh;
         overflow: hidden;
     }
 }
@@ -255,7 +255,10 @@ export default {
 
 .btn-group {
     width: 100%;
-    height: calc(100% - 20px);
-    padding: 100% 30%;
+    //height: calc(100% - 20px);
+    padding: 150px 20%;
 }
-</style>
+.el-row {
+  margin: 5px 0;
+}
+</style>

industry-admin/src/views/report/reportTablePolicy/reportDataPolicy.vue

@@ -25,7 +25,7 @@
                                         :value="dict.id"></el-option>
                                 </el-select>
                                 <el-button size="mini" @click="addDataItem"
-                                    style="float: right; width: 100px; margin-top: 4px">添加数据项</el-button>
+                                    style="float: right; width: 100px; margin-top: 4px">添加点位</el-button>
                             </el-form-item>
                             <el-form-item label="" prop="policyItemList">
                                 <el-tag size="mini" v-if="reportDataPolicyForm.policyItemList.length != 0">

industry-admin/src/views/report/runConfig/index.vue

@@ -118,7 +118,7 @@ export default {
                     labelName: "运行状态",
                     type: "html",
                     formatter: (row, column, cellValue, index) => {
-                        if (row.runState == 0) {
+                        if (row.runState == 0 && row.reportTableType != 0) {
                             return '<span class="el-tag el-tag--danger">停止</span>'
                         } else if (row.runState == 1) {
                             return '<span class="el-tag el-tag--success">运行</span>'
@@ -150,9 +150,9 @@ export default {
                     style: '',
                     icon: 'el-icon-setting',
                     methodName: "timeConfigEvent",
-                    hidden: row => {
-                        return row.runState === 0
-                    }
+                    // hidden: row => {
+                    //     return row.runState === 0
+                    // }
                 },
                 {
                     btnName: '运行',
@@ -161,7 +161,7 @@ export default {
                     icon: 'el-icon-video-play',
                     methodName: "runConfigEvent",
                     hidden: row => {
-                        return row.runState === 0
+                        return row.runState === 0 && row.reportTableType != 0
                     }
                 },
                 {

industry-admin/src/views/report/runConfig/timeConfig.vue

@@ -70,10 +70,10 @@
                     </el-col>
                 </el-row>
             </el-form>
-            <span slot="footer">
-                <el-button size="mini" type="primary" @click="saveReportConfig" style="margin-top: 20px">确定</el-button>
+            <div slot="footer">
+                <el-button v-if="reportForm.runState == 0" size="mini" type="primary" @click="saveReportConfig" style="margin-top: 20px">确定</el-button>
                 <el-button size="mini" @click="dialogClose" style="margin-top: 20px">取消</el-button>
-            </span>
+            </div>
         </el-dialog>
 
         <!-- 打印配置列表界面 -->
@@ -93,7 +93,7 @@ export default {
     },
     data() {
         return {
-            title: "配置报表",
+            title: "报表运行配置",
             visible: false,
             reportForm: {
                 id: null,
@@ -105,7 +105,8 @@ export default {
                 type: 0,
                 cron: "",
                 isRunPrint: 0,
-                printConfigId: null
+                printConfigId: null,
+                runState:0
             },
             radioByCron: "",
             radioByCronValM: "",

industry-admin/src/views/source/dataQuery/chooseItem.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :title="title" width="60%" custom-class="dialog-addItem" top="5vh" center :before-close="dialogClose"
+    <el-dialog :title="title" width="50%" custom-class="dialog-addItem" top="4vh" center :before-close="dialogClose"
         :visible.sync="visible" @open="handleOpen" @close="handleClose">
         <el-form ref="form" label-width="80px">
             <el-form-item label="数据组">
@@ -12,11 +12,11 @@
         <!-- <el-divider content-position="left"></el-divider> -->
         <el-row>
             <el-col :span="10">
-                <el-divider content-position="left">数据项</el-divider>
+                <el-divider content-position="left">点位</el-divider>
                 <div class="cy-line">
                     <el-checkbox v-model="isSelectAllGroupItem" @change="selectAllGroupItem"
                         style="margin-left: 10px">全选</el-checkbox>
-                    <div style="height: 60vh; overflow: auto">
+                    <div style="height: 40vh; overflow: auto">
                         <p-virtual-check ref="groupItem" :data-sources="groupItemList"
                             @check-change-all="checkChangeAllGroupItem" @check-change="checkChangeGroupItem">
                         </p-virtual-check>
@@ -37,11 +37,11 @@
                 </div>
             </el-col>
             <el-col :span="10">
-                <el-divider content-position="left">已选择数据项({{ selectedItemList.length }})</el-divider>
+                <el-divider content-position="left">已选择点位({{ selectedItemList.length }})</el-divider>
                 <div class="cy-line">
                     <el-checkbox v-model="isSelectAllSelectedItem" @change="selectAllSelectedItem"
                         style="margin-left: 10px">全选</el-checkbox>
-                    <div style="height: 60vh; overflow: auto">
+                    <div style="height: 40vh; overflow: auto">
                         <p-virtual-check ref="selectedItem" :data-sources="selectedItemList"
                             @check-change-all="checkChangeAllSelectedItem" @check-change="checkChangeSelectedItem">
                         </p-virtual-check>
@@ -49,9 +49,9 @@
                 </div>
             </el-col>
         </el-row>
-        <div style="width: 100%; text-align: center;margin-bottom: 5px;">
-            <el-button type="primary" @click="addItemEvent">确定</el-button>
-            <el-button @click="dialogClose">取消</el-button>
+        <div style="width: 100%; text-align: right;margin-top:20px">
+            <el-button type="primary" @click="addItemEvent" size="small">确定</el-button>
+            <el-button @click="dialogClose" size="small">取消</el-button>
         </div>
     </el-dialog>
 </template>
@@ -269,10 +269,10 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .dialog-addItem {
-    height: 80vh;
+    height: 40vh;
 
     .el-dialog__body {
-        height: 70vh;
+        height: 40vh;
         overflow: hidden;
     }
 }
@@ -293,7 +293,10 @@ export default {
 
 .btn-group {
     width: 100%;
-    height: calc(100% - 20px);
-    padding: 100% 30%;
+    //height: calc(100% - 20px);
+    padding: 150px 20%;
 }
-</style>
+.el-row {
+  margin: 5px 0;
+}
+</style>

industry-admin/src/views/source/dataQuery/index.vue

@@ -71,7 +71,7 @@
                     </el-row>
                     <el-row type="flex" justify="end">
                         <el-form-item>
-                            <el-select v-model="chooseScheme" @change="chooseSchemeEvent" placeholder="请选择查询方案">
+                            <el-select v-model="chooseScheme" clearable @change="chooseSchemeEvent" placeholder="请选择查询方案" style="margin-right:10px">
                                 <el-option v-for="scheme in schemeList" :key="scheme.id" :label="scheme.schemeName"
                                     :value="scheme.id">
                                     <span style="float: left">{{ scheme.schemeName }}</span>
@@ -818,10 +818,14 @@ export default {
         },
         /** 选择方案事件 */
         chooseSchemeEvent(val) {
+          if (val){
             getDataSchemeById(val).then(res => {
-                this.chartForm = res.data
-                this.queryData()
+              this.chartForm = res.data
+              this.queryData()
             })
+          }else{
+            console.log(val)
+          }
         },
         /** 保存方案 */
         saveScheme() {

industry-admin/src/views/source/itemGroup/chooseModel.vue

@@ -6,9 +6,9 @@
             <el-option v-for="(item, index) in this.dataModelList" :key="index" :label="item.remark" :value="item.id">
             </el-option>
         </el-select>
-        <div style="width: 100%; text-align: center; margin-top: 20px">
-            <el-button type="primary" @click="saveDataModelEvent">确定</el-button>
-            <el-button @click="dialogClose">取消</el-button>
+        <div style="width: 100%; text-align: right; margin-top: 20px">
+            <el-button type="primary" @click="saveDataModelEvent" size="mini">确定</el-button>
+            <el-button @click="dialogClose" size="mini">取消</el-button>
         </div>
     </el-dialog>
 </template>
@@ -37,4 +37,4 @@ export default {
         }
     }
 }
-</script>
+</script>

industry-admin/src/views/source/itemGroup/itemChoose.vue

@@ -29,10 +29,10 @@
                     </el-tag>
                 </div>
             </el-form>
-            <span slot="footer">
+            <div slot="footer" style="text-align:right">
                 <el-button type="primary" size="mini" @click="saveOrUpdateItemGroup">确定</el-button>
                 <el-button @click="dialogClose" size="mini">取消</el-button>
-            </span>
+            </div>
         </el-dialog>
 
         <!-- 数据项选择树 -->

industry-admin/src/views/source/itemGroup/itemChooseTree.vue

@@ -106,8 +106,8 @@
                 </div>
             </div>
             <span slot="footer">
-                <el-button type="primary" @click="gotoItemConfig">下一步</el-button>
-                <el-button @click="dialogClose">取消</el-button>
+                <el-button type="primary" size="mini" @click="gotoItemConfig">下一步</el-button>
+                <el-button @click="dialogClose" size="mini">取消</el-button>
             </span>
         </el-dialog>
 

industry-admin/src/views/source/itemGroup/itemConfigModel.vue

@@ -15,21 +15,21 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="点位：" style="margin-bottom: 5px; width: 100%">
-                            <el-input placeholder="请输入点位名称进行过滤" style="" @input="chooseItemChangeEvent"
+                            <el-input placeholder="请输入点位进行过滤" style="" @input="chooseItemChangeEvent"
                                 v-model="filterChooseItemText"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
             </el-form>
-            <el-button size="mini" @click="multipleModel"
+            <el-button type="primary" size="small" @click="multipleModel"
                 style="position: absolute; right: 30px; top: 80px">批量设置表达式</el-button>
             <CommonTable ref="itemConfigTable" :tableHeaderTitle="tableHeaderTitle" :tableData="tableData"
                 :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex" :tableHight="tableHight"
                 :tableOperate="tableOperate" @receiveCheckedData="receiveCheckedData" @chooseModel="chooseModel">
             </CommonTable>
             <span slot="footer">
-                <el-button type="primary" @click="saveItemChoose">确定</el-button>
-                <el-button @click="dialogClose">取消</el-button>
+                <el-button type="primary" @click="saveItemChoose" size="small">确定</el-button>
+                <el-button @click="dialogClose" size="small">取消</el-button>
             </span>
         </el-dialog>