提交代码

唐耀东

2022-05-18 c01dff9a24f98f10f247d2f2e449383f567ec338

提交代码

 src/views/basics/building/index.vue

@@ -277,7 +277,7 @@
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      this.$modal.confirm('是否确认删除"' + row.detailedName + '"？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delBuilding(row.id);
      }).then(() => {

 src/views/basics/organization/index.vue

@@ -181,7 +181,7 @@
    },
    /** 查询高校组织机构下拉树结构 */
    getTreeselect() {
      listOrganization().then(response => {
      listOrganization({schoolId: this.schoolId}).then(response => {
        this.organizationOptions = [];
        const data = {id: 0, name: '顶级节点', children: []};
        data.children = this.handleTree(response.data, "id", "parentId");
@@ -276,7 +276,7 @@
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      this.$modal.confirm('是否确认删除高校组织机构编号为"' + row.id + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delOrganization(row.id);
      }).then(() => {

 src/views/construction/ai/index.vue

@@ -291,7 +291,7 @@
          {required: true, message: "IP不能为空", trigger: "blur"},
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
@@ -305,7 +305,7 @@
        ipTwo: [
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
@@ -441,7 +441,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除AI设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delAi(ids);
      }).then(() => {

 src/views/construction/constructionBatch/index.vue

@@ -106,6 +106,7 @@
          <el-date-picker
              v-model="form.date"
              type="daterange"
              value-format="yyyy-MM-dd"
              range-separator="至"
              start-placeholder="开始日期"
              end-placeholder="截至日期">
@@ -275,8 +276,9 @@
      const id = row.id || this.ids
      getConstructionBatch(id).then(response => {
        this.loading = false;
        this.form = response.data;
        this.form.date = [this.form.startDate, this.form.endDate]
        // this.form = response.data;
        const localDate = [response.data.startDate, response.data.endDate];
        this.form = Object.assign({}, response.data, {date: localDate})
        this.open = true;
        this.title = "修改施工批次";
      });
@@ -284,7 +286,6 @@
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
        console.log(this.form.date)
        this.form.startDate = this.form.date[0];
        this.form.endDate = this.form.date[1];
        if (valid) {

 src/views/construction/exchange/index.vue

@@ -137,6 +137,7 @@
      <el-table-column label="具体位置" min-width="220" align="center" prop="address"/>
      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="型号" min-width="180" align="center" prop="model"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
@@ -516,7 +517,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除交换设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delExchange(ids);
      }).then(() => {

 src/views/construction/iot/index.vue

@@ -120,8 +120,8 @@
      <el-table-column label="安装位置" min-width="180" align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="150" align="center" prop="constructionBatchId_dictText"/>
<!--      <el-table-column label="序列号" align="center" prop="serialNumber"/>-->
<!--      <el-table-column label="型号" align="center" prop="model"/>-->
      <el-table-column label="序列号" align="center" prop="serialNumber"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText"/>
      <el-table-column label="监控对象" align="center" min-width="180" prop="monitorObject"/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
@@ -340,7 +340,7 @@
          {required: true, message: "IP不能为空", trigger: "blur"},
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
@@ -505,7 +505,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除IoT设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delIot(ids);
      }).then(() => {

 src/views/construction/ipc/index.vue

@@ -84,9 +84,9 @@
      <el-table-column label="安装位置" min-width="240"  align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="200" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="120" align="center" prop="constructionBatchId_dictText"/>
      <!--      <el-table-column label="序列号" align="center" prop="serialNumber" />-->
      <!--      <el-table-column label="型号" align="center" prop="model" />-->
      <!--      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText" />-->
      <el-table-column label="序列号" align="center" prop="serialNumber"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -279,7 +279,7 @@
          {required: true, message: "mac不能为空", trigger: "blur"},
          {
            pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
            message: "请输入正确的MAC",
            message: "请输入正确的MAC，文本范围 0~9、a~f、A~F、：",
            trigger: "blur"
          }
        ],
@@ -287,7 +287,7 @@
          {required: true, message: "IP不能为空", trigger: "blur"},
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
@@ -476,7 +476,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除ipc设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delIpc(ids);
      }).then(() => {

 src/views/construction/nvr/index.vue

@@ -24,8 +24,6 @@
        <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
@@ -90,10 +88,10 @@
      <el-table-column label="硬盘" align="center" min-width="120" prop="hardDisk"/>
      <el-table-column label="安装位置" align="center" min-width="240" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" align="center" min-width="200" prop="organizationId_dictText"/>
      <!--      <el-table-column label="施工批次" align="center" prop="constructionBatchId" />-->
      <!--      <el-table-column label="序列号" align="center" prop="serialNumber" />-->
      <!--      <el-table-column label="型号" align="center" prop="model" />-->
      <!--      <el-table-column label="生产厂商" align="center" prop="manufacturerId" />-->
      <el-table-column label="施工批次" align="center" prop="constructionBatchId_dictText"/>
      <el-table-column label="序列号" align="center" prop="serialNumber"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -322,26 +320,26 @@
          {required: true, message: "ip1不能为空", trigger: "blur"},
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
        lanTwo: [
          {required: true, message: "LAN2不能为空", trigger: "blur"},
          {
            pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
            message: "请输入正确的LAN",
            trigger: "blur"
          }
        ],
        ipTwo: [
          {required: true, message: "ip2不能为空", trigger: "blur"},
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            trigger: "blur"
          }
        ],
        // lanTwo: [
        //   {required: true, message: "LAN2不能为空", trigger: "blur"},
        //   {
        //     pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
        //     message: "请输入正确的LAN",
        //     trigger: "blur"
        //   }
        // ],
        // ipTwo: [
        //   {required: true, message: "ip2不能为空", trigger: "blur"},
        //   {
        //     pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
        //     message: "请输入正确的ip地址，文本范围 0~9、.",
        //     trigger: "blur"
        //   }
        // ],
        loginAccount: [
          {required: true, message: "登录账号不能为空", trigger: "blur"}
        ],
@@ -493,7 +491,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除NVR设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delNvr(ids);
      }).then(() => {

 src/views/construction/reserveIp/index.vue

@@ -10,6 +10,9 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="适用地点" prop="buildingId">
        <building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -25,7 +28,8 @@
          size="mini"
          @click="handleAdd"
          v-hasPermi="['oa:reserveIp:add']"
        >新增</el-button>
        >新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
@@ -36,7 +40,8 @@
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['oa:reserveIp:edit']"
        >修改</el-button>
        >修改
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
@@ -47,7 +52,8 @@
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['oa:reserveIp:remove']"
        >删除</el-button>
        >删除
        </el-button>
      </el-col>
    </el-row>

@@ -75,7 +81,8 @@
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['oa:reserveIp:edit']"
          >修改</el-button>
          >修改
          </el-button>
          <el-button
            size="mini"
            type="text"
@@ -83,7 +90,8 @@
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:reserveIp:remove']"
          >删除</el-button>
          >删除
          </el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -97,7 +105,8 @@
    />

    <!-- 添加或修改预留IP对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true" :close-on-click-modal="false">
    <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true"
               :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="IP地址" prop="ip">
          <el-input v-model="form.ip" placeholder="请输入ip地址" />
@@ -112,11 +121,13 @@
          <el-date-picker clearable size="small"
            v-model="form.applicationDate"
            type="date"
                          value-format="yyyy-MM-dd"
            placeholder="选择申请日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit placeholder="请输入内容" />
          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -179,11 +190,19 @@
      rules: {
        ip: [
          { required: true, message: "ip地址不能为空", trigger: "blur" },
          { pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/, message: "请输入正确的ip地址", trigger: "blur" }
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
        mac: [
          { required: true, message: "MAC地址不能为空", trigger: "blur" },
          { pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/, message: "请输入正确的MAC地址", trigger: "blur" }
          {
            pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
            message: "请输入正确的MAC地址，文本范围 0~9、a~f、A~F、：",
            trigger: "blur"
          }
        ],
        buildingId: [
          { required: true, message: "建筑单元不能为空", trigger: "change" }

 src/views/construction/server/index.vue

@@ -81,17 +81,17 @@
          <dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
        </template>
      </el-table-column>
      <!--      <el-table-column label="账户" align="center" prop="account" />-->
      <el-table-column label="系统账号" align="center" prop="account"/>
      <el-table-column label="部署位置" align="center" min-width="180" prop="buildingId_dictText"/>
      <el-table-column label="机柜号" align="center" prop="cabinetNumber"/>
      <el-table-column label="机架号" align="center" prop="rackNumber"/>
      <el-table-column label="所属单位" align="center" min-width="180" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" align="center" min-width="180" prop="constructionBatchId_dictText"/>
      <!--      <el-table-column label="序列号" align="center" prop="serialNumber" />-->
      <el-table-column label="序列号" align="center" prop="serialNumber"/>
      <el-table-column label="型号" align="center" min-width="180" prop="model"/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText"/>
      <!--      <el-table-column label="性能指标" align="center" prop="performanceIndex" />-->
      <!--      <el-table-column label="备注" align="center" prop="remarks" />-->
      <el-table-column label="性能指标" align="center" prop="performanceIndex"/>
      <el-table-column label="备注" align="center" prop="remarks"/>
      <!--      <el-table-column label="附件" align="center" prop="filePath" />-->
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
@@ -212,11 +212,11 @@
          </el-col>
        </el-row>
        <el-form-item label="性能指标" prop="performanceIndex">
          <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="64" show-word-limit
          <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="64" show-word-limit
          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
@@ -322,7 +322,7 @@
          {required: true, message: "IP不能为空", trigger: "blur"},
          {
            pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
            message: "请输入正确的ip地址",
            message: "请输入正确的ip地址，文本范围 0~9、.",
            trigger: "blur"
          }
        ],
@@ -482,7 +482,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除服务器编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delServer(ids);
      }).then(() => {

 src/views/construction/system/index.vue

@@ -144,7 +144,7 @@
          </el-col>
        </el-row>
        <el-form-item label="功能描述" prop="functionDescription">
          <el-input v-model="form.functionDescription" :rows="8" maxlength="64" show-word-limit type="textarea"
          <el-input v-model="form.functionDescription" :rows="8" maxlength="512" show-word-limit type="textarea"
                    placeholder="请输入内容"/>
        </el-form-item>
        <el-row>
@@ -183,7 +183,7 @@
          </el-col>
        </el-row>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容"/>
          <el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -443,7 +443,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除软件系统编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delSystem(ids);
      }).then(() => {