修改分享显示

industry-admin/src/components/CommonTable/index.vue

@@ -33,7 +33,9 @@
                     </el-option>
                 </el-select>
                 <div v-if="item.type == 'html'" v-html="item.formatter(scope.row)"
-                    @click="operateMethod(scope.row, item.methodName)"></div>
+                    @click="operateMethod(scope.row, item.methodName)">
+
+                </div>
 
             </template>
         </el-table-column>

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

@@ -233,7 +233,7 @@
           <el-input placeholder="请输入采集间隔" v-model="itemForm.interval">
             <template slot="append">
               <div class="unit-my">
-                <el-select v-model="itemForm.unit">
+                <el-select v-model="itemForm.unit" style="width: 80px">
                   <el-option label="毫秒" value="ms" />
                   <el-option label="秒" value="s" />
                   <el-option label="分" value="m" />

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

@@ -122,17 +122,19 @@ export default {
                     labelName: "分享信息",
                     type: "html",
                     formatter: (row, column, cellValue, index) => {
-                        let html = '<el-tag style="margin-right: 5px;"  type="'
-                        if (row.userId == this.uid) {
-                            html += 'success">'
-                            html += '已分享</el-tag>'
-                            return html
+                        let grouplist = JSON.parse(JSON.stringify(row.userGroupList));
+                        let groupnameList = '';
+                        if(grouplist.length>0){
+                          for(let i in grouplist){
+                            groupnameList = groupnameList + grouplist[i].userGroupName + ',';
+                          }
+                          groupnameList = groupnameList.slice(0, -1);
+                          return '已分享至(' + groupnameList +')'
                         }
-                        html += 'warning">'
-                        html += row.userName + '被分享</el-tag>'
-                        return html
+
                     },
-                    align: "left"
+                    align: "left",
+                    width: '200'
                 },
                 {
                     propName: "createTime",

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

@@ -7,7 +7,6 @@
                     <el-col :span="1.5">
                         <el-button type="primary" icon="el-icon-plus" size="small"
                             @click="addPolicyEvent">新增</el-button>
-
                     </el-col>
                 </el-row>
                 <!-- 数据组表格信息 -->
@@ -79,7 +78,7 @@ export default {
                     formatter: (row, column, cellValue, index) => {
                       let result = ''
                         if (row.readMode == 0) {
-                            return '<i class="el-icon-alarm-clock"></i> <span>按周期读取</span>' //'按周期读取'
+                            return '<span>按周期读取</span>' //'按周期读取'
                         } else if (row.readMode == 1) {
                             result = '按值改变读取'
                         } else if (row.readMode == 2) {

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

@@ -127,6 +127,19 @@ export default {
                     align: "left",
                     width: '200'
                 },
+              {
+                propName: "shareGroup",
+                labelName: "分享信息",
+                type: "html",
+                formatter: (row, column, cellValue, index) => {
+                  if(row.shareGroup){
+                    return '已分享至(' + row.shareGroup + ')'
+                  }
+
+                },
+                align: "left",
+                width: '200'
+              },
                 {
                     propName: "createTime",
                     labelName: "创建时间",

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

@@ -55,9 +55,9 @@
                             </el-form-item>
                         </el-col>
                         <el-col :xl="5">
-                            <el-form-item label="数据项" prop="itemListTitile">
+                            <el-form-item label="点位" prop="itemListTitile">
                                 <el-input :title="chartForm.itemListTitile" v-model="chartForm.itemListTitile" readonly
-                                    placeholder="请选择数据项" maxlength="10" style="width: 200px;">
+                                    placeholder="请选择点位" maxlength="10" style="width: 200px;">
                                     <el-button size="mini" type="primary" slot="append" icon="el-icon-search"
                                         @click="chooseItemEvent">选择</el-button>
                                 </el-input>
@@ -381,7 +381,7 @@ export default {
             this.destroyChart()
             if (this.chartForm.idList.length == 0) {
                 this.$message({
-                    message: '请选择数据项',
+                    message: '请选择点位',
                     type: 'warning'
                 })
                 return
@@ -761,7 +761,7 @@ export default {
         saveSchemeEvent() {
             if (this.chartForm.idList.length == 0) {
                 this.$message({
-                    message: '请选择数据项',
+                    message: '请选择点位',
                     type: 'warning'
                 })
                 return
@@ -872,7 +872,7 @@ export default {
         exportItemListData(type) {
             if (this.chartForm.idList.length == 0) {
                 this.$message({
-                    message: '请选择数据项',
+                    message: '请选择点位',
                     type: 'warning'
                 })
                 return

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

@@ -61,7 +61,7 @@
                                 </virtual-tree>
                             </div>
                             <!-- 树节点对应的叶节点 -->
-                            <div style="height: 30vh; overflow: auto">
+                            <div style="height: 40vh; overflow: auto">
                                 <el-divider content-position="left" style="margin-bottom: 15px !important">
                                     <i></i>
                                     <span>（共{{ leavesList.length }}项）</span>