名称字段

data-ui/src/views/data/digitalfirecontrol/fireforce/index.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"  @submit.native.prevent>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="所在乡镇" prop="village">
         <el-input
           v-model="queryParams.village"
@@ -122,7 +131,7 @@
 
     <el-table v-loading="loading" :data="fireforceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <!--<el-table-column label="主键id" align="center" prop="id"/>-->
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="所在乡镇" align="center" prop="village"/>
       <el-table-column label="地址" align="center" prop="address"/>
       <el-table-column label="总载水量" align="center" prop="totalLoadofWater"/>
@@ -173,11 +182,8 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="所属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
-                          placeholder="请选择部门" @select="hx"/>
-<!--            <el-form-item label="所属部门" prop="deptId">-->
-<!--              <Deptselector :setValue=setDataDeptId :dataDeptId="form.deptId"/>-->
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
             </el-form-item>
             <el-form-item label="经度" prop="longitude" @dblclick.native="showMap">
               <el-input v-model="form.longitude" placeholder="鼠标双击此处以选择经纬度" maxlength="32"/>
@@ -191,6 +197,12 @@
             <el-form-item label="负责人2" prop="principalTwo">
               <el-input v-model="form.principalTwo" placeholder="请输入负责人" maxlength="20"/>
             </el-form-item>
+            <el-form-item label="所属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
+                          placeholder="请选择部门" @select="hx"/>
+              <!--            <el-form-item label="所属部门" prop="deptId">-->
+              <!--              <Deptselector :setValue=setDataDeptId :dataDeptId="form.deptId"/>-->
+            </el-form-item>
           </el-col>
 
           <el-col :span="12">
@@ -292,6 +304,7 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        name: null,
         pageNum: 1,
         pageSize: 10,
         village: null,
@@ -317,6 +330,9 @@ export default {
       checkPositiveDecimal: checkPositiveDecimal,
       // 表单校验
       rules: {
+        name: [
+          {required: true, message: '名称不能为空', trigger: 'blur'}
+        ],
         village: [
           {required: true, message: '所在乡镇不能为空', trigger: 'blur'}
         ],

data-ui/src/views/data/digitalfirecontrol/otherlinkageforce/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="单位" prop="company">
+      <el-form-item label="单位名称" prop="company">
         <el-input
           v-model="queryParams.company"
           placeholder="请输入单位"
@@ -114,7 +114,7 @@
     <el-table v-loading="loading" :data="otherlinkageforceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="主键id" align="center" prop="id"/>-->
-      <el-table-column label="单位" align="center" prop="company"/>
+      <el-table-column label="单位名称" align="center" prop="company"/>
       <el-table-column label="单位电话" align="center" prop="companyPhone"/>
       <el-table-column label="联系人" align="center" prop="contacts"/>
       <el-table-column label="联系人电话" align="center" prop="contactsPhone"/>
@@ -167,8 +167,8 @@
 <!--        </el-row>-->
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单位" prop="company">
-              <el-input v-model="form.company" placeholder="请输入单位" maxlength="20"/>
+            <el-form-item label="单位名称" prop="company">
+              <el-input v-model="form.company" placeholder="请输入单位名称" maxlength="20"/>
             </el-form-item>
             <el-form-item label="联系人" prop="contacts">
               <el-input v-model="form.contacts" placeholder="请输入联系人" maxlength="20"/>
@@ -297,7 +297,7 @@ export default {
       // 表单校验
       rules: {
         company: [
-          {required: true, message: '单位不能为空', trigger: 'blur'}
+          {required: true, message: '单位名称不能为空', trigger: 'blur'}
         ],
         companyPhone: [
           {required: true, message: '单位电话不能为空', trigger: 'blur'},

data-ui/src/views/data/generalbusiness/keyProjects/index.vue

@@ -425,17 +425,29 @@
 
     <el-dialog :title="title" :visible.sync="scheduleHistory" width="900px" class="form-style">
       <!-- 修改内容回显开始 -->
-      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <!--<el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <ul class="xg_cont">
             <li>
-              <h4 class="sjxtitle">项目名称</h4>
-              <span class="sjx_cont">{{form.projectName}}</span>
+              <el-form-item label="年度计划投资（万元）" prop="yearInvest">
+                <el-input v-model="form.yearInvest" placeholder="请输入年度计划投资" maxlength="32" disabled/>
+              </el-form-item>
             </li>
             <li>
-              <h4 class="sjxtitle">项目环境</h4>
+             &lt;!&ndash; <h4 class="sjxtitle">项目环境</h4>
               <span class="sjx_cont">
                 <dict-tag :options="dict.type.centerdata_environment" :value="form.environment"/>
-              </span>
+              </span>&ndash;&gt;
+
+              <el-form-item label="项目环境" prop="environment">
+                <el-select v-model="form.environment" placeholder="请选择项目环境" disabled>
+                  <el-option
+                    v-for="dict in dict.type.centerdata_environment"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
             </li>
             <li>
               <h4 class="sjxtitle">经度</h4>
@@ -544,32 +556,156 @@
             </li>
 
         </ul>
+      </el-form>-->
+
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" maxlength="50" readonly/>
+            </el-form-item>
+            <el-form-item label="经度" prop="longitude">
+              <el-input v-model="form.longitude" maxlength="32" readonly/>
+            </el-form-item>
+            <el-form-item label="属地辖区" prop="territoriality">
+              <el-select v-model="form.territoriality" maxlength="32" disabled>
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="负责人" prop="principal">
+              <el-input v-model="form.principal" maxlength="20" disabled/>
+            </el-form-item>
+            <el-form-item label="开发区中心点经度" prop="parkLongitude" @dblclick.native="showMaptwo">
+              <el-input v-model="form.parkLongitude" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="开复工时间" prop="startTime">
+              <el-date-picker clearable
+                              v-model="form.startTime"
+                              type="month"
+                              value-format="yyyy-MM" disabled>
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="建设地点" prop="constructionSite">
+              <el-input v-model="form.constructionSite" maxlength="255" disabled/>
+            </el-form-item>
+            <el-form-item label="总投资（万元）" prop="totalInvest">
+              <el-input v-model="form.totalInvest" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="法人单位" prop="legalUnit">
+              <el-input v-model="form.legalUnit" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="项目秘书职务" prop="secretaryDuties">
+              <el-input v-model="form.secretaryDuties" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="所属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
+                          @select="hx" :noResultsText="'空'" :noOptionsText="'空'" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目环境" prop="environment">
+              <el-select v-model="form.environment" disabled>
+                <el-option
+                  v-for="dict in dict.type.centerdata_environment"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="纬度" prop="latitude" @dblclick.native="showMap">
+              <el-input v-model="form.latitude" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="所属开发区" prop="park">
+              <el-select v-model="form.park" disabled>
+                <el-option
+                  v-for="item in deptOptionsPark"
+                  :key="item.deptId"
+                  :label="item.deptName"
+                  :value="item.deptId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" maxlength="13" disabled/>
+            </el-form-item>
+            <el-form-item label="开发区中心点纬度" prop="parkLatitude" @dblclick.native="showMaptwo">
+              <el-input v-model="form.parkLatitude" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="计划竣工时间" prop="endTime">
+              <el-date-picker clearable
+                              v-model="form.endTime"
+                              type="month"
+                              value-format="yyyy-MM" disabled>
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="在建性质" prop="nature">
+              <el-select v-model="form.nature" disabled>
+                <el-option
+                  v-for="dict in dict.type.centerdata_zj_nature"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="年度计划投资（万元）" prop="yearInvest">
+              <el-input v-model="form.yearInvest" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="项目秘书" prop="secretary">
+              <el-input v-model="form.secretary" maxlength="32" disabled/>
+            </el-form-item>
+            <el-form-item label="项目秘书手机" prop="secretaryPhone">
+              <el-input v-model="form.secretaryPhone" maxlength="13" disabled/>
+            </el-form-item>
+            <el-form-item label="产业类别" prop="industryType">
+              <el-select v-model="form.industryType" disabled>
+                <el-option
+                  v-for="dict in dict.type.centerdata_industry_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="绑定设备" prop="deviceList">
+              <el-select v-model="form.deviceList" filterable multiple  disabled>
+                <el-option
+                  v-for="dict in cameraList"
+                  :key="dict.id"
+                  :label="dict.cameraName"
+                  :value="dict.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="建设内容" prop="introduction">
+              <el-input v-model="form.introduction" type="textarea" maxlength="500"
+                        :autosize="{ minRows: 5, maxRows: 5}" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="封面" prop="photoId" >
+              <ImageUpload  v-if="form.photoId!=null" ref="ImageUpload" :limit="1" :fileType="['png', 'jpg', 'jpeg']" :value="form.photoId"
+                           @input="getUrl"></ImageUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <!-- 修改内容回显结束 -->
-<!--      <el-form ref="historyForm" :inline="true" :model="historyQueryParams" :rules="rules" label-width="80px">-->
-<!--        <el-form-item label="起始时间" prop="startTime">-->
-<!--          <el-date-picker clearable size="small"-->
-<!--                          :disabled="!scheduleHistory"-->
-<!--                          v-model="historyQueryParams.startTime"-->
-<!--                          type="date"-->
-<!--                          value-format="yyyy-MM-dd"-->
-<!--                          placeholder="选择起始时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="终止时间" prop="endTime">-->
-<!--          <el-date-picker clearable size="small"-->
-<!--                          :disabled="!scheduleHistory"-->
-<!--                          v-model="historyQueryParams.endTime"-->
-<!--                          type="date"-->
-<!--                          value-format="yyyy-MM-dd"-->
-<!--                          placeholder="选择终止时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item>-->
-<!--          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleHistoryQuery" :loading="loading1">搜索</el-button>-->
-<!--          <el-button icon="el-icon-refresh" size="mini" @click="resetHistoryQuery">重置</el-button>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
       <b>{{ this.keyProjectsName }}</b><br><br>
       <div class="block" style="overflow: auto;">
         <el-timeline :reverse="!scheduleHistory">

src/main/java/com/sooka/sponest/data/digitalfirecontrol/domain/CenterdataTFirecontrolOtherLinkageForce.java

@@ -34,8 +34,8 @@ public class CenterdataTFirecontrolOtherLinkageForce extends BaseBusinessEntity
      * 单位
      */
     @ApiModelProperty(value = "单位", required = true)
-    @Excel(name = "单位")
-    @NotBlank(message = "单位不能为空")
+    @Excel(name = "单位名称")
+    @NotBlank(message = "单位名称不能为空")
     private String company;
 
     /**

src/main/java/com/sooka/sponest/data/digitalfirecontrol/service/impl/CenterdataTFirecontrolFireForceServiceImpl.java

@@ -65,7 +65,6 @@ public class CenterdataTFirecontrolFireForceServiceImpl extends BaseServiceImpl
     @Override
     public int insertCenterdataTFireForce(CenterdataTFirecontrolFireForce centerdataTFirecontrolFireForce) {
         centerdataTFirecontrolFireForce.setId(IdUtils.simpleUUID());
-        centerdataTFirecontrolFireForce.setName(centerdataTFirecontrolFireForce.getVillage());
         centerdataTFirecontrolFireForce.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTFirecontrolFireForce.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFirecontrolFireForce.setCreateTime(DateUtils.getNowDate());
@@ -91,7 +90,6 @@ public class CenterdataTFirecontrolFireForceServiceImpl extends BaseServiceImpl
     @Override
     public int updateCenterdataTFireForce(CenterdataTFirecontrolFireForce centerdataTFirecontrolFireForce) {
         centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTFirecontrolFireForce.getId());
-        centerdataTFirecontrolFireForce.setName(centerdataTFirecontrolFireForce.getVillage());
         centerdataTFirecontrolFireForce.setUpdateBy(SecurityUtils.getUserId());
         centerdataTFirecontrolFireForce.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTFirecontrolFireForce.setUpdateTime(DateUtils.getNowDate());

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFireForceMapper.xml

@@ -46,6 +46,7 @@
             <if test="totalLoadofWater != null  and totalLoadofWater != ''">and total_loadof_water =
                 #{totalLoadofWater}
             </if>
+            <if test="name != null  and name != ''">and name LIKE CONCAT('%',#{name}, '%')</if>
             <if test="principal != null  and principal != ''">and principal LIKE CONCAT('%',#{principal}, '%')</if>
             <if test="contact != null  and contact != ''">and contact = #{contact}</if>
             <if test="longitude != null  and longitude != ''">and longitude = #{longitude}</if>
@@ -86,7 +87,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateName != null">update_name,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="village != null">name,</if>
+            <if test="name != null">name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -107,7 +108,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateName != null">#{updateName},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="village != null">#{name},</if>
+            <if test="name != null">#{name},</if>
         </trim>
     </insert>
 
@@ -131,7 +132,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateName != null">update_name = #{updateName},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="village != null">name = #{village},</if>
+            <if test="name != null">name = #{name},</if>
         </trim>
         where id = #{id}
     </update>

src/main/resources/mapper/digitalfirecontrol/CenterdataTFirecontrolFulltimeStationMapper.xml

@@ -70,7 +70,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateName != null">update_name,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="principal != null">name,</if>
+            <if test="name != null">name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -87,7 +87,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateName != null">#{updateName},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="principal != null">#{name},</if>
+            <if test="name != null">#{name},</if>
         </trim>
     </insert>
 

src/main/resources/mapper/digitalwater/CenterdataTHydraulicPatrolTaskMapper.xml

@@ -41,7 +41,7 @@
 
     <select id="selectCenterdataTHydraulicPatrolTaskList" parameterType="CenterdataTHydraulicPatrolTask"
             resultMap="CenterdataTHydraulicPatrolTaskResult">
-        SELECT t1.*,IFNULL(Round( sum(t2.length) / 1000,2),0) realLength FROM (
+        SELECT t1.*,IFNULL(Round( t2.length / 1000,2),0) realLength FROM (
         <include refid="selectCenterdataTHydraulicPatrolTaskVo"/>
         left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
         <where>