1、修改曹莉提交的bug

industry-admin/src/store/modules/user.js

@@ -24,13 +24,16 @@ const state = {
     'value': 1
   }],
   // 用户类型
-  userType: [{
-    'name': '客户端用户',
-    'value': 0
-  }, {
+  userType: [
+  //   {
+  //   'name': '客户端用户',
+  //   'value': 0
+  // },
+    {
     'name': '管理端用户',
     'value': 1
-  }],
+  }
+  ],
   // 验证码路径
   verifyCode: '',
   // 验证码参数

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

@@ -13,7 +13,7 @@
             <svg-icon icon-class="user-manger" class-name="card-panel-icon" />
           </div>
           <div class="card-panel-description">
-            <div class="card-panel-text">管理端用户数量</div>
+            <div class="card-panel-text">用户数量</div>
             <count-to
               :start-val="startVal"
               :end-val="statistics.managerUserNum"

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

@@ -108,7 +108,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>'
@@ -168,7 +168,7 @@ export default {
                     value: 2,
                     label: '事件驱动报表'
                 }, {
-                    value: 3,
+                    value: 5,
                     label: '设备报表'
                 }
             ]

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

@@ -10,7 +10,7 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item label="" prop="reportTableType">
-                            <el-select v-model="queryParams.reportTableType" placeholder="请选择报表类型">
+                            <el-select v-model="queryParams.reportTableType" placeholder="请选择报表类型" clearable>
                                 <el-option v-for="tableType in reportTableTypeList" :key="tableType.value"
                                     :label="tableType.label" :value="tableType.value">
                                 </el-option>
@@ -20,7 +20,7 @@
                             <el-button type="primary" icon="el-icon-search" size="mini"
                                 @click="getAllReportTable">搜索</el-button>
 <!--                          <svg-icon icon-class="report_m" />-->
-                            <!-- <el-button ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
+                             <el-button type="info" ref="btn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
                         </el-form-item>
                     </el-form>
                     <!-- 数据组表格信息 -->
@@ -272,7 +272,7 @@ export default {
                     value: 2,
                     label: '事件驱动报表'
                 }, {
-                    value: 3,
+                    value: 5,
                     label: '设备报表'
                 }
             ],
@@ -425,6 +425,11 @@ export default {
                 })
             })
         },
+      /** 重置按钮操作 */
+      resetQuery(event) {
+        this.$refs['queryForm'].resetFields()
+        this.getAllReportTable()
+      },
     }
 }
 </script>

industry-admin/src/views/source/dataModel/test.vue

@@ -43,6 +43,7 @@ export default {
         dialogClose() {
             if (this.$refs['dataModelTestForm']) this.$refs['dataModelTestForm'].resetFields()
             this.visible = false
+            this.calcValResult = ''
         },
         /** 列表测试 */
         testByIdEvent() {

industry-admin/src/views/system/user/delet-user.vue

@@ -62,7 +62,7 @@
         >
           <template slot-scope="scope">
             <span>{{
-              scope.row.userType === 0 ? "客户端用户" : "管理端用户"
+              scope.row.userType === 0 ? "管理端用户" : "管理端用户"
             }}</span>
           </template>
         </el-table-column>

industry-admin/src/views/system/user/index.vue

@@ -92,21 +92,21 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="" prop="userType">
-                <el-select
-                  v-model="queryParams.userType"
-                  placeholder="类型"
-                  clearable
-                  style="width: 100px"
-                >
-                  <el-option
-                    v-for="type in userType"
-                    :key="type.value"
-                    :label="type.name"
-                    :value="type.value"
-                  />
-                </el-select>
-              </el-form-item>
+<!--              <el-form-item label="" prop="userType">-->
+<!--                <el-select-->
+<!--                  v-model="queryParams.userType"-->
+<!--                  placeholder="类型"-->
+<!--                  clearable-->
+<!--                  style="width: 100px"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="type in userType"-->
+<!--                    :key="type.value"-->
+<!--                    :label="type.name"-->
+<!--                    :value="type.value"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
           </el-col>
         </el-row>
 
@@ -153,17 +153,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            key="state"
-            label="状态"
-            align="left"
-            prop="state"
-            :show-overflow-tooltip="true"
-          >
-            <template slot-scope="scope">
-              <span>{{ convertUserStatus(scope.row.state) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
             key="userType"
             label="类型"
             align="left"

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/ItemGroupServiceImpl.java

@@ -580,6 +580,7 @@ public class ItemGroupServiceImpl implements ItemGroupService {
         ExcelWriter writer = null;
         try {
             writer = ExcelUtil.getWriter(true);
+            //writer.getSheet().setColumnWidth(0,1000);
             writer.write(rows, true);
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/RoleServiceImpl.java

@@ -147,10 +147,10 @@ public class RoleServiceImpl implements RoleService {
         }
         Integer roleMenuCount = roleDao.getRoleMenuByRoleIdList(roleIdList);
         if (roleMenuCount != 0) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "删除失败！请检查所选角色是否已分配菜单");
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "删除失败！该菜单已分配角色，不允许删除");
         }
         if (roleDao.queryUserNumByRoleIdList(roleIdList)>0){
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "删除失败！请检查所选角色是否已分配用户");
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "删除失败！该用户已分配角色，不允许删除");
         }
         roleDao.deleteRoleList(roleIdList);
         roleDao.deleteRoleIdList(roleIdList);

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

@@ -276,6 +276,7 @@ public class ManualReportTableValidate implements ReportTableValidate {
                 serieJsonObject.put("data", serieDataList.get(i));
             }
             JSONObject xAxis = chartData.getJSONArray("xAxis").getJSONObject(0);
+            JSONObject axisLabel = xAxis.getJSONObject("axisLabel");
             xAxis.put("data", xAxisList);
             //如果为饼图
         } else if (chartType.equals(ConstantStr.PIE_CHART)) {

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

@@ -300,6 +300,7 @@ const indexFn = {
 												templateData.chart[key].chartData.backgroundColor = colorForm.background
 												$(`#${chartId}_c`).css('background', colorForm.background)
 											}
+											console.log(templateData.chart[key].chartData);
 											chart.setOption(templateData.chart[key].chartData, {
 												notMerge: true
 											})

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/echart-util.js

@@ -40,6 +40,7 @@ layui.define(function(exports) {
 			}
 			let obj = {}
 			obj[skey] = arr
+			//console.log(obj);
 			chartElem.setOption(obj)
 		},
 		setTitle: function(id, key, val) {
@@ -72,6 +73,7 @@ layui.define(function(exports) {
 				obj[key] = val
 				series[i][skey] = obj
 			}
+			//console.log(series)
 			chartElem.setOption({
 				series
 			})

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/excel-util.js

@@ -1834,6 +1834,8 @@ layui.define(function(exports) {
 					chartId: key,
 					option: data[key].position,
 					init: function(chart, chartId) {
+						//console.log("showChart");
+						//console.log(data[key].chartData);
 						chart.setOption(data[key].chartData, {
 							notMerge: true
 						})

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

@@ -78,7 +78,8 @@ layui.define(['layer', 'util', 'jquery', 'form', 'sheetTypew', 'chartRightw', 'i
 					chart: layui.excelUtil.getChartData()
 				}),
 			}
-			//console.log(params)
+			console.log("save");
+			console.log(layui.excelUtil.getChartData())
 			if (layui.sheetTypew.templateReportId > 0) {
 				params.id = layui.sheetTypew.templateReportId
 				params.version = layui.sheetTypew.templateReportVersion

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

@@ -121,7 +121,11 @@ const chartOption = {
 			type: 'category',
 			data: ['点位一', '点位二', '点位三'],
 			axisLabel: {
-				interval: 0
+				interval: 0,
+				formatter: function (value) {
+				                        return value.substr(0, 10) + "\n" + value.substr(10, value.length)
+				                       //return new Date(value).format("yyyy-MM-dd HH:mm")
+				                    }
 			}
 		},
 		yAxis: {