Merge branch 'master' of http://116.63.33.55/git/industry-data-platform into master

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

@@ -83,7 +83,7 @@
       </el-col>
     </el-row>
 
-    <el-dialog title="编辑采集器" :visible.sync="dialogAdd" width="800px" :close-on-click-modal="false">
+    <el-dialog :title="diatitle" :visible.sync="dialogAdd" width="800px" :close-on-click-modal="false">
       <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="90px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="addForm.name" placeholder="请输入采集器名称"/>
@@ -302,6 +302,7 @@ export default {
       dialogSetting: false,
       activeName: '0',
       loading: true,
+      diatitle:'新增采集器',
       groupDialog: false,
       queryParams: {
         page: 1,
@@ -523,6 +524,7 @@ export default {
       }
     },
     handelAdd() {
+      this.diatitle = '新增采集器'
       this.dialogAdd = true
     },
     handelAddCancel() {
@@ -850,6 +852,7 @@ export default {
       this.dialogSetting = false
     },
     handelEdit(row) {
+      this.diatitle = '编辑采集器'
       this.dialogAdd = true
       this.addForm = {
         id: row.id,

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

@@ -92,7 +92,12 @@ export default {
             loading.close()
             return
           }
-          let checkedKeys = res2.data.map(v => "u_" + v.userId + "_g_" + v.userGroupId)
+
+          let checkedKeys = res2.data[0].userIds.split(',')
+          let userGroupId = res2.data[0].userGroupId
+          for(let i=0;i<checkedKeys.length;i++){
+            checkedKeys[i] = "u_"+checkedKeys[i]+"_g_"+userGroupId
+          }
           this.$refs.deptUserTree.setCheckedKeys(checkedKeys);
           loading.close()
         }).catch(e => {

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/TableUserGroupUser.java

@@ -31,6 +31,9 @@ public class TableUserGroupUser implements Serializable {
      * 用户名称
      */
     private String userName;
-
+    /**
+     * 用户ids
+     */
+    private String userIds;
 
 }

industry-system/industry-da/src/main/java/com/example/opc_da/validate/reportTable/AutomaticReportTableValidate.java

@@ -649,10 +649,18 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
                 List<JSONObject> item = list.stream().map(v -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("value", v.getValue());
-                    if(v.getName()!=null){
-                        jsonObject.put("name", v.getName());
+                    String itemId = v.getName();
+                    String itemName="";
+                    for(int i=0;i<items.size(); i++){
+                        JSONObject obj = items.getJSONObject(i);
+                        if (obj.getString("value").equals(itemId)) {
+                            itemName = obj.getString("title");
+                        }
+                    }
+                    if(items.size()>1){
+                        jsonObject.put("name", itemName);
                     }else{
-                        jsonObject.put("name", v.getTime());
+                        jsonObject.put("name", itemName + ' '+v.getTime());
                     }
                     return jsonObject;
                 }).collect(Collectors.toList());
@@ -668,7 +676,7 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
                     for (int j = 0; j < items.size(); j++) {
                         JSONObject obj = items.getJSONObject(j);
                         if (obj.getString("value").equals(itemName)) {
-                            object.put("name", obj.getString("title"));
+                            //object.put("name", obj.getString("title"));
                         }
                     }
                     pieserieData.add(object);
@@ -764,9 +772,12 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
             while (sDateTime.isBefore(endDateTime)) {
                 eDateTime = BucketTypeFactory.getBucketType(bucketType).plusLocalDateTime(sDateTime, bucketValue);
                 List<String> valueList = new ArrayList<>();
+                String itemName = "";
                 if (CollUtil.isNotEmpty(itemList)) {
                     for (int i = 0; i < itemList.size(); i++) {
                         Item item = itemList.get(i);
+
+                        itemName = item.getName();
                         LocalDateTime itemDateTime = LocalDateTime.parse(item.getTime(), DateTimeFormatter.ofPattern(timePattern));
                         if (sDateTime.isAfter(itemDateTime)) {
                             itemList.remove(i);
@@ -804,7 +815,8 @@ public abstract class AutomaticReportTableValidate implements ReportTableValidat
 
                 newItemList.add(new Item()
                         .value(CalculateDataFactory.getCalculateData(valueTakingMode).calculateData(valueList, scale, defaultScale))
-                        .time(sDateTime.format(DateTimeFormatter.ofPattern(timePattern_str))));
+                        .time(sDateTime.format(DateTimeFormatter.ofPattern(timePattern_str)))
+                        .name(itemName));
 
                 sDateTime = eDateTime;
 

industry-system/industry-da/src/main/resources/mapper/ReportTableDao.xml

@@ -1229,7 +1229,7 @@
 
 
     <select id="getTableUserGroupUserList" resultType="com.example.opc_common.entity.TableUserGroupUser">
-        select ttugu.report_table_id,ttugu.user_group_id,tug.user_group_name,GROUP_CONCAT(su.user_name) user_name
+        select ttugu.report_table_id,ttugu.user_group_id,tug.user_group_name,GROUP_CONCAT(su.user_name) user_name,GROUP_CONCAT(su.user_id)user_ids
         from t_table_user_group_user ttugu,t_user_group tug,sys_user su
         where ttugu.report_table_id = #{reportTableId} and ttugu.user_group_id = tug.id and ttugu.user_id = su.user_id
         GROUP BY ttugu.report_table_id,ttugu.user_group_id,tug.user_group_name

industry-system/industry-da/src/main/resources/mapper/SceneDao.xml

@@ -6,14 +6,14 @@
     <select id="getCountSceneByName" resultType="java.lang.Integer">
         select count(*) from f_scene where scene_name = #{sceneName}
         <if test="sceneId != null">
-            id = #{sceneId}
+           and id != #{sceneId}
         </if>
     </select>
 
     <insert id="saveScene" parameterType="java.util.Map" useGeneratedKeys="true" keyProperty="id">
         insert into f_scene(scene_name, directory_ids, monitor_ids) values (#{sceneName}, #{ids}, #{monitors})
     </insert>
-    
+
     <insert id="saveSceneImgs">
         insert into f_scene_img (scene_id, scene_img) values
             <foreach collection="list" item="item" separator=",">

industry-system/industry-da/src/main/resources/static/reportSheet/js/design.js

@@ -234,14 +234,24 @@ const sceneView = {
 				html += `<option value="${pageData.sceneData[i].id}" ${id && id == pageData.sceneData[i].id ? 'selected': ''}>
 				${pageData.sceneData[i].sceneName}</option>`
 				if (id && id == pageData.sceneData[i].id && img) {
-					_this.renderImgView(pageData.sceneData[i].imgs, function(imgJson) {
-						let imgUrl = imgJson.sceneImg
-						if (!imgJson.sceneImg.startsWith('http')) {
-							imgUrl = pageData.path() + imgJson.sceneImg
-						}
-						$('#sceneImg').attr('src', imgUrl)
-						_this.getSceneByIdApi()
-					})
+					let imgJson = {};
+					if(pageData.sceneData[i].imgs.length>0){
+						imgJson = pageData.sceneData[i].imgs[0]
+					}
+					console.log(imgJson);
+					if(imgJson!=null){
+						_this.renderImgView(pageData.sceneData[i].imgs, function(imgJson) {
+							if(imgJson!=undefined){
+								let imgUrl = imgJson.sceneImg
+								if (!imgJson.sceneImg.startsWith('http')) {
+									imgUrl = pageData.path() + imgJson.sceneImg
+								}
+								$('#sceneImg').attr('src', imgUrl)
+								_this.getSceneByIdApi()
+							}
+						})
+					}
+					
 				}
 			}
 			$('#sceneList').empty().append(html)
@@ -253,7 +263,7 @@ const sceneView = {
 	},
 	renderImgView: function(arr, callback) {
 		const img = pageData.getParam('img')
-		let html = '<option value="">请选择</option>'
+		let html = ''//'<option value="">请选择</option>'
 		let data;
 		for (var j = 0; j < arr.length; j++) {
 			if (img && img == arr[j].id) {
@@ -685,29 +695,37 @@ const sceneWindow = {
 		const tree = layui.tree
 		const table = layui.table
 		let imgarr = []
+		let hasimg = true
 		$('input[name="imgPath"][data-type="0"]').each(function(i, item) {
 			if (!$(item).hasClass('layui-hide')) {
 				if (!$(item).val()) {
-					layer.msg('模型图地址不能为空！', {
-						icon: 2
-					})
-					return
+					hasimg = false
 				}
 				imgarr.push($(item).val())
 			}
 		})
+		if(!hasimg){
+			layer.msg('模型图地址不能为空！', {
+				icon: 2
+			})
+			return
+		}
 		let formData = new FormData();
+		let hasimg2 = true
 		$('input[name="imgPath"][data-type="1"]').each(function(i, item) {
 			if (!$(item).hasClass('layui-hide')) {
 				if (!$(item).val()) {
-					layer.msg('模型图地址不能为空！', {
-						icon: 2
-					})
-					return
+					hasimg2 = false
 				}
 				formData.append('file', $(item)[0].files[0])
 			}
 		})
+		if(!hasimg2){
+			layer.msg('模型图地址不能为空！', {
+				icon: 2
+			})
+			return
+		}
 		formData.append('monitors', JSON.stringify(layui.xmSelect.get('#monitorSelect', true).getValue('value')))
 		formData.append('ids', JSON.stringify(this.treeData(tree.getChecked('deviceTree'))))
 		formData.append('imgs', JSON.stringify(imgarr))

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/chart-right-window.js

@@ -183,8 +183,15 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 			let nameData = []
 			let series = []
 			if (this.data.chartType == 'pie') {
-				const num = Math.floor(Math.random() * 1000)
+				console.log(itemList);
 				nameData.push(itemList[0].title)
+				let sdata = []
+				for(let i=0;i<itemList.length;i++){
+					const num = Math.floor(Math.random() * 1000)
+					sdata.push({
+						value:num,name:itemList[i].title
+					})
+				}
 				series.push({
 					left:'10%',
 					right:'10%',
@@ -192,9 +199,7 @@ layui.define(['layer', 'form', 'jquery', 'element', 'laydate', 'colorpicker', 's
 					bottom:'10%',
 					radius: "80%",
 					type: "pie",
-					data: [
-						{ value: num, name: itemList[0].title }
-					]
+					data: sdata
 				})
 			} else {
 				for (let i = 0; i < itemList.length; i++) {